Changeset 25027 for branches/pap/Ohana/src/opihi/cmd.data/gaussj.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/cmd.data/gaussj.c (modified) (2 diffs)

branches/pap/Ohana/src/opihi/cmd.data/gaussj.c

@@ -47 +47 @@
   status = dgaussjordan (a, b, N, 1);
 
-  // output vector needs to be float, so re-cast it
-  ResetVector (B, OPIHI_FLT, N);
-  vf = B[0].elements.Flt;
+  // if dgaussjordan succeeds, replace the input values with the results
+  if (status) {
+    // output vector needs to be float, so re-cast it
+    ResetVector (B, OPIHI_FLT, N);
+    vf = B[0].elements.Flt;
 
-  for (i = 0; i < N; i++) {
-    for (j = 0; j < N; j++) {
-       m[i+j*N] = a[i][j];
+    for (i = 0; i < N; i++) {
+      for (j = 0; j < N; j++) {
+        m[i+j*N] = a[i][j];
+      }
+      vf[i] = b[i][0]; 
     }
-    vf[i] = b[i][0]; 
   }
 
@@ -66 +69 @@
 
   if (!status && !QUIET) {
-      gprint (GP_ERR, "failure in matrix solution\n");
+      gprint (GP_ERR, "gaussjordan: ill-conditioned matrix; input values are retained\n");
   }
   return (status);