Changeset 42324 for branches/eam_branches/psLib.20230123/src/math/psSpline.h

Timestamp:

Jan 26, 2023, 10:04:39 AM (3 years ago)

Author:

eugene

Message:

rework the splines to use (x,y,dy2) values instead of full polynomials

File:

• branches/eam_branches/psLib.20230123/src/math/psSpline.h (modified) (4 diffs)

branches/eam_branches/psLib.20230123/src/math/psSpline.h

@@ -35 +35 @@
 typedef struct
 {
-    unsigned int n;                    ///< The number of spline pieces
-    psF32 *xKnots; ///< x-coordinate of the knots (n+1)
-    psF32 *yKnots; ///< y-coordinate of the knots (n+1)
-    psF32 *d2yKnots; ///< 2nd derivative of y at the knots (n+1)
+    unsigned int n;    ///< The number of knots
+    psF32 *xKnots; ///< x-coordinate of the knots
+    psF32 *yKnots; ///< y-coordinate of the knots
+    psF32 *d2yKnots; ///< 2nd derivative of y at the knots
     bool equalSpacing; // if knots are equally spaced, the seqment choice can be optimized
     psF32 xMin; // for equally-spaced knots, the value at the lower bound (xKnots[0])
@@ -58 +58 @@
 float psSpline1DEval(
     const psSpline1D *spline,          ///< spline pointer
+    float x                            ///< location at which to evaluate
+);
+
+/** Evaluates 1-D spline polynomials at a specific coordinate.
+ *
+ *  @return float    result of spline polynomials evaluated at given location
+ */
+float psSpline1DEval_Segment(
+    const psSpline1D *spline,          ///< spline pointer
+    int n,                             // choice of segment
     float x                            ///< location at which to evaluate
 );
@@ -81 +91 @@
 psSpline1D *psSpline1DFitVector(
     const psVector* x,                 ///< Ordinates (or NULL to just use the indices)
-    const psVector* y                  ///< Coordinates
+    const psVector* y,                  ///< Coordinates.
+    psF32 dyLower,                      ///< 1st derivative at lower bound
+    psF32 dyUpper                       ///< 1st derivative at upper bound
 );
 
@@ -93 +105 @@
     psPtr ptr                          ///< the pointer whose type to check
 );
+
+// check for equal spacing and set internal boolean if true
+bool psSpline1DisEqualSpacing (psSpline1D *spline);
+
+// convert the cubic spline elements to a simply ordinary polynomial for segment n
+psPolynomial1D *psSpline1DToPoly (psSpline1D *spline, int n);
 
 /*****************************************************************************