Changeset 34525 for branches/eam_branches/ipp-20120905/Ohana/src/opihi

Timestamp:

Oct 7, 2012, 2:47:52 PM (14 years ago)

Author:

eugene

Message:

adding functions for native spline

Location:

branches/eam_branches/ipp-20120905/Ohana/src/opihi

Files:

• cmd.data/Makefile (modified) (1 diff)
• cmd.data/init.c (modified) (2 diffs)
• cmd.data/spline.c (added)
• cmd.data/spline_commands.c (added)
• include/data.h (modified) (2 diffs)
• lib.data/SplineOps.c (added)

branches/eam_branches/ipp-20120905/Ohana/src/opihi/cmd.data/Makefile

@@ -114 +114 @@
 $(SRC)/shift.$(ARCH).o          \
 $(SRC)/sort.$(ARCH).o           \
+$(SRC)/spline.$(ARCH).o         \
+$(SRC)/spline_commands.$(ARCH).o \
 $(SRC)/imspline_apply.$(ARCH).o \
 $(SRC)/imspline_construct.$(ARCH).o \

branches/eam_branches/ipp-20120905/Ohana/src/opihi/cmd.data/init.c

@@ -102 +102 @@
 int shift            PROTO((int, char **));
 int sort_vectors     PROTO((int, char **));
+int spline_command   PROTO((int, char **));
 int imspline_apply   PROTO((int, char **));
 int imspline_construct PROTO((int, char **));
@@ -254 +255 @@
   {1, "shift",        shift,            "shift data in an image"},
   {1, "sort",         sort_vectors,     "sort list of vectors"},
+  {1, "spline",       spline_command,   "shift data in an image"},
   {1, "imspline.apply", imspline_apply, "apply spline fit to generate an image"},
   {1, "imspline.const", imspline_construct, "create spline 2nd deriv. terms"},

branches/eam_branches/ipp-20120905/Ohana/src/opihi/include/data.h

@@ -84 +84 @@
 
 /* in spline.c */
-void spline_construct (float *x, float *y, int N, float *y2);
-float spline_apply (float *x, float *y, float *y2, int N, float X);
+void spline_construct_flt (float *x, float *y, int N, float *y2);
+float spline_apply_flt (float *x, float *y, float *y2, int N, float X);
+void spline_construct_dbl (opihi_flt *x, opihi_flt *y, int N, opihi_flt *y2);
+opihi_flt spline_apply_dbl (opihi_flt *x, opihi_flt *y, opihi_flt *y2, int N, opihi_flt X);
 
 /* in svdcmp.c */
@@ -168 +170 @@
 void FreeQueues (void);
 void FreeBooks (void);
+
+// the interpolating spline has valu
+typedef struct {
+  int Nknots;
+  opihi_flt *xk;
+  opihi_flt *yk;
+  opihi_flt *y2;
+  char *name;
+} Spline;
+
+/* in SplineOps.c */
+void InitSplines ();
+void FreeSplines ();
+void InitSpline (Spline *spline, char *name, int Nknots);
+void FreeSpline (Spline *spline);
+Spline *GetSpline (int where);
+Spline *FindSpline (char *name);
+Spline *CreateSpline (char *name, int Nknots);
+int DeleteSpline (Spline *spline);
+void ListSplines ();
 
 /* hermitian functions */