rangekeeper 0.7.2__tar.gz → 0.7.2.post2__tar.gz

{rangekeeper-0.7.2 → rangekeeper-0.7.2.post2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Rangekeeper
-Version: 0.7.2
+Version: 0.7.2.post2
 Summary: A Python library assisting financial modelling in real estate asset & development planning, decision-making, cashflow forecasting, and scenario analysis.
 License: MPL-2.0
 Author: Daniel Fink

{rangekeeper-0.7.2 → rangekeeper-0.7.2.post2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "Rangekeeper"
-version = "0.7.2"
+version = "0.7.2-2"
 description = "A Python library assisting financial modelling in real estate asset & development planning, decision-making, cashflow forecasting, and scenario analysis."
 authors = ["Daniel Fink <danfink@mit.edu>"]
 license = "MPL-2.0"

{rangekeeper-0.7.2 → rangekeeper-0.7.2.post2}/rangekeeper/flux.py

@@ -445,7 +445,7 @@ class Stream:
     #     format = self._format(decimals=decimals)
     #     print(format + os.linesep)
 
-    def __iadd__(self, other):
+    def __add__(self, other):
         flows = self.flows
         if isinstance(other, Flow):
             flows.append(other)
@@ -458,6 +458,7 @@ class Stream:
             flows=flows,
             frequency=self.frequency)
 
+
     def is_homogeneous(self) -> bool:
         return len(list(set(list(self.units.values())))) == 1
 
@@ -684,8 +685,10 @@ class Stream:
                 json.dumps(
                     {flow.name: flow.units.__str__() for flow in self.flows}, indent=4)))
         else:
-            return Flow(
-                movements=self.frame.min(axis=1),
+            name=name if name is not None else self.name + ' (min)'
+            return Flow.from_sequence(
+                sequence=self.frame.index,
+                data=self.frame.min(axis=1).to_list(),
                 units=next(iter(self.units.values())),
                 name=name)
 
@@ -700,8 +703,10 @@ class Stream:
                 json.dumps(
                     {flow.name: flow.units.__str__() for flow in self.flows}, indent=4)))
         else:
-            return Flow(
-                movements=self.frame.max(axis=1),
+            name=name if name is not None else self.name + ' (max)'
+            return Flow.from_sequence(
+                sequence=self.frame.index,
+                data=self.frame.max(axis=1).to_list(),
                 units=next(iter(self.units.values())),
                 name=name)