Merge pull request #124 from rl-institut/release/v4.6

Release v4.6
rl-institut · Aug 17, 2020 · 2cb83a7 · 2cb83a7
2 parents 4a63104 + e2c2980
commit 2cb83a7
Show file tree

Hide file tree

Showing 28 changed files with 201 additions and 9,560 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,14 +12,19 @@ Here is a template for new release sections
 ### Added
 -
 ### Changed
-Readthedocs corrected
-
+-
 ### Removed
 -
 ### Fixed
 -
 ```
 
+## [Offgridders V4.6] - 2020-08-17
+
+### Changed
+- Replaced `== False` with `is False` and `== True` with `is True`
+- Facilitated upgrade to unbundled oemof version: `oemof.solph == 0.4.0`, `oemof.network==0.4.0rc0`, `oemof.tools==0.4.0` and update `requirements.txt`
+
 ## [Offgridders V4.5] - 2020-08-12
 
 ### Added

diff --git a/Offgridders.py b/Offgridders.py
@@ -19,6 +19,7 @@
 import src.F_case_definitions as cases
 import src.G0_oemof_simulate as oemof_simulate
 import src.H0_multicriteria_analysis as multicriteria_analysis
+
 from src.constants import (
     TOTAL_NUMBER_OF_EXPERIMENTS,
     MAX_DATE_TIME_INDEX,
@@ -129,7 +130,7 @@ def main():
     process_input.apply_noise(sensitivity_experiment_s)  # Applies white noise
 
     # Calculation of grid_availability with randomized blackouts
-    if settings[NECESSITY_FOR_BLACKOUT_TIMESERIES_GENERATION] == True:
+    if settings[NECESSITY_FOR_BLACKOUT_TIMESERIES_GENERATION] is True:
         sensitivity_grid_availability, blackout_results = central_grid.get_blackouts(
             settings, blackout_experiment_s
         )
@@ -253,7 +254,7 @@ def main():
             )
             print("\n")
 
-        if settings[DISPLAY_EXPERIMENT] == True:
+        if settings[DISPLAY_EXPERIMENT] is True:
             logging.info("The experiment with following parameters has been analysed:")
             pp.pprint(sensitivity_experiment_s[experiment])
 
@@ -267,7 +268,7 @@ def main():
     pp.pprint(overall_results[output_names])
 
     # Calculate multicriteria analysis
-    if settings[PERFORM_MULTICRITERIA_ANALYSIS] == True:
+    if settings[PERFORM_MULTICRITERIA_ANALYSIS] is True:
         logging.info("Performing multicriteria analysis")
         multicriteria_analysis.main_analysis(
             overall_results, multicriteria_data, settings

diff --git a/__init__.py b/__init__.py
@@ -1 +0,0 @@
-import src

diff --git a/inputs/test_input_template.xlsx b/inputs/test_input_template.xlsx
diff --git a/requirements.txt b/requirements.txt
@@ -11,20 +11,22 @@ matplotlib==3.0.0
 nose==1.3.7
 numexpr==2.6.8
 numpy==1.14.5
-oemof==0.2.2
+oemof.network==0.4.0rc0
+oemof.solph==0.4.1
+oemof.tools==0.4.0
 pandas==0.23.4
 pip==19.0.2
 ply==3.11
-Pyomo==5.5.0
+Pyomo==5.7.0
 pyparsing==2.2.2
 python-dateutil==2.7.3
 pytz==2018.5
-PyUtilib==5.6.3
+PyUtilib==6.0.0
 setuptools==40.4.3
 scipy==1.4.1
 six==1.11.0
 tables==3.4.4
 urllib3==1.25.2
 wheel==0.32.1
 xlrd==1.2.0
-xlsxwriter==1.2.7
+xlsxwriter==1.2.7
diff --git a/simulation_results/test/inputs/input_template_excel.xlsx b/simulation_results/test/inputs/input_template_excel.xlsx