Merge pull request #36 from openego/dev

Release v0.2.11
openego · Sep 8, 2017 · e336186 · e336186
2 parents 9feda28 + 0523a1c
commit e336186
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/egoio/db_tables/model_draft.py b/egoio/db_tables/model_draft.py
@@ -2441,17 +2441,23 @@ class EgoGridPfHvResultMeta(Base):
     scn_name = Column(String)
     calc_date = Column(DateTime)
     method = Column(String)
-    network_clustering = Column(Boolean)
     gridversion = Column(String)
     start_snapshot = Column(Integer)
     end_snapshot = Column(Integer)
     snapshots = Column(ARRAY(DateTime))
     solver = Column(String)
-    branch_cap_factor = Column(Float(53))
-    storage_extendable  = Column(Boolean)
-    load_shedding  = Column(Boolean)
-    generator_noise  = Column(Boolean)
-    commentary = Column(String)
+    branch_capacity_factor = Column(Float(53))
+    pf_post_lopf = Column(Boolean)
+    network_clustering = Column(Boolean)
+    storage_extendable = Column(Boolean)
+    load_shedding = Column(Boolean)
+    generator_noise = Column(Boolean)
+    minimize_loading = Column(Boolean)
+    k_mean_clustering = Column(Boolean)
+    parallelisation = Column(Boolean)
+    line_grouping = Column(Boolean)
+    misc = Column(ARRAY(String))
+    comments = Column(String)
 
 class EgoGridPfHvResultStorage(Base):
     __tablename__ = 'ego_grid_pf_hv_result_storage'

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
       author='NEXT ENERGY, Reiner Lemoine Institut gGmbH, ZNES',
       author_email='',
       description='ego input/output repository',
-      version='0.2.10.post1',
+      version='0.2.11',
       url='https://github.com/openego/ego.io',
       packages=find_packages(),
       license='GNU Affero General Public License v3.0',