-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into ck/#267-adaptColumnSchemeOfCOSMOWeatherData
# Conflicts: # CHANGELOG.md
- Loading branch information
Showing
79 changed files
with
832 additions
and
231 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
src/main/java/edu/ie3/datamodel/io/csv/CsvIndividualTimeSeriesMetaInformation.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * © 2022. TU Dortmund University, | ||
| * Institute of Energy Systems, Energy Efficiency and Energy Economics, | ||
| * Research group Distribution grid planning and operation | ||
| */ | ||
| package edu.ie3.datamodel.io.csv; | ||
|
|
||
| import edu.ie3.datamodel.io.naming.timeseries.ColumnScheme; | ||
| import edu.ie3.datamodel.io.naming.timeseries.IndividualTimeSeriesMetaInformation; | ||
| import java.util.Objects; | ||
| import java.util.UUID; | ||
|
|
||
| /** Enhancing the {@link IndividualTimeSeriesMetaInformation} with the full path to csv file */ | ||
| public class CsvIndividualTimeSeriesMetaInformation extends IndividualTimeSeriesMetaInformation { | ||
| private final String fullFilePath; | ||
|
|
||
| public CsvIndividualTimeSeriesMetaInformation( | ||
| UUID uuid, ColumnScheme columnScheme, String fullFilePath) { | ||
| super(uuid, columnScheme); | ||
| this.fullFilePath = fullFilePath; | ||
| } | ||
|
|
||
| public CsvIndividualTimeSeriesMetaInformation( | ||
| IndividualTimeSeriesMetaInformation metaInformation, String fullFilePath) { | ||
| this(metaInformation.getUuid(), metaInformation.getColumnScheme(), fullFilePath); | ||
| } | ||
|
|
||
| public String getFullFilePath() { | ||
| return fullFilePath; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) return true; | ||
| if (!(o instanceof CsvIndividualTimeSeriesMetaInformation that)) return false; | ||
| if (!super.equals(o)) return false; | ||
| return fullFilePath.equals(that.fullFilePath); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(super.hashCode(), fullFilePath); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "CsvIndividualTimeSeriesMetaInformation{" | ||
| + "uuid=" | ||
| + getUuid() | ||
| + ", columnScheme=" | ||
| + getColumnScheme() | ||
| + ", fullFilePath='" | ||
| + fullFilePath | ||
| + '\'' | ||
| + '}'; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.