Include history export feature in optimisation

tsaoyu · tsaoyu · commit 501c59fbd254 · 2018-04-17T14:20:57.000+01:00
diff --git 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
@@ -13,4 +13,4 @@ nvector
 pytest
 pytest-cov
 codecov
-PyResis
+PyResis

-Original file line number
+Diff line change
 pytest
 pytest-cov
 codecov
 -PyResis
 +PyResis