Changeset 789

Timestamp:

05/08/15 10:48:37 (13 months ago)

Author:

mmckerns

Message:

impose_reweighted_* should only return weights

Location:

mystic

Files:

• _math/measures.py (modified) (3 diffs)
• tests/test_impose.py (modified) (2 diffs)

mystic/_math/measures.py

@@ -414 +414 @@
 
 def impose_reweighted_mean(m, samples, weights=None, solver=None):
-    """impose a mean on a list of points, using reweighting"""
+    """impose a mean on a list of points by reweighting weights"""
     ndim = len(samples)
     if weights is None:
@@ -451 +451 @@
     if warn or not almostEqual(_norm, norm):
         print "Warning: could not impose mean through reweighting"
-        return impose_mean(m, samples, weights), weights
-
-    return samples, wts
+        return None #impose_mean(m, samples, weights), weights
+
+    return wts #samples, wts
 
 
 def impose_reweighted_variance(v, samples, weights=None, solver=None):
-    """impose a variance on a list of points, using reweighting"""
+    """impose a variance on a list of points by reweighting weights"""
     ndim = len(samples)
     if weights is None:
@@ -498 +498 @@
     if warn or not almostEqual(_norm, norm):
         print "Warning: could not impose mean through reweighting"
-        return impose_variance(v, samples, weights), weights
-
-    return samples, wts  # "mean-preserving"
+        return None #impose_variance(v, samples, weights), weights
+
+    return wts #samples, wts  # "mean-preserving"
 
 def impose_reweighted_std(s, samples, weights=None, solver=None):
-    """impose a standard deviation on a list of points, using reweighting"""
+    """impose a standard deviation on a list of points by reweighting weights"""
     return impose_reweighted_variance(s**2, samples, weights, solver)
 

mystic/tests/test_impose.py

@@ -15 +15 @@
   m = 3.5
 
-  x, w = impose_reweighted_mean(m, x0, w0)
-  assert x0 == x
-  assert almostEqual(mean(x,w), m)
+  w = impose_reweighted_mean(m, x0, w0)
+  assert almostEqual(mean(x0,w), m)
 
 
@@ -26 +25 @@
   v = 1.0
 
-  x, w = impose_reweighted_variance(v, x0, w0)
-  assert x0 == x
-  assert almostEqual(variance(x,w), v)
-  assert almostEqual(mean(x0,w0), mean(x,w))
+  w = impose_reweighted_variance(v, x0, w0)
+  assert almostEqual(variance(x0,w), v)
+  assert almostEqual(mean(x0,w0), mean(x0,w))