Changeset 687 for branches/UQ/math/legacy/MINMAX_StAlData.py

Timestamp:

06/15/13 18:43:09 (3 years ago)

Author:

mmckerns

Message:

renaming of some of the measure methods, including dirac_measure to measure
moved dirac_measure.py to discrete.py, and paramtrans to distance
added isinstance to tools; added min, max, ess_min, ess_max to measures
moved dirac_measure.coords to dirac_measure.positions

File:

• branches/UQ/math/legacy/MINMAX_StAlData.py (modified) (4 diffs)

branches/UQ/math/legacy/MINMAX_StAlData.py

@@ -67 +67 @@
 def maximize(params,npts,bounds):
 
-  from mystic.math.dirac_measure import scenario
+  from mystic.math.discrete import scenario
   from numpy import inf
   target,error = params
@@ -104 +104 @@
     ##################### begin function-specific #####################
     # impose norm on the weights of the discrete measures
-    from mystic.math.dirac_measure import norm_wts_constraintsFactory as factory
+    from mystic.math.discrete import norm_wts_constraintsFactory as factory
     constrain = factory(npts)
 
@@ -167 +167 @@
   nz = 1  #NOTE: SET THE NUMBER OF 'v' POINTS HERE!
   npts = (nx,ny,nz)
-  from mystic.math.paramtrans import _npts
+  from mystic.math.distance import _npts
   _n = _npts(npts)
 
@@ -229 +229 @@
 
   from numpy import array
-  from mystic.math.dirac_measure import scenario
+  from mystic.math.discrete import scenario
   c = scenario()
   c.load(solved,npts)