Changeset 559 for branches

Timestamp:

09/12/12 11:40:33 (4 years ago)

Author:

mmckerns

Message:

fmin_powell with full_output return more standard (moved direc to end)

Location:

branches

Files:

• HPCtut/optimize_helper.py (modified) (2 diffs)
• UQ/math/legacy/dirac_measure.py (modified) (6 diffs)

branches/HPCtut/optimize_helper.py

@@ -11 +11 @@
                                          disp=disp, itermon=mon, handler=0)
     # return: solution, energy, generations, fevals
-    return solved[0], solved[1], solved[3], solved[4]
+    return solved[0], solved[1], solved[2], solved[3]
 
 def diffev(cost, x0, full=1, disp=1, monitor=0):
@@ -23 +23 @@
                                          disp=disp, itermon=mon, handler=0)
     # return: solution, energy, generations, fevals
-    return solved[0], solved[1], solved[3], solved[4]
+    return solved[0], solved[1], solved[2], solved[3]
 
 

branches/UQ/math/legacy/dirac_measure.py

@@ -1022 +1022 @@
   if debug: stepmon = VerboseMonitor(10)  #!!!
   if npop: # use VTR
-    _i = 2 #XXX: iter returned as results[2]
     results = diffev2(cost, guess, npop, ftol=ftol, gtol=gtol, bounds=bounds,\
                       maxiter=maxiter, maxfun=maxfun, constraints=constraints,\
@@ -1029 +1028 @@
                       full_output=1, disp=0, handler=False)
   else: # use VTR
-    _i = 3 #XXX: iter returned as results[3]  (results[2] == direc)
     results = fmin_powell(cost, guess, ftol=ftol, gtol=gtol, bounds=bounds,\
                       maxiter=maxiter, maxfun=maxfun, constraints=constraints,\
@@ -1037 +1035 @@
   pm = scenario()
   pm.load(results[0], pts)            # params: w,x,y
-  if debug: print "final cost: %s" % results[1]
-  if debug and results[_i] >= maxiter: # iterations
+ #if debug: print "final cost: %s" % results[1]
+  if debug and results[2] >= maxiter: # iterations
     print "Warning: constraints solver terminated at maximum iterations"
- #func_evals = results[_i+1]           # evaluation
+ #func_evals = results[3]           # evaluation
   return pm
 
@@ -1154 +1152 @@
   if debug: stepmon = VerboseMonitor(2)  #!!!
   if npop: # use VTR
-    _i = 2 #XXX: iter returned as results[2]
     results = diffev2(cost, guess, npop, ftol=ftol, gtol=gtol, bounds=bounds,\
                       maxiter=maxiter, maxfun=maxfun, constraints=constraints,\
@@ -1161 +1158 @@
                       full_output=1, disp=0, handler=False)
   else: # use VTR
-    _i = 3 #XXX: iter returned as results[3]  (results[2] == direc)
     results = fmin_powell(cost, guess, ftol=ftol, gtol=gtol, bounds=bounds,\
                       maxiter=maxiter, maxfun=maxfun, constraints=constraints,\
@@ -1170 +1166 @@
   pm.load(results[0], pts)            # params: w,x,y
  #if debug: print "final cost: %s" % results[1]
-  if debug and results[_i] >= maxiter: # iterations
+  if debug and results[2] >= maxiter: # iterations
     print "Warning: constraints solver terminated at maximum iterations"
- #func_evals = results[_i+1]           # evaluation
+ #func_evals = results[3]           # evaluation
   return pm