Fixed a bug of empty list being ignored by AndAggregator (#77)

* fixed a bug * updated version number * updated changelog * fixed typos * avoided pandas warning
arundo · Feb 24, 2020 · 0952680 · 0952680
1 parent 3b44204
commit 0952680
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 5 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -66,7 +66,7 @@
 # The short X.Y version.
 version = "0.5"
 # The full version, including alpha/beta/rc tags.
-release = "0.5.5-dev.1+pr.70"
+release = "0.5.5"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/releasehistory.rst b/docs/releasehistory.rst
@@ -2,9 +2,10 @@
 Release History
 ***************
 
-Version 0.5.5-dev
+Version 0.5.5 (Feb 24, 2020)
 ===================================
-- Fixed some typo in the documentation (0.5.5-dev.1+pr.70)
+- Fixed a bug that empty lists were ignored by AndAggregator
+- Fixed some typo in the documentation
 
 Version 0.5.4 (Feb 18, 2020)
 ===================================

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = adtk
-version = 0.5.5-dev.1+pr.70
+version = 0.5.5
 author = Arundo Analytics, Inc.
 maintainer = Tailai Wen
 maintainer_email = tailai.wen@arundo.com

diff --git a/src/adtk/__init__.py b/src/adtk/__init__.py
@@ -20,4 +20,4 @@
 
 """
 
-__version__ = "0.5.5-dev.1+pr.70"
+__version__ = "0.5.5"
diff --git a/src/adtk/aggregator/aggregator.py b/src/adtk/aggregator/aggregator.py
@@ -118,6 +118,7 @@ def _predict_core(self, lists):
                                 for window in clean_predict
                             ]
                         ),
+                        dtype="int",
                     ).sort_index()
                     for key, clean_predict in clean_lists.items()
                 }
@@ -129,6 +130,7 @@ def _predict_core(self, lists):
                     pd.concat(time_window_stats, axis=1, join="outer")
                     .fillna(method="ffill")
                     .fillna(method="bfill")
+                    .fillna(0)
                 )
                 time_window_stats = time_window_stats.all(axis=1)
                 status = 0

diff --git a/tests/test_aggregators.py b/tests/test_aggregators.py
@@ -29,6 +29,20 @@ def test_or_dict_of_lists():
         Timestamp("2017-1-11"),
     ]
 
+    lists = {
+        "A": [
+            (Timestamp("2017-1-1"), Timestamp("2017-1-2")),
+            (Timestamp("2017-1-5"), Timestamp("2017-1-8")),
+            Timestamp("2017-1-10"),
+        ],
+        "B": [],
+    }
+    assert aggt.OrAggregator().aggregate(lists) == [
+        (Timestamp("2017-1-1"), Timestamp("2017-1-2")),
+        (Timestamp("2017-1-5"), Timestamp("2017-1-8")),
+        Timestamp("2017-1-10"),
+    ]
+
 
 def test_or_df():
     """
@@ -93,6 +107,16 @@ def test_and_dict_of_lists():
         (Timestamp("2017-1-7 00:00:00"), Timestamp("2017-1-8 00:00:00")),
     ]
 
+    lists = {
+        "A": [
+            (Timestamp("2017-1-1"), Timestamp("2017-1-2")),
+            (Timestamp("2017-1-5"), Timestamp("2017-1-8")),
+            Timestamp("2017-1-10"),
+        ],
+        "B": [],
+    }
+    assert aggt.AndAggregator().aggregate(lists) == []
+
 
 def test_and_df():
     """