rbolgaryn
Showing 4 of 5 files from the diff.
@@ -168,6 +168,9 @@
Loading
| 168 | 168 | net, boundary_buses, all_internal_buses, all_external_buses, |
|
| 169 | 169 | show_computing_time, calc_volt_angles=calc_volt_angles, runpp_fct=runpp_fct) |
|
| 170 | 170 | net_zpbn = net_external |
|
| 171 | + | # --- remove buses without power flow results in net_eq |
|
| 172 | + | # pp.drop_buses(net_zpbn, net_zpbn.res_bus.index[net_zpbn.res_bus.vm_pu.isnull()]) |
|
| 173 | + | ||
| 171 | 174 | Z, S, v, limits = calc_zpbn_parameters(net_zpbn, boundary_buses, all_external_buses) |
|
| 172 | 175 | # --- remove the original load, sgen and gen in exteranl area, |
|
| 173 | 176 | # and creat new buses and impedance |
@@ -543,14 +543,14 @@
Loading
| 543 | 543 | INPUT: |
|
| 544 | 544 | **net** (pandapowerNet) - The pandapower network in which the element is created |
|
| 545 | 545 | ||
| 546 | + | **vn_kv** (float) - The grid voltage level. |
|
| 547 | + | ||
| 546 | 548 | OPTIONAL: |
|
| 547 | 549 | **name** (string, default None) - the name for this bus |
|
| 548 | 550 | ||
| 549 | 551 | **index** (int, default None) - Force a specified ID if it is available. If None, the \ |
|
| 550 | 552 | index one higher than the highest already existing index is selected. |
|
| 551 | 553 | ||
| 552 | - | **vn_kv** (float) - The grid voltage level. |
|
| 553 | - | ||
| 554 | 554 | **geodata** ((x,y)-tuple, default None) - coordinates used for plotting |
|
| 555 | 555 | ||
| 556 | 556 | **type** (string, default "b") - Type of the bus. "n" - node, |
@@ -587,6 +587,7 @@
Loading
| 587 | 587 | net["bus_geodata"].loc[index, ["x", "y"]] = geodata |
|
| 588 | 588 | ||
| 589 | 589 | if coords is not None: |
|
| 590 | + | net["bus_geodata"].at[index, "coords"] = None |
|
| 590 | 591 | net["bus_geodata"].at[index, "coords"] = coords |
|
| 591 | 592 | ||
| 592 | 593 | # column needed by OPF. 0. and 2. are the default maximum / minimum voltages |
@@ -366,7 +366,7 @@
Loading
| 366 | 366 | if kwargs.get("drop_boundary_buses", True): |
|
| 367 | 367 | pp.drop_elements_at_buses(net_internal, boundary_buses_inclusive_bswitch, |
|
| 368 | 368 | branch_elements=False) |
|
| 369 | - | ||
| 369 | + | ||
| 370 | 370 | # --- merge equivalent external net and internal net |
|
| 371 | 371 | merged_net = pp.merge_nets(net_internal, net_eq, validate=kwargs.pop("validate", False), |
|
| 372 | 372 | retain_original_indices_in_net1=retain_original_internal_indices, |
@@ -446,10 +446,11 @@
Loading
| 446 | 446 | unsupplied_boundary_buses = boundary_buses & unsupplied_buses |
|
| 447 | 447 | if len(unsupplied_boundary_buses): |
|
| 448 | 448 | raise ValueError( |
|
| 449 | - | "Although get_equivalent() do not allow unsupplied boundary " + |
|
| 449 | + | "get_equivalent() do not allow unsupplied boundary " + |
|
| 450 | 450 | "buses, these have no voltage results (possibly because power " + |
|
| 451 | 451 | "flow results miss, the buses are isolated " + |
|
| 452 | - | "or out of service): " + str(sorted(unsupplied_boundary_buses))) |
|
| 452 | + | "or out of service): " + str(sorted(unsupplied_boundary_buses)) + |
|
| 453 | + | ". Remove these buses from the boundary buses and try again.") |
|
| 453 | 454 | ||
| 454 | 455 | if internal_buses & boundary_buses: |
|
| 455 | 456 | logger.info("Some internal buses are also contained in the boundary buses, " + |
@@ -1807,8 +1807,9 @@
Loading
| 1807 | 1807 | dtypes = net[element].dtypes |
|
| 1808 | 1808 | net[element] = pd.concat([net[element], net2[element]], sort=False, |
|
| 1809 | 1809 | ignore_index=ignore_index) |
|
| 1810 | - | if retain_original_indices_in_net1 and not elm_with_critical_index: |
|
| 1811 | - | start = net1.bus.index.max() + 1 |
|
| 1810 | + | if retain_original_indices_in_net1 and not elm_with_critical_index and \ |
|
| 1811 | + | len(net1[element]): |
|
| 1812 | + | start = int(net1[element].index.max()) + 1 |
|
| 1812 | 1813 | net[element].index = net1[element].index.tolist() + \ |
|
| 1813 | 1814 | list(range(start, len(net2[element]) + start)) |
|
| 1814 | 1815 | _preserve_dtypes(net[element], dtypes) |
| Files | Coverage |
|---|---|
| pandapower | 76.72% |
| setup.py | 0.00% |
| Project Totals (189 files) | 76.67% |
3188784783
Sunburst
The inner-most circle is the entire project, moving away from the center are folders then, finally, a single file.
The size and color of each slice is representing the number of statements and the coverage, respectively.
Icicle
The top section represents the entire project. Proceeding with folders and finally individual files.
The size and color of each slice is representing the number of statements and the coverage, respectively.
