Rangekeeper 0.8.27__tar.gz → 0.8.29__tar.gz

{rangekeeper-0.8.27 → rangekeeper-0.8.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Rangekeeper
-Version: 0.8.27
+Version: 0.8.29
 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.27 → rangekeeper-0.8.29}/Rangekeeper.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Rangekeeper
-Version: 0.8.27
+Version: 0.8.29
 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.27 → rangekeeper-0.8.29}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Rangekeeper"
-version = "0.8.27"
+version = "0.8.29"
 description = "A Python library assisting financial modelling in real estate asset & development planning, decision-making, cashflow forecasting, and scenario analysis."
 authors = [
     { name = "Daniel Fink", email = "danfink@mit.edu" }

{rangekeeper-0.8.27 → rangekeeper-0.8.29}/rangekeeper/duration.py

@@ -18,7 +18,7 @@ class Type(enum.Enum):
     SEMIYEAR = "6M"
     QUARTER = "Q"
     MONTH = "M"
-    BIWEEKLY = "2W"
+    BIWEEK = "2W"
     WEEK = "W"
     DAY = "D"
 
@@ -39,7 +39,7 @@ class Type(enum.Enum):
         if value == "M":
             return Type.MONTH
         if value in ("2W", "2W-SUN"):
-            return Type.BIWEEKLY
+            return Type.BIWEEK
         if value in ("W-SUN", "W"):
             return Type.WEEK
         if value == "D":
@@ -63,7 +63,7 @@ class Type(enum.Enum):
             return "Q"
         if type == Type.MONTH:
             return "M"
-        if type == Type.BIWEEKLY:
+        if type == Type.BIWEEK:
             return "2W"
         if type == Type.WEEK:
             return "W"
@@ -88,10 +88,10 @@ class Type(enum.Enum):
             return "QE"
         if type == Type.MONTH:
             return "ME"
-        if type == Type.BIWEEKLY:
-            return "2W"
+        if type == Type.BIWEEK:
+            return "2W-SUN"
         if type == Type.WEEK:
-            return "W"
+            return "W-SUN"
         if type == Type.DAY:
             return "D"
         else:
@@ -129,7 +129,7 @@ def measure(
         result = (delta.years * 4) + math.floor(delta.months / 3)
     elif duration.value == Type.MONTH.value:
         result = (delta.years * 12) + delta.months
-    elif duration.value == Type.BIWEEKLY.value:
+    elif duration.value == Type.BIWEEK.value:
         result = math.floor((calc_end_date - start_date).days / 14)
     elif duration.value == Type.WEEK.value:
         result = math.floor((calc_end_date - start_date).days / 7)
@@ -177,7 +177,7 @@ def offset(
             result = date + pd.offsets.MonthEnd(3 * amount)
         elif duration.value == Type.MONTH.value:
             result = date + pd.offsets.MonthEnd(amount)
-        elif duration.value == Type.BIWEEKLY.value:
+        elif duration.value == Type.BIWEEK.value:
             result = date + pd.DateOffset(weeks=2 * amount)
         elif duration.value == Type.WEEK.value:
             result = date + pd.DateOffset(weeks=amount)
@@ -200,7 +200,7 @@ def offset(
             result = date + pd.DateOffset(months=3 * amount)
         elif duration.value == Type.MONTH.value:
             result = date + pd.DateOffset(months=amount)
-        elif duration.value == Type.BIWEEKLY.value:
+        elif duration.value == Type.BIWEEK.value:
             result = date + pd.DateOffset(weeks=2 * amount)
         elif duration.value == Type.WEEK.value:
             result = date + pd.DateOffset(weeks=amount)
@@ -245,7 +245,7 @@ class Period:
             Type.SEMIYEAR: 2,
             Type.QUARTER: 4,
             Type.MONTH: 12,
-            Type.BIWEEKLY: 26,
+            Type.BIWEEK: 26,
             Type.WEEK: 52,
             Type.DAY: 365,
         }.get(duration, None)

{rangekeeper-0.8.27 → rangekeeper-0.8.29}/tests/test_modules.py

@@ -229,9 +229,15 @@ class TestFlow:
     to_periods = flow.to_periods(frequency=rk.duration.Type.YEAR)
 
     def test_conversion_to_period_index(self):
-        print(TestFlow.to_periods)
+        # print(TestFlow.to_periods)
         # assert TestFlow.to_periods
 
+        resampled = TestFlow.invert_flow.resample(frequency=rk.duration.Type.BIWEEK)
+        resampled.display()
+
+        fortnightly = TestFlow.invert_flow.to_periods(frequency=rk.duration.Type.BIWEEK)
+        print(fortnightly)
+
     def test_distribution_as_input(self):
         periods = rk.duration.Sequence.from_bounds(
             include_start=datetime.date(2020, 1, 31),