Changeset 687 for branches/UQ/math/legacy/TEST_OUQ_1dSurr_CxCy.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/TEST_OUQ_1dSurr_CxCy.py (modified) (5 diffs)

branches/UQ/math/legacy/TEST_OUQ_1dSurr_CxCy.py

@@ -73 +73 @@
 def maximize(params,npts,bounds,printmon=None,**kwds):
 
-  from mystic.math.dirac_measure import scenario
+  from mystic.math.discrete import scenario
   from numpy import inf
   target,error = params
@@ -110 +110 @@
     ##################### begin function-specific #####################
     # impose mean on the values of the product measure
-    from mystic.math.dirac_measure import mean_y_norm_wts_constraintsFactory as factory
+    from mystic.math.discrete import mean_y_norm_wts_constraintsFactory as factory
     constrain = factory((target[0],error[0]), npts)
 
@@ -203 +203 @@
   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)
 
@@ -271 +271 @@
 
   from numpy import array
-  from mystic.math.dirac_measure import scenario
+  from mystic.math.discrete import scenario
   c = scenario()
   c.load(solved,npts)
@@ -294 +294 @@
   try: _Cx = max(Cx)
   except TypeError: _Cx = Cx
-  from mystic.math.paramtrans import graphical_distance
+  from mystic.math.distance import graphical_distance
   Ry = graphical_distance(model, c, ytol=Cy, xtol=Cx, cutoff=0.0,
                           imax=0, hausdorff=hausdorff)