[lisplab-cvs] r162 - trunk/src/matrix

[Jørn Inge Vestgården]

Author: jivestgarden
Date: Thu May 13 12:12:07 2010
New Revision: 162

Log:
simplfied class hierarchi for dge and zge

Modified:
   trunk/src/matrix/level1-dge.lisp
   trunk/src/matrix/level1-zge.lisp

Modified: trunk/src/matrix/level1-dge.lisp
==============================================================================
--- trunk/src/matrix/level1-dge.lisp	(original)
+++ trunk/src/matrix/level1-dge.lisp	Thu May 13 12:12:07 2010
@@ -43,13 +43,9 @@
   (:documentation "A full matrix (rows x cols) with double float elements. 
 Executes in lisp only."))
 
-(defclass matrix-blas-dge (matrix-implementation-blas matrix-lisp-dge) ()
-  (:documentation "A full matrix (rows x cols) with double float elements. 
-Executes in alien blas/lapack only."))
-
-(defclass matrix-dge (matrix-blas-dge) ()
+(defclass matrix-dge (matrix-implementation-blas matrix-lisp-dge) ()
   (:documentation "A full matrix (rows x cols) with double float matrix elements.
-Executes first in alien blas/lapack if possible. If not it executes in lisp."))
+Executes in FFI if possible. If not it executes in lisp."))
 
 (defmethod make-matrix-class ((a (eql :d)) (b (eql :ge)) (c (eql :base)))
   (find-class 'matrix-base-dge))
@@ -58,10 +54,10 @@
   (find-class 'matrix-lisp-dge))
 
 (defmethod make-matrix-class ((a (eql :d)) (b (eql :ge)) (c (eql :ffi)))
-  (find-class 'matrix-blas-dge))
+  (find-class 'matrix-dge))
 
 (defmethod make-matrix-class ((a (eql :d)) (b (eql :ge)) (c (eql :blas)))
-  (find-class 'matrix-blas-dge))
+  (find-class 'matrix-dge))
 
 (defmethod make-matrix-class ((a (eql :d)) (b (eql :ge)) (c (eql :any)))
   (find-class 'matrix-dge))

Modified: trunk/src/matrix/level1-zge.lisp
==============================================================================
--- trunk/src/matrix/level1-zge.lisp	(original)
+++ trunk/src/matrix/level1-zge.lisp	Thu May 13 12:12:07 2010
@@ -41,13 +41,9 @@
   (:documentation "A full matrix (rows x cols) with complex double float elements. 
 Executes in lisp only."))
 
-(defclass matrix-blas-zge (matrix-implementation-blas matrix-lisp-zge) ()
-  (:documentation "A full matrix (rows x cols) with complex double float elements. 
-Executes in alien blas/lapack only."))
-
-(defclass matrix-zge (matrix-blas-zge) ()
+(defclass matrix-zge (matrix-implementation-blas matrix-lisp-zge) ()
    (:documentation "A full matrix (rows x cols) with complex double float matrix elements.
-Executes first in alien blas/lapack if possible. If not it executes in lisp."))
+Executes in FFI if possible. If not it executes in lisp."))
 
 (defmethod make-matrix-class ((a (eql :z)) (b (eql :ge)) (c (eql :base)))
   (find-class 'matrix-base-zge))
@@ -56,10 +52,10 @@
   (find-class 'matrix-lisp-zge))
 
 (defmethod make-matrix-class ((a (eql :z)) (b (eql :ge)) (c (eql :ffi)))
-  (find-class 'matrix-blas-zge))
+  (find-class 'matrix-zge))
 
 (defmethod make-matrix-class ((a (eql :z)) (b (eql :ge)) (c (eql :blas)))
-  (find-class 'matrix-blas-zge))
+  (find-class 'matrix-zge))
 
 (defmethod make-matrix-class ((a (eql :z)) (b (eql :ge)) (c (eql :any)))
   (find-class 'matrix-zge))