Merge remote-tracking branch 'origin/refactor'

energy-modelling-toolkit · Feb 6, 2020 · dd616a6 · dd616a6
2 parents 66db74b + e937fc7
commit dd616a6
Show file tree

Hide file tree

Showing 6 changed files with 993 additions and 975 deletions.
diff --git a/dispaset/__init__.py b/dispaset/__init__.py
@@ -5,7 +5,7 @@
 from ._version import __version__
 from .common import commons
 
-from .preprocessing.preprocessing import get_git_revision_tag
+from .preprocessing.build import get_git_revision_tag
 __gitversion__ = get_git_revision_tag()
 
 # Logging: # TODO: Parametrize in dispacli or external config
@@ -50,7 +50,8 @@
 
 # Importing the main Dispa-SET functions so that they can be called with "ds.function"
 from .preprocessing.data_handler import load_config_excel, load_config_yaml, load_config, export_yaml_config
-from .preprocessing.preprocessing import build_simulation, adjust_capacity, adjust_storage, get_temp_sim_results, mid_term_scheduling, build_full_simulation
+from .preprocessing.preprocessing import build_simulation
+from .preprocessing.utils import adjust_storage, adjust_capacity
 
 from .solve import solve_GAMS