PythonTsa 1.4.7__tar.gz → 1.4.9__tar.gz

{PythonTsa-1.4.7 → pythontsa-1.4.9}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: PythonTsa
-Version: 1.4.7
+Version: 1.4.9
 Summary: Package for Applied Time Series Analysis and Forecasting with Python, Springer 2022
 Author: Changquan Huang
 Author-email: h.changquan@icloud.com
@@ -9,6 +9,13 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: requires-python
+Dynamic: summary
 
 This package is a companion to the book  Applied Time Series Analysis and Forecasting with Python, Springer 2022. It contains several 
 important Python functions for analyzing time series and most data sets analyzed in the book. Naturally, these functions can also be used to analyze other time series data. 

{PythonTsa-1.4.7 → pythontsa-1.4.9}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="PythonTsa",
-    version="1.4.7",
+    version="1.4.9",
     author="Changquan Huang",
     author_email="h.changquan@icloud.com",
     description="Package for Applied Time Series Analysis and Forecasting with Python, Springer 2022",

PythonTsa-1.4.7/src/PythonTsa/Utils.py → pythontsa-1.4.9/src/PythonTsa/TsTensor.py

@@ -8,10 +8,10 @@ import numpy as np
 import pandas as pd
 import requests
 
-def create_evaluation_df(predictions, test_inputs, H, scaler):
+def create_evaluation_df(predictions, test_inputs, h, scaler):
     """Create a data frame for easy evaluation"""
     eval_df = pd.DataFrame(
-        predictions, columns=["t+" + str(t) for t in range(1, H + 1)]
+        predictions, columns=["t+" + str(t) for t in range(1, h + 1)]
     )
     eval_df["timestamp"] = test_inputs.dataframe.index
     eval_df = pd.melt(
@@ -24,7 +24,7 @@ def create_evaluation_df(predictions, test_inputs, H, scaler):
     return eval_df
 
 
-class TimeSeriesTensor(UserDict):
+class tstensor(UserDict):
     """A dictionary of tensors for input into the RNN model.
 
     Use this class to:
@@ -47,7 +47,7 @@ class TimeSeriesTensor(UserDict):
     """
 
     def __init__(
-        self, dataset, target, H, tensor_structure, freq="H", drop_incomplete=True
+        self, dataset, target, h, tensor_structure, freq="h", drop_incomplete=True
     ):
         self.dataset = dataset
         self.target = target
@@ -57,7 +57,7 @@ class TimeSeriesTensor(UserDict):
         self.dataframe = self._shift_data(H, freq, drop_incomplete)
         self.data = self._df2tensors(self.dataframe)
 
-    def _shift_data(self, H, freq, drop_incomplete):
+    def _shift_data(self, h, freq, drop_incomplete):
 
         # Use the tensor_structures definitions to shift the features in the original dataset.
         # The result is a Pandas dataframe with multi-index columns in the hierarchy
@@ -68,7 +68,7 @@ class TimeSeriesTensor(UserDict):
         df = self.dataset.copy()
 
         idx_tuples = []
-        for t in range(1, H + 1):
+        for t in range(1, h + 1):
             df["t+" + str(t)] = df[self.target].shift(t * -1, freq=freq)
             idx_tuples.append(("target", "y", "t+" + str(t)))
 
@@ -103,26 +103,27 @@ class TimeSeriesTensor(UserDict):
     
         return df
  
-        def _df2tensors(self, dataframe):
+    def _df2tensors(self, dataframe):
 
-            inputs = {}
-            y = dataframe["target"]
-            y = y.to_numpy()
-            inputs["target"] = y
+        inputs = {}
+        y = dataframe["target"]
+        y = y.to_numpy()
+        inputs["target"] = y
  
-            for name, structure in self.tensor_structure.items():
-                rng = structure[0]
-                cols = structure[1]
-                tensor = dataframe[name][cols].to_numpy()
-                if rng is None:
-                    tensor = tensor.reshape(tensor.shape[0], len(cols))
-                else:
-                    tensor = tensor.reshape(tensor.shape[0], len(cols), len(rng))
-                    tensor = np.transpose(tensor, axes=[0, 2, 1])
-                inputs[name] = tensor
+        for name, structure in self.tensor_structure.items():
+            rng = structure[0]
+            cols = structure[1]
+            tensor = dataframe[name][cols].to_numpy()
+            if rng is None:
+                tensor = tensor.reshape(tensor.shape[0], len(cols))
+            else:
+                tensor = tensor.reshape(tensor.shape[0], len(cols), len(rng))
+                tensor = np.transpose(tensor, axes=[0, 2, 1])
+            inputs[name] = tensor
     
-            return inputs
+        return inputs
  
-        def subset_data(self, new_dataframe):
+    def subset_data(self, new_dataframe):
 
-            self.dataframe = new_dataframe
+        self.dataframe = new_dataframe
+        self.data = self._df2tensors(self.dataframe)

pythontsa-1.4.9/src/PythonTsa/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.4.8"

{PythonTsa-1.4.7 → pythontsa-1.4.9}/src/PythonTsa.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: PythonTsa
-Version: 1.4.7
+Version: 1.4.9
 Summary: Package for Applied Time Series Analysis and Forecasting with Python, Springer 2022
 Author: Changquan Huang
 Author-email: h.changquan@icloud.com
@@ -9,6 +9,13 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: requires-python
+Dynamic: summary
 
 This package is a companion to the book  Applied Time Series Analysis and Forecasting with Python, Springer 2022. It contains several 
 important Python functions for analyzing time series and most data sets analyzed in the book. Naturally, these functions can also be used to analyze other time series data. 

{PythonTsa-1.4.7 → pythontsa-1.4.9}/src/PythonTsa.egg-info/SOURCES.txt

@@ -12,7 +12,7 @@ src/PythonTsa/Selecting_arma.py
 src/PythonTsa/Selecting_arma2.py
 src/PythonTsa/SimulSBM.py
 src/PythonTsa/True_acf.py
-src/PythonTsa/Utils.py
+src/PythonTsa/TsTensor.py
 src/PythonTsa/__init__.py
 src/PythonTsa/datadir.py
 src/PythonTsa/plot_acf_pacf.py

PythonTsa-1.4.7/src/PythonTsa/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.4.7"