[cig-commits] r12841 - cs/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2008-09-10 12:50:42 -0700 (Wed, 10 Sep 2008)
New Revision: 12841

Modified:
   cs/cigma/trunk/src/Numeric.cpp
   cs/cigma/trunk/src/Numeric.h
Log:
Changed signature of the minmax() and centroid() functions




Modified: cs/cigma/trunk/src/Numeric.cpp
===================================================================
--- cs/cigma/trunk/src/Numeric.cpp	2008-09-10 19:50:41 UTC (rev 12840)
+++ cs/cigma/trunk/src/Numeric.cpp	2008-09-10 19:50:42 UTC (rev 12841)
@@ -85,45 +85,63 @@
     return 1;
 }
 
-void cigma::minmax(int n, double *X, double *Y, double *Z, double min[3], double max[3])
+void cigma::minmax(double *points, int npts, int nsd, double *min, double *max)
 {
-    min[0] = X[0];
-    min[1] = Y[0];
-    min[2] = Z[0];
+    // 
+    // X[i] = points[nsd*i + 0]
+    // Y[i] = points[nsd*i + 1]
+    // Z[i] = points[nsd*i + 2]
+    //
+    // PT_n = (X[n],Y[n],Z[n])  (n-th point)
+    //
+    
+    int i,j;
 
-    max[0] = X[0];
-    max[1] = Y[0];
-    max[2] = Z[0];
+    #define PT(i,j) points[nsd*(i) + (j)]
 
-    for (int i = 1; i < n; i++)
+    for (j = 0; j < nsd; j++)
     {
-        min[0] = MIN(X[i], min[0]);
-        min[1] = MIN(Y[i], min[1]);
-        min[2] = MIN(Z[i], min[2]);
+        min[j] = PT(0,j);
+        max[j] = PT(0,j);
+    }
 
-        max[0] = MAX(X[i], max[0]);
-        max[1] = MAX(Y[i], max[1]);
-        max[2] = MAX(Z[i], max[2]);
+    for (i = 1; i < npts; i++)
+    {
+        for (j = 0; j < nsd; j++)
+        {
+            min[j] = MIN(PT(i,j), min[j]);
+            max[j] = MAX(PT(i,j), max[j]);
+        }
     }
+
+    #undef PT
 }
 
-void cigma::centroid(int n, double *X, double *Y, double *Z, double c[3])
+void cigma::centroid(double *points, int npts, int nsd, double c[3])
 {
-    const double oc = 1.0 / (double)n;
+    int i, j;
+    const double oc = 1.0 / (double)npts;
 
-    c[0] = X[0];
-    c[1] = Y[0];
-    c[2] = Z[0];
+    #define PT(i,j)  points[nsd*(i) + (j)]
 
-    for (int i = 1; i < n; i++)
+    c[0] = c[1] = c[2] = 0.0;
+    for (j = 0; j < nsd; j++)
     {
-        c[0] += X[i];
-        c[1] += Y[i];
-        c[2] += Z[i];
+        c[j] = PT(0,j);
     }
 
-    c[0] *= oc;
-    c[1] *= oc;
-    c[2] *= oc;
+    for (i = 1; i < npts; i++)
+    {
+        for (j = 0; j < nsd; j++)
+            c[j] += PT(i,j);
+    }
+
+    for (j = 0; j < nsd; j++)
+    {
+        c[j] *= oc;
+    }
+
+    #undef PT
+
 }
 

Modified: cs/cigma/trunk/src/Numeric.h
===================================================================
--- cs/cigma/trunk/src/Numeric.h	2008-09-10 19:50:41 UTC (rev 12840)
+++ cs/cigma/trunk/src/Numeric.h	2008-09-10 19:50:42 UTC (rev 12841)
@@ -1,6 +1,8 @@
 #ifndef __NUMERIC_H__
 #define __NUMERIC_H__
 
+#include <cmath>
+
 #define MIN(a,b)    (((a) < (b)) ? (a) : (b))
 #define MAX(a,b)    (((a) > (b)) ? (a) : (b))
 #define SQR(x)      ((x)*(x))
@@ -15,8 +17,8 @@
 
     int sys3x3(double mat[3][3], double b[3], double res[3], double *det);
 
-    void minmax(int n, double *X, double *Y, double *Z, double min[3], double max[3]);
-    void centroid(int n, double *X, double *Y, double *Z, double c[3]);
+    void minmax(double *points, int npts, int nsd, double *min, double *max);
+    void centroid(double *points, int npts, int nsd, double c[3]);
 }
 
 #endif