fixing naming on _count in analysis

wino6687 · Feb 12, 2020 · 5705da2 · 5705da2
1 parent b0bf997
commit 5705da2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/swepy/analysis.py b/swepy/analysis.py
@@ -75,7 +75,7 @@ def create_year_splits(self):
             year_splits[-1] = np.shape(self.swe)[0]
         return year_splits
 
-    def __count_melt(self, swe):  # RENAME __COUNT
+    def _count_melt(self, swe):  # RENAME __COUNT
         """
         Count the date that each pixel reaches zero for first time of season on a given date.
         Useful for comparison between years of a given region.
@@ -122,7 +122,7 @@ def count_melt_onset(self):  # RENAME, get rid of mp
         cpus = cpu_count()
         swe_parts = np.array_split(self.swe, cpus, axis=2)
         with Pool(cpus) as p:
-            parts = p.map(self.__count_melt, swe_parts)
+            parts = p.map(self._count_melt, swe_parts)
             df = parts[0]  # recombine parts
             for i in range(1, len(parts)):
                 df["count"] = df["count"].add(parts[i]["count"])

diff --git a/swepy/tests/test_analysis.py b/swepy/tests/test_analysis.py
@@ -148,7 +148,7 @@ def test_display_melt():
     """
     swe = np.zeros((3000, 50, 50))
     a = analysis.Analysis(datetime.date(1993, 1, 1), swe)
-    melt = a.melt_date_year(a.__count_melt())
+    melt = a.melt_date_year(a._count_melt())
     fig = a.display_melt_onset_change(melt, 1993, 1995, True)
     assert type(fig) == matplotlib.figure.Figure
 
@@ -159,7 +159,7 @@ def test_display_melt_fail1():
     """
     swe = np.zeros((3000, 50, 50))
     a = analysis.Analysis(datetime.date(1993, 1, 1), swe)
-    melt = a.melt_date_year(a.__count_melt())
+    melt = a.melt_date_year(a._count_melt())
     with pytest.raises(Exception):
         a.display_melt_onset_change(melt, 1944, 1993)
 
@@ -170,7 +170,7 @@ def test_display_melt_fail2():
     """
     swe = np.zeros((3000, 50, 50))
     a = analysis.Analysis(datetime.date(1993, 1, 1), swe)
-    melt = a.melt_date_year(a.__count_melt())
+    melt = a.melt_date_year(a._count_melt())
     with pytest.raises(Exception):
         a.display_melt_onset_change(melt, 1993, 1944)
 

diff --git a/swepy/tests/test_downsample.py b/swepy/tests/test_downsample.py
@@ -13,4 +13,4 @@ def swe():
 
 def test_tuple_block_fail(swe):
     with pytest.raises(TypeError):
-        downsample.downsample(swe, [1, 2, 2], np.mean)
+        downsample.downsample(swe, ([1, 2, 2]), np.mean)