[lisplab-cvs] r230 - in trunk: . src/matrix/1/funmat src/vector/1/funmat

[jivestgarden at common-lisp.net]

Author: jivestgarden
Date: Fri Apr 20 12:42:28 2012
New Revision: 230

Log:
Created function-vector

Added:
   trunk/src/vector/1/funmat/
Modified:
   trunk/lisplab.asd
   trunk/src/matrix/1/funmat/level1-funmat.lisp

Modified: trunk/lisplab.asd
==============================================================================
--- trunk/lisplab.asd	Fri Apr 20 11:40:23 2012	(r229)
+++ trunk/lisplab.asd	Fri Apr 20 12:42:28 2012	(r230)
@@ -128,17 +128,17 @@
      (:file "vector1-ub32")
      (:file "vector1-idx")))
 
-   (:module :src/matrix/1
+   (:module :src/vector/1/funmat
     :depends-on (:src/interface/1)
     :serial t
     :components 
-    ((:file "matrix1-constructors")))
+    ((:file "vector1-funmat")))
 
-   (:module :src/matrix/1/funmat
+   (:module :src/matrix/1
     :depends-on (:src/interface/1)
     :serial t
     :components 
-    ((:file "level1-funmat")))
+    ((:file "matrix1-constructors")))
 
    (:module :src/matrix/1/generic
     :depends-on (:src/interface/1)
@@ -167,6 +167,12 @@
      (:file "matrix1-ub8")
      (:file "matrix1-ub16")
      (:file "matrix1-ub32")))
+
+   (:module :src/matrix/1/funmat
+    :depends-on (:src/interface/1)
+    :serial t
+    :components 
+    ((:file "level1-funmat")))
    
    ))
 

Modified: trunk/src/matrix/1/funmat/level1-funmat.lisp
==============================================================================
--- trunk/src/matrix/1/funmat/level1-funmat.lisp	Fri Apr 20 11:40:23 2012	(r229)
+++ trunk/src/matrix/1/funmat/level1-funmat.lisp	Fri Apr 20 12:42:28 2012	(r230)
@@ -1,7 +1,7 @@
-;;; Lisplab, level1-dge.lisp
+;;; Lisplab, vector1-funmat.lisp
 ;;; General, storeless matrices
 
-;;; Copyright (C) 2009 Joern Inge Vestgaarden
+;;; Copyright (C) 2012 Joern Inge Vestgaarden
 ;;;
 ;;; This program is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 ;;; Function matrices (matrices without a store)
 
 (defclass function-matrix
-    (structure-general element-base implementation-base vector-base)
+    (structure-general element-base implementation-base function-vector)
   ((mref
     :initarg :mref
     :initform (constantly 0)
@@ -32,16 +32,6 @@
     :initarg :set-mref
     :initform (constantly nil)
     :accessor function-matrix-set-mref
-    :type function)
-   (vref
-    :initarg :vref
-    :initform (constantly 0)
-    :accessor function-matrix-vref 
-    :type function)
-   (set-vref
-    :initarg :set-vref
-    :initform (constantly nil)
-    :accessor function-matrix-set-vref
     :type function))
   (:documentation "Matrix without a store."))
 
@@ -57,8 +47,3 @@
 (defmethod (setf mref) (value (f function-matrix) row col)
   (funcall (function-matrix-set-mref f) value f row col))
 
-(defmethod vref ((f function-matrix) idx)
-  (funcall (function-matrix-vref f) f idx))
-
-(defmethod (setf vref) (value (f function-matrix) idx)
-  (funcall (function-matrix-set-vref f) value f idx))