improved constant

4 files changed, 1 insertions, 63 deletions

diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index 51fb6f8..477b453 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -208,19 +208,16 @@ compat m1 m2 = rows m1 == rows m2 && cols m1 == cols m2
 
 -- | Optimized matrix computations are provided for elements in the Element class.
 class (Storable a, Floating a) => Element a where
-    constantD :: a -> Int -> Vector a
     transdata :: Int -> Vector a -> Int -> Vector a
     subMatrixD :: (Int,Int) -- ^ (r0,c0) starting position 
                -> (Int,Int) -- ^ (rt,ct) dimensions of submatrix
                -> Matrix a -> Matrix a
 
 instance Element Double where
-    constantD  = constantR
     transdata = transdataR
     subMatrixD = subMatrixR
 
 instance Element (Complex Double) where
-    constantD  = constantC
     transdata  = transdataC
     subMatrixD = subMatrixC
 
@@ -284,31 +281,6 @@ subMatrix :: Element a
           -> Matrix a -- ^ result
 subMatrix = subMatrixD
 
-------------------------------------------------------------------------
-
-constantAux fun x n = unsafePerformIO $ do
-    v <- createVector n
-    px <- newArray [x]
-    app1 (fun px) vec v "constantAux"
-    free px
-    return v
-
-constantR :: Double -> Int -> Vector Double
-constantR = constantAux cconstantR
-foreign import ccall "auxi.h constantR" cconstantR :: Ptr Double -> TV
-
-constantC :: Complex Double -> Int -> Vector (Complex Double)
-constantC = constantAux cconstantC
-foreign import ccall "auxi.h constantC" cconstantC :: Ptr (Complex Double) -> TCV
-
-{- | creates a vector with a given number of equal components:
-
-@> constant 2 7
-7 |> [2.0,2.0,2.0,2.0,2.0,2.0,2.0]@
--}
-constant :: Element a => a -> Int -> Vector a
-constant = constantD
-
 --------------------------------------------------------------------------
 
 -- | obtains the complex conjugate of a complex vector
@@ -329,10 +301,6 @@ fromComplex :: Vector (Complex Double) -> (Vector Double, Vector Double)
 fromComplex z = (r,i) where
     [r,i] = toColumns $ reshape 2 $ asReal z
 
--- | converts a real vector into a complex representation (with zero imaginary parts)
-comp :: Vector Double -> Vector (Complex Double)
-comp v = toComplex (v,constant 0 (dim v))
-
 -- | loads a matrix efficiently from formatted ASCII text file (the number of rows and columns must be known in advance).
 fromFile :: FilePath -> (Int,Int) -> IO (Matrix Double)
 fromFile filename (r,c) = do
diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs
index 2df33e0..f590919 100644
--- a/lib/Data/Packed/Internal/Vector.hs
+++ b/lib/Data/Packed/Internal/Vector.hs
@@ -99,6 +99,7 @@ n |> l = if length l == n then fromList l else error "|> with wrong size"
 -- | access to Vector elements without range checking
 at' :: Storable a => Vector a -> Int -> a
 at' v n = safeRead v $ flip peekElemOff n
+{-# INLINE at' #-}
 
 --
 -- turn off bounds checking with -funsafe at configure time.
diff --git a/lib/Data/Packed/Internal/auxi.c b/lib/Data/Packed/Internal/auxi.c
index c449b9a..48b05e8 100644
--- a/lib/Data/Packed/Internal/auxi.c
+++ b/lib/Data/Packed/Internal/auxi.c
@@ -1,12 +1,5 @@
 #include "auxi.h"
-#include <gsl/gsl_blas.h>
-#include <gsl/gsl_linalg.h>
 #include <gsl/gsl_matrix.h>
-#include <gsl/gsl_math.h>
-#include <gsl/gsl_errno.h>
-#include <gsl/gsl_complex.h>
-#include <gsl/gsl_complex_math.h>
-#include <gsl/gsl_cblas.h>
 #include <string.h>
 #include <stdio.h>
 
@@ -92,27 +85,6 @@ int submatrixR(int r1, int r2, int c1, int c2, KRMAT(x),RMAT(r)) {
 }
 
 
-int constantR(double * pval, RVEC(r)) {
-    DEBUGMSG("constantR")
-    int k;
-    double val = *pval;
-    for(k=0;k<rn;k++) {
-        rp[k]=val;
-    }
-    OK
-}
-
-int constantC(gsl_complex* pval, CVEC(r)) {
-    DEBUGMSG("constantC")
-    int k;
-    gsl_complex val = *pval;
-    for(k=0;k<rn;k++) {
-        rp[k]=val;
-    }
-    OK
-}
-
-
 int conjugate(KCVEC(x),CVEC(t)) {
     REQUIRES(xn==tn,BAD_SIZE);
     DEBUGMSG("conjugate");
diff --git a/lib/Data/Packed/Internal/auxi.h b/lib/Data/Packed/Internal/auxi.h
index b57fdaf..4698696 100644
--- a/lib/Data/Packed/Internal/auxi.h
+++ b/lib/Data/Packed/Internal/auxi.h
@@ -13,9 +13,6 @@
 int transR(KRMAT(x),RMAT(t));
 int transC(KCMAT(x),CMAT(t));
 
-int constantR(double *val     , RVEC(r));
-int constantC(gsl_complex *val, CVEC(r));
-
 int submatrixR(int r1, int r2, int c1, int c2, KRMAT(x),RMAT(r));
 
 const char * gsl_strerror (const int gsl_errno);