Changeset 37690

Timestamp:

Nov 28, 2014, 4:02:50 PM (12 years ago)

Author:

eugene

Message:

add dgaussjordan function with modifyable min pivot

Location:

branches/eam_branches/ipp-20140904/Ohana/src/libohana

Files:

• include/ohana.h (modified) (1 diff)
• src/gaussj.c (modified) (4 diffs)
• src/vstats.c (modified) (1 diff)

branches/eam_branches/ipp-20140904/Ohana/src/libohana/include/ohana.h

@@ -341 +341 @@
 char   *ohana_version          PROTO((void));
 
+int     dgaussjordan_pivot     PROTO((double **A, double **B, int N, int M, double minPivot));
 int     dgaussjordan           PROTO((double **A, double **B, int N, int M));
 int     fgaussjordan           PROTO((float **A, float **B, int n, int m));

branches/eam_branches/ipp-20140904/Ohana/src/libohana/src/gaussj.c

@@ -3 +3 @@
 # define VERY_VERBOSE 0
 # define MAX_RANGE 1.0e16
-# define MIN_PIVOT 1.0e-7
 
 // Gauss-Jordan elimination using full pivots based on Press et al's description.  Substantially
@@ -10 +9 @@
 // than their implementation.  (largely based on version by William Kahan)
 
+int dgaussjordan (double **A, double **B, int N, int M) {
+
+# define myMIN_PIVOT 1.0e-7
+  int status = dgaussjordan_pivot (A, B, N, M, myMIN_PIVOT);
+  return status;
+}
+
 // MAX_RANGE is used to test for ill-conditioned input matrices.  For an ill-conditioned
 // matrix, one or more of the pivots trends towards zero.  Rather than allow this to go to the
 // numerical precision, I am raising an error if |growth| > 1e8
-int dgaussjordan (double **A, double **B, int N, int M) {
+int dgaussjordan_pivot (double **A, double **B, int N, int M, double MIN_PIVOT) {
 
   int *colIndex;
@@ -106 +112 @@
     double tmpval = 1.0 / A[maxcol][maxcol];
 
+# if (0)
     if (fabs(A[maxcol][maxcol]) < MIN_PIVOT) {
       // we are ill-conditioned.  set this row & col to 0.0, 1.0 on pivot 
@@ -115 +122 @@
       continue;
     }
-
+# endif
 
     // XXX why is this here (don't I double count this element?) A[maxcol][maxcol] = 1.0;

branches/eam_branches/ipp-20140904/Ohana/src/libohana/src/vstats.c

@@ -189 +189 @@
   for (i = ks; i < ke; i++) {
     M  = SQ (value[i] - Mo);
-    dM = SQ (dvalue[i]);
+    dM = dvalue ? SQ (dvalue[i]) : 1.0;
     X2 += M / dM;
     dS += M;
   }
-  X2 = X2 / (Nm - 1);
+  X2 = dvalue ? X2 / (Nm - 1) : NAN;
   dS = sqrt (dS / (Nm - 1));