hackathon before syncing

nismod · Feb 22, 2017 · a492204 · a492204
1 parent 11abdc1
commit a492204
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/energy_demand/main.py b/energy_demand/main.py
@@ -21,7 +21,7 @@
 import main_functions as mf                         # Functions main module
 import residential_model                            # Residential sub-module
 import yaml
-#import numpy as np
+import numpy as np
 
 print("Start Energy Demand Model with python version: " + str(sys.version))
 

diff --git a/energy_demand/main_functions.py b/energy_demand/main_functions.py
@@ -845,5 +845,3 @@ def own_timesteps(timesteps_own_selection):
 
 
     return timestep_dates
-
-
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
 # Add your requirements here like:
-# numpy
+numpy
 # scipy>=0.9
diff --git a/run.py b/run.py
@@ -19,8 +19,8 @@ def simulate(self, decisions, state, data):
         # ...
 
         # Run Model
-        pop_data = {'population': {0: 3000000, 1: 5300000, 2: 53000000}}
-        results = energy_demand_model(base_data, pop_data["population"])
+        #pop_data = {'population': {0: 3000000, 1: 5300000, 2: 53000000}}
+        results = energy_demand_model(base_data, data["population"])
 
         return results