Merge branch 'develop' of https://github.com/e2nIEE/pandapower into sc

HenrikRabler · Mar 28, 2019 · 4e0492b · 4e0492b
2 parents 76ddf0c + 2927fc4
commit 4e0492b
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -10,7 +10,7 @@ develop
 ----------------------
 - [CHANGED] units from kW/kVAr/kVA to MW/MVAr/MVA in all elements #73
 - [CHANGED] signing system from load to generation in gen, sgen and ext_grid #208
-- [CHANGED] all trafo tap parameters from tp_ to tap_, tp_mid to tap_neutral #246
+- [CHANGED] all trafo tap parameters from 'tp' to 'tap', tp_mid to tap_neutral #246
 - [CHANGED] all trafo short-circuit voltage parameter names from "vsc" to "vk" #246
 - [CHANGED] definition of cost functions #211
 - [CHANGED] definition of measurements in measurement table #343

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,4 +2,5 @@ include LICENSE AUTHORS README.rst requirements.txt CHANGELOG.rst
 global-include *.p 
 global-include *.mat
 global-include *.json
+global-include *.jl
 
diff --git a/pandapower/estimation/__init__.py b/pandapower/estimation/__init__.py
@@ -1 +1,2 @@
 from pandapower.estimation.state_estimation import *
+import pandapower.estimation.estimator
diff --git a/pandapower/estimation/estimator/__init__.py b/pandapower/estimation/estimator/__init__.py
diff --git a/pandapower/test/api/test_diagnostic.py b/pandapower/test/api/test_diagnostic.py
@@ -1096,7 +1096,7 @@ def test_missing_bus_indices(test_net, diag_params, diag_errors, report_methods)
 def test_runpp_errors(test_net, diag_params, diag_errors, report_methods):
     net = copy.deepcopy(test_net)
     net.load.p_mw *= 100
-    diag = pp.diagnostic(net)
+    diag = pp.diagnostic(net, report_style=None)
 
 if __name__ == "__main__":
     pytest.main(["test_diagnostic.py", "-xs"])
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		from pandapower.estimation.state_estimation import *
		import pandapower.estimation.estimator