finished working from home

nismod · Apr 3, 2018 · 29b2fc8 · 29b2fc8
1 parent 144527b
commit 29b2fc8
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 102 deletions.
diff --git a/.pytest_cache/v/cache/lastfailed b/.pytest_cache/v/cache/lastfailed
diff --git a/.pytest_cache/v/cache/nodeids b/.pytest_cache/v/cache/nodeids
diff --git a/energy_demand/basic/testing_functions.py b/energy_demand/basic/testing_functions.py
@@ -1,6 +1,5 @@
 """TEsting functions
 """
-import sys
 import numpy as np
 import logging
 

diff --git a/energy_demand/dwelling_stock/dw_stock.py b/energy_demand/dwelling_stock/dw_stock.py
@@ -2,7 +2,6 @@
 =============================
 Generates a virtual dwelling stock
 """
-import sys
 import logging
 import numpy as np
 

diff --git a/energy_demand/enduse_func.py b/energy_demand/enduse_func.py
@@ -6,7 +6,6 @@
 where the change in enduse specific energy demand is simulated
 depending on scenaric assumptions.
 """
-import sys
 import logging
 import math
 import numpy as np

diff --git a/energy_demand/main.py b/energy_demand/main.py
@@ -34,6 +34,7 @@
 Calculate future regional floor area demand based on GVA and pop projection
 
 TODO: Write all metadata of model run restuls to txt
+TODO: EFFICIENCS OF STRATEGIES ROLL COLD
 TODO: Related ed to houses & householdsize
 TODO: data loading, load multiple years for real elec data
 TODO: THECK VARIALBES IN HOUSEHOLD MODEL

diff --git a/energy_demand/read_write/read_data.py b/energy_demand/read_write/read_data.py
@@ -3,7 +3,6 @@
 This file holds all functions necessary to read in information
 and data to run the energy demand model.
 """
-import sys
 import os
 import csv
 import logging
@@ -91,7 +90,8 @@ def __init__(
             installed_capacity,
             sector=None
         ):
-
+        """Constructor
+        """
         self.enduse = enduse
         self.technology_install = technology_install
         self.switch_yr = switch_yr
@@ -186,6 +186,8 @@ def __init__(
             service_share_ey=None,
             switch_yr=None
         ):
+        """Constructor
+        """
         self.enduse = enduse
         self.technology_install = technology_install
         self.service_share_ey = service_share_ey
@@ -220,7 +222,6 @@ def read_in_results(path_runs, seasons, model_yeardays_daytype):
         seasons
     model_yeardays_daytype : dict
         Daytype of modelled yeardays
-
     """
     logging.info("... Reading in results")
 

diff --git a/energy_demand/technologies/technological_stock.py b/energy_demand/technologies/technological_stock.py
@@ -1,7 +1,6 @@
 """
 Functions related to the technological stock
 """
-import sys
 from energy_demand.technologies import tech_related
 
 class TechStock(object):

diff --git a/tests/profiles/test_load_profile.py b/tests/profiles/test_load_profile.py
@@ -1,9 +1,8 @@
 
 """Testing
 """
-from energy_demand.profiles import load_profile
-import sys
 import numpy as np
+from energy_demand.profiles import load_profile
 
 def test_abs_to_rel():
     """Test