Changeset 790

Timestamp:

06/04/15 09:15:26 (12 months ago)

Author:

mmckerns

Message:

ensemble solvers add self.id to solver.id in self._map;
allow slice iter of trajectories on mystic_model_plotter

Location:

mystic

Files:

• mystic/ensemble.py (modified) (2 diffs)
• scripts/mystic_model_plotter.py (modified) (4 diffs)

mystic/mystic/ensemble.py

@@ -141 +141 @@
         vb = [verbose for i in range(len(initial_values))]
         cb = [echo for i in range(len(initial_values))] #XXX: remove?
-        id = range(len(initial_values))
+        at = self.id if self.id else 0  # start at self.id
+        id = range(at,at+len(initial_values))
 
         # generate the local_optimize function
@@ -327 +328 @@
         vb = [verbose for i in range(len(initial_values))]
         cb = [echo for i in range(len(initial_values))] #XXX: remove?
-        id = range(len(initial_values))
+        at = self.id if self.id else 0  # start at self.id
+        id = range(at,at+len(initial_values))
 
         # generate the local_optimize function

mystic/scripts/mystic_model_plotter.py

@@ -355 +355 @@
                       help="id # of the nth simultaneous points to plot")
     parser.add_option("-i","--iter",action="store",dest="stop",\
-                      metavar="INT",default=None,
-                      help="the largest iteration to plot")
+                      metavar="STR",default=":",
+                      help="string for smallest:largest iterations to plot")
     parser.add_option("-r","--reduce",action="store",dest="reducer",\
                       metavar="STR",default="None",
@@ -442 +442 @@
 
     try: # select which iteration to stop plotting at
-      stop = int(parsed_opts.stop)
-    except:
-      stop = None
+      stop = parsed_opts.stop  # format is "1:10:1"
+      stop = stop if ":" in stop else ":"+stop
+    except:
+      stop = ":"
 
     #################################################
@@ -520 +521 @@
            #px = p[int(s)] # draw_projection requires one parameter
            ## ignore everything after 'stop'
-           #_c = c[:stop]
-           #_x = px[:stop]
+           #_c = eval('c[%s]' % stop)
+           #_x = eval('px[%s]' % stop)
            #fig0 = draw_projection(_x,_c, style=style, scale=scale, shift=shift, figure=fig0)
 
@@ -529 +530 @@
             px,py = p # draw_trajectory requires two parameters
             # ignore everything after 'stop'
-            _x = px[:stop]
-            _y = py[:stop]
-            _c = c[:stop] if surface else None
+            _x = eval('px[%s]' % stop)
+            _y = eval('py[%s]' % stop)
+            _c = eval('c[%s]' % stop) if surface else None
             fig = draw_trajectory(_x,_y,_c, style=style, scale=scale, shift=shift, figure=fig)