merge dev into features/#21-import-connect-genos

openego · Sep 11, 2017 · 854a7db · 854a7db
2 parents 77a3265 + 7ccb55f
commit 854a7db
Show file tree

Hide file tree

Showing 22 changed files with 1,153 additions and 231 deletions.
diff --git a/doc/definitions_and_units.rst b/doc/definitions_and_units.rst
@@ -9,4 +9,9 @@ Glossary
 
 Units
 -----
-Voltage in kV
+.. csv-table:: List of variables and units
+   :file: units_table.csv
+   :delim: ;
+   :header-rows: 1
+   :widths: 5, 1, 1, 5
+   :stub-columns: 0
diff --git a/doc/dev_notes.rst b/doc/dev_notes.rst
@@ -16,6 +16,16 @@ Therefore use the flag :code:`--process-dependency-links` ::
     pip3 install -e <path-to-repo> --process-dependency-links
 
 
+Code style
+~~~~~~~~~~
+
+* **Documentation of `@property` functions**: Put documentation of getter and
+    setter both in Docstring of getter, see
+    `on Stackoverflow <https://stackoverflow.com/a/16025754/6385207>`_
+* Order of public/private/protected methods, property decorators, etc. in a
+    class: TBD
+
+
 Documentation
 ~~~~~~~~~~~~~
 

diff --git a/doc/eDisGo_UML.graphml b/doc/eDisGo_UML.graphml
@@ -530,7 +530,7 @@ get_ego_load_timeseries()</y:MethodLabel>
           </y:Path>
           <y:LineStyle color="#000000" type="line" width="1.0"/>
           <y:Arrows source="diamond" target="plain"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="free" modelPosition="anywhere" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="49.181640625" x="-514.3714579948359" y="56.407269478294836">#graph
+          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" modelName="free" modelPosition="anywhere" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" visible="true" width="49.181640625" x="-282.56137674425173" y="69.97069253212169">#graph
 1<y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/>
           </y:EdgeLabel>
           <y:BendStyle smoothed="false"/>
@@ -643,7 +643,7 @@ get_ego_load_timeseries()</y:MethodLabel>
           </y:Path>
           <y:LineStyle color="#000000" type="line" width="1.0"/>
           <y:Arrows source="diamond" target="plain"/>
-          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" horizontalTextPosition="center" iconTextGap="4" modelName="free" modelPosition="anywhere" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" verticalTextPosition="bottom" visible="true" width="62.787109375" x="331.28771656783374" y="28.158226000033835">#network
+          <y:EdgeLabel alignment="center" configuration="AutoFlippingLabel" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="31.9375" modelName="free" modelPosition="anywhere" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" visible="true" width="62.787109375" x="442.5946014070996" y="69.97069253212169">#network
 1<y:PreferredPlacementDescriptor angle="0.0" angleOffsetOnRightSide="0" angleReference="absolute" angleRotationOnRightSide="co" distance="-1.0" frozen="true" placement="anywhere" side="anywhere" sideReference="relative_to_edge_flow"/>
           </y:EdgeLabel>
           <y:BendStyle smoothed="false"/>

diff --git a/doc/units_table.csv b/doc/units_table.csv
@@ -0,0 +1,11 @@
+Variable;Symbol;Unit;Comment
+Current;I;A;
+Length;l;km;
+Active Power;P;kW;
+Reactive Power;Q;kvar;
+Apparent Power;S;kVA;
+Resistance;R;Ohm or Ohm/km;Ohm/km applies to lines
+Reactance;X;Ohm or Ohm/km;Ohm/km applies to lines
+Voltage;V;kV;
+Inductance;L;mH/km;
+Capacitance;C;nF/km;
diff --git a/edisgo/config/config_flexopt_default.cfg b/edisgo/config/config_flexopt_default.cfg
@@ -6,7 +6,7 @@
 # eDisGo lives at github: https://github.com/openego/edisgo/
 # The documentation is available on RTD: http://edisgo.readthedocs.io
 
-[grid_expansion]
+[flex_opt]
 
 # standard equipment (column 'name' in equipment files)
 std_hv_mv_transformer = 40 MVA