From 4957cff8af91cbb23c12382e25f5373fe96acb95 Mon Sep 17 00:00:00 2001
From: Vivian McPhail <haskell.vivian.mcphail@gmail.com>
Date: Tue, 29 Jun 2010 09:03:19 +0000
Subject: add-vector-float

---
 lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c | 22 ++++++++++++++++++++++
 lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h |  6 ++++++
 2 files changed, 28 insertions(+)

(limited to 'lib/Numeric/LinearAlgebra/LAPACK')

diff --git a/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c
index fd840e3..b9c2572 100644
--- a/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c
+++ b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c
@@ -1039,6 +1039,18 @@ int multiplyC(int ta, int tb, KCMAT(a),KCMAT(b),CMAT(r)) {
 
 //////////////////// transpose /////////////////////////
 
+int transF(KFMAT(x),FMAT(t)) {
+    REQUIRES(xr==tc && xc==tr,BAD_SIZE);
+    DEBUGMSG("transF");
+    int i,j;
+    for (i=0; i<tr; i++) {
+        for (j=0; j<tc; j++) {
+        tp[i*tc+j] = xp[j*xc+i];
+        }
+    }
+    OK
+}
+
 int transR(KDMAT(x),DMAT(t)) {
     REQUIRES(xr==tc && xc==tr,BAD_SIZE);
     DEBUGMSG("transR");
@@ -1065,6 +1077,16 @@ int transC(KCMAT(x),CMAT(t)) {
 
 //////////////////// constant /////////////////////////
 
+int constantF(float * pval, FVEC(r)) {
+    DEBUGMSG("constantF")
+    int k;
+    double val = *pval;
+    for(k=0;k<rn;k++) {
+        rp[k]=val;
+    }
+    OK
+}
+
 int constantR(double * pval, DVEC(r)) {
     DEBUGMSG("constantR")
     int k;
diff --git a/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h
index adf096e..415a6ab 100644
--- a/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h
+++ b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h
@@ -40,13 +40,17 @@ typedef short ftnlen;
 
 /********************************************************/
 
+#define FVEC(A) int A##n, float*A##p
 #define DVEC(A) int A##n, double*A##p
 #define CVEC(A) int A##n, double*A##p
+#define FMAT(A) int A##r, int A##c, float* A##p
 #define DMAT(A) int A##r, int A##c, double* A##p
 #define CMAT(A) int A##r, int A##c, double* A##p
 
+#define KFVEC(A) int A##n, const float*A##p
 #define KDVEC(A) int A##n, const double*A##p
 #define KCVEC(A) int A##n, const double*A##p
+#define KFMAT(A) int A##r, int A##c, const float* A##p
 #define KDMAT(A) int A##r, int A##c, const double* A##p
 #define KCMAT(A) int A##r, int A##c, const double* A##p
 
@@ -55,9 +59,11 @@ typedef short ftnlen;
 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 transF(KFMAT(x),FMAT(t));
 int transR(KDMAT(x),DMAT(t));
 int transC(KCMAT(x),CMAT(t));
 
+int constantF(float * pval, FVEC(r));
 int constantR(double * pval, DVEC(r));
 int constantC(doublecomplex* pval, CVEC(r));
 
-- 
cgit v1.2.3