[lisplab-cvs] r78 - src/matrix
Jørn Inge Vestgården
jivestgarden at common-lisp.net
Sat Aug 8 19:43:16 UTC 2009
Author: jivestgarden
Date: Sat Aug 8 15:43:14 2009
New Revision: 78
Log:
cleaned up
Modified:
src/matrix/level2-constructors.lisp
src/matrix/level2-generic.lisp
src/matrix/level2-matrix-dge.lisp
src/matrix/level2-matrix-zge.lisp
Modified: src/matrix/level2-constructors.lisp
==============================================================================
--- src/matrix/level2-constructors.lisp (original)
+++ src/matrix/level2-constructors.lisp Sat Aug 8 15:43:14 2009
@@ -139,7 +139,7 @@
:rows ,rows2
:cols ,cols2
:mref (lambda (self , at args)
- (declare (muffle-conditions style-warning))
+ #+cbcl(declare (sb-ext::muffle-conditions style-warning))
, at body)
:vref (lambda (self ,i)
;; Default self vector reference in column major order
Modified: src/matrix/level2-generic.lisp
==============================================================================
--- src/matrix/level2-generic.lisp (original)
+++ src/matrix/level2-generic.lisp Sat Aug 8 15:43:14 2009
@@ -101,9 +101,6 @@
args))))))
b))
-#+nil (defmethod .map (f (a matrix-base) &rest args)
- (apply #'mmap (class-name (class-of a)) f a args))
-
(defmethod msum ((m matrix-base))
"Sums all elements of m."
(let ((sum 0))
@@ -340,42 +337,5 @@
(each-element-function-matrix-ge x (.besh2 n x)))
-;;; TRASH
-
-#|
-
-(defmethod .conj ((x matrix-ge))
- (each-element-function-matrix-ge x (.conj x)))
-
-;;; Trignometric functions
-
-(defmethod .sin ((x matrix-ge))
- (each-element-function-matrix-ge x (.sin x)))
-
-(defmethod .cos ((x matrix-ge))
- (each-element-function-matrix-ge x (.cos x)))
-
-(defmethod .tan ((x matrix-ge))
- (each-element-function-matrix-ge x (.tan x)))
-;;; Hyperbolic functions
-(defmethod .sinh ((x matrix-ge))
- (each-element-function-matrix-ge x (.sinh x)))
-
-(defmethod .cosh ((x matrix-ge))
- (each-element-function-matrix-ge x (.cosh x)))
-
-(defmethod .tanh ((x matrix-ge))
- (each-element-function-matrix-ge x (.tanh x)))
-
-;;; Logarithms and exponents
-
-(defmethod .exp ((x matrix-ge))
- (each-element-function-matrix-ge x (.exp x)))
-
-
-(defmethod .sqrt ((x matrix-ge))
- (each-element-function-matrix-ge x (.sqrt x)))
-
-|#
Modified: src/matrix/level2-matrix-dge.lisp
==============================================================================
--- src/matrix/level2-matrix-dge.lisp (original)
+++ src/matrix/level2-matrix-dge.lisp Sat Aug 8 15:43:14 2009
@@ -40,14 +40,6 @@
(matrix-store a) (mapcar #'matrix-store args))
b))
-#+nil (defmethod .map (f (a matrix-base-dge) &rest args)
- (let ((b (copy a)))
- (apply #'map-into
- (matrix-store b)
- (lambda (&rest args)
- (coerce (apply f args) 'double-float))
- (matrix-store a) (mapcar #'matrix-store args))
- b))
(defmethod msum ((m matrix-base-dge))
(let ((sum 0.0)
@@ -206,73 +198,3 @@
(defmethod .besh2 (n (x matrix-base-dge))
(each-matrix-element-df-to-complex-df x (.besh2 n x)))
-
-;;;;;;;;;;;;;;; TRASH
-
-#|
-(def-binary-op-matrix-base-dge .add +)
-
-(def-binary-op-matrix-base-dge .mul *)
-
-(def-binary-op-matrix-base-dge .sub -)
-
-(def-binary-op-matrix-base-dge .div /)
-
-(def-binary-op-matrix-base-dge .expt expt)
-
-(def-binary-op-matrix-base-dge .max max)
-
-(def-binary-op-matrix-base-dge .min min)
-
-|#
-
-
-
-#|
-;;; Trignometric functions
-(defmethod .sin ((x matrix-base-dge))
- (each-matrix-element-df-to-df x (sin x)))
-
-(defmethod .cos ((x matrix-base-dge))
- (each-matrix-element-df-to-df x (cos x)))
-
-(defmethod .tan ((x matrix-base-dge))
- (each-matrix-element-df-to-df x (tan x)))
-
-(defmethod .asin ((x matrix-base-dge))
- (each-matrix-element-df-to-df x (asin x)))
-
-(defmethod .acos ((x matrix-base-dge))
- (each-matrix-element-df-to-df x (acos x)))
-
-(defmethod .atan ((x matrix-base-dge))
- (each-matrix-element-df-to-df x (atan x)))
-
-;;; Hyperbolic functions
-
-(defmethod .sinh ((x matrix-base-dge))
- (each-matrix-element-df-to-df x (sinh x)))
-
-(defmethod .cosh ((x matrix-base-dge))
- (each-matrix-element-df-to-df x (cosh x)))
-
-(defmethod .tanh ((x matrix-base-dge))
- (each-matrix-element-df-to-df x (tanh x)))
-
-(defmethod .asinh ((x matrix-base-dge))
- (each-matrix-element-df-to-df x (asinh x)))
-
-(defmethod .acosh ((x matrix-base-dge))
- (each-matrix-element-df-to-df x (acosh x)))
-
-(defmethod .atanh ((x matrix-base-dge))
- (each-matrix-element-df-to-df x (atanh x)))
-
-(defmethod .exp ((x matrix-base-dge))
- (each-matrix-element-df-to-df x (exp x)))
-
-(defmethod .sqrt ((x matrix-base-dge))
- (each-matrix-element-df-to-df x (sqrt x)))
-
-
-|#
Modified: src/matrix/level2-matrix-zge.lisp
==============================================================================
--- src/matrix/level2-matrix-zge.lisp (original)
+++ src/matrix/level2-matrix-zge.lisp Sat Aug 8 15:43:14 2009
@@ -194,74 +194,3 @@
(each-element-function-matrix-base-zge x (.besh2 n x)))
-
-;;; TRASH
-
-
-#|
-(def-binary-op-blas-complex .add +)
-
-(def-binary-op-blas-complex .mul *)
-
-(def-binary-op-blas-complex .sub -)
-
-(def-binary-op-blas-complex .div /)
-
-(def-binary-op-blas-complex .expt expt)
-|#
-
-
-#|
-(defmethod .exp ((x matrix-base-zge))
- (each-element-function-matrix-base-zge x (exp x)))
-
-(defmethod .sqrt ((x matrix-base-zge))
- (each-element-function-matrix-base-zge x (sqrt x)))
-
-
-
-(defmethod .conj ((x matrix-base-zge))
- (each-element-function-matrix-base-zge x (conjugate x)))
-
-;;; Trignometric functions
-
-(defmethod .sin ((x matrix-base-zge))
- (each-element-function-matrix-base-zge x (sin x)))
-
-(defmethod .cos ((x matrix-base-zge))
- (each-element-function-matrix-base-zge x (cos x)))
-
-(defmethod .tan ((x matrix-base-zge))
- (each-element-function-matrix-base-zge x (tan x)))
-
-(defmethod .asin ((x matrix-base-zge))
- (each-element-function-matrix-base-zge x (asin x)))
-
-(defmethod .acos ((x matrix-base-zge))
- (each-element-function-matrix-base-zge x (acos x)))
-
-(defmethod .atan ((x matrix-base-zge))
- (each-element-function-matrix-base-zge x (atan x)))
-
-;;; Hyperbolic functions
-
-(defmethod .sinh ((x matrix-base-zge))
- (each-element-function-matrix-base-zge x (sinh x)))
-
-(defmethod .cosh ((x matrix-base-zge))
- (each-element-function-matrix-base-zge x (cosh x)))
-
-(defmethod .tanh ((x matrix-base-zge))
- (each-element-function-matrix-base-zge x (tanh x)))
-
-(defmethod .asinh ((x matrix-base-zge))
- (each-element-function-matrix-base-zge x (asinh x)))
-
-(defmethod .acosh ((x matrix-base-zge))
- (each-element-function-matrix-base-zge x (acosh x)))
-
-(defmethod .atanh ((x matrix-base-zge))
- (each-element-function-matrix-base-zge x (atanh x)))
-
-;;; Logarithm and exponent
-|#
\ No newline at end of file
More information about the lisplab-cvs
mailing list