Made changes to the soiling tests Addresses (pvlib#970)

Author: jsstein

pvlib/tests/test_soiling.py

@@ -19,48 +19,40 @@ def expected_output():
                        end=pd.Timestamp(2019, 1, 1, 23, 59, 0), freq='1h')
 
     expected_no_cleaning = pd.Series(
-        data=[0.884980357535360, 0.806308930084762, 0.749974647038078,
-              0.711804155175089, 0.687489866078621, 0.672927554408964,
-              0.664714899337491, 0.660345851212099, 0.658149551658860,
-              0.657104593968981, 0.656633344364056, 0.656431630729954,
-              0.656349579062171, 0.656317825078228, 0.656306121502393,
-              0.656302009396500, 0.656300630853678, 0.656300189543417,
-              0.656300054532516, 0.656300015031680, 0.656300003971846,
-              0.656300001006533, 0.656300000244750, 0.656300000057132],
+        data=[0.97230454, 0.95036146, 0.93039061, 0.91177978, 0.89427556,
+              0.8777455 , 0.86211038, 0.84731759, 0.83332881, 0.82011354,
+              0.80764549, 0.79590056, 0.78485556, 0.77448749, 0.76477312,
+              0.75568883, 0.74721046, 0.73931338, 0.73197253, 0.72516253,
+              0.7188578 , 0.71303268, 0.7076616 , 0.70271919],
         index=dt)
-
     return expected_no_cleaning
 
-
 @pytest.fixture
 def expected_output_1():
-    return np.array([
-        0.99927224, 0.99869067, 0.99815393, 0.99764437, 1.0,
-        0.99927224, 0.99869067, 0.99815393, 1.0, 1.0,
-        0.99927224, 0.99869067, 0.99815393, 0.99764437, 0.99715412,
-        0.99667873, 0.99621536, 0.99576203, 0.99531731, 0.9948801,
-        0.99444954, 0.99402494, 0.99360572, 0.99319142])
-
+    dt = pd.date_range(start=pd.Timestamp(2019, 1, 1, 0, 0, 0),
+        end=pd.Timestamp(2019, 1, 1, 23, 59, 0), freq='1h')
+    expected_output_1 = pd.Series(
+        data=[0.9872406 , 0.97706269, 0.96769693, 0.95884032, 1.,
+              0.9872406 , 0.97706269, 0.96769693, 1.        , 1.        ,
+              0.9872406 , 0.97706269, 0.96769693, 0.95884032, 0.95036001,
+              0.94218263, 0.93426236, 0.92656836, 0.91907873, 0.91177728,
+              0.9046517 , 0.89769238, 0.89089165, 0.88424329],
+        index=dt)
+    return expected_output_1
 
 @pytest.fixture
-def expected_output_2(expected_output):
-    # Sample output (calculated manually)
+def expected_output_2():
     dt = pd.date_range(start=pd.Timestamp(2019, 1, 1, 0, 0, 0),
                        end=pd.Timestamp(2019, 1, 1, 23, 59, 0), freq='1h')
+    expected_output_2 = pd.Series(  
+            data = [0.97229869, 0.95035106, 0.93037619, 0.91176175, 1.,
+            1.        , 1.        , 0.97229869, 1.        , 1.        ,
+            1.        , 1.        , 0.97229869, 0.95035106, 0.93037619,
+            0.91176175, 0.89425431, 1.        , 1.        , 1.        ,
+            1.        , 0.97229869, 0.95035106, 0.93037619],
+        index=dt)
 
-    expected_no_cleaning = expected_output
-
-    expected = pd.Series(index=dt, dtype='float64')
-    expected[dt[:4]] = expected_no_cleaning[dt[:4]]
-    expected[dt[4:7]] = 1.
-    expected[dt[7]] = expected_no_cleaning[dt[0]]
-    expected[dt[8:12]] = 1.
-    expected[dt[12:17]] = expected_no_cleaning[dt[:5]]
-    expected[dt[17:21]] = 1.
-    expected[dt[21:]] = expected_no_cleaning[:3]
-
-    return expected
-
+    return expected_output_2
 
 @pytest.fixture
 def rainfall_input():
@@ -81,7 +73,7 @@ def test_hsu_no_cleaning(rainfall_input, expected_output):
     rainfall = rainfall_input
     pm2_5 = 1.0
     pm10 = 2.0
-    depo_veloc = {'2_5': 1.0, '10': 1.0}
+    depo_veloc = {'2_5': 1.0e-5, '10': 1.0e-4}
     tilt = 0.
     expected_no_cleaning = expected_output
 
@@ -99,16 +91,15 @@ def test_hsu(rainfall_input, expected_output_2):
     rainfall = rainfall_input
     pm2_5 = 1.0
     pm10 = 2.0
-    depo_veloc = {'2_5': 1.0, '10': 1.0}
+    depo_veloc = {'2_5': 1.0e-4, '10': 1.0e-4}
     tilt = 0.
-    expected = expected_output_2
 
     # three cleaning events at 4:00-6:00, 8:00-11:00, and 17:00-20:00
     result = hsu(rainfall=rainfall, cleaning_threshold=0.5, tilt=tilt,
                  pm2_5=pm2_5, pm10=pm10, depo_veloc=depo_veloc,
                  rain_accum_period=pd.Timedelta('3h'))
 
-    assert_series_equal(result, expected)
+    assert_series_equal(result, expected_output_2)
 
 
 @requires_scipy
@@ -119,8 +110,8 @@ def test_hsu_defaults(rainfall_input, expected_output_1):
     accumulation period.
     """
     result = hsu(
-        rainfall=rainfall_input, cleaning_threshold=0.5, tilt=0.0, pm2_5=1.0,
-        pm10=2.0)
+        rainfall=rainfall_input, cleaning_threshold=0.5, tilt=0.0, pm2_5=1.0e-2,
+        pm10=2.0e-2)
     assert np.allclose(result.values, expected_output_1)