Commit 81e2888
committed
Merge branch 'develop' into feature/deprecate-create_empty_entwork
# Conflicts:
# pandapower/auxiliary.py
# pandapower/groups.py
# pandapower/test/api/test_group.py
# pandapower/test/conftest.py
# pandapower/test/loadflow/test_facts_b2b_vsc.py
# pandapower/test/loadflow/test_facts_vsc.py
# pandapower/test/loadflow/test_rundcpp.py
# pandapower/test/loadflow/test_runpp_3ph_n_line.py
# pandapower/test/toolbox/test_result_info.pyFile tree
22 files changed
+1158
-438
lines changed- pandapower
- create
- pf
- protection
- pypower
- test
- estimation
- loadflow
22 files changed
+1158
-438
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
9 | 10 | | |
10 | 11 | | |
11 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
| 10 | + | |
9 | 11 | | |
10 | 12 | | |
11 | 13 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
26 | | - | |
27 | 25 | | |
28 | 26 | | |
29 | 27 | | |
| |||
0 commit comments