Changeset 838

Timestamp:

10/16/15 11:18:48 (7 months ago)

Author:

mmckerns

Message:

add read_trajectories function; use in model_plotter and log_reader;
enable support functions to take monitor instance and use kwds string

Location:

mystic/mystic

Files:

• munge.py (modified) (1 diff)
• scripts.py (modified) (3 diffs)
• support.py (modified) (13 diffs)

mystic/mystic/munge.py

@@ -69 +69 @@
   return step, param, cost
 
+def read_trajectories(source):
+  """read trajectories from a convergence logfile or a monitor
+
+source can either be a monitor instance or a logfile path
+  """
+  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
+  return step, param, cost
+
 
 # read and write monitor (to and from raw data)

mystic/mystic/scripts.py

@@ -17 +17 @@
 
 from mystic.munge import read_history
-from mystic.munge import logfile_reader, raw_to_support, read_raw_file
+from mystic.munge import raw_to_support, read_raw_file, read_trajectories
 
 # globals
@@ -31 +31 @@
     """
     try: # if it's a logfile, it might be multi-id
-        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
+        step, param, cost = read_trajectories(source)
     except: # it's not a logfile, so read and return
         param, cost = read_history(source)
@@ -841 +833 @@
     # parse file contents to get (i,id), cost, and parameters
     try:
-        if instance:
-            step = enumerate(instance.id)
-            if len(instance) == instance.id.count(None):
-                step = [(i,) for (i,j) in step]
-            else:
-                step = list(step)
-            param, cost = instance.x, instance.y
-        else:
-            step, param, cost = logfile_reader(filename)
+        instance = instance if instance else filename
+        step, param, cost = read_trajectories(instance)
     except SyntaxError:
         read_raw_file(filename)

mystic/mystic/support.py

@@ -21 +21 @@
 
 from mystic.munge import read_history
-from mystic.munge import logfile_reader, raw_to_support
+from mystic.munge import raw_to_support, read_trajectories
 from mystic.tools import factor, flatten
 
@@ -311 +311 @@
     __quit = False
 
+    instance = None
     # handle the special case where list is provided by sys.argv
     if isinstance(filename, (list,tuple)) and not kwds:
@@ -318 +319 @@
     # 'everything else' is essentially the functional interface
     else:
-        out = kwds.get('out', None)
-        iter = kwds.get('iter', None)
-        param = kwds.get('param', None)
-        label = kwds.get('label', None)
-        nid = kwds.get('nid', None)
-        cost = kwds.get('cost', False)
-        legend = kwds.get('legend', False)
-
-        # process "commandline" arguments
-        cmdargs = ''
-        cmdargs += '' if out is None else '--out={} '.format(out)
-        cmdargs += '' if iter is None else '--iter={} '.format(iter)
-        cmdargs += '' if param is None else '--param="{}" '.format(param)
-        cmdargs += '' if label is None else '--label="{}" '.format(label)
-        cmdargs += '' if nid is None else '--nid={} '.format(nid)
-        cmdargs += '' if cost == False else '--cost '
-        cmdargs += '' if legend == False else '--legend '
-        cmdargs = filename.split() + shlex.split(cmdargs)
+        cmdargs = kwds.get('kwds', '')
+        if not cmdargs:
+            out = kwds.get('out', None)
+            iter = kwds.get('iter', None)
+            param = kwds.get('param', None)
+            label = kwds.get('label', None)
+            nid = kwds.get('nid', None)
+            cost = kwds.get('cost', False)
+            legend = kwds.get('legend', False)
+
+            # process "commandline" arguments
+            cmdargs = ''
+            cmdargs += '' if out is None else '--out={} '.format(out)
+            cmdargs += '' if iter is None else '--iter={} '.format(iter)
+            cmdargs += '' if param is None else '--param="{}" '.format(param)
+            cmdargs += '' if label is None else '--label="{}" '.format(label)
+            cmdargs += '' if nid is None else '--nid={} '.format(nid)
+            cmdargs += '' if cost == False else '--cost '
+            cmdargs += '' if legend == False else '--legend '
+        else:
+            cmdargs = ' ' + cmdargs
+        if isinstance(filename, basestring):
+            cmdargs = filename.split() + shlex.split(cmdargs)
+        else: # special case of passing in monitor instance
+            instance = filename
+            cmdargs = shlex.split(cmdargs)
 
     #XXX: note that 'argparse' is new as of python2.7
@@ -382 +391 @@
 
     # get the name of the parameter log file
-    params, cost = read_history(parsed_args[0])
+    if instance is None:
+        instance = parsed_args[0]
+    params, cost = read_history(instance)
 
     if parsed_opts.cost: # also plot the cost
@@ -548 +559 @@
     __quit = False
 
+    instance = None
     # handle the special case where list is provided by sys.argv
     if isinstance(filename, (list,tuple)) and not kwds:
@@ -555 +567 @@
     # 'everything else' is essentially the functional interface
     else:
-        out = kwds.get('out', None)
-        bounds = kwds.get('bounds', None)
-        axes = kwds.get('axes', None)
-        iters = kwds.get('iters', None)
-        label = kwds.get('label', None)
-        nid = kwds.get('nid', None)
-        scale = kwds.get('scale', None)
-        flat = kwds.get('flat', False)
-
-        # process "commandline" arguments
-        cmdargs = ''
-        cmdargs += '' if out is None else '--out={} '.format(out)
-        cmdargs += '' if bounds is None else '--bounds="{}" '.format(bounds)
-        cmdargs += '' if axes is None else '--axes="{}" '.format(axes)
-        cmdargs += '' if iters is None else '--iters="{}" '.format(iters)
-        cmdargs += '' if label is None else '--label="{}" '.format(label)
-        cmdargs += '' if nid is None else '--nid={} '.format(nid)
-        cmdargs += '' if scale is None else '--scale={} '.format(scale)
-        cmdargs += '' if flat == False else '--flat '
-        cmdargs = filename.split() + shlex.split(cmdargs)
+        cmdargs = kwds.get('kwds', '')
+        if not cmdargs:
+            out = kwds.get('out', None)
+            bounds = kwds.get('bounds', None)
+            axes = kwds.get('axes', None)
+            iters = kwds.get('iters', None)
+            label = kwds.get('label', None)
+            nid = kwds.get('nid', None)
+            scale = kwds.get('scale', None)
+            flat = kwds.get('flat', False)
+
+            # process "commandline" arguments
+            cmdargs = ''
+            cmdargs += '' if out is None else '--out={} '.format(out)
+            cmdargs += '' if bounds is None else '--bounds="{}" '.format(bounds)
+            cmdargs += '' if axes is None else '--axes="{}" '.format(axes)
+            cmdargs += '' if iters is None else '--iters="{}" '.format(iters)
+            cmdargs += '' if label is None else '--label="{}" '.format(label)
+            cmdargs += '' if nid is None else '--nid={} '.format(nid)
+            cmdargs += '' if scale is None else '--scale={} '.format(scale)
+            cmdargs += '' if flat == False else '--flat '
+        else:
+            cmdargs = ' ' + cmdargs
+        if isinstance(filename, basestring):
+            cmdargs = filename.split() + shlex.split(cmdargs)
+        else: # special case of passing in monitor instance
+            instance = filename
+            cmdargs = shlex.split(cmdargs)
 
     #XXX: note that 'argparse' is new as of python2.7
@@ -626 +646 @@
 
     # get the name of the parameter log file
-    params, _cost = read_history(parsed_args[0])
+    if instance is None:
+        instance = parsed_args[0]
+    params, _cost = read_history(instance)
     # would be nice to use meta = ['wx','wx2','x','x2','wy',...]
     # exec "from %s import meta" % file
@@ -828 +850 @@
     __quit = False
 
+    instance = None
     # handle the special case where list is provided by sys.argv
     if isinstance(filename, (list,tuple)) and not kwds:
@@ -835 +858 @@
     # 'everything else' is essentially the functional interface
     else:
-        out = kwds.get('out', None)
-        bounds = kwds.get('bounds', None)
-        axes = kwds.get('axes', None)
-        weight = kwds.get('weight', None)
-        iters = kwds.get('iters', None)
-        label = kwds.get('label', None)
-        nid = kwds.get('nid', None)
-        scale = kwds.get('scale', None)
-        flat = kwds.get('flat', False)
-
-        # process "commandline" arguments
-        cmdargs = ''
-        cmdargs += '' if out is None else '--out={} '.format(out)
-        cmdargs += '' if bounds is None else '--bounds="{}" '.format(bounds)
-        cmdargs += '' if axes is None else '--axes="{}" '.format(axes)
-        cmdargs += '' if weight is None else '--weight="{}" '.format(weight)
-        cmdargs += '' if iters is None else '--iters="{}" '.format(iters)
-        cmdargs += '' if label is None else '--label="{}" '.format(label)
-        cmdargs += '' if nid is None else '--nid={} '.format(nid)
-        cmdargs += '' if scale is None else '--scale={} '.format(scale)
-        cmdargs += '' if flat == False else '--flat '
-        cmdargs = filename.split() + shlex.split(cmdargs)
+        cmdargs = kwds.get('kwds', '')
+        if not cmdargs:
+            out = kwds.get('out', None)
+            bounds = kwds.get('bounds', None)
+            axes = kwds.get('axes', None)
+            weight = kwds.get('weight', None)
+            iters = kwds.get('iters', None)
+            label = kwds.get('label', None)
+            nid = kwds.get('nid', None)
+            scale = kwds.get('scale', None)
+            flat = kwds.get('flat', False)
+
+            # process "commandline" arguments
+            cmdargs = ''
+            cmdargs += '' if out is None else '--out={} '.format(out)
+            cmdargs += '' if bounds is None else '--bounds="{}" '.format(bounds)
+            cmdargs += '' if axes is None else '--axes="{}" '.format(axes)
+            cmdargs += '' if weight is None else '--weight="{}" '.format(weight)
+            cmdargs += '' if iters is None else '--iters="{}" '.format(iters)
+            cmdargs += '' if label is None else '--label="{}" '.format(label)
+            cmdargs += '' if nid is None else '--nid={} '.format(nid)
+            cmdargs += '' if scale is None else '--scale={} '.format(scale)
+            cmdargs += '' if flat == False else '--flat '
+        else:
+            cmdargs = ' ' + cmdargs
+        if isinstance(filename, basestring):
+            cmdargs = filename.split() + shlex.split(cmdargs)
+        else: # special case of passing in monitor instance
+            instance = filename
+            cmdargs = shlex.split(cmdargs)
 
     #XXX: note that 'argparse' is new as of python2.7
@@ -911 +942 @@
 
     # get the name of the parameter log file
-    params, _cost = read_history(parsed_args[0])
+    if instance is None:
+        instance = parsed_args[0]
+    params, _cost = read_history(instance)
     # would be nice to use meta = ['wx','wx2','x','x2','wy',...]
     # exec "from %s import meta" % file
@@ -1141 +1174 @@
     __quit = False
 
+    instance = None
     # handle the special case where list is provided by sys.argv
     if isinstance(filename, (list,tuple)) and not kwds:
@@ -1148 +1182 @@
     # 'everything else' is essentially the functional interface
     else:
-        out = kwds.get('out', None)
-        bounds = kwds.get('bounds', None)
-        iters = kwds.get('iters', None)
-        label = kwds.get('label', None)
-        dim = kwds.get('dim', None)
-        filter = kwds.get('filter', None)
-        mask = kwds.get('mask', None)
-        nid = kwds.get('nid', None)
-        scale = kwds.get('scale', None)
-        gap = kwds.get('gap', None)
-        data = kwds.get('data', False)
-        cones = kwds.get('cones', False)
-        vertical = kwds.get('vertical', False)
-        flat = kwds.get('flat', False)
-
-        # process "commandline" arguments
-        cmdargs = ''
-        cmdargs += '' if out is None else '--out={} '.format(out)
-        cmdargs += '' if bounds is None else '--bounds="{}" '.format(bounds)
-        cmdargs += '' if iters is None else '--iters="{}" '.format(iters)
-        cmdargs += '' if label is None else '--label="{}" '.format(label)
-        cmdargs += '' if dim is None else '--dim="{}" '.format(dim)
-        cmdargs += '' if filter is None else '--filter="{}" '.format(filter)
-        cmdargs += '' if mask is None else '--mask={} '.format(mask)
-        cmdargs += '' if nid is None else '--nid={} '.format(nid)
-        cmdargs += '' if scale is None else '--scale={} '.format(scale)
-        cmdargs += '' if gap is None else '--gap={} '.format(gap)
-        cmdargs += '' if data == False else '--data '
-        cmdargs += '' if cones == False else '--cones '
-        cmdargs += '' if vertical == False else '--vertical '
-        cmdargs += '' if flat == False else '--flat '
-        cmdargs = filename.split() + shlex.split(cmdargs)
+        cmdargs = kwds.get('kwds', '')
+        if not cmdargs:
+            out = kwds.get('out', None)
+            bounds = kwds.get('bounds', None)
+            iters = kwds.get('iters', None)
+            label = kwds.get('label', None)
+            dim = kwds.get('dim', None)
+            filter = kwds.get('filter', None)
+            mask = kwds.get('mask', None)
+            nid = kwds.get('nid', None)
+            scale = kwds.get('scale', None)
+            gap = kwds.get('gap', None)
+            data = kwds.get('data', False)
+            cones = kwds.get('cones', False)
+            vertical = kwds.get('vertical', False)
+            flat = kwds.get('flat', False)
+
+            # process "commandline" arguments
+            cmdargs = ''
+            cmdargs += '' if out is None else '--out={} '.format(out)
+            cmdargs += '' if bounds is None else '--bounds="{}" '.format(bounds)
+            cmdargs += '' if iters is None else '--iters="{}" '.format(iters)
+            cmdargs += '' if label is None else '--label="{}" '.format(label)
+            cmdargs += '' if dim is None else '--dim="{}" '.format(dim)
+            cmdargs += '' if filter is None else '--filter="{}" '.format(filter)
+            cmdargs += '' if mask is None else '--mask={} '.format(mask)
+            cmdargs += '' if nid is None else '--nid={} '.format(nid)
+            cmdargs += '' if scale is None else '--scale={} '.format(scale)
+            cmdargs += '' if gap is None else '--gap={} '.format(gap)
+            cmdargs += '' if data == False else '--data '
+            cmdargs += '' if cones == False else '--cones '
+            cmdargs += '' if vertical == False else '--vertical '
+            cmdargs += '' if flat == False else '--flat '
+        else:
+            cmdargs = ' ' + cmdargs
+        if isinstance(filename, basestring):
+            cmdargs = filename.split() + shlex.split(cmdargs)
+        else: # special case of passing in monitor instance
+            instance = filename
+            cmdargs = shlex.split(cmdargs)
 
     #XXX: note that 'argparse' is new as of python2.7
@@ -1246 +1288 @@
 
     # get the name of the parameter log file
-    params, _cost = read_history(parsed_args[0])
+    if instance is None:
+        instance = parsed_args[0]
+    params, _cost = read_history(instance)
     # would be nice to use meta = ['wx','wx2','x','x2','wy',...]
     # exec "from %s import meta" % file