Changeset 372

Timestamp:

08/04/10 12:44:55 (6 years ago)

Author:

mmckerns

Message:

marker toggleable on log_reader; all=False is default on Sows

Files:

• branches/multilogger/log_reader.py (modified) (3 diffs)
• mystic/mystic/differential_evolution.py (modified) (4 diffs)
• mystic/mystic/scipy_optimize.py (modified) (4 diffs)
• mystic/mystic/tools.py (modified) (2 diffs)
• mystic/tests/test_SOW.py (modified) (4 diffs)

branches/multilogger/log_reader.py

@@ -1 +1 @@
 import sys
+if '--dots' in sys.argv:
+  mark = 'o'
+  sys.argv.remove('--dots')
+else:
+  mark = ''
+
 try:
   filename = sys.argv[1]
@@ -81 +87 @@
   for i in range(len(conv)):
     tag = "%d,%d" % (i,j)
-    ax1.plot(iter_conv[i],conv[i][j],label="%s" % tag,marker='o')
+    ax1.plot(iter_conv[i],conv[i][j],label="%s" % tag,marker=mark)
 plt.legend()
 
@@ -87 +93 @@
 for i in range(len(conv)):
   tag = "%d" % i
-  ax2.plot(iter_conv[i],cost_conv[i],label='cost %s' % tag,marker='o')
+  ax2.plot(iter_conv[i],cost_conv[i],label='cost %s' % tag,marker=mark)
 plt.legend()
 

mystic/mystic/differential_evolution.py

@@ -277 +277 @@
                     self.bestEnergy = trialEnergy
                     self.bestSolution[:] = self.trialSolution[:]
-                            
+
         self.energy_history.append(self.bestEnergy)
         StepMonitor(self.bestSolution[:], self.bestEnergy, id)
@@ -307 +307 @@
                         self.bestEnergy = trialEnergy
                         self.bestSolution[:] = self.trialSolution[:]
-                            
+
             self.energy_history.append(self.bestEnergy)
             StepMonitor(self.bestSolution[:], self.bestEnergy, id)
@@ -486 +486 @@
                     self.bestEnergy = trialEnergy[candidate]
                     self.bestSolution[:] = trialPop[candidate][:]
-                        
+
         self.energy_history.append(self.bestEnergy)
        #FIXME: StepMonitor works for 'pp'?
@@ -528 +528 @@
                         self.bestEnergy = trialEnergy[candidate]
                         self.bestSolution[:] = trialPop[candidate][:]
-                            
+
             self.energy_history.append(self.bestEnergy)
            #FIXME: StepMonitor works for 'pp'?

mystic/mystic/scipy_optimize.py

@@ -207 +207 @@
             allvecs = [sim[0]]
         fsim[0] = func(x0)
-        StepMonitor(sim[0], fsim[0], id) # sim = all values; "best" is sim[0]
+        StepMonitor(sim[0], fsim[0], id) # sim = all; "best" is sim[0]
 
         #--- ensure initial simplex is within bounds ---
@@ -228 +228 @@
         self.popEnergy = fsim
         self.energy_history.append(self.bestEnergy)
-        StepMonitor(sim[0], fsim[0], id) # sim = all values; "best" is sim[0]
+        StepMonitor(sim[0], fsim[0], id) # sim = all; "best" is sim[0]
 
         iterations = 1
@@ -296 +296 @@
             self.popEnergy = fsim
             self.energy_history.append(self.bestEnergy)
-            StepMonitor(sim[0], fsim[0],id) # sim = all values; "best" is sim[0]
+            StepMonitor(sim[0], fsim[0],id) # sim = all; "best" is sim[0]
 
         self.generations = iterations
@@ -591 +591 @@
             self.population[0] = x    #XXX: pointless
             self.popEnergy[0] = fval  #XXX: pointless
-            StepMonitor(x, fval, id) # get ith values; #XXX: should be [x],[fval] ?
+            StepMonitor(x, fval, id) # get ith values
     
         self.generations = iter

mystic/mystic/tools.py

@@ -164 +164 @@
     """
     import numpy
-    def __init__(self, interval = 10, xinterval = numpy.inf, all=False):
+    def __init__(self, interval = 10, xinterval = numpy.inf, all=True):
         super(VerboseSow,self).__init__()
         self._step = 0
@@ -209 +209 @@
     """
     import numpy
-    def __init__(self, interval=1, filename='log.txt', new=False, all=False):
+    def __init__(self, interval=1, filename='log.txt', new=False, all=True):
         import datetime
         super(LoggingSow,self).__init__()

mystic/tests/test_SOW.py

@@ -47 +47 @@
 def test2(monitor, diffenv=None):
   if diffenv == True:
-    from mystic.differential_evolution import DifferentialEvolutionSolver as DE
-   #from mystic.differential_evolution import DifferentialEvolutionSolver2 as DE
+   #from mystic.differential_evolution import DifferentialEvolutionSolver as DE
+    from mystic.differential_evolution import DifferentialEvolutionSolver2 as DE
   elif diffenv == False:
     from mystic.scipy_optimize import NelderMeadSimplexSolver as noDE
@@ -62 +62 @@
   ndim = len(lb)
   npop = 5
-  maxiter = 5
+  maxiter = 10
   maxfun = 1e+6
   convergence_tol = 1e-10; ngen = 100
@@ -81 +81 @@
 
   tol = convergence_tol
-  solver.Solve(cost, termination=COG(tol,ngen), StepMonitor=monitor)
+ #solver.Solve(cost, termination=COG(tol,ngen), StepMonitor=monitor)
+  solver.Solve(cost, termination=COG(tol,ngen), EvaluationMonitor=monitor)
 
   solved = solver.Solution()
@@ -91 +92 @@
 if __name__ == '__main__':
 
-  from mystic import Sow, VerboseSow
-  monitor = Sow()
+  from mystic import Sow, VerboseSow, LoggingSow
+ #monitor = Sow()
+ #monitor = Sow(all=True)
  #monitor = Sow(all=False)
  #monitor = VerboseSow(1,1) 
  #monitor = VerboseSow(1,1, all=True) 
- #monitor = LoggingSow(1)
+ #monitor = VerboseSow(1,1, all=False) 
+  monitor = LoggingSow(1)
  #monitor = LoggingSow(1, all=True)
+ #monitor = LoggingSow(1, all=False)
 
  #test0(monitor)
-  test1(monitor)
- #test2(monitor)                 # r340 is like test0; desired is like test1
- #test2(monitor, diffenv=False)  #       ... (for Powell, add enclosing [ ])
+ #test1(monitor)
+  test2(monitor)                 # StepMonitor works like test0
+ #test2(monitor, diffenv=False)  # (to make like test1, add enclosing [])
  #test2(monitor, diffenv=True)
 
   # these are for "SowPlotter(s)"; need to adapt log.py plotters for test1
   write_support_file(monitor,'paramlog1.py')
-  write_converge_file(monitor,'paramlog2.py')
-
-  # also need "LogPlotter(s)" for log.txt from test1 all=True & all=False data
-  # all Plotters for all=True should take "best=True" to draw only 'best' data
-
-  # when using "best=True", find ChiSq[i] that is least, take corresponding x ??
+ #write_converge_file(monitor,'paramlog2.py')
 
 # EOF