Changeset 846

Timestamp:

11/25/15 13:41:25 (6 months ago)

Author:

mmckerns

Message:

edit scripts and support for faster import of mystic (local imports of mpl)

Location:

mystic/mystic

Files:

• scripts.py (modified) (11 diffs)
• support.py (modified) (12 diffs)

mystic/mystic/scripts.py

@@ -12 +12 @@
 __all__ = ['model_plotter','log_reader']
 
-from mpl_toolkits.mplot3d import axes3d
-import matplotlib.pyplot as plt
-from matplotlib import cm
-
-from mystic.munge import read_history
-from mystic.munge import raw_to_support, read_raw_file, read_trajectories
-
 # globals
 __quit = False
@@ -31 +24 @@
     """
     try: # if it's a logfile, it might be multi-id
+        from mystic.munge import read_trajectories
         step, param, cost = read_trajectories(source)
     except: # it's not a logfile, so read and return
+        from mystic.munge import read_history
         param, cost = read_history(source)
         return [param],[cost]
@@ -52 +47 @@
 
     # convert to support format
+    from mystic.munge import raw_to_support
     for i in range(len(params)):
         params[i], costs[i] = raw_to_support(params[i], costs[i])
@@ -157 +153 @@
 if figure is provided, plot to an existing figure
     """
+    import matplotlib.pyplot as plt
     if not figure: figure = plt.figure()
     ax = figure.gca()
@@ -188 +185 @@
 if figure is provided, plot to an existing figure
     """
+    import matplotlib.pyplot as plt
+    from mpl_toolkits.mplot3d import axes3d
     if not figure: figure = plt.figure()
 
@@ -242 +241 @@
     #XXX: need to 'correct' the z-axis (or provide easy conversion)
 
+    import matplotlib.pyplot as plt
     fig = plt.figure()
     ax = fig.gca()
@@ -263 +263 @@
     """
     import numpy
+    from matplotlib import cm
 
     if y is None:
@@ -280 +281 @@
     #XXX: need to 'correct' the z-axis (or provide easy conversion)
 
+    import matplotlib.pyplot as plt
+    from mpl_toolkits.mplot3d import axes3d
     fig = plt.figure()
     if surface and fill is None: # 'hidden' option; full 3D surface plot
@@ -665 +668 @@
             fig = _draw_trajectory(_x,_y,_c, style=style, scale=scale, shift=shift, figure=fig)
 
+    import matplotlib.pyplot as plt
+    from mpl_toolkits.mplot3d import axes3d
     # add labels to the axes
     if surface: kwds = {'projection':'3d'} # 3D
@@ -844 +849 @@
     try:
         instance = instance if instance else filename
+        from mystic.munge import read_trajectories
         step, param, cost = read_trajectories(instance)
     except SyntaxError:
+        from mystic.munge import read_raw_file
         read_raw_file(filename)
         msg = "incompatible file format, try 'support_convergence.py'"
@@ -896 +903 @@
     #print "conv = %s" % conv
 
+    import matplotlib.pyplot as plt
     fig = plt.figure()
 

mystic/mystic/support.py

@@ -12 +12 @@
            'hypercube_scenario', 'best_dimensions', 'swap']
 
-from mpl_toolkits.mplot3d import Axes3D as _Axes3D
-from matplotlib.axes import subplot_class_factory
-Subplot3D = subplot_class_factory(_Axes3D)
-
-from mpl_toolkits.mplot3d import axes3d
-import matplotlib.pyplot as plt
-from matplotlib import cm
-
-from mystic.munge import read_history
-from mystic.munge import raw_to_support, read_trajectories
-from mystic.tools import factor, flatten
+# from mpl_toolkits.mplot3d import axes3d
 
 # globals
@@ -31 +21 @@
 def best_dimensions(n):
   "get the 'best' dimensions (n x m) for arranging plots"
+  from mystic.tools import factor
   allfactors = list(factor(n))
   from numpy import product
@@ -393 +384 @@
     if instance is None:
         instance = parsed_args[0]
+    from mystic.munge import read_history
     params, cost = read_history(instance)
 
@@ -455 +447 @@
     dim1,dim2 = best_dimensions(plots + j)
 
+    import matplotlib.pyplot as plt
     fig = plt.figure()
     ax1 = fig.add_subplot(dim1,dim2,1)
@@ -648 +641 @@
     if instance is None:
         instance = parsed_args[0]
+    from mystic.munge import read_history
     params, _cost = read_history(instance)
     # would be nice to use meta = ['wx','wx2','x','x2','wy',...]
@@ -737 +731 @@
 
     # correctly bound the first plot.  there must be at least one plot
+    import matplotlib.pyplot as plt
+    from mpl_toolkits.mplot3d import Axes3D as _Axes3D
+    from matplotlib.axes import subplot_class_factory
+    Subplot3D = subplot_class_factory(_Axes3D)
     fig = plt.figure()
     ax1 = Subplot3D(fig, dim1,dim2,1)
@@ -787 +785 @@
     #steps = [[0,1],[1,2],[2,3],[3,4,5,6,7,8]] or similar
     if flatten:
+        from mystic.tools import flatten
         steps = [list(flatten(steps))]
 
@@ -944 +943 @@
     if instance is None:
         instance = parsed_args[0]
+    from mystic.munge import read_history
     params, _cost = read_history(instance)
     # would be nice to use meta = ['wx','wx2','x','x2','wy',...]
@@ -1043 +1043 @@
 
     # correctly bound the first plot.  there must be at least one plot
+    import matplotlib.pyplot as plt
+    from mpl_toolkits.mplot3d import Axes3D as _Axes3D
+    from matplotlib.axes import subplot_class_factory
+    Subplot3D = subplot_class_factory(_Axes3D)
     fig = plt.figure()
     ax1 = Subplot3D(fig, dim1,dim2,1)
@@ -1095 +1099 @@
     #steps = [[0],[1],[3],[8]] or similar
     if flatten:
+        from mystic.tools import flatten
         steps = [list(flatten(steps))]
 
@@ -1290 +1295 @@
     if instance is None:
         instance = parsed_args[0]
+    from mystic.munge import read_history
     params, _cost = read_history(instance)
     # would be nice to use meta = ['wx','wx2','x','x2','wy',...]
@@ -1469 +1475 @@
 
     # correctly bound the first plot.  there must be at least one plot
+    import matplotlib.pyplot as plt
+    from mpl_toolkits.mplot3d import Axes3D as _Axes3D
+    from matplotlib.axes import subplot_class_factory
+    Subplot3D = subplot_class_factory(_Axes3D)
     fig = plt.figure() 
     if _2D: