simple tests

6 files changed, 38 insertions, 15 deletions

diff --git a/lib/Numeric/GSL/gsl-aux.c b/lib/Numeric/GSL/gsl-aux.c
index 3e9e2cb..33d7dab 100644
--- a/lib/Numeric/GSL/gsl-aux.c
+++ b/lib/Numeric/GSL/gsl-aux.c
@@ -157,7 +157,7 @@ int prodF(KFVEC(x),FVEC(r)) {
     DEBUGMSG("prodF");
     REQUIRES(rn==1,BAD_SIZE);
     int i;
-    float res = 0;
+    float res = 1;
     for (i = 0; i < xn; i++) res *= xp[i];
     rp[0] = res;
     OK
@@ -167,7 +167,7 @@ int prodR(KRVEC(x),RVEC(r)) {
     DEBUGMSG("prodR");
     REQUIRES(rn==1,BAD_SIZE);
     int i;
-    double res = 0;
+    double res = 1;
     for (i = 0; i < xn; i++) res *= xp[i];
     rp[0] = res;
     OK
@@ -178,11 +178,13 @@ int prodQ(KQVEC(x),QVEC(r)) {
     REQUIRES(rn==1,BAD_SIZE);
     int i;
     gsl_complex_float res;
-    res.dat[0] = 0;
+    float temp;
+    res.dat[0] = 1;
     res.dat[1] = 0;
     for (i = 0; i < xn; i++) {
-      res.dat[0] = res.dat[0] * xp[i].dat[0] - res.dat[1] * xp[i].dat[1];
+      temp       = res.dat[0] * xp[i].dat[0] - res.dat[1] * xp[i].dat[1];
       res.dat[1] = res.dat[0] * xp[i].dat[1] + res.dat[1] * xp[i].dat[0];
+      res.dat[0] = temp;
     }
     rp[0] = res;
     OK
@@ -193,11 +195,13 @@ int prodC(KCVEC(x),CVEC(r)) {
     REQUIRES(rn==1,BAD_SIZE);
     int i;
     gsl_complex res;
-    res.dat[0] = 0;
+    double temp;
+    res.dat[0] = 1;
     res.dat[1] = 0;
     for (i = 0; i < xn; i++)  {
-      res.dat[0] = res.dat[0] * xp[i].dat[0] - res.dat[1] * xp[i].dat[1];
+      temp       = res.dat[0] * xp[i].dat[0] - res.dat[1] * xp[i].dat[1];
       res.dat[1] = res.dat[0] * xp[i].dat[1] + res.dat[1] * xp[i].dat[0];
+      res.dat[0] = temp;
     }
     rp[0] = res;
     OK
diff --git a/lib/Numeric/LinearAlgebra/Algorithms.hs b/lib/Numeric/LinearAlgebra/Algorithms.hs
index 5bc9ca5..f2f5473 100644
--- a/lib/Numeric/LinearAlgebra/Algorithms.hs
+++ b/lib/Numeric/LinearAlgebra/Algorithms.hs
@@ -76,8 +76,6 @@ module Numeric.LinearAlgebra.Algorithms (
 
 import Data.Packed.Internal hiding ((//))
 import Data.Packed.Matrix
-import Data.Complex
-
 import Numeric.LinearAlgebra.LAPACK as LAPACK
 import Data.List(foldl1')
 import Data.Array
diff --git a/lib/Numeric/LinearAlgebra/LAPACK.hs b/lib/Numeric/LinearAlgebra/LAPACK.hs
index 288439f..cb48571 100644
--- a/lib/Numeric/LinearAlgebra/LAPACK.hs
+++ b/lib/Numeric/LinearAlgebra/LAPACK.hs
@@ -43,7 +43,7 @@ module Numeric.LinearAlgebra.LAPACK (
 
 import Data.Packed.Internal
 import Data.Packed.Matrix
-import Data.Complex
+--import Data.Complex
 import Numeric.Conversion
 import Numeric.GSL.Vector(vectorMapValR, FunCodeSV(Scale))
 import Foreign
diff --git a/lib/Numeric/LinearAlgebra/Tests.hs b/lib/Numeric/LinearAlgebra/Tests.hs
index 426700b..2d5b0da 100644
--- a/lib/Numeric/LinearAlgebra/Tests.hs
+++ b/lib/Numeric/LinearAlgebra/Tests.hs
@@ -271,6 +271,31 @@ normsMTest = TestList [
 
 ---------------------------------------------------------------------
 
+sumprodTest = TestList [
+    utest "sumCD" $ sumElements z            == 6
+  , utest "sumCF" $ sumElements (single z)   == 6
+  , utest "sumD"  $ sumElements v            == 6
+  , utest "sumF"  $ sumElements (single v)   == 6
+
+  , utest "prodCD" $ prodProp z
+  , utest "prodCF" $ prodProp (single z)
+  , utest "prodD"  $ prodProp v
+  , utest "prodF"  $ prodProp (single v)
+ ] where v = fromList [1,2,3] :: Vector Double
+         z = fromList [1,2-i,3+i]
+         prodProp x = prodElements x == product (toList x)
+
+---------------------------------------------------------------------
+
+chainTest = utest "chain" $ foldl1' (<>) ms |~| chain ms where
+    ms = [ diag (fromList [1,2,3 :: Double])
+         , konst 3 (3,5)
+         , (5><10) [1 .. ]
+         , konst 5 (10,2)
+         ]
+
+---------------------------------------------------------------------
+
 conjuTest m = mapVector conjugate (flatten (trans m)) == flatten (ctrans m)
 
 ---------------------------------------------------------------------
@@ -439,6 +464,8 @@ runTests n = do
         , utest "offset" offsetTest
         , normsVTest
         , normsMTest
+        , sumprodTest
+        , chainTest
         ]
     return ()
 
diff --git a/lib/Numeric/Matrix.hs b/lib/Numeric/Matrix.hs
index ce36ef2..fe0ec13 100644
--- a/lib/Numeric/Matrix.hs
+++ b/lib/Numeric/Matrix.hs
@@ -36,10 +36,7 @@ module Numeric.Matrix (
 
 -------------------------------------------------------------------
 
-import Data.Packed.Vector
 import Data.Packed.Matrix
-
-import Numeric.Container
 import Numeric.Vector
 import Numeric.Chain
 import Numeric.LinearAlgebra.Algorithms
diff --git a/lib/Numeric/Vector.hs b/lib/Numeric/Vector.hs
index 1baa6f8..bd356b1 100644
--- a/lib/Numeric/Vector.hs
+++ b/lib/Numeric/Vector.hs
@@ -27,12 +27,9 @@ module Numeric.Vector (
     (<.>)
                       ) where
 
-import Data.Complex
-
 import Data.Packed.Vector
 import Data.Packed.Internal.Matrix
 import Numeric.GSL.Vector
-
 import Numeric.Container
 
 -------------------------------------------------------------------