Changeset 176 for branches/alta/mystic-0.1a2/mystic/scipy_ncg.py

Timestamp:

08/09/09 13:45:49 (7 years ago)

Author:

altafang

Message:

Fixing termination, gradient call counter

File:

• branches/alta/mystic-0.1a2/mystic/scipy_ncg.py (modified) (12 diffs)

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

@@ -18 +18 @@
    - StepMonitor = CustomSow() with 4 columns
    - enable_signal_handler()
+   - termination = SolutionImprovement(tolerance)
 
 Usage
@@ -130 +131 @@
 
 
-    def Solve(self, func, fprime, termination, sigint_callback=None,
-              EvaluationMonitor=Null, StepMonitor=Null, GradMonitor=Null,
-              HessianMonitor=Null, ExtraArgs=(), **kwds):
+    def Solve(self, func, termination, sigint_callback=None,
+              EvaluationMonitor=Null, StepMonitor=Null, #GradientMonitor=Null,
+              ExtraArgs=(), **kwds):
         """Minimize a function using NCG.
 
@@ -143 +144 @@
 
     func -- the Python function or method to be minimized.
-    fprime -- callable f'(x,*args)
-            Gradient of f.
     termination -- callable object providing termination conditions.
 
@@ -158 +157 @@
 Further Inputs:
 
+    fprime -- callable f'(x,*args)
+            Gradient of f.
     fhess_p : callable fhess_p(x,p,*args)
         Function which computes the Hessian of f times an
@@ -186 +187 @@
         x0 = self.population[0]
         x0 = asarray(x0).flatten()
+
         epsilon = _epsilon
-        disp = 1
-        callback = None
+        self.disp = 1
+        self.callback = None
         fhess_p = None
         fhess = None
 
         if kwds.has_key('epsilon'): epsilon = kwds['epsilon']
-        if kwds.has_key('callback'): callback = kwds['callback']
-        if kwds.has_key('disp'): disp = kwds['disp']
+        if kwds.has_key('callback'): self.callback = kwds['callback']
+        if kwds.has_key('disp'): self.disp = kwds['disp']
         if kwds.has_key('fhess'): fhess = kwds['fhess']
         if kwds.has_key('fhess_p'): fhess_p = kwds['fhess_p']
+
+        # fprime is actually required. Temporary fix?:
+        if kwds.has_key('fprime'): fprime = kwds['fprime']
         #-------------------------------------------------------------
 
@@ -216 +221 @@
             self._maxiter = len(x0)*200
 
-        # Wrap gradient function?        
+        # Wrap gradient function? 
+        # gcalls, fprime = wrap_function(fprime, args, GradientMonitor)   
         gcalls, fprime = wrap_function(fprime, args, Null)
 
@@ -286 +292 @@
             update = alphak * pk
 
+            # Put last solution in trialSolution for termination()
             self.trialSolution = xk
 
             xk = xk + update        # upcast if necessary
-            if callback is not None:
-                callback(xk)
+            if self.callback is not None:
+                self.callback(xk)
             k += 1
 
@@ -304 +311 @@
         self.generations = k
 
+        # Fix me?
         self.hcalls = hcalls
+        self.gcalls = gcalls[0]
 
         signal.signal(signal.SIGINT,signal.default_int_handler)
     
-        if disp:
+        if self.disp:
             fval = old_fval
         if k >= self._maxiter:
-            if disp:
+            if self.disp:
                 print "Warning: Maximum number of iterations has been exceeded"
                 print "         Current function value: %f" % fval
@@ -319 +328 @@
                 print "         Hessian evaluations: %d" % hcalls
         else:
-            if disp:
+            if self.disp:
                 print "Optimization terminated successfully."
                 print "         Current function value: %f" % fval
@@ -402 +411 @@
  
     from mystic.tools import Sow, CustomSow
-    from mystic.termination import XTermination
+    from mystic.termination import SolutionImprovement
     #stepmon = Sow()
     stepmon = CustomSow('x','y','g','h', x='x', y='fval', \
@@ -413 +422 @@
     solver.SetEvaluationLimits(maxiter,None)
     # Does requiring fprime break abstract_solver interface?
-    solver.Solve(func, fprime, termination=XTermination(xtol),\
+    solver.Solve(func, SolutionImprovement(tolerance=xtol),\
                  EvaluationMonitor=evalmon,StepMonitor=stepmon,\
                  disp=disp, ExtraArgs=args, callback=callback,\
                  epsilon=epsilon, fhess_p=fhess_p,\
-                 fhess=fhess)
+                 fhess=fhess, fprime=fprime)
     solution = solver.Solution()
 
@@ -427 +436 @@
     fcalls = len(evalmon.x)
     iterations = len(stepmon.x)
-    gcalls = iterations   # Fix me?
+
+    # Fix me?
+    gcalls = solver.gcalls  
     hcalls = solver.hcalls
+
     allvecs = []
     for i in range(iterations):