Changeset 3853 for trunk/psLib/src/dataManip/psMinimize.c

Timestamp:

May 5, 2005, 12:15:16 PM (21 years ago)

Author:

gusciora

Message:

Minor coding standard mods.

File:

• trunk/psLib/src/dataManip/psMinimize.c (modified) (6 diffs)

trunk/psLib/src/dataManip/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.111 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-05 22:10:12 $
+ *  @version $Revision: 1.112 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-05 22:15:16 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -808 +808 @@
 }
 
-# define SWAP(X,Y) {double tmp=(X); (X) = (Y); (Y) = tmp;}
+// XXX" put this in constants.h
+# define PS_SWAP(X,Y) {double tmp=(X); (X) = (Y); (Y) = tmp;}
 
 // XXX EAM : temporary gauss-jordan solver based on gene's
@@ -829 +830 @@
     indxr = psAlloc (Nx*sizeof(int));
     ipiv  = psAlloc (Nx*sizeof(int));
-    for (j = 0; j < Nx; j++)
+    for (j = 0; j < Nx; j++) {
         ipiv[j] = 0;
+    }
 
     irow = icol = 0;
@@ -864 +866 @@
         if (irow != icol) {
             for (l = 0; l < Nx; l++) {
-                SWAP (matrix[irow][l], matrix[icol][l]);
-            }
-            SWAP (vector[irow], vector[icol]);
+                PS_SWAP (matrix[irow][l], matrix[icol][l]);
+            }
+            PS_SWAP (vector[irow], vector[icol]);
         }
         indxr[i] = irow;
@@ -886 +888 @@
                 dum = matrix[ll][icol];
                 matrix[ll][icol] = 0.0;
-                for (l = 0; l < Nx; l++)
+                for (l = 0; l < Nx; l++) {
                     matrix[ll][l] -= matrix[icol][l]*dum;
+                }
                 vector[ll] -= vector[icol]*dum;
             }
@@ -894 +897 @@
 
     for (l = Nx - 1; l >= 0; l--) {
-        if (indxr[l] != indxc[l])
-            for (k = 0; k < Nx; k++)
-                SWAP (matrix[k][indxr[l]], matrix[k][indxc[l]]);
+        if (indxr[l] != indxc[l]) {
+            for (k = 0; k < Nx; k++) {
+                PS_SWAP (matrix[k][indxr[l]], matrix[k][indxc[l]]);
+            }
+        }
     }
     psFree (ipiv);