summaryrefslogtreecommitdiff
path: root/lib/Numeric
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Numeric')
-rw-r--r--lib/Numeric/Container.hs2
-rw-r--r--lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h4
-rw-r--r--lib/Numeric/Matrix.hs2
3 files changed, 6 insertions, 2 deletions
diff --git a/lib/Numeric/Container.hs b/lib/Numeric/Container.hs
index 8cf3e07..83bf44e 100644
--- a/lib/Numeric/Container.hs
+++ b/lib/Numeric/Container.hs
@@ -62,7 +62,7 @@ type instance IndexOf Matrix = (Int,Int)
62------------------------------------------------------------------- 62-------------------------------------------------------------------
63 63
64-- | Basic element-by-element functions for numeric containers 64-- | Basic element-by-element functions for numeric containers
65class (Complexable c, Element e) => Container c e where 65class (Complexable c, Fractional e, Element e) => Container c e where
66 -- | create a structure with a single element 66 -- | create a structure with a single element
67 scalar :: e -> c e 67 scalar :: e -> c e
68 -- | complex conjugate 68 -- | complex conjugate
diff --git a/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h
index 12dcde4..0543f7a 100644
--- a/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h
+++ b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h
@@ -64,18 +64,22 @@ typedef short ftnlen;
64 64
65/********************************************************/ 65/********************************************************/
66 66
67int multiplyF(int ta, int tb, KFMAT(a),KFMAT(b),FMAT(r));
67int multiplyR(int ta, int tb, KDMAT(a),KDMAT(b),DMAT(r)); 68int multiplyR(int ta, int tb, KDMAT(a),KDMAT(b),DMAT(r));
68int multiplyC(int ta, int tb, KCMAT(a),KCMAT(b),CMAT(r)); 69int multiplyC(int ta, int tb, KCMAT(a),KCMAT(b),CMAT(r));
70int multiplyQ(int ta, int tb, KQMAT(a),KQMAT(b),QMAT(r));
69 71
70int transF(KFMAT(x),FMAT(t)); 72int transF(KFMAT(x),FMAT(t));
71int transR(KDMAT(x),DMAT(t)); 73int transR(KDMAT(x),DMAT(t));
72int transQ(KQMAT(x),QMAT(t)); 74int transQ(KQMAT(x),QMAT(t));
73int transC(KCMAT(x),CMAT(t)); 75int transC(KCMAT(x),CMAT(t));
76int transP(KPMAT(x),PMAT(t));
74 77
75int constantF(float * pval, FVEC(r)); 78int constantF(float * pval, FVEC(r));
76int constantR(double * pval, DVEC(r)); 79int constantR(double * pval, DVEC(r));
77int constantQ(complex* pval, QVEC(r)); 80int constantQ(complex* pval, QVEC(r));
78int constantC(doublecomplex* pval, CVEC(r)); 81int constantC(doublecomplex* pval, CVEC(r));
82int constantP(void* pval, PVEC(r));
79 83
80int float2double(FVEC(x),DVEC(y)); 84int float2double(FVEC(x),DVEC(y));
81int double2float(DVEC(x),FVEC(y)); 85int double2float(DVEC(x),FVEC(y));
diff --git a/lib/Numeric/Matrix.hs b/lib/Numeric/Matrix.hs
index f78e0c2..d5c6f44 100644
--- a/lib/Numeric/Matrix.hs
+++ b/lib/Numeric/Matrix.hs
@@ -63,7 +63,7 @@ instance (Container Vector a, Fractional (Vector a), Num (Matrix a)) => Fraction
63 63
64--------------------------------------------------------- 64---------------------------------------------------------
65 65
66instance (Container Vector a, Floating (Vector a), Fractional (Matrix a)) => Floating (Matrix a) where 66instance (Floating a, Container Vector a, Floating (Vector a), Fractional (Matrix a)) => Floating (Matrix a) where
67 sin = liftMatrix sin 67 sin = liftMatrix sin
68 cos = liftMatrix cos 68 cos = liftMatrix cos
69 tan = liftMatrix tan 69 tan = liftMatrix tan