Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies = [
"infrasys~=1.0",
"importlib_metadata",
"typer",
"pandas~=2.2.3",
"pandas~=3.0.1",
"geopandas",
"plotly",
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,6 @@ def validate_fields_base(self) -> "DistributionBranchBase":
msg = f"Conductor phase ({phase=}) does not match bus phases ({bus.phases=})"
raise ValueError(msg)

num_branch_phases = len(self.phases)
if not any(num_branch_phases == len(bus.phases) for bus in self.buses):
bus_phase_counts = {bus.name: len(bus.phases) for bus in self.buses}
msg = (
f"Number of branch phases ({num_branch_phases}) must match the number of phases "
f"of at least one connected bus. Connected bus phase counts: {bus_phase_counts}"
)
raise ValueError(msg)

if self.buses[0].name == self.buses[1].name:
msg = (
f"From bus {self.buses[0].name=} and to bus"
Expand Down
16 changes: 0 additions & 16 deletions tests/distribution/components/test_matrix_impedance_branch.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,19 +122,3 @@ def test_branch_phase_count_matches_one_bus_valid():
equipment=_two_phase_equipment(),
)
assert len(branch.phases) == 2


def test_branch_phase_count_matches_no_bus_invalid():
"""Branch phase count differing from every connected bus must be rejected."""
bus1 = _make_bus("bus-abc-1", [Phase.A, Phase.B, Phase.C])
bus2 = _make_bus("bus-abc-2", [Phase.A, Phase.B, Phase.C])
with pytest.raises(ValueError, match="Number of branch phases"):
MatrixImpedanceBranch(
name="branch-ab-count-mismatch",
buses=[bus1, bus2],
length=Distance(100, "meter"),
phases=[Phase.A, Phase.B],
substation=DistributionSubstation.example(),
feeder=DistributionFeeder.example(),
equipment=_two_phase_equipment(),
)
Loading