Changeset 562 for branches

Timestamp:

09/18/12 14:07:03 (4 years ago)

Author:

mmckerns

Message:

better bounds clipping for datapoints; allow coneless plotting of data

File:

• branches/UQ/math/legacy/plot_data.py (modified) (11 diffs)

branches/UQ/math/legacy/plot_data.py

@@ -3 +3 @@
 
 #### building the cone primitive ####
-def cone_builder(slope, lb, ub):
+def cone_builder(slope, bounds):
   """ factory to create a cone primitive
 
   slope -- slope multiplier for cone on the X,Y,Z axes (for mesh construction)
-  lb -- tuple of lower bounds for the plot view
-  ub -- tuple of upper bounds for the plot view
+  bounds -- list of tuples of bounds for the plot; (lower,upper) for each axis
 """
   from mystic.math import almostEqual
@@ -35 +34 @@
     return X,Z,Y
 
+  lb,ub = zip(*bounds)
+  # if False, the cone surface may violate bounds
+  strict = True # always respect the bounds
+
   def cone(position, top=True):
     """ construct a cone primitive, with vertex at given position
@@ -45 +48 @@
     d_hi = ub - position
     d_lo = lb - position
-    # check if out of bounds
-    if any(d_hi < 0): return None  #FIXME: poor design
-    if any(d_lo > 0): return None  #FIXME: poor design
+    if strict and (any(d_hi < 0) or any(d_lo > 0)):
+      return None  # don't plot cone if vertex is out of bounds
 
     if top: # distance of vertex from upper edge
@@ -65 +67 @@
 
 #### plotting the cones ####
-def plot_cones(ax, data, slope, lb, ub):
+def plot_cones(ax, data, slope, bounds):
   """plot double cones for a given dataset
 
@@ -71 +73 @@
   data -- list of datapoints, where datapoints are 3-tuples (i.e. x,y,z)
   slope -- slope multiplier for cone on the X,Y,Z axes (for mesh construction)
-  lb -- tuple of lower bounds for the plot view
-  ub -- tuple of upper bounds for the plot view
+  bounds -- list of tuples of bounds for the plot; (lower,upper) for each axis
 """
-  cone = cone_builder(slope, lb, ub)
+  cone = cone_builder(slope, bounds)
   # plot the upper and lower cone
   for datapt in data:
@@ -87 +88 @@
   return ax
 
-def plot_data(ax, data):
+def plot_data(ax, data, bounds):
   """plot datapoints for a given dataset
 
   ax -- matplotlib 'Axes3D' plot object
   data -- list of datapoints, where datapoints are 3-tuples (i.e. x,y,z)
+  bounds -- list of tuples of bounds for the plot; (lower,upper) for each axis
 """
+  strict = True # always respect the bounds
+  lb,ub = zip(*bounds)
   # plot the datapoints themselves
+  from numpy import asarray
   for datapt in data:
-    ax.plot([datapt[0]], [datapt[2]], [datapt[1]], \
-            color='r', marker='o', markersize=10)
+    position = asarray(datapt)
+    d_hi = ub - position
+    d_lo = lb - position
+    if strict and (any(d_hi < 0) or any(d_lo > 0)):
+      pass  # don't plot if datapt is out of bounds
+    else:
+      ax.plot([datapt[0]], [datapt[2]], [datapt[1]], \
+              color='r', marker='o', markersize=10)
   return ax
 
-def clip_axes(ax, lb, ub):
+def clip_axes(ax, bounds):
   """ clip plots to be within given lower and upper bounds
 
   ax -- matplotlib 'Axes3D' plot object
-  lb -- tuple of lower bounds for the plot view
-  ub -- tuple of upper bounds for the plot view
+  bounds -- list of tuples of bounds for the plot; (lower,upper) for each axis
 """
+  lb,ub = zip(*bounds)
   # plot only within [lb,ub]
   ax.set_xlim3d(lb[0], ub[0])
@@ -112 +123 @@
   return ax
 
-def reduce_dimension(axis, coords, values, slope, lb, ub):
+def reduce_dimension(axis, coords, values, slope, bounds):
   """ replace one coordiate axis in a 3-D data set with 'data values'
   (i.e. replace an 'x' axis with the 'y' values of the data)
@@ -120 +131 @@
   values -- list of datapoint values, where values are floats
   slope -- slope multiplier for cone on the X,Y,Z axes
-  lb -- tuple of lower bounds for the plot view
-  ub -- tuple of upper bounds for the plot view
+  bounds -- list of tuples of bounds for the plot; (lower,upper) for each axis
 
 NOTE: for the axis indicated by 'axis', replace
@@ -128 +138 @@
    - selected slope with 1.0
   """
+  if axis not in range(len(bounds[:-1])):  # don't replace an axis
+    return coords, slope[:-1], bounds[:-1] 
   xs = axis
-  lb = lb[:xs] + lb[xs+1:]
-  ub = ub[:xs] + ub[xs+1:]
+  bounds = bounds[:xs] + bounds[xs+1:]
   slope = slope[:xs] + slope[xs+1:]
   coords = [coords[i][:xs] + coords[i][xs+1:] + [values[i]] \
                              for i in range(len(coords))]
-  return coords, slope, lb, ub
+  return coords, slope, bounds
 
 
@@ -149 +160 @@
   h_lower = [0.062]; a_lower = [0.0];  v_lower = [2300.0]
   h_upper = [0.125]; a_upper = [30.0]; v_upper = [3200.0]
-  axis_to_replace = xs = 0  #XXX: select axis NOT to plot here
+  axis_to_replace = xs = 0    #XXX: select axis NOT to plot here
 
+  # temporarily 'inflate' bounds and slopes to include values
   lb = h_lower + a_lower + v_lower + Y_lower
   ub = h_upper + a_upper + v_upper + Y_upper
-
+  bounds = zip(lb,ub)
   slope = data.lipschitz + [1.0]
   coords = data.coords
   values = data.values
+  # replace selected coords axis; 'reduce' the size of bounds and slopes
+  coords, slope, bounds = reduce_dimension(xs, coords, values, slope, bounds)
 
-  coords, slope, lb, ub = reduce_dimension(xs, coords, values, slope, lb, ub)
-
-  print "lower: %s" % lb
-  print "upper: %s" % ub
+  print "bounds: %s" % bounds
   print "slope: %s" % slope
  #print "coords: %s" % coords
@@ -170 +181 @@
   fig = plt.figure() 
   ax = Axes3D(fig)#,aspect='equal') 
-  plot_cones(ax, coords, slope, lb, ub)
-  plot_data(ax, coords)
- #clip_axes(ax, lb, ub)
+  if xs in range(len(bounds)):  # we are replacing an axis
+    plot_cones(ax, coords, slope, bounds)
+  plot_data(ax, coords, bounds)
+  clip_axes(ax, bounds)
   plt.show()