Changeset 768

Timestamp:

11/12/14 07:37:47 (18 months ago)

Author:

mmckerns

Message:

fix: impose_product should also work when prod is negative

File:

• mystic/_math/measures.py (modified) (2 diffs)

mystic/_math/measures.py

@@ -511 +511 @@
     return list(weights * inf)  # protect against ZeroDivision
   if float(mass):
-    return list(weights / (w/mass)**(1./n))  #FIXME: not "mean-preserving"
+    if w/mass < 0.0:
+      return list(-weights / (-w/mass)**(1./n))  #FIXME: not "mean-preserving"
+    return list(weights / (w/mass)**(1./n))      #FIXME: not "mean-preserving"
   # force selected member to satisfy product = 0.0
   if not zsum:
@@ -520 +522 @@
   n = n-1
   mass = zmass
-  return list(weights[:-1]/(w/mass)**(1./n))+[0.] #FIXME: not "mean-preserving"
+  if w/mass >= 0.0:
+    return list(weights[:-1]/(w/mass)**(1./n))+[0.]#FIXME: not "mean-preserving"
+  return list(-weights[:-1]/(-w/mass)**(1./n))+[0.]#FIXME: not "mean-preserving"