From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 8 Apr 2018 16:17:07 +0000 (+0100)
Subject: Revert "curveopt: try simple, but no good"
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=cda8fe43b3905920d2f0a0898dd9920e996d8ae1;p=moebius3.git

Revert "curveopt: try simple, but no good"

This reverts commit 7b5370bb5115b5179c4fb36093677330ef909e59.
---

diff --git a/curveopt.py b/curveopt.py
index 5ce8cf7..ab27e44 100644
--- a/curveopt.py
+++ b/curveopt.py
@@ -48,7 +48,7 @@ class OptimisedCurve():
 
     oc._dbg(repr(fc_input))
 
-    findcurve_epsilon = 1E-10
+    findcurve_epsilon = 0.0001
 
     cl = ['./findcurve', '%d' % (nt+1), '%.18g' % findcurve_epsilon]
     oc._dbg('STARTING FINDCURVE %s' % cl)
diff --git a/findcurve.c b/findcurve.c
index ca3cd8f..dff770a 100644
--- a/findcurve.c
+++ b/findcurve.c
@@ -137,7 +137,7 @@ int main(int argc, const char *const *argv) {
   gsl_vector_set_all(step_size, 0.01);
 
   gsl_multimin_fminimizer *minimiser =
-    gsl_multimin_fminimizer_alloc(gsl_multimin_fminimizer_nmsimplex2rand, NX);
+    gsl_multimin_fminimizer_alloc(gsl_multimin_fminimizer_nmsimplex2, NX);
 
   for (;;) {
     /* NINPUT + 1 doubles: startpoint, epsilon for residual */