dimwit 0.2.4__tar.gz → 0.2.6__tar.gz

{dimwit-0.2.4 → dimwit-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimwit
-Version: 0.2.4
+Version: 0.2.6
 Summary: A package containing various functions and classes for fetching, transforming, and visualising data for personal metrics.
 Home-page: https://github.com/danielsoutar/dimwit
 Author: Daniel Soutar

{dimwit-0.2.4 → dimwit-0.2.6}/dimwit/main.py

@@ -274,25 +274,27 @@ def compute_rounded_matrix(ts, events, rounding_unit, rounding_size):
     return df.fillna(0)
 
 
-def pad_out_table(df, pad_t, unit):
+def zero_padded_df(num_rows, num_cols, index):
+    return pd.DataFrame([[0] * num_cols] * num_rows, index=index)
+
+
+def pad_out_table(df, pad_t, unit, pad_before=True, pad_after=True):
     # Pad out df with entries before and after boundary rows, to ensure correct
-    # copy-on padding.
+    # same- (or zero-) padding.
     pad_t_days = pd.Timedelta(pad_t, unit=unit)
     pad_before_start = df.index[0] - pad_t_days
     pad_after_start = df.index[-1] + pd.Timedelta(1, unit=unit)
 
     # The index in df cannot yet be assumed to be dense - so use a date range
     # with the earliest and latest entries as reference points.
-    pad_before = pd.date_range(pad_before_start, periods=pad_t, freq=unit)
-    pad_after = pd.date_range(pad_after_start, periods=pad_t, freq=unit)
-
-    df = pd.concat(
-        [
-            pd.DataFrame([df.iloc[0]] * pad_t, index=pad_before),
-            df,
-            pd.DataFrame([df.iloc[-1]] * pad_t, index=pad_after),
-        ]
-    )
+    index_before = pd.date_range(pad_before_start, periods=pad_t, freq=unit)
+    index_after = pd.date_range(pad_after_start, periods=pad_t, freq=unit)
+
+    num_rows, num_cols = pad_t, len(df.columns)
+    if pad_before:
+        df = pd.concat([zero_padded_df(num_rows, num_cols, index_before), df])
+    if pad_after:
+        df = pd.concat([zero_padded_df(num_rows, num_cols, index_after), df])
 
     return df
 
@@ -306,8 +308,6 @@ def compute_moving_average_matrix(
     df = compute_rounded_matrix(ts, events, rounding_unit, rounding_size)
     categories = df.columns
 
-    # Pad out df with entries before and after boundary rows, to ensure correct
-    # copy-on padding.
     df_needs_padding = window_size > 1
     if df_needs_padding:
         pad_t = (window_size - 1) // 2

{dimwit-0.2.4 → dimwit-0.2.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dimwit"
-version = "0.2.4"
+version = "0.2.6"
 description = "A package containing various functions and classes for fetching, transforming, and visualising data for personal metrics."
 authors = ["Daniel Soutar <danielsoutar144@gmail.com>"]
 readme = "README.md"