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

Timestamp:

Jan 26, 2005, 10:41:04 AM (21 years ago)

Author:

gusciora

Message:

Substituted knots for domains in the spline structs.

File:

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

trunk/psLib/src/dataManip/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.101 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-17 23:25:09 $
+ *  @version $Revision: 1.102 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-26 20:41:04 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -171 +171 @@
     PS_PTR_CHECK_NULL(spline, NAN);
     PS_INT_CHECK_NON_NEGATIVE(spline->n, NAN);
-    PS_PTR_CHECK_NULL(spline->domains, NAN);
+    PS_VECTOR_CHECK_NULL(spline->domains, NAN);
     PS_PTR_CHECK_NULL(spline->p_psDeriv2, NAN);
     PS_VECTOR_CHECK_NULL(x, NAN);
@@ -189 +189 @@
  
     n = spline->n;
-    klo = p_psVectorBinDisect32(spline->domains, (spline->n)+1, X);
+    klo = p_psVectorBinDisect32(spline->knots->data.F32, (spline->n)+1, X);
     if (klo < 0) {
         psLogMsg(__func__, PS_LOG_WARN,
@@ -196 +196 @@
     }
     khi = klo + 1;
-    H = (spline->domains)[khi] - (spline->domains)[klo];
-    A = ((spline->domains)[khi] - X) / H;
-    B = (X - (spline->domains)[klo]) / H;
+    H = spline->knots->data.F32[khi] - spline->knots->data.F32[klo];
+    A = (spline->knots->data.F32[khi] - X) / H;
+    B = (X - spline->knots->data.F32[klo]) / H;
     C = ((A*A*A)-A) * (H*H/6.0);
     D = ((B*B*B)-B) * (H*H/6.0);
@@ -236 +236 @@
  
 XXX: Is the x argument redundant?  What do we do if the x argument is
-supplied, but does not equal the domains specified in mySpline?
+supplied, but does not equal the knots specified in mySpline?
  
 XXX: can psSpline be NULL?
@@ -314 +314 @@
         for (i=0;i<mySpline->n;i++) {
             slope = (y32->data.F32[i+1] - y32->data.F32[i]) /
-                    (mySpline->domains[i+1] - mySpline->domains[i]);
+                    (mySpline->knots->data.F32[i+1] - mySpline->knots->data.F32[i]);
             (mySpline->spline[i])->coeff[0] = y32->data.F32[i] -
-                                              (slope * mySpline->domains[i]);
+                                              (slope * mySpline->knots->data.F32[i]);
 
             (mySpline->spline[i])->coeff[1] = slope;