[lisplab-cvs] r61 - src/matrix

[Jørn Inge Vestgården]

Author: jivestgarden
Date: Mon Jul 20 06:54:56 2009
New Revision: 61

Log:
matrix views

Modified:
   lisplab.asd
   src/matrix/level2-funmat.lisp

Modified: lisplab.asd
==============================================================================
--- lisplab.asd	(original)
+++ lisplab.asd	Mon Jul 20 06:54:56 2009
@@ -68,7 +68,9 @@
       (:file "level2-generic")
       (:file "level2-matrix-dge")
       (:file "level2-matrix-zge")
-      (:file "level2-array-functions")))
+      (:file "level2-array-functions")
+      (:file "level2-funmat")
+      ))
 
    ;;
    ;; IO (level 3)

Modified: src/matrix/level2-funmat.lisp
==============================================================================
--- src/matrix/level2-funmat.lisp	(original)
+++ src/matrix/level2-funmat.lisp	Mon Jul 20 06:54:56 2009
@@ -28,8 +28,6 @@
     (make-instance 'function-matrix 
 		   :rows rows
 		   :cols cols
-		   :size size
-		   :element-type (element-type matrix)
 		   :mref #'(lambda (x i j) 
 			    (declare (ignore x))
 			    (vref matrix (column-major-idx i j rows)))
@@ -47,8 +45,6 @@
   (make-instance 'function-matrix 
 		 :rows (cols matrix)
 		 :cols 1
-		 :size (cols matrix)
-		 :element-type (element-type matrix)
 		 :mref #'(lambda (x i j) 
 			  (declare (ignore x j)) 
 			  (mref matrix row i))
@@ -67,8 +63,6 @@
   (make-instance 'function-matrix  
 		 :rows (rows matrix)
 		 :cols 1
-		 :size (rows matrix)
-		 :element-type (element-type matrix)
 		 :mref #'(lambda (x i j) 
 			  (declare (ignore x j)) 
 			  (mref matrix i col))