Merge pull request #12 from histogrammar/1.0.x

1.0.x

Author: jpivarski

docs/conf.py

@@ -24,7 +24,7 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinxcontrib.napoleon', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath', 'sphinx.ext.mathjax', 'sphinx.ext.ifconfig', 'sphinx.ext.linkcode']
+extensions = ['sphinx.ext.autodoc', 'sphinxcontrib.napoleon', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.mathjax', 'sphinx.ext.ifconfig', 'sphinx.ext.linkcode']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -47,9 +47,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = "1.0.0"
+version = "1.0.3"
 # The full version, including alpha/beta/rc tags.
-release = "1.0.0"
+release = "1.0.3"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

histogrammar/defs.py

@@ -159,7 +159,15 @@ def zero(self):
         raise NotImplementedError
 
     def __add__(self, other):
-        """Add two containers of the same type. The originals are unaffected. """
+        """Add two containers of the same type. The originals are unaffected."""
+        raise NotImplementedError
+
+    def __mul__(self, factor):
+        """Reweight the contents in all nested aggregators by a scalar factor, as though they had been filled with a different weight. The original is unaffected."""
+        raise NotImplementedError
+
+    def __rmul__(self, factor):
+        """Reweight the contents in all nested aggregators by a scalar factor, as though they had been filled with a different weight. The original is unaffected."""
         raise NotImplementedError
 
     def fill(self, datum, weight=1.0):
@@ -301,6 +309,8 @@ def fillroot(self, ttree, start=-1, end=-1, debug=False, debugOnError=True, **ex
   }}
 
   void fillall(TTree* ttree, Long64_t start, Long64_t end) {{
+    ttree->SetBranchStatus("*", 0);
+{11}
     init();
 {8}
     if (start < 0) start = 0;
@@ -323,7 +333,8 @@ def fillroot(self, ttree, start=-1, end=-1, debug=False, debugOnError=True, **ex
            "\n".join(initCode),
            "".join("    ttree->SetBranchAddress(" + jsonlib.dumps(key) + ", &" + n + ");\n" for n, key in inputFieldNames.items()),
            "".join(x for x in derivedFieldExprs.values()),
-           "\n".join(fillCode))
+           "\n".join(fillCode),
+           "".join("    ttree->SetBranchStatus(\"" + key + "\", 1);\n" for key in inputFieldNames.values()))
 
             if debug:
                 print("line |")

histogrammar/primitives/average.py

@@ -87,6 +87,20 @@ def __add__(self, other):
         else:
             raise ContainerException("cannot add {0} and {1}".format(self.name, other.name))
 
+    @inheritdoc(Container)
+    def __mul__(self, factor):
+        if math.isnan(factor) or factor <= 0.0:
+            return self.zero()
+        else:
+            out = self.zero()
+            out.entries = factor * self.entries
+            out.mean = self.mean
+            return out.specialize()
+
+    @inheritdoc(Container)
+    def __rmul__(self, factor):
+        return self.__mul__(factor)
+
     @inheritdoc(Container)
     def fill(self, datum, weight=1.0):
         self._checkForCrossReferences()

histogrammar/primitives/bag.py

@@ -102,6 +102,21 @@ def __add__(self, other):
         else:
             raise ContainerException("cannot add {0} and {1}".format(self.name, other.name))
 
+    @inheritdoc(Container)
+    def __mul__(self, factor):
+        if math.isnan(factor) or factor <= 0.0:
+            return self.zero()
+        else:
+            out = self.zero()
+            out.entries = factor * self.entries
+            for value, count in self.values.items():
+                out.values[value] = factor * count
+            return out.specialize()
+
+    @inheritdoc(Container)
+    def __rmul__(self, factor):
+        return self.__mul__(factor)
+
     @inheritdoc(Container)
     def fill(self, datum, weight=1.0):
         self._checkForCrossReferences()
@@ -224,9 +239,31 @@ def children(self):
 
     @inheritdoc(Container)
     def toJsonFragment(self, suppressName):
-        aslist = sorted(x for x in self.values.items() if x[0] != "nan")
-        if "nan" in self.values:
-            aslist.append(("nan", self.values["nan"]))
+        if self.range == "N":
+            aslist = sorted(x for x in self.values.items() if x[0] != "nan")
+            if "nan" in self.values:
+                aslist.append(("nan", self.values["nan"]))
+
+        elif self.range[0] == "N":
+            class Sorter(object):
+                def __init__(self, x):
+                    self.x = x
+                def __lt__(self, other):
+                    for xi, yi in zip(self.x, other.x):
+                        if isinstance(xi, str) and isinstance(yi, float):
+                            return False
+                        elif isinstance(xi, float) and isinstance(yi, str):
+                            return True
+                        elif xi < yi:
+                            return True
+                        elif xi > yi:
+                            return False
+                    return False
+            aslist = sorted((x for x in self.values.items()), key=lambda y: tuple(Sorter(z) for z in y))
+
+        else:
+            aslist = sorted(x for x in self.values.items())
+
         return maybeAdd({
             "entries": floatToJson(self.entries),
             "values": [{"w": floatToJson(n), "v": rangeToJson(v)} for v, n in aslist],
@@ -303,8 +340,34 @@ def __eq__(self, other):
         if len(self.values) != len(other.values):
             return False
 
-        one = sorted(x for x in self.values.items() if x[0] != "nan") + [("nan", self.values.get("nan"))]
-        two = sorted(x for x in other.values.items() if x[0] != "nan") + [("nan", other.values.get("nan"))]
+        if self.range != other.range:
+            return False
+
+        if self.range == "N":
+            one = sorted(x for x in self.values.items() if x[0] != "nan") + [("nan", self.values.get("nan"))]
+            two = sorted(x for x in other.values.items() if x[0] != "nan") + [("nan", other.values.get("nan"))]
+
+        elif self.range[0] == "N":
+            class Sorter(object):
+                def __init__(self, x):
+                    self.x = x
+                def __lt__(self, other):
+                    for xi, yi in zip(self.x, other.x):
+                        if isinstance(xi, str) and isinstance(yi, float):
+                            return False
+                        elif isinstance(xi, float) and isinstance(yi, str):
+                            return True
+                        elif xi < yi:
+                            return True
+                        elif xi > yi:
+                            return False
+                    return False
+            one = sorted((x for x in self.values.items()), key=lambda y: tuple(Sorter(z) for z in y))
+            two = sorted((x for x in other.values.items()), key=lambda y: tuple(Sorter(z) for z in y))
+
+        else:
+            one = sorted(x for x in self.values.items())
+            two = sorted(x for x in other.values.items())
 
         for (v1, w1), (v2, w2) in zip(one, two):
             if isinstance(v1, basestring) and isinstance(v2, basestring):
@@ -334,7 +397,7 @@ def __eq__(self, other):
             else:
                 return False
 
-        return isinstance(other, Bag) and self.quantity == other.quantity and numeq(self.entries, other.entries) and self.range == other.range
+        return isinstance(other, Bag) and self.quantity == other.quantity and numeq(self.entries, other.entries)
 
     def __ne__(self, other): return not self == other
 

histogrammar/primitives/bin.py

@@ -173,6 +173,24 @@ def __add__(self, other):
         else:
             raise ContainerException("cannot add {0} and {1}".format(self.name, other.name))
 
+    @inheritdoc(Container)
+    def __mul__(self, factor):
+        if math.isnan(factor) or factor <= 0.0:
+            return self.zero()
+        else:
+            out = self.zero()
+            out.entries = factor * self.entries
+            for i, v in enumerate(self.values):
+                out.values[i] = v * factor
+            out.overflow = self.overflow * factor
+            out.underflow = self.underflow * factor
+            out.nanflow = self.nanflow * factor
+            return out.specialize()
+
+    @inheritdoc(Container)
+    def __rmul__(self, factor):
+        return self.__mul__(factor)
+
     @property
     def num(self):
         """Number of bins."""

histogrammar/primitives/categorize.py

@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import math
 import numbers
 
 from histogrammar.defs import *
@@ -141,6 +142,21 @@ def __add__(self, other):
         else:
             raise ContainerException("cannot add {0} and {1}".format(self.name, other.name))
 
+    @inheritdoc(Container)
+    def __mul__(self, factor):
+        if math.isnan(factor) or factor <= 0.0:
+            return self.zero()
+        else:
+            out = self.zero()
+            out.entries = factor * self.entries
+            for k, v in self.bins.items():
+                out.bins[k] = v * factor
+            return out.specialize()
+
+    @inheritdoc(Container)
+    def __rmul__(self, factor):
+        return self.__mul__(factor)
+
     @inheritdoc(Container)
     def fill(self, datum, weight=1.0):
         self._checkForCrossReferences()

histogrammar/primitives/centrallybin.py

@@ -172,6 +172,21 @@ def __add__(self, other):
         out.bins = newbins
         return out.specialize()
 
+    @inheritdoc(Container)
+    def __mul__(self, factor):
+        if math.isnan(factor) or factor <= 0.0:
+            return self.zero()
+        else:
+            out = self.zero()
+            out.entries = factor * self.entries
+            out.bins = [(c, v * factor) for (c, v) in self.bins]
+            out.nanflow = self.nanflow * factor
+            return out.specialize()
+
+    @inheritdoc(Container)
+    def __rmul__(self, factor):
+        return self.__mul__(factor)
+
     @inheritdoc(Container)
     def fill(self, datum, weight=1.0):
         self._checkForCrossReferences()

histogrammar/primitives/collection.py

@@ -15,6 +15,7 @@
 # limitations under the License.
 
 import json
+import math
 import numbers
 import struct
 
@@ -318,6 +319,21 @@ def __add__(self, other):
         else:
             raise ContainerException("cannot add {0} and {1}".format(self.name, other.name))
 
+    @inheritdoc(Container)
+    def __mul__(self, factor):
+        if math.isnan(factor) or factor <= 0.0:
+            return self.zero()
+        else:
+            out = self.zero()
+            out.entries = factor * self.entries
+            for k, v in self.pairs.items():
+                out.pairs[k] = v * factor
+            return out.specialize()
+
+    @inheritdoc(Container)
+    def __rmul__(self, factor):
+        return self.__mul__(factor)
+
     @inheritdoc(Container)
     def fill(self, datum, weight=1.0):
         self._checkForCrossReferences()
@@ -501,6 +517,21 @@ def __add__(self, other):
         else:
             raise ContainerException("cannot add {0} and {1}".format(self.name, other.name))
 
+    @inheritdoc(Container)
+    def __mul__(self, factor):
+        if math.isnan(factor) or factor <= 0.0:
+            return self.zero()
+        else:
+            out = self.zero()
+            out.entries = factor * self.entries
+            for k, v in self.pairs.items():
+                out.pairs[k] = v * factor
+            return out.specialize()
+
+    @inheritdoc(Container)
+    def __rmul__(self, factor):
+        return self.__mul__(factor)
+
     @inheritdoc(Container)
     def fill(self, datum, weight=1.0):
         self._checkForCrossReferences()
@@ -692,6 +723,19 @@ def __add__(self, other):
         else:
             raise ContainerException("cannot add {0} and {1}".format(self.name, other.name))
 
+    @inheritdoc(Container)
+    def __mul__(self, factor):
+        if math.isnan(factor) or factor <= 0.0:
+            return self.zero()
+        else:
+            out = Index(*[x * factor for x in self.values])
+            out.entries = factor * self.entries
+            return out.specialize()
+
+    @inheritdoc(Container)
+    def __rmul__(self, factor):
+        return self.__mul__(factor)
+
     @inheritdoc(Container)
     def fill(self, datum, weight=1.0):
         self._checkForCrossReferences()
@@ -890,6 +934,19 @@ def __add__(self, other):
         else:
             raise ContainerException("cannot add {0} and {1}".format(self.name, other.name))
 
+    @inheritdoc(Container)
+    def __mul__(self, factor):
+        if math.isnan(factor) or factor <= 0.0:
+            return self.zero()
+        else:
+            out = Branch(*[x * factor for x in self.values])
+            out.entries = factor * self.entries
+            return out.specialize()
+
+    @inheritdoc(Container)
+    def __rmul__(self, factor):
+        return self.__mul__(factor)
+
     @inheritdoc(Container)
     def fill(self, datum, weight=1.0):
         self._checkForCrossReferences()

histogrammar/primitives/count.py

@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import math
 import numbers
 import re
 import struct
@@ -82,6 +83,24 @@ def __add__(self, other):
         else:
             raise ContainerException("cannot add {0} and {1}".format(self.name, other.name))
 
+    @inheritdoc(Container)
+    def __mul__(self, factor):
+        if self.transform != identity or \
+           not callable(self.transform.expr) or \
+           (hasattr(self.transform.expr, "func_code") and self.transform.expr.func_code.co_code != identity.expr.func_code.co_code) or \
+           (hasattr(self.transform.expr, "__code__") and self.transform.expr.__code__.co_code != identity.expr.__code__.co_code):
+            raise ContainerException("Cannot scalar-multiply Count with a non-identity transform.")
+        elif math.isnan(factor) or factor <= 0.0:
+            return self.zero()
+        else:
+            out = self.zero()
+            out.entries = factor * self.entries
+            return out.specialize()
+
+    @inheritdoc(Container)
+    def __rmul__(self, factor):
+        return self.__mul__(factor)
+
     @inheritdoc(Container)
     def fill(self, datum, weight=1.0):
         self._checkForCrossReferences()