Changeset 687 for branches/collapse/TEST_OUQ_surrogate_diam_collapse.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/collapse/TEST_OUQ_surrogate_diam_collapse.py (modified) (5 diffs)

branches/collapse/TEST_OUQ_surrogate_diam_collapse.py

@@ -58 +58 @@
 
   from mystic.math.measures import split_param
-  from mystic.math.dirac_measure import product_measure
+  from mystic.math.discrete import product_measure
   from mystic.math import almostEqual
   from numpy import inf
@@ -84 +84 @@
     # impose expectation on product measure
     ##################### begin function-specific #####################
-    E = float(c.get_expect(model))
+    E = float(c.expect(model))
     if not (E <= float(target[0] + error[0])) \
     or not (float(target[0] - error[0]) <= E):
@@ -96 +96 @@
     c = product_measure()
     c.load(rv, npts)
-    E = float(c.get_expect(model))
+    E = float(c.expect(model))
     if E > (target[0] + error[0]) or E < (target[0] - error[0]):
       if debug: print "skipping expect: %s" % E
@@ -188 +188 @@
 
   from numpy import array
-  from mystic.math.dirac_measure import product_measure
+  from mystic.math.discrete import product_measure
   c = product_measure()
   c.load(solved,npts)
@@ -195 +195 @@
   print "solved: [wz,z]\n%s" % array(zip(c[2].weights,c[2].coords))
 
-  print "expect: %s" % str( c.get_expect(model) )
+  print "expect: %s" % str( c.expect(model) )
   
   elapsed = (clock() - start)