Changeset 173

Timestamp:

08/07/09 11:45:32 (7 years ago)

Author:

altafang

Message:

Temporarily restoring disp and callback as parameters

File:

• branches/alta/mystic-0.1a2/mystic/snobfit_solver.py (modified) (6 diffs)

branches/alta/mystic-0.1a2/mystic/snobfit_solver.py

@@ -131 +131 @@
         self.fac = 0.0
         self.fglob = 0
+        self.disp = False
+        self.callback = None
 
         # Initialize some variables depending on input
@@ -136 +138 @@
         if kwds.has_key('fac'): self.fac = kwds['fac']
         if kwds.has_key('fglob'): self.fglob = kwds['fglob']
+        if kwds.has_key('disp'): self.disp = kwds['disp']
+        if kwds.has_key('callback'): self.callback = kwds['callback']
 
         #-------------------------------------------------------------
@@ -152 +156 @@
         #-------------------------------------------------------------
 
+        # to be fixed
         self.func = func
 
@@ -210 +215 @@
 
              # update function call counter
-             #ncall += self.nPop
+             #ncall += self.nPop    # <-- original snobfit function call counter
 
              # best of the new function values
@@ -2672 +2677 @@
             solver = SnobfitSoftSolver(len(x0))
 
-    solver.disp = disp
-    solver.callback = callback
-
     # Problem?: SetStrictRanges must be called before SetInitialPoints
     # In fact, _strictMin and _strictMax must always be set. Perhaps
@@ -2684 +2686 @@
     solver.Solve(func,termination=SnobfitTermination(rtol, ftol, nstop),\
                  EvaluationMonitor=evalmon,StepMonitor=stepmon,\
-                 ExtraArgs=args,\
+                 ExtraArgs=args,disp=disp, callback=callback,\
                  p=p, fac=fac, fglob=fglob,constraint=constraint) 
     solution = solver.Solution()