Changeset 4570

Timestamp:

Jul 15, 2005, 2:42:28 PM (21 years ago)

Author:

gusciora

Message:

Mods to thespline code.

Location:

trunk/psLib/src/math

Files:

• psFunctions.c (modified) (5 diffs)
• psMinimize.c (modified) (1 diff)
• psMinimize.h (modified) (2 diffs)

trunk/psLib/src/math/psFunctions.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-16 00:06:32 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-16 00:42:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1829 +1829 @@
                             float max)
 {
-    printf("HEY: psSpline1DAlloc()\n");
     PS_ASSERT_INT_NONNEGATIVE(numSplines, NULL);
     PS_ASSERT_INT_NONNEGATIVE(order, NULL);
@@ -1853 +1852 @@
     //
     tmpSpline->knots = psVectorAlloc(numSplines+1, PS_TYPE_F32);
-    if (tmpSpline->knots == NULL) {
-        printf("BAD\n");
-    } else {
-        printf("GOOD\n");
-    }
     psF32 width = (max - min) / ((psF32) numSplines);
     tmpSpline->knots->data.F32[0] = min;
@@ -1897 +1891 @@
                                    int order)
 {
-    printf("HEY: psSpline1DAllocGeneric()\n");
     PS_ASSERT_VECTOR_NON_NULL(bounds, NULL);
     PS_ASSERT_VECTOR_NON_EMPTY(bounds, NULL);
@@ -1930 +1923 @@
     }
     tmpSpline->knots = PsVectorDup((psVector *) bounds);
-    if (tmpSpline->knots == NULL) {
-        printf("BAD\n");
-    } else {
-        printf("GOOD\n");
-    }
 
     psMemSetDeallocator(tmpSpline, (psFreeFunc)spline1DFree);

trunk/psLib/src/math/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.125 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-16 00:06:32 $
+ *  @version $Revision: 1.126 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-16 00:42:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/src/math/psMinimize.h

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-12 19:12:01 $
+ *  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-16 00:42:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -93 +93 @@
     const psVector* yErr               ///< Errors in coordinates, or NULL
 );
+psSpline1D *psVectorFitSpline1DNEW(
+    const psVector* x,                 ///< Ordinates (or NULL to just use the indices)
+    const psVector* y,                 ///< Coordinates
+    int nKnots
+);
 
 /** Specifies the format of a user-defined function that the general Levenberg-