Rangekeeper 0.8.33__py3-none-any.whl → 0.8.34__py3-none-any.whl

rangekeeper/duration.py

@@ -277,10 +277,23 @@ class Sequence:
         :param bound: A terminating condition; either a pd.Timestamp end date or a (integer) number of periods
         """
         if isinstance(bound, datetime.date):
+            freq = Type.period(frequency)
+
+            # Align to the start & ends of first & last periods
+            aligned_start = pd.Period(
+                value=include_start,
+                freq=freq,
+            ).start_time.date()
+
+            aligned_end = pd.Period(
+                value=bound,
+                freq=freq,
+            ).end_time.date()
+
             return pd.period_range(
-                start=include_start,
-                end=bound,
-                freq=Type.period(frequency),
+                start=aligned_start,
+                end=aligned_end,
+                freq=freq,
                 name="periods",
             )
         elif isinstance(bound, int):

rangekeeper/flux.py

@@ -403,25 +403,44 @@ class Flow:
 
     def to_periods(
         self,
-        frequency: rk.duration.Type,
-        origin: Optional[Union[str, pd.Timestamp]] = "end_day",
+        index: pd.PeriodIndex,
     ) -> pd.Series:
         """
         Returns a pd.Series (of index pd.PeriodIndex) with movements summed to specified frequency
         """
-        return (
-            self.resample(
-                frequency=frequency,
-                origin=origin,
-            )
-            .movements.to_period(
-                freq=rk.duration.Type.period(frequency),
-                copy=True,
-            )
-            .rename_axis("period")
-            .groupby(level="period")
-            .sum()
+        resampled = self.resample(
+            frequency=rk.duration.Type.from_value(index.freqstr),
+            origin=index[0].start_time.date(),
+        )
+
+        return resampled.movements.to_period(freq=index.freq).reindex(
+            index=index,
+            method="pad",
+            limit=1,
+            fill_value=0,
         )
+        # return self.resample(
+        #     frequency=rk.duration.Type.from_value(index.freqstr)
+        # ).movements.reindex(
+        #     index=index,
+        #     # method="pad",
+        #     # limit=1,
+        #     fill_value=0,
+        # )
+
+        # return (
+        #     # self.resample(
+        #     #     frequency=frequency,
+        #     #     origin=origin,
+        #     # )
+        #     self.movements.to_period(
+        #         freq=rk.duration.Type.period(frequency),
+        #         copy=True,
+        #     )
+        #     .rename_axis("period")
+        #     .groupby(level="period")
+        #     .sum()
+        # )
 
     def earliest(self) -> datetime.date:
         """
@@ -550,20 +569,22 @@ class Stream:
         self.end_date = max(dates)
         """The latest date of the Stream's constituent Flows' movements."""
 
+        self.index = rk.duration.Sequence.from_bounds(
+            include_start=self.start_date,
+            bound=self.end_date,
+            frequency=self.frequency,
+        )
+
         self._resampled_flows = [
-            flow.to_periods(
-                frequency=self.frequency,
-                origin=self.start_date,
-            )
-            for flow in self.flows
+            flow.to_periods(index=self.index) for flow in self.flows
         ]
         self.frame = (
             pd.concat(
                 self._resampled_flows,
                 axis=1,
             )
-            .fillna(0)
-            .sort_index()
+            # .fillna(0)
+            # .sort_index()
         )
         """
         A pd.DataFrame of the Stream's flow Flows accumulated into the Stream's frequency
@@ -584,7 +605,7 @@ class Stream:
 
         formatted_flows = []
         for flow in self.flows:
-            series = flow.to_periods(frequency=self.frequency)
+            series = flow.to_periods(index=self.frame.index)
             formatted_flows.append(
                 _format_series(
                     series=series,

{rangekeeper-0.8.33.dist-info → rangekeeper-0.8.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Rangekeeper
-Version: 0.8.33
+Version: 0.8.34
 Summary: A Python library assisting financial modelling in real estate asset & development planning, decision-making, cashflow forecasting, and scenario analysis.
 Author-email: Daniel Fink <danfink@mit.edu>
 License-Expression: MPL-2.0

{rangekeeper-0.8.33.dist-info → rangekeeper-0.8.34.dist-info}/RECORD

@@ -1,9 +1,9 @@
 rangekeeper/__init__.py,sha256=8q0KF90SLgIfptpFGuI66FOCqe3K9UgIzTHFL1pwP4Y,1731
 rangekeeper/api.py,sha256=3nuG7C2IQjpumcn79MvYDTa7ADWPAos7VfVM-3pL4n4,4798
 rangekeeper/distribution.py,sha256=2C3jhi1rLJUs0seBztdQb196hNhc00sKJEGMkFiDpYs,8961
-rangekeeper/duration.py,sha256=c0roYG0zzIfr3B19_NxahlaBoAt1DuKSjeqyVGOhn0Y,20425
+rangekeeper/duration.py,sha256=ZskXtIJhb8hYV0eSoas3UPenHroiu0Qx2siWsBR6pBs,20780
 rangekeeper/extrapolation.py,sha256=Zfsz2KwkImxEMMCNZaF8RpiQxlIgemS1dQkSnjliYU4,2814
-rangekeeper/flux.py,sha256=U7dlyFu8vdyvb9QEUbeH4jMkxeSg4p1uT49EKPJyPW0,32417
+rangekeeper/flux.py,sha256=U7GhD0PCkfsOAiJDGw1E2WEQ2B9BWxZby3JVPIEv458,33067
 rangekeeper/format.py,sha256=DOfF4-LCXqWyCtE1OomwE80sJLe6LjL4gqEOAP454LQ,10796
 rangekeeper/graph.py,sha256=6oWRv-qzGsM5Z19UyJ1v3hwtWaQp_F4qQKxizvkQ_gg,28043
 rangekeeper/measure.py,sha256=eCdoTAocq1loNZBnOp3nPiPV7yIi0QTwpVHvjba1hkY,4125
@@ -20,7 +20,7 @@ rangekeeper/dynamics/trend.py,sha256=-WqrRvmmTj2mE24Pz-Dl5lXEpLXnDUMngafU__em_ac
 rangekeeper/dynamics/volatility.py,sha256=MGDLzrI1uP_C6HL-pigJwWikHg1KNbfB_0m0Akh-L2A,5162
 rangekeeper/formula/__init__.py,sha256=4OXzdJAYDBxQeOMzLR5MZvIjxxIfFOTE9aNu9zFryAE,36
 rangekeeper/formula/financial.py,sha256=oNFdhygbtdEUFjpxYFuuDnpC_P8nOO538b21FzaMtTU,14045
-rangekeeper-0.8.33.dist-info/METADATA,sha256=5bOJNQipEckHpvtf7_kS7AXGcYI4H5eEiWLCFME55Pc,2212
-rangekeeper-0.8.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rangekeeper-0.8.33.dist-info/top_level.txt,sha256=7ov6d70lppmzKc088MAmRWnCtCRGA2cd43G28QBSv-c,12
-rangekeeper-0.8.33.dist-info/RECORD,,
+rangekeeper-0.8.34.dist-info/METADATA,sha256=w8ARoQcinhvVeVZXHGScmM4yC7OzshemLYWH3vw6epI,2212
+rangekeeper-0.8.34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rangekeeper-0.8.34.dist-info/top_level.txt,sha256=7ov6d70lppmzKc088MAmRWnCtCRGA2cd43G28QBSv-c,12
+rangekeeper-0.8.34.dist-info/RECORD,,