Skip to content

Commit

Permalink
refactor: remove unused merge functionality
Browse files Browse the repository at this point in the history
  • Loading branch information
jsolaas committed Feb 26, 2025
1 parent 5d894a9 commit bdd95ae
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 370 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lib-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
id: total
if: matrix.python-version == '3.11'
run: |
poetry run python -m coverage report --fail-under 45
poetry run python -m coverage report --fail-under 40
poetry run python -m coverage html -d build/
poetry run python -m coverage json -o build/coverage.json
echo '# Code Coverage Report\n See the index.html for a more detailed report.\n' >> build/README.md
Expand Down
84 changes: 0 additions & 84 deletions src/libecalc/common/tabular_time_series.py

This file was deleted.

16 changes: 0 additions & 16 deletions src/libecalc/core/result/results.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from pydantic import Field

from libecalc.common.component_type import ComponentType
from libecalc.common.tabular_time_series import TabularTimeSeriesUtils
from libecalc.common.time_utils import Periods
from libecalc.common.utils.rates import (
TimeSeriesBoolean,
Expand Down Expand Up @@ -37,21 +36,6 @@ class GenericComponentResult(CommonResultBase):
typ: Literal["generc"] = "generc"
id: str

def merge(self, *other_results: CompressorResult) -> Self:
"""
Merge all attributes of TimeSeries type, while also making sure the other attributes can be merged (i.e. id should be equal).
Args:
*other_results:
Returns:
"""
# Verify that we are merging the same entity
if len({other_result.id for other_result in other_results}) != 1:
raise ValueError("Can not merge objects with differing ids.")

return TabularTimeSeriesUtils.merge(self, *other_results)


class GeneratorSetResult(GenericComponentResult):
"""The Generator set result component."""
Expand Down
208 changes: 0 additions & 208 deletions tests/libecalc/common/test_tabular_time_series.py

This file was deleted.

61 changes: 0 additions & 61 deletions tests/libecalc/core/result/test_results.py

This file was deleted.

0 comments on commit bdd95ae

Please sign in to comment.