From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 7 Apr 2018 22:11:02 +0000 (+0100)
Subject: curveopt: wip
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=86ca0919d18060946ebff1a17cf4ab26ba28ce3b;p=moebius3.git

curveopt: wip
---

diff --git a/findcurve.c b/findcurve.c
index 58f7472..a8dfc46 100644
--- a/findcurve.c
+++ b/findcurve.c
@@ -26,6 +26,17 @@ static int NP;
 static double *INPUT; /* dyanmic array, on main's stack */
 static double PREP[NPREP];
 
+static void printcore(const double *X) {
+  int i, j;
+  DECLARE_F_G;
+  CALCULATE_F_G;
+  printf("[");
+  for (i=0; i<NP; i++)
+    for (j=0; j<3; j++)
+      printf(" %25.18g,", POINT(i)[j]);
+  printf(" ]\n");
+}
+
 static void prepare(double X[] /* startpoint */) {
   /* fills in PREP and startpoint */
   PREPARE;
@@ -36,13 +47,18 @@ static double cb_Efunc(void *xp) {
   DECLARE_F_G;
   CALCULATE_F_G;
 
+  printf(" Efunc ");
+  printcore(X);
+
   double e = 0;
   int P;
   for (P=0; P<NP-3; P++) {
     double P_cost;
     CALCULATE_COST;
+    printf(" %.18g", P_cost);
     e += P_cost;
   }
+  printf("\n");
   return e;
 }
 
@@ -69,17 +85,6 @@ static double cb_metric(void *xp, void *yp) {
   return sqrt(s);
 }
 
-static void printcore(const double *X) {
-  int i, j;
-  DECLARE_F_G;
-  CALCULATE_F_G;
-  printf("[");
-  for (i=0; i<NP; i++)
-    for (j=0; j<3; j++)
-      printf(" %.18g,", POINT(i)[i]);
-  printf(" ]\n");
-}
-
 static void __attribute__((unused)) cb_print(void *xp) {
   const double *x = xp;
   printf("\n");