fixed tests

nismod · Sep 24, 2018 · 8ec17d4 · 8ec17d4
1 parent 8bf0241
commit 8ec17d4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 16 deletions.
diff --git a/energy_demand/read_write/data_loader.py b/energy_demand/read_write/data_loader.py
@@ -871,15 +871,6 @@ def load_temp_data(local_paths, result_paths, temp_year_scenario):
     weather_stations = read_weather_stations_raw(
         local_paths['folder_path_weater_stations'])
 
-    # Select original weather stations #TODO REMOVE
-    '''original_station_selection = [
-        971, 1198, 14093, 1450, 660, 1431, 17101, 1067, 889, 18912, 605, 1395, 455, 1272, 24089,
-        1346, 595, 393, 24090, 17091, 386, 1393, 24103, 17097, 1383, 593, 1378, 676, 24275, 56904,
-        358, 725, 56937, 940, 711, 367, 18923, 842, 23417, 1319, 1575, 56370, 622, 57254, 48, 1190,
-        888, 17314, 91249, 346, 13343, 18929, 466, 56907, 847, 18930, 1215, 61948, 709, 1352, 4911,
-        56906, 862, 855, 1226, 634, 657]
-    #all_weater_stations = original_station_selection'''
-
     temp_data = read_weather_data.read_weather_data_script_data(
         local_paths['weather_data'], temp_year_scenario)
 

diff --git a/energy_demand/scripts/s_post_installation.py b/energy_demand/scripts/s_post_installation.py
@@ -9,7 +9,6 @@
 from pkg_resources import Requirement
 from pkg_resources import resource_filename
 from energy_demand.assumptions import general_assumptions
-from energy_demand.scripts import s_raw_weather_data
 from energy_demand.scripts import s_rs_raw_shapes
 from energy_demand.scripts import s_ss_raw_shapes
 from energy_demand.read_write import data_loader

diff --git a/energy_demand/scripts/smif_data_related/generate_data_version.py b/energy_demand/scripts/smif_data_related/generate_data_version.py
@@ -139,5 +139,11 @@ def package_data(
 
 
 if __name__ == '__main__':
+    """Provide version name and path to data folder
+
+    E.g.:
+
+    python ../generate_data_version.py v_6_1 C:/path_to_data
+    """
     # Map command line arguments to function arguments.
     package_data(*sys.argv[1:])
diff --git a/tests/scripts/test_s_raw_weather_data.py b/tests/scripts/test_s_raw_weather_data.py
diff --git a/tests/test_enduse_func.py b/tests/test_enduse_func.py
@@ -107,7 +107,7 @@ def test_get_peak_day():
 
     assert result == expected
 
-def test_service_switch():
+def test_apply_service_switch():
     """Test
     """
     share_boilerA_cy = 0.2
@@ -133,7 +133,7 @@ def test_service_switch():
 
     crit_switch_happening = {'test_enduse': ['test_sector']}
 
-    result = enduse_func.calc_service_switch(
+    result = enduse_func.apply_service_switch(
         enduse='test_enduse',
         s_tech_y_cy=tot_s_yh_cy,
         all_technologies=all_technologies,
@@ -163,7 +163,7 @@ def test_service_switch():
             }
         }}
 
-    result = enduse_func.calc_service_switch(
+    result = enduse_func.apply_service_switch(
         enduse='test_enduse',
         s_tech_y_cy=tot_s_yh_cy,
         all_technologies=all_technologies,