From 501c59fbd2546a2e17fa95d19eb41009d56c5901 Mon Sep 17 00:00:00 2001
From: Yu Cao <tsaoyu@tsaoyu.com>
Date: Tue, 17 Apr 2018 14:20:57 +0100
Subject: [PATCH] Include history export feature in optimisation

---
 D3HRE/optimization.py | 4 ++--
 requirements.txt      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/D3HRE/optimization.py b/D3HRE/optimization.py
index 2e53878..72fe81c 100644
--- a/D3HRE/optimization.py
+++ b/D3HRE/optimization.py
@@ -116,7 +116,7 @@ def get_result_df(start_time, route, speed, solar_area, wind_area, use, battery_
     wind_power = wind_power_unit * wind_area
     power = solar_power + wind_power
     SOC, energy_history, unmet_history, waste_history, use_history = \
-        simulation.soc_model_fixed_load(power, use, battery_capacity, depth_of_discharge,
+        soc_model_fixed_load(power, use, battery_capacity, depth_of_discharge,
                              discharge_rate, battery_eff, discharge_eff)
 
     all_history = np.vstack((
@@ -242,7 +242,7 @@ def combined_df(self):
         """
         power = self.power_df(self)
         resource = self.resource_df(self)
-        pass 
+        pass
 
 
 if __name__ == '__main__':
diff --git a/requirements.txt b/requirements.txt
index 37657a8..11df257 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,4 +13,4 @@ nvector
 pytest
 pytest-cov
 codecov
-PyResis
\ No newline at end of file
+PyResis