Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix non-linear shunt compensator section number #900

Merged
merged 9 commits into from
Dec 11, 2024
Merged

Fix non-linear shunt compensator section number #900

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
312fc4f
Fix non-linear shunt compensator section number
jeandemanged Nov 20, 2024
903298b
better error handling
jeandemanged Nov 21, 2024
84ac06c
Merge branch 'main' into fix-non-linear-shunt-section-number
jeandemanged Nov 21, 2024
a47d755
avoid the linear search for getting an index for each of the section
jeandemanged Nov 22, 2024
1d2297e
fix
jeandemanged Nov 22, 2024
d57ff2c
Merge branch 'main' into fix-non-linear-shunt-section-number
jeandemanged Nov 27, 2024
5225c79
Merge branch 'main' into fix-non-linear-shunt-section-number
jeandemanged Dec 5, 2024
7ce0f17
Merge branch 'main' into fix-non-linear-shunt-section-number
jeandemanged Dec 10, 2024
0882c0a
Merge branch 'main' into fix-non-linear-shunt-section-number
geofjamg Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions java/src/main/java/com/powsybl/dataframe/network/NetworkDataframes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,8 @@ static NetworkDataframeMapper shuntsNonLinear() {
.filter(sc -> sc.getModelType() == ShuntCompensatorModelType.NON_LINEAR)
.flatMap(shuntCompensator -> {
ShuntCompensatorNonLinearModel model = (ShuntCompensatorNonLinearModel) shuntCompensator.getModel();
return model.getAllSections().stream().map(section -> Triple.of(shuntCompensator, section, model.getAllSections().indexOf(section)));
// careful: shunt section number starts at 1, but position in array starts at 0
return model.getAllSections().stream().map(section -> Triple.of(shuntCompensator, section, model.getAllSections().indexOf(section) + 1));
jeandemanged marked this conversation as resolved.
Show resolved Hide resolved
});
return NetworkDataframeMapperBuilder.ofStream(nonLinearShunts, NetworkDataframes::getShuntSectionNonlinear)
.stringsIndex("id", triple -> triple.getLeft().getId())
Expand All @@ -457,7 +458,12 @@ static Triple<ShuntCompensator, ShuntCompensatorNonLinearModel.Section, Integer>
} else {
int section = dataframe.getIntValue("section", index)
.orElseThrow(() -> new PowsyblException("section is missing"));
return Triple.of(shuntCompensator, shuntNonLinear.getAllSections().get(section), section);
// careful: shunt section number starts at 1, but position in array starts at 0
List<ShuntCompensatorNonLinearModel.Section> allSections = shuntNonLinear.getAllSections();
if (section < 1 || section > allSections.size()) {
throw new PowsyblException(String.format("Section number must be between 1 and %d, inclusive", allSections.size()));
}
return Triple.of(shuntCompensator, allSections.get(section - 1), section);
}
}

Expand Down
40 changes: 27 additions & 13 deletions tests/test_network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1423,24 +1423,24 @@ def test_busbar_sections():
def test_non_linear_shunt():
n = util.create_non_linear_shunt_network()
non_linear_shunt_sections = n.get_non_linear_shunt_compensator_sections()
pd.testing.assert_series_equal(non_linear_shunt_sections.loc[('SHUNT', 0)],
pd.Series(data={'g': 0.0, 'b': 0.00001},
name=('SHUNT', 0)), check_dtype=False)
pd.testing.assert_series_equal(non_linear_shunt_sections.loc[('SHUNT', 1)],
pd.Series(data={'g': 0.3, 'b': 0.0200},
pd.Series(data={'g': 0.0, 'b': 0.00001},
name=('SHUNT', 1)), check_dtype=False)
update = pd.DataFrame(index=pd.MultiIndex.from_tuples([('SHUNT', 0), ('SHUNT', 1)], names=['id', 'section']),
pd.testing.assert_series_equal(non_linear_shunt_sections.loc[('SHUNT', 2)],
pd.Series(data={'g': 0.3, 'b': 0.0200},
name=('SHUNT', 2)), check_dtype=False)
update = pd.DataFrame(index=pd.MultiIndex.from_tuples([('SHUNT', 1), ('SHUNT', 2)], names=['id', 'section']),
columns=['g', 'b'],
data=[[0.1, 0.00002],
[0.4, 0.03]])
n.update_non_linear_shunt_compensator_sections(update)
non_linear_shunt_sections = n.get_non_linear_shunt_compensator_sections()
pd.testing.assert_series_equal(non_linear_shunt_sections.loc[('SHUNT', 0)],
pd.Series(data={'g': 0.1, 'b': 0.00002},
name=('SHUNT', 0)), check_dtype=False)
pd.testing.assert_series_equal(non_linear_shunt_sections.loc[('SHUNT', 1)],
pd.Series(data={'g': 0.4, 'b': 0.03},
pd.Series(data={'g': 0.1, 'b': 0.00002},
name=('SHUNT', 1)), check_dtype=False)
pd.testing.assert_series_equal(non_linear_shunt_sections.loc[('SHUNT', 2)],
pd.Series(data={'g': 0.4, 'b': 0.03},
name=('SHUNT', 2)), check_dtype=False)


def test_voltage_levels():
Expand Down Expand Up @@ -1469,11 +1469,25 @@ def test_voltage_levels():
pd.testing.assert_frame_equal(expected, n.get_voltage_levels(), check_dtype=False)


def test_update_with_keywords():
def test_update_non_linear_shunt_with_keywords():
n = util.create_non_linear_shunt_network()
n.update_non_linear_shunt_compensator_sections(id='SHUNT', section=1, g=0.2, b=0.000001)
n.update_non_linear_shunt_compensator_sections(id='SHUNT', section=2, g=0.3, b=0.000002)
sections = n.get_non_linear_shunt_compensator_sections()
assert 0.2 == sections.loc['SHUNT', 1]['g']
assert 0.000001 == sections.loc['SHUNT', 1]['b']
assert 0.3 == sections.loc['SHUNT', 2]['g']
assert 0.000002 == sections.loc['SHUNT', 2]['b']


def test_update_non_linear_shunt_wrong_section():
n = util.create_non_linear_shunt_network()
n.update_non_linear_shunt_compensator_sections(id='SHUNT', section=0, g=0.2, b=0.000001)
assert 0.2 == n.get_non_linear_shunt_compensator_sections().loc['SHUNT', 0]['g']
assert 0.000001 == n.get_non_linear_shunt_compensator_sections().loc['SHUNT', 0]['b']
with pytest.raises(PyPowsyblError) as exc:
n.update_non_linear_shunt_compensator_sections(id='SHUNT', section=0, g=0.2, b=0.000001)
assert exc.match('Section number must be between 1 and 2, inclusive')
with pytest.raises(PyPowsyblError) as exc:
n.update_non_linear_shunt_compensator_sections(id='SHUNT', section=3, g=0.2, b=0.000001)
assert exc.match('Section number must be between 1 and 2, inclusive')


def test_update_generators_with_keywords():
Expand Down
8 changes: 4 additions & 4 deletions tests/test_network_elements_creation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,16 +446,16 @@ def test_non_linear_shunt():
assert shunt.b == 2

model1 = n.get_non_linear_shunt_compensator_sections().loc['SHUNT1']
section1 = model1.loc[0]
section2 = model1.loc[1]
section1 = model1.loc[1]
section2 = model1.loc[2]
assert section1.g == 1
assert section1.b == 2
assert section2.g == 3
assert section2.b == 4

model2 = n.get_non_linear_shunt_compensator_sections().loc['SHUNT2']
section1 = model2.loc[0]
section2 = model2.loc[1]
section1 = model2.loc[1]
section2 = model2.loc[2]
assert section1.g == 5
assert section1.b == 6
assert section2.g == 7
Expand Down
16 changes: 8 additions & 8 deletions tests/test_network_modification.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,16 +527,16 @@ def test_add_non_linear_shunt_bay():
assert shunt.b == 2

model1 = n.get_non_linear_shunt_compensator_sections().loc['shunt1']
section1 = model1.loc[0]
section2 = model1.loc[1]
section1 = model1.loc[1]
section2 = model1.loc[2]
assert section1.g == 1
assert section1.b == 2
assert section2.g == 3
assert section2.b == 4

model2 = n.get_non_linear_shunt_compensator_sections().loc['shunt2']
section1 = model2.loc[0]
section2 = model2.loc[1]
section1 = model2.loc[1]
section2 = model2.loc[2]
assert section1.g == 5
assert section1.b == 6
assert section2.g == 7
Expand Down Expand Up @@ -581,16 +581,16 @@ def test_add_non_linear_shunt_bay_bus_breaker():
assert shunt.b == 2

model1 = n.get_non_linear_shunt_compensator_sections().loc['shunt1']
section1 = model1.loc[0]
section2 = model1.loc[1]
section1 = model1.loc[1]
section2 = model1.loc[2]
assert section1.g == 1
assert section1.b == 2
assert section2.g == 3
assert section2.b == 4

model2 = n.get_non_linear_shunt_compensator_sections().loc['shunt2']
section1 = model2.loc[0]
section2 = model2.loc[1]
section1 = model2.loc[1]
section2 = model2.loc[2]
assert section1.g == 5
assert section1.b == 6
assert section2.g == 7
Expand Down
Loading