From 29b45d369dcbd9365bf8ab6b9973e41dff83dd5d Mon Sep 17 00:00:00 2001 From: Coline PILOQUET Date: Fri, 26 Jul 2024 14:32:17 +0200 Subject: [PATCH] fix tests Signed-off-by: Coline PILOQUET --- cpp/lib/pybind11 | 2 +- tests/test_java_perunit.py | 8 ++++---- tests/test_network.py | 8 ++++---- tests/test_network_elements_creation.py | 4 ++-- tests/test_per_unit.py | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cpp/lib/pybind11 b/cpp/lib/pybind11 index 3e9dfa286..19a6b9f4e 160000 --- a/cpp/lib/pybind11 +++ b/cpp/lib/pybind11 @@ -1 +1 @@ -Subproject commit 3e9dfa2866941655c56877882565e7577de6fc7b +Subproject commit 19a6b9f4efb569129c878b7f8db09132248fbaa1 diff --git a/tests/test_java_perunit.py b/tests/test_java_perunit.py index 9d908c230..3b957d60a 100644 --- a/tests/test_java_perunit.py +++ b/tests/test_java_perunit.py @@ -144,17 +144,17 @@ def test_dangling_lines_per_unit(): expected = pd.DataFrame(index=pd.Series(name='id', data=['DL']), columns=['name', 'r', 'x', 'g', 'b', 'p0', 'q0', 'p', 'q', 'i', 'voltage_level_id', - 'bus_id', 'connected', 'pairing_key', 'ucte_xnode_code', 'tie_line_id'], + 'bus_id', 'connected', 'pairing_key', 'tie_line_id'], data=[['', 0.1, 0.01, 0.01, 0.001, 0.5, 0.3, 0.5482, 0.3029, 0.6263, 'VL', 'VL_0', - True, '', '', '']]) + True, '','']]) dangling_lines = n.get_dangling_lines() pd.testing.assert_frame_equal(expected, dangling_lines, check_dtype=False, atol=10 ** -4) n.update_dangling_lines(pd.DataFrame(index=['DL'], columns=['p0', 'q0'], data=[[0.75, 0.25]])) expected = pd.DataFrame(index=pd.Series(name='id', data=['DL']), columns=['name', 'r', 'x', 'g', 'b', 'p0', 'q0', 'p', 'q', 'i', 'voltage_level_id', - 'bus_id', 'connected', 'pairing_key', 'ucte_xnode_code', 'tie_line_id'], + 'bus_id', 'connected', 'pairing_key', 'tie_line_id'], data=[['', 0.1, 0.01, 0.01, 0.001, 0.75, 0.25, 0.5482, 0.3029, 0.6263, 'VL', 'VL_0', - True, '', '', '']]) + True, '', '']]) dangling_lines = n.get_dangling_lines() pd.testing.assert_frame_equal(expected, dangling_lines, check_dtype=False, atol=10 ** -4) diff --git a/tests/test_network.py b/tests/test_network.py index a829ef23c..a23964ee9 100644 --- a/tests/test_network.py +++ b/tests/test_network.py @@ -992,18 +992,18 @@ def test_dangling_lines(): expected = pd.DataFrame(index=pd.Series(name='id', data=['DL']), columns=['name', 'r', 'x', 'g', 'b', 'p0', 'q0', 'p', 'q', 'i', 'voltage_level_id', 'bus_id', - 'connected', 'pairing_key', 'ucte_xnode_code', 'tie_line_id'], + 'connected', 'pairing_key', 'tie_line_id'], data=[['', 10.0, 1.0, 0.0001, 0.00001, 50.0, 30.0, nan, nan, nan, 'VL', 'VL_0', True, - '', '', '']]) + '', '']]) pd.testing.assert_frame_equal(expected, n.get_dangling_lines(), check_dtype=False) n.update_dangling_lines( pd.DataFrame(index=['DL'], columns=['r', 'x', 'g', 'b', 'p0', 'q0', 'connected'], data=[[11.0, 1.1, 0.0002, 0.00002, 40.0, 40.0, False]])) updated = pd.DataFrame(index=pd.Series(name='id', data=['DL']), columns=['name', 'r', 'x', 'g', 'b', 'p0', 'q0', 'p', 'q', 'i', 'voltage_level_id', - 'bus_id', 'connected', 'pairing_key', 'ucte_xnode_code', 'tie_line_id'], + 'bus_id', 'connected', 'pairing_key', 'tie_line_id'], data=[['', 11.0, 1.1, 0.0002, 0.00002, 40.0, 40.0, nan, nan, nan, 'VL', '', False, - '', '', '']]) + '', '']]) pd.testing.assert_frame_equal(updated, n.get_dangling_lines(), check_dtype=False) n = util.create_dangling_lines_network() dangling_lines = n.get_dangling_lines(attributes=['bus_breaker_bus_id', 'node']) diff --git a/tests/test_network_elements_creation.py b/tests/test_network_elements_creation.py index 4acb3daf9..86bfa5f68 100644 --- a/tests/test_network_elements_creation.py +++ b/tests/test_network_elements_creation.py @@ -920,7 +920,7 @@ def test_deprecated_ucte_xnode_code_kwargs(): ucte_xnode_code=['XNODE1', 'XNODE']) assert 'DL_TEST' in network.get_dangling_lines().index assert 'DL_TEST2' in network.get_dangling_lines().index - assert 'ucte_xnode_code' in network.get_dangling_lines().columns + assert 'ucte_xnode_code' in network.get_dangling_lines(all_attributes=True).columns def test_deprecated_ucte_xnode_code_dataframe(): @@ -939,7 +939,7 @@ def test_deprecated_ucte_xnode_code_dataframe(): index='id')) assert 'DL_TEST' in network.get_dangling_lines().index assert 'DL_TEST2' in network.get_dangling_lines().index - assert 'ucte_xnode_code' in network.get_dangling_lines().columns + assert 'ucte_xnode_code' in network.get_dangling_lines(all_attributes=True).columns def test_3_windings_transformers_creation(): diff --git a/tests/test_per_unit.py b/tests/test_per_unit.py index 6f037043b..a68c368d1 100644 --- a/tests/test_per_unit.py +++ b/tests/test_per_unit.py @@ -199,17 +199,17 @@ def test_dangling_lines_per_unit(): expected = pd.DataFrame(index=pd.Series(name='id', data=['DL']), columns=['name', 'r', 'x', 'g', 'b', 'p0', 'q0', 'p', 'q', 'i', 'voltage_level_id', - 'bus_id', 'connected', 'pairing_key', 'ucte_xnode_code', 'tie_line_id'], + 'bus_id', 'connected', 'pairing_key', 'tie_line_id'], data=[['', 0.1, 0.01, 0.01, 0.001, 0.5, 0.3, 0.5482, 0.3029, 0.6263, 'VL', 'VL_0', - True, '', '', '']]) + True, '', '']]) dangling_lines = n.get_dangling_lines() pd.testing.assert_frame_equal(expected, dangling_lines, check_dtype=False, atol=10 ** -4) n.update_dangling_lines(pd.DataFrame(index=['DL'], columns=['p0', 'q0'], data=[[0.75, 0.25]])) expected = pd.DataFrame(index=pd.Series(name='id', data=['DL']), columns=['name', 'r', 'x', 'g', 'b', 'p0', 'q0', 'p', 'q', 'i', 'voltage_level_id', - 'bus_id', 'connected', 'pairing_key', 'ucte_xnode_code', 'tie_line_id'], + 'bus_id', 'connected', 'pairing_key', 'tie_line_id'], data=[['', 0.1, 0.01, 0.01, 0.001, 0.75, 0.25, 0.5482, 0.3029, 0.6263, 'VL', 'VL_0', - True, '', '', '']]) + True, '', '']]) dangling_lines = n.get_dangling_lines() pd.testing.assert_frame_equal(expected, dangling_lines, check_dtype=False, atol=10 ** -4)