Changeset 82 for tests/sam_mogi.py

Timestamp:

01/26/09 16:12:08 (7 years ago)

Author:

mmckerns

Message:

scipy.optimize.fmin fit to mystic.Solve interface;
mystic handlers, etc added to fmin solver;
VerboseSow? edited to handle simplex-type cloud of results per iteration

File:

• tests/sam_mogi.py (modified) (3 diffs)

tests/sam_mogi.py

@@ -9 +9 @@
 import sam
 from test_mogi import *
-from mystic.nelder_mead import fmin
+from mystic.scipy_optimize_fmin import NelderMeadSimplexSolver as fmin
+from mystic.nmtools import IterationRelativeError as IRE
 from mystic import getch, Sow
 
@@ -61 +62 @@
     z1 = z0*random.uniform(0.5,1.5)
     v1 = v0*random.uniform(0.5,1.5)
-    sol = fmin(cost_function, [random.uniform(x0-40,x0+40), random.uniform(y0-40,y0+40), z1, v1], retall = True, StepMonitor = simplex)
-    print sol[0]
+    xinit = [random.uniform(x0-40,x0+40), random.uniform(y0-40,y0+40), z1, v1]
+
+    solver = fmin(len(xinit))
+    solver.SetInitialPoints(xinit)
+    killme = IRE(1e-4,1e-4)
+    solver.Solve(cost_function, termination=killme, StepMonitor = simplex)
+    sol = solver.Solution()
+    print sol
     
     for x in simplex.x:
         sam.putarray('x',x)
         sam.eval("plot(x([1,2,3,1],1),x([1,2,3,1],4),'w-','LineWidth',2)")
-    return sol[0]
+    return sol
 
 
@@ -74 +81 @@
     y1 = y0*random.uniform(0.5,1.5)
     z1 = z0*random.uniform(0.5,1.5)
-    sol = fmin(cost_function, [random.uniform(x0-40,x0+40), y1, z1, random.uniform(v0-0.1,v0+0.1)], retall = True, StepMonitor = simplex)
-    print sol[0]
-    
+    xinit = [random.uniform(x0-40,x0+40), y1, z1, random.uniform(v0-0.1,v0+0.1)]
+
+    solver = fmin(len(xinit))
+    solver.SetInitialPoints(xinit)
+    killme = IRE(1e-4,1e-4)
+    solver.Solve(cost_function, termination=killme, StepMonitor = simplex)
+    sol = solver.Solution()
+    print sol
+
     for x in simplex.x:
         sam.putarray('x',x)
         sam.eval("plot(x([1,2,3,1],1),x([1,2,3,1],2),'w-','LineWidth',2)")
-    return sol[0]
+    return sol
 
 draw_contour_xv()