curveopt: symbolic: compiles

[moebius3.git] / findcurve.c

diff --git a/findcurve.c b/findcurve.c
index 65c5672eb7753c5a117d741c2723fda43c2f7a5b..32050acde23644aa4bf675cf8a8cba4358f699ee 100644 (file)
--- a/findcurve.c
+++ b/findcurve.c
@@ -2,6 +2,7 @@
  */
 
 #include <math.h>
+#include <string.h>
 
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_sf.h>
@@ -21,6 +22,7 @@ static inline double sinc(double x) {
   return gsl_sf_sinc(x / M_PI);
 }
 
+static int NP;
 static double *INPUT; /* dyanmic array, on main's stack */
 static double PREP[NPREP];
 
@@ -36,6 +38,7 @@ static double cb_Efunc(void *xp) {
   CALCULATE_F_G;
 
   double e = 0;
+  int P;
   for (P=0; P<NP-3; P++) {
     double P_cost;
     CALCULATE_COST;
@@ -48,8 +51,8 @@ static void cb_step(const gsl_rng *rng, void *xp, double step_size) {
   double *x = xp;
   int i;
   double step[NX];
-  gsl_ran_dir_nd(rng, N,step);
-  for (i=0; i<N; i++)
+  gsl_ran_dir_nd(rng, NX, step);
+  for (i=0; i<NX; i++)
     x[i] += step_size * step[i];
   //printf("\n cb_step %p %10.7f [", xp, step_size);
   //for (i=0; i<N; i++) printf(" %10.7f,", step[i]);
@@ -60,21 +63,17 @@ static double cb_metric(void *xp, void *yp) {
   const double *x=xp, *y=yp;
   int i;
   double s;
-  for (i=0, s=0; i<N; i++) {
+  for (i=0, s=0; i<NX; i++) {
     double d = x[i] - y[i];
     s += d*d;
   }
   return sqrt(s);
 }
 
-static void printcore(const double *x) {
+static void printcore(const double *X) {
   int i;
-  double F[N];
-  X_EXTRACT;
-  F_POPULATE;
   printf("[");
-  for (i=0; i<6; i++) printf(" %.18g,", x[i]);
-  for (i=0; i<6; i++) printf(" %.18g,", F[i]);
+  for (i=0; i<NX; i++) printf(" %.18g,", X[i]);
   printf(" ]\n");
 }
 
@@ -95,7 +94,7 @@ static double scan1double(void) {
   return v;
 }
 
-int main(int argc, const char *const argv) {
+int main(int argc, const char *const *argv) {
   double epsilon;
   int i;