Changeset 836

Timestamp:

10/15/15 19:57:49 (7 months ago)

Author:

mmckerns

Message:

enable mystic.model_plotter to take monitor instance

File:

• mystic/mystic/scripts.py (modified) (7 diffs)

mystic/mystic/scripts.py

@@ -31 +31 @@
     """
     try: # if it's a logfile, it might be multi-id
-        step, param, cost = logfile_reader(source)
+        if isinstance(source, basestring):
+            step, param, cost = logfile_reader(source)
+        else:
+            step = enumerate(source.id)
+            if len(source) == source.id.count(None):
+                step = [(i,) for (i,j) in step]
+            else:
+                step = list(step)
+            param, cost = source.x, source.y
     except: # it's not a logfile, so read and return
         param, cost = read_history(source)
@@ -362 +370 @@
     _solver = None
 
+    instance = None
     # handle the special case where list is provided by sys.argv
     if isinstance(model, (list,tuple)) and not logfile and not kwds:
@@ -398 +407 @@
 
         # handle logfile if given
-        if logfile: model += ' ' + logfile
+        if logfile:
+            if isinstance(logfile, basestring):
+                model += ' ' + logfile
+            else: # special case of passing in monitor instance
+                instance = logfile
 
         # process "commandline" arguments
@@ -566 +579 @@
     #FIXME: does grid=False still make sense here...?
     if reducer: reducer = _reducer or _get_instance(reducer)
-    if solver and (not source or not model):
+    if solver and (not source or not model): #XXX: not instance?
         raise RuntimeError('a model and results filename are required')
-    elif not source and not model:
+    elif not source and not model and not instance:
         raise RuntimeError('a model or a results file is required')
     if model:
@@ -585 +598 @@
             initial = [0]*xlen
         from mystic.monitors import VerboseLoggingMonitor
-        itermon = VerboseLoggingMonitor(filename=source, new=True)
+        if instance:
+            itermon = VerboseLoggingMonitor(new=True)
+            itermon.prepend(instance)
+        else:
+            itermon = VerboseLoggingMonitor(filename=source, new=True)
         # explicitly constrain parameters
         model = partial(mask)(model)
@@ -613 +630 @@
         fig = None
 
+    if instance: source = instance
     if source:
         # params are the parameter trajectories
@@ -703 +721 @@
         else: # special case of passing in monitor instance
             instance = filename
-            cmdargs = ['^1203@magic*key311&'] + shlex.split(cmdargs)
+            cmdargs = shlex.split(cmdargs)
 
     #XXX: note that 'argparse' is new as of python2.7