remove Fractional from Element

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)
 -------------------------------------------------------------------
 
 -- | Basic element-by-element functions for numeric containers
-class (Complexable c, Element e) => Container c e where
+class (Complexable c, Fractional e, Element e) => Container c e where
     -- | create a structure with a single element
     scalar      :: e -> c e
     -- | 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;
 
 /********************************************************/
 
+int multiplyF(int ta, int tb, KFMAT(a),KFMAT(b),FMAT(r));
 int multiplyR(int ta, int tb, KDMAT(a),KDMAT(b),DMAT(r));
 int multiplyC(int ta, int tb, KCMAT(a),KCMAT(b),CMAT(r));
+int multiplyQ(int ta, int tb, KQMAT(a),KQMAT(b),QMAT(r));
 
 int transF(KFMAT(x),FMAT(t));
 int transR(KDMAT(x),DMAT(t));
 int transQ(KQMAT(x),QMAT(t));
 int transC(KCMAT(x),CMAT(t));
+int transP(KPMAT(x),PMAT(t));
 
 int constantF(float * pval, FVEC(r));
 int constantR(double * pval, DVEC(r));
 int constantQ(complex* pval, QVEC(r));
 int constantC(doublecomplex* pval, CVEC(r));
+int constantP(void* pval, PVEC(r));
 
 int float2double(FVEC(x),DVEC(y));
 int 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
 
 ---------------------------------------------------------
 
-instance (Container Vector a, Floating (Vector a), Fractional (Matrix a)) => Floating (Matrix a) where
+instance (Floating a, Container Vector a, Floating (Vector a), Fractional (Matrix a)) => Floating (Matrix a) where
     sin   = liftMatrix sin
     cos   = liftMatrix cos
     tan   = liftMatrix tan