From 1c4f55928f2dd0d8545b795176e90d3dd7d1fac2 Mon Sep 17 00:00:00 2001 From: Mathieu Bague Date: Tue, 18 Oct 2016 16:55:07 +0200 Subject: [PATCH 1/3] Rename ucte-util to entsoe-util --- .gitignore | 2 +- {ucte-util => entsoe-util}/pom.xml | 6 +++--- .../entsoe}/util/BoundaryPoint.java | 2 +- .../entsoe}/util/BoundaryPointXlsParser.java | 2 +- .../entsoe/util/EntsoeFileName.java | 18 +++++++++--------- .../entsoe/util/EntsoeGeographicalCode.java | 12 ++++++------ .../entsoe/util/EntsoeFileNameTest.java | 10 +++++----- .../util/EntsoeGeographicalCodeTest.java | 10 +++++----- pom.xml | 2 +- 9 files changed, 32 insertions(+), 32 deletions(-) rename {ucte-util => entsoe-util}/pom.xml (90%) rename {ucte-util/src/main/java/eu/itesla_project/ucte => entsoe-util/src/main/java/eu/itesla_project/entsoe}/util/BoundaryPoint.java (96%) rename {ucte-util/src/main/java/eu/itesla_project/ucte => entsoe-util/src/main/java/eu/itesla_project/entsoe}/util/BoundaryPointXlsParser.java (99%) rename ucte-util/src/main/java/eu/itesla_project/ucte/util/UcteFileName.java => entsoe-util/src/main/java/eu/itesla_project/entsoe/util/EntsoeFileName.java (79%) rename ucte-util/src/main/java/eu/itesla_project/ucte/util/UcteGeographicalCode.java => entsoe-util/src/main/java/eu/itesla_project/entsoe/util/EntsoeGeographicalCode.java (80%) rename ucte-util/src/test/java/eu/itesla_project/ucte/util/UcteFileNameTest.java => entsoe-util/src/test/java/eu/itesla_project/entsoe/util/EntsoeFileNameTest.java (77%) rename ucte-util/src/test/java/eu/itesla_project/ucte/util/UcteGeographicalCodeTest.java => entsoe-util/src/test/java/eu/itesla_project/entsoe/util/EntsoeGeographicalCodeTest.java (57%) diff --git a/.gitignore b/.gitignore index e2910c9e..a6acc234 100644 --- a/.gitignore +++ b/.gitignore @@ -49,7 +49,7 @@ /target/ /ucte-import/target/ /ucte-network/target/ -/ucte-util/target/ +/entsoe-util/target/ /wca-integration/target/ /case-repository/target/ /network-merge/target/ diff --git a/ucte-util/pom.xml b/entsoe-util/pom.xml similarity index 90% rename from ucte-util/pom.xml rename to entsoe-util/pom.xml index fef983db..9e64f072 100644 --- a/ucte-util/pom.xml +++ b/entsoe-util/pom.xml @@ -18,10 +18,10 @@ 0.1-SNAPSHOT - ucte-util + entsoe-util - UCTE util - Utilities for working with UCTE data + ENTSO-E util + Utilities for working with ENTSO-E data diff --git a/ucte-util/src/main/java/eu/itesla_project/ucte/util/BoundaryPoint.java b/entsoe-util/src/main/java/eu/itesla_project/entsoe/util/BoundaryPoint.java similarity index 96% rename from ucte-util/src/main/java/eu/itesla_project/ucte/util/BoundaryPoint.java rename to entsoe-util/src/main/java/eu/itesla_project/entsoe/util/BoundaryPoint.java index 0d1b52c5..58b6fd58 100644 --- a/ucte-util/src/main/java/eu/itesla_project/ucte/util/BoundaryPoint.java +++ b/entsoe-util/src/main/java/eu/itesla_project/entsoe/util/BoundaryPoint.java @@ -4,7 +4,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package eu.itesla_project.ucte.util; +package eu.itesla_project.entsoe.util; import eu.itesla_project.iidm.network.Country; diff --git a/ucte-util/src/main/java/eu/itesla_project/ucte/util/BoundaryPointXlsParser.java b/entsoe-util/src/main/java/eu/itesla_project/entsoe/util/BoundaryPointXlsParser.java similarity index 99% rename from ucte-util/src/main/java/eu/itesla_project/ucte/util/BoundaryPointXlsParser.java rename to entsoe-util/src/main/java/eu/itesla_project/entsoe/util/BoundaryPointXlsParser.java index 13512f57..1af19c80 100644 --- a/ucte-util/src/main/java/eu/itesla_project/ucte/util/BoundaryPointXlsParser.java +++ b/entsoe-util/src/main/java/eu/itesla_project/entsoe/util/BoundaryPointXlsParser.java @@ -4,7 +4,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package eu.itesla_project.ucte.util; +package eu.itesla_project.entsoe.util; import eu.itesla_project.commons.config.PlatformConfig; import eu.itesla_project.iidm.network.Country; diff --git a/ucte-util/src/main/java/eu/itesla_project/ucte/util/UcteFileName.java b/entsoe-util/src/main/java/eu/itesla_project/entsoe/util/EntsoeFileName.java similarity index 79% rename from ucte-util/src/main/java/eu/itesla_project/ucte/util/UcteFileName.java rename to entsoe-util/src/main/java/eu/itesla_project/entsoe/util/EntsoeFileName.java index d0be4784..6fc793e3 100644 --- a/ucte-util/src/main/java/eu/itesla_project/ucte/util/UcteFileName.java +++ b/entsoe-util/src/main/java/eu/itesla_project/entsoe/util/EntsoeFileName.java @@ -4,7 +4,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package eu.itesla_project.ucte.util; +package eu.itesla_project.entsoe.util; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -16,7 +16,7 @@ * * @author Geoffroy Jamgotchian */ -public class UcteFileName { +public class EntsoeFileName { private static final Pattern DATE_REGEX = Pattern.compile(".*(\\d{4})[- /._]?(\\d{2})[- /._]?(\\d{2})[- /._]?(\\d{2})[- /._]?(\\d{2}).*"); @@ -24,12 +24,12 @@ public class UcteFileName { private final int forecastDistance; - private final UcteGeographicalCode geographicalCode; + private final EntsoeGeographicalCode geographicalCode; - public static UcteFileName parse(String str) { + public static EntsoeFileName parse(String str) { DateTime date = DateTime.now(); int forecastDistance = 0; - UcteGeographicalCode geographicalCode = null; + EntsoeGeographicalCode geographicalCode = null; Matcher m = DATE_REGEX.matcher(str); if (m.matches()) { // time zone is Europe/Paris @@ -48,13 +48,13 @@ public static UcteFileName parse(String str) { } } if (str.length() >= 19) { - geographicalCode = UcteGeographicalCode.valueOf(str.substring(18, 20)); + geographicalCode = EntsoeGeographicalCode.valueOf(str.substring(18, 20)); } - return new UcteFileName(date, forecastDistance, geographicalCode); + return new EntsoeFileName(date, forecastDistance, geographicalCode); } - private UcteFileName(DateTime date, int forecastDistance, UcteGeographicalCode geographicalCode) { + private EntsoeFileName(DateTime date, int forecastDistance, EntsoeGeographicalCode geographicalCode) { this.date = date; this.forecastDistance = forecastDistance; this.geographicalCode = geographicalCode; @@ -68,7 +68,7 @@ public int getForecastDistance() { return forecastDistance; } - public UcteGeographicalCode getGeographicalCode() { + public EntsoeGeographicalCode getGeographicalCode() { return geographicalCode; } diff --git a/ucte-util/src/main/java/eu/itesla_project/ucte/util/UcteGeographicalCode.java b/entsoe-util/src/main/java/eu/itesla_project/entsoe/util/EntsoeGeographicalCode.java similarity index 80% rename from ucte-util/src/main/java/eu/itesla_project/ucte/util/UcteGeographicalCode.java rename to entsoe-util/src/main/java/eu/itesla_project/entsoe/util/EntsoeGeographicalCode.java index 2d9313c2..e301c4e0 100644 --- a/ucte-util/src/main/java/eu/itesla_project/ucte/util/UcteGeographicalCode.java +++ b/entsoe-util/src/main/java/eu/itesla_project/entsoe/util/EntsoeGeographicalCode.java @@ -4,7 +4,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package eu.itesla_project.ucte.util; +package eu.itesla_project.entsoe.util; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -17,7 +17,7 @@ /** * @author Geoffroy Jamgotchian */ -public enum UcteGeographicalCode { +public enum EntsoeGeographicalCode { AT(Country.AT), BE(Country.BE), CH(Country.CH), @@ -36,16 +36,16 @@ public enum UcteGeographicalCode { NO(Country.NO), // not a real UCTE geo code but necessary to work with nordic UX(null); - private static Multimap COUNTRY_TO_GEOGRAPHICAL_CODES; + private static Multimap COUNTRY_TO_GEOGRAPHICAL_CODES; private static final Lock LOCK = new ReentrantLock(); - public static Collection forCountry(Country country) { + public static Collection forCountry(Country country) { LOCK.lock(); try { if (COUNTRY_TO_GEOGRAPHICAL_CODES == null) { COUNTRY_TO_GEOGRAPHICAL_CODES = HashMultimap.create(); - for (UcteGeographicalCode geographicalCode : UcteGeographicalCode.values()) { + for (EntsoeGeographicalCode geographicalCode : EntsoeGeographicalCode.values()) { COUNTRY_TO_GEOGRAPHICAL_CODES.put(geographicalCode.getCountry(), geographicalCode); } } @@ -57,7 +57,7 @@ public static Collection forCountry(Country country) { private final Country country; - UcteGeographicalCode(Country country) { + EntsoeGeographicalCode(Country country) { this.country = country; } diff --git a/ucte-util/src/test/java/eu/itesla_project/ucte/util/UcteFileNameTest.java b/entsoe-util/src/test/java/eu/itesla_project/entsoe/util/EntsoeFileNameTest.java similarity index 77% rename from ucte-util/src/test/java/eu/itesla_project/ucte/util/UcteFileNameTest.java rename to entsoe-util/src/test/java/eu/itesla_project/entsoe/util/EntsoeFileNameTest.java index 4f9ea0b2..1d9811bf 100644 --- a/ucte-util/src/test/java/eu/itesla_project/ucte/util/UcteFileNameTest.java +++ b/entsoe-util/src/test/java/eu/itesla_project/entsoe/util/EntsoeFileNameTest.java @@ -4,7 +4,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package eu.itesla_project.ucte.util; +package eu.itesla_project.entsoe.util; import org.joda.time.DateTime; import org.junit.Test; @@ -14,22 +14,22 @@ /** * @author Geoffroy Jamgotchian */ -public class UcteFileNameTest { +public class EntsoeFileNameTest { @Test public void testValidName() { String fileName = "20140213_0830_SN4_D20"; - UcteFileName ucteFileName = UcteFileName.parse(fileName); + EntsoeFileName ucteFileName = EntsoeFileName.parse(fileName); assertTrue(ucteFileName.getDate().isEqual(DateTime.parse("2014-02-13T08:30:00.000+01:00"))); assertTrue(ucteFileName.getForecastDistance() == 0); assertTrue(ucteFileName.getCountry().equals("DE")); - assertTrue(ucteFileName.getGeographicalCode() == UcteGeographicalCode.D2); + assertTrue(ucteFileName.getGeographicalCode() == EntsoeGeographicalCode.D2); } @Test public void testInvalidName() { String fileName = "???"; - UcteFileName ucteFileName = UcteFileName.parse(fileName); + EntsoeFileName ucteFileName = EntsoeFileName.parse(fileName); assertTrue(ucteFileName.getForecastDistance() == 0); assertTrue(ucteFileName.getCountry() == null); } diff --git a/ucte-util/src/test/java/eu/itesla_project/ucte/util/UcteGeographicalCodeTest.java b/entsoe-util/src/test/java/eu/itesla_project/entsoe/util/EntsoeGeographicalCodeTest.java similarity index 57% rename from ucte-util/src/test/java/eu/itesla_project/ucte/util/UcteGeographicalCodeTest.java rename to entsoe-util/src/test/java/eu/itesla_project/entsoe/util/EntsoeGeographicalCodeTest.java index d71216f2..458e4bf8 100644 --- a/ucte-util/src/test/java/eu/itesla_project/ucte/util/UcteGeographicalCodeTest.java +++ b/entsoe-util/src/test/java/eu/itesla_project/entsoe/util/EntsoeGeographicalCodeTest.java @@ -4,7 +4,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package eu.itesla_project.ucte.util; +package eu.itesla_project.entsoe.util; import com.google.common.collect.Sets; import eu.itesla_project.iidm.network.Country; @@ -15,12 +15,12 @@ /** * @author Geoffroy Jamgotchian */ -public class UcteGeographicalCodeTest { +public class EntsoeGeographicalCodeTest { @Test public void testForCountry() throws Exception { - assertTrue(UcteGeographicalCode.forCountry(Country.FR).equals(Sets.newHashSet(UcteGeographicalCode.FR))); - assertTrue(UcteGeographicalCode.forCountry(Country.DE).equals(Sets.newHashSet( - UcteGeographicalCode.D1, UcteGeographicalCode.D2, UcteGeographicalCode.D4, UcteGeographicalCode.D7, UcteGeographicalCode.D8))); + assertTrue(EntsoeGeographicalCode.forCountry(Country.FR).equals(Sets.newHashSet(EntsoeGeographicalCode.FR))); + assertTrue(EntsoeGeographicalCode.forCountry(Country.DE).equals(Sets.newHashSet( + EntsoeGeographicalCode.D1, EntsoeGeographicalCode.D2, EntsoeGeographicalCode.D4, EntsoeGeographicalCode.D7, EntsoeGeographicalCode.D8))); } } \ No newline at end of file diff --git a/pom.xml b/pom.xml index ad0f0a4d..63cea410 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ offline-server modelica-export modelica-events-adder - ucte-util + entsoe-util ucte-network ucte-import mcla-integration From 7276160a7aca4e8b7fa2c44067715eca7e6cb234 Mon Sep 17 00:00:00 2001 From: Mathieu Bague Date: Tue, 18 Oct 2016 17:24:55 +0200 Subject: [PATCH 2/3] Compilation fix --- case-repository/pom.xml | 2 +- .../EntsoeAndXmlCaseRepositoryConfig.java | 4 +-- .../cases/EntsoeCaseRepository.java | 30 +++++++++---------- .../cases/EntsoeCaseRepositoryConfig.java | 14 ++++----- .../cases/EntsoeAndXmlCaseRepositoryTest.java | 12 ++++---- .../cases/EntsoeCaseRepositoryConfigTest.java | 8 ++--- .../cases/EntsoeCaseRepositoryTest.java | 4 +-- cim1-import/pom.xml | 2 +- .../iidm/import_/cim1/CIM1Converter.java | 8 ++--- .../modules/wca/StochasticInjection.java | 4 +-- ucte-import/pom.xml | 2 +- .../iidm/import_/ucte/UcteImporter.java | 10 +++---- 12 files changed, 49 insertions(+), 51 deletions(-) diff --git a/case-repository/pom.xml b/case-repository/pom.xml index badb0108..f44ec7e8 100644 --- a/case-repository/pom.xml +++ b/case-repository/pom.xml @@ -36,7 +36,7 @@ ${project.groupId} - ucte-util + entsoe-util ${project.version} diff --git a/case-repository/src/main/java/eu/itesla_project/cases/EntsoeAndXmlCaseRepositoryConfig.java b/case-repository/src/main/java/eu/itesla_project/cases/EntsoeAndXmlCaseRepositoryConfig.java index 6bfe58a4..9f01a112 100644 --- a/case-repository/src/main/java/eu/itesla_project/cases/EntsoeAndXmlCaseRepositoryConfig.java +++ b/case-repository/src/main/java/eu/itesla_project/cases/EntsoeAndXmlCaseRepositoryConfig.java @@ -9,7 +9,7 @@ import com.google.common.collect.Multimap; import eu.itesla_project.commons.config.PlatformConfig; import eu.itesla_project.iidm.import_.Importers; -import eu.itesla_project.ucte.util.UcteGeographicalCode; +import eu.itesla_project.entsoe.util.EntsoeGeographicalCode; import java.nio.file.Path; import java.util.Collection; @@ -20,7 +20,7 @@ */ public class EntsoeAndXmlCaseRepositoryConfig extends EntsoeCaseRepositoryConfig { - public EntsoeAndXmlCaseRepositoryConfig(Path rootDir, Multimap forbiddenFormatsByGeographicalCode) { + public EntsoeAndXmlCaseRepositoryConfig(Path rootDir, Multimap forbiddenFormatsByGeographicalCode) { super(rootDir, forbiddenFormatsByGeographicalCode); } diff --git a/case-repository/src/main/java/eu/itesla_project/cases/EntsoeCaseRepository.java b/case-repository/src/main/java/eu/itesla_project/cases/EntsoeCaseRepository.java index 884a2473..5ad12967 100644 --- a/case-repository/src/main/java/eu/itesla_project/cases/EntsoeCaseRepository.java +++ b/case-repository/src/main/java/eu/itesla_project/cases/EntsoeCaseRepository.java @@ -16,8 +16,8 @@ import eu.itesla_project.iidm.import_.Importers; import eu.itesla_project.iidm.network.Country; import eu.itesla_project.iidm.network.Network; -import eu.itesla_project.ucte.util.UcteFileName; -import eu.itesla_project.ucte.util.UcteGeographicalCode; +import eu.itesla_project.entsoe.util.EntsoeFileName; +import eu.itesla_project.entsoe.util.EntsoeGeographicalCode; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.Interval; @@ -106,15 +106,15 @@ private ImportContext(Importer importer, ReadOnlyDataSource ds) { } // because D1 snapshot does not exist and forecast replacement is not yet implemented - private static Collection forCountryHacked(Country country) { - return UcteGeographicalCode.forCountry(country).stream() - .filter(ucteGeographicalCode -> ucteGeographicalCode != UcteGeographicalCode.D1) + private static Collection forCountryHacked(Country country) { + return EntsoeGeographicalCode.forCountry(country).stream() + .filter(EntsoeGeographicalCode -> EntsoeGeographicalCode != EntsoeGeographicalCode.D1) .collect(Collectors.toList()); } private R scanRepository(DateTime date, CaseType type, Country country, Function, R> handler) { - Collection geographicalCodes = country != null ? forCountryHacked(country) - : Collections.singleton(UcteGeographicalCode.UX); + Collection geographicalCodes = country != null ? forCountryHacked(country) + : Collections.singleton(EntsoeGeographicalCode.UX); for (EntsoeFormat format : formats) { Path formatDir = config.getRootDir().resolve(format.getDirName()); if (Files.exists(formatDir)) { @@ -125,7 +125,7 @@ private R scanRepository(DateTime date, CaseType type, Country country, Func .resolve(String.format("%02d", date.getDayOfMonth())); if (Files.exists(dayDir)) { List importContexts = null; - for (UcteGeographicalCode geographicalCode : geographicalCodes) { + for (EntsoeGeographicalCode geographicalCode : geographicalCodes) { Collection forbiddenFormats = config.getForbiddenFormatsByGeographicalCode().get(geographicalCode); if (!forbiddenFormats.contains(format.getImporter().getFormat())) { for (int i = 9; i >= 0; i--) { @@ -224,27 +224,27 @@ private void browse(Path dir, Consumer handler) { @Override public Set dataAvailable(CaseType type, Set countries, Interval interval) { - Set geographicalCodes = new HashSet<>(); + Set geographicalCodes = new HashSet<>(); if (countries == null) { - geographicalCodes.add(UcteGeographicalCode.UX); + geographicalCodes.add(EntsoeGeographicalCode.UX); } else { for (Country country : countries) { geographicalCodes.addAll(forCountryHacked(country)); } } - Multimap dates = HashMultimap.create(); + Multimap dates = HashMultimap.create(); for (EntsoeFormat format : formats) { Path formatDir = config.getRootDir().resolve(format.getDirName()); if (Files.exists(formatDir)) { Path typeDir = formatDir.resolve(type.name()); if (Files.exists(typeDir)) { browse(typeDir, path -> { - UcteFileName ucteFileName = UcteFileName.parse(path.getFileName().toString()); - UcteGeographicalCode geographicalCode = ucteFileName.getGeographicalCode(); + EntsoeFileName entsoeFileName = EntsoeFileName.parse(path.getFileName().toString()); + EntsoeGeographicalCode geographicalCode = entsoeFileName.getGeographicalCode(); if (geographicalCode != null && !config.getForbiddenFormatsByGeographicalCode().get(geographicalCode).contains(format.getImporter().getFormat()) - && interval.contains(ucteFileName.getDate())) { - dates.put(ucteFileName.getDate(), geographicalCode); + && interval.contains(entsoeFileName.getDate())) { + dates.put(entsoeFileName.getDate(), geographicalCode); } }); } diff --git a/case-repository/src/main/java/eu/itesla_project/cases/EntsoeCaseRepositoryConfig.java b/case-repository/src/main/java/eu/itesla_project/cases/EntsoeCaseRepositoryConfig.java index a48b38f0..cebe77a3 100644 --- a/case-repository/src/main/java/eu/itesla_project/cases/EntsoeCaseRepositoryConfig.java +++ b/case-repository/src/main/java/eu/itesla_project/cases/EntsoeCaseRepositoryConfig.java @@ -12,7 +12,7 @@ import eu.itesla_project.commons.config.ModuleConfig; import eu.itesla_project.commons.config.PlatformConfig; import eu.itesla_project.iidm.import_.Importers; -import eu.itesla_project.ucte.util.UcteGeographicalCode; +import eu.itesla_project.entsoe.util.EntsoeGeographicalCode; import java.nio.file.Path; import java.util.Collection; @@ -26,7 +26,7 @@ public class EntsoeCaseRepositoryConfig { private final Path rootDir; - private final Multimap forbiddenFormatsByGeographicalCode; + private final Multimap forbiddenFormatsByGeographicalCode; public static EntsoeCaseRepositoryConfig load() { return load(PlatformConfig.defaultConfig()); @@ -43,8 +43,8 @@ static EntsoeCaseRepositoryConfig load(PlatformConfig platformConfig, Collection static EntsoeCaseRepositoryConfig load(String moduleConfigName, PlatformConfig platformConfig, Collection supportedFormats) { ModuleConfig config = platformConfig.getModuleConfig(moduleConfigName); Path rootDir = config.getPathProperty("rootDir"); - Multimap forbiddenFormatsByCountry = HashMultimap.create(); - for (UcteGeographicalCode geographicalCode : UcteGeographicalCode.values()) { + Multimap forbiddenFormatsByCountry = HashMultimap.create(); + for (EntsoeGeographicalCode geographicalCode : EntsoeGeographicalCode.values()) { List forbiddenFormats = config.getStringListProperty("forbiddenFormats_" + geographicalCode, Collections.emptyList()); if (forbiddenFormats.size() > 0) { forbiddenFormatsByCountry.putAll(geographicalCode, forbiddenFormats); @@ -53,7 +53,7 @@ static EntsoeCaseRepositoryConfig load(String moduleConfigName, PlatformConfig p return new EntsoeCaseRepositoryConfig(rootDir, checkedFormats(forbiddenFormatsByCountry, supportedFormats)); } - private static Multimap checkedFormats(Multimap forbiddenFormatsByGeographicalCode, + private static Multimap checkedFormats(Multimap forbiddenFormatsByGeographicalCode, Collection supportedFormats) { // check that formats are valids for (String format : forbiddenFormatsByGeographicalCode.values()) { @@ -64,7 +64,7 @@ private static Multimap checkedFormats(Multimap forbiddenFormatsByGeographicalCode) { + public EntsoeCaseRepositoryConfig(Path rootDir, Multimap forbiddenFormatsByGeographicalCode) { this.rootDir = rootDir; this.forbiddenFormatsByGeographicalCode = forbiddenFormatsByGeographicalCode; } @@ -73,7 +73,7 @@ public Path getRootDir() { return rootDir; } - public Multimap getForbiddenFormatsByGeographicalCode() { + public Multimap getForbiddenFormatsByGeographicalCode() { return forbiddenFormatsByGeographicalCode; } diff --git a/case-repository/src/test/java/eu/itesla_project/cases/EntsoeAndXmlCaseRepositoryTest.java b/case-repository/src/test/java/eu/itesla_project/cases/EntsoeAndXmlCaseRepositoryTest.java index 2ad2b74c..9cd3c539 100644 --- a/case-repository/src/test/java/eu/itesla_project/cases/EntsoeAndXmlCaseRepositoryTest.java +++ b/case-repository/src/test/java/eu/itesla_project/cases/EntsoeAndXmlCaseRepositoryTest.java @@ -12,7 +12,7 @@ import eu.itesla_project.iidm.import_.Importer; import eu.itesla_project.iidm.network.Country; import eu.itesla_project.iidm.network.Network; -import eu.itesla_project.ucte.util.UcteGeographicalCode; +import eu.itesla_project.entsoe.util.EntsoeGeographicalCode; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.nio.file.ShrinkWrapFileSystems; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -34,9 +34,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.EnumSet; -import java.util.List; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; /** @@ -177,8 +175,8 @@ public void tearDown() throws Exception { @Test public void testLoad() throws Exception { // check that, when cim and ucte is forbidden for france, xml is loaded - caseRepository.getConfig().getForbiddenFormatsByGeographicalCode().put(UcteGeographicalCode.FR, "CIM1"); - caseRepository.getConfig().getForbiddenFormatsByGeographicalCode().put(UcteGeographicalCode.FR, "UCTE"); + caseRepository.getConfig().getForbiddenFormatsByGeographicalCode().put(EntsoeGeographicalCode.FR, "CIM1"); + caseRepository.getConfig().getForbiddenFormatsByGeographicalCode().put(EntsoeGeographicalCode.FR, "UCTE"); assertTrue(caseRepository.load(DateTime.parse("2013-01-14T00:15:00+01:00"), CaseType.SN, Country.FR).equals(Collections.singletonList(xmlNetwork))); } @@ -192,8 +190,8 @@ public void testDataAvailable() throws Exception { public void testLoadXiidm() throws Exception { // check that, when cim and ucte is forbidden for france, xml is loaded // file suffix .xiidm - caseRepository.getConfig().getForbiddenFormatsByGeographicalCode().put(UcteGeographicalCode.FR, "CIM1"); - caseRepository.getConfig().getForbiddenFormatsByGeographicalCode().put(UcteGeographicalCode.FR, "UCTE"); + caseRepository.getConfig().getForbiddenFormatsByGeographicalCode().put(EntsoeGeographicalCode.FR, "CIM1"); + caseRepository.getConfig().getForbiddenFormatsByGeographicalCode().put(EntsoeGeographicalCode.FR, "UCTE"); assertTrue(caseRepository.load(DateTime.parse("2016-02-02T01:15:00+01:00"), CaseType.SN, Country.FR).equals(Collections.singletonList(xmlNetwork))); } diff --git a/case-repository/src/test/java/eu/itesla_project/cases/EntsoeCaseRepositoryConfigTest.java b/case-repository/src/test/java/eu/itesla_project/cases/EntsoeCaseRepositoryConfigTest.java index e3388cb1..31e225d2 100644 --- a/case-repository/src/test/java/eu/itesla_project/cases/EntsoeCaseRepositoryConfigTest.java +++ b/case-repository/src/test/java/eu/itesla_project/cases/EntsoeCaseRepositoryConfigTest.java @@ -9,7 +9,7 @@ import com.google.common.collect.Sets; import eu.itesla_project.commons.config.InMemoryPlatformConfig; import eu.itesla_project.commons.config.MapModuleConfig; -import eu.itesla_project.ucte.util.UcteGeographicalCode; +import eu.itesla_project.entsoe.util.EntsoeGeographicalCode; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.nio.file.ShrinkWrapFileSystems; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -57,9 +57,9 @@ public void testLoad() throws Exception { config = EntsoeCaseRepositoryConfig.load(platformConfig, Arrays.asList("CIM1", "UCTE")); assertTrue(config.getRootDir().toString().equals("/config")); assertTrue(config.getForbiddenFormatsByGeographicalCode().size() == 2); - assertTrue(config.getForbiddenFormatsByGeographicalCode().get(UcteGeographicalCode.FR).equals(Sets.newHashSet("CIM1"))); - assertTrue(config.getForbiddenFormatsByGeographicalCode().get(UcteGeographicalCode.BE).equals(Sets.newHashSet("CIM1"))); - assertTrue(config.getForbiddenFormatsByGeographicalCode().get(UcteGeographicalCode.D2).isEmpty()); + assertTrue(config.getForbiddenFormatsByGeographicalCode().get(EntsoeGeographicalCode.FR).equals(Sets.newHashSet("CIM1"))); + assertTrue(config.getForbiddenFormatsByGeographicalCode().get(EntsoeGeographicalCode.BE).equals(Sets.newHashSet("CIM1"))); + assertTrue(config.getForbiddenFormatsByGeographicalCode().get(EntsoeGeographicalCode.D2).isEmpty()); } @Test diff --git a/case-repository/src/test/java/eu/itesla_project/cases/EntsoeCaseRepositoryTest.java b/case-repository/src/test/java/eu/itesla_project/cases/EntsoeCaseRepositoryTest.java index b370c324..064e9ff0 100644 --- a/case-repository/src/test/java/eu/itesla_project/cases/EntsoeCaseRepositoryTest.java +++ b/case-repository/src/test/java/eu/itesla_project/cases/EntsoeCaseRepositoryTest.java @@ -12,7 +12,7 @@ import eu.itesla_project.iidm.import_.Importer; import eu.itesla_project.iidm.network.Country; import eu.itesla_project.iidm.network.Network; -import eu.itesla_project.ucte.util.UcteGeographicalCode; +import eu.itesla_project.entsoe.util.EntsoeGeographicalCode; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.nio.file.ShrinkWrapFileSystems; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -170,7 +170,7 @@ public void testLoad() throws Exception { assertTrue(caseRepository.load(DateTime.parse("2013-01-14T00:15:00+01:00"), CaseType.SN, Country.FR).equals(Collections.singletonList(cimNetwork))); // check that if cim is vorbidden for france, uct is loaded - caseRepository.getConfig().getForbiddenFormatsByGeographicalCode().put(UcteGeographicalCode.FR, "CIM1"); + caseRepository.getConfig().getForbiddenFormatsByGeographicalCode().put(EntsoeGeographicalCode.FR, "CIM1"); assertTrue(caseRepository.load(DateTime.parse("2013-01-14T00:15:00+01:00"), CaseType.SN, Country.FR).equals(Collections.singletonList(uctNetwork))); assertTrue(caseRepository.load(DateTime.parse("2013-01-15T00:15:00+01:00"), CaseType.SN, Country.DE).size() == 4); diff --git a/cim1-import/pom.xml b/cim1-import/pom.xml index d646cd68..037b38a9 100644 --- a/cim1-import/pom.xml +++ b/cim1-import/pom.xml @@ -52,7 +52,7 @@ ${project.groupId} - ucte-util + entsoe-util ${project.version} diff --git a/cim1-import/src/main/java/eu/itesla_project/iidm/import_/cim1/CIM1Converter.java b/cim1-import/src/main/java/eu/itesla_project/iidm/import_/cim1/CIM1Converter.java index b15e74e7..994a25df 100644 --- a/cim1-import/src/main/java/eu/itesla_project/iidm/import_/cim1/CIM1Converter.java +++ b/cim1-import/src/main/java/eu/itesla_project/iidm/import_/cim1/CIM1Converter.java @@ -10,7 +10,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Multimap; import eu.itesla_project.iidm.network.*; -import eu.itesla_project.ucte.util.UcteFileName; +import eu.itesla_project.entsoe.util.EntsoeFileName; import org.jgrapht.UndirectedGraph; import org.jgrapht.alg.ConnectivityInspector; import org.jgrapht.graph.Pseudograph; @@ -1191,11 +1191,11 @@ Network convert() { } } - UcteFileName ucteFileName = UcteFileName.parse(fileName); + EntsoeFileName entsoeFileName = EntsoeFileName.parse(fileName); Network network = NetworkFactory.create(fileName, FORMAT); - network.setCaseDate(ucteFileName.getDate()); - network.setForecastDistance(ucteFileName.getForecastDistance()); + network.setCaseDate(entsoeFileName.getDate()); + network.setForecastDistance(entsoeFileName.getForecastDistance()); // Ends of transformers need to be in the same substation in the IIDM model, so check that a mapping is // not needed diff --git a/modules/src/main/java/eu/itesla_project/modules/wca/StochasticInjection.java b/modules/src/main/java/eu/itesla_project/modules/wca/StochasticInjection.java index 0af16da0..747501e8 100644 --- a/modules/src/main/java/eu/itesla_project/modules/wca/StochasticInjection.java +++ b/modules/src/main/java/eu/itesla_project/modules/wca/StochasticInjection.java @@ -9,8 +9,8 @@ import eu.itesla_project.iidm.network.*; import eu.itesla_project.iidm.network.util.ConnectedComponents; import eu.itesla_project.iidm.network.util.Identifiables; -import eu.itesla_project.ucte.util.BoundaryPoint; -import eu.itesla_project.ucte.util.BoundaryPointXlsParser; +import eu.itesla_project.entsoe.util.BoundaryPoint; +import eu.itesla_project.entsoe.util.BoundaryPointXlsParser; import java.io.IOException; import java.util.ArrayList; diff --git a/ucte-import/pom.xml b/ucte-import/pom.xml index ab0fdb5e..edc5ef37 100644 --- a/ucte-import/pom.xml +++ b/ucte-import/pom.xml @@ -42,7 +42,7 @@ ${project.groupId} - ucte-util + entsoe-util ${project.version} diff --git a/ucte-import/src/main/java/eu/itesla_project/iidm/import_/ucte/UcteImporter.java b/ucte-import/src/main/java/eu/itesla_project/iidm/import_/ucte/UcteImporter.java index 61869824..ef92245c 100644 --- a/ucte-import/src/main/java/eu/itesla_project/iidm/import_/ucte/UcteImporter.java +++ b/ucte-import/src/main/java/eu/itesla_project/iidm/import_/ucte/UcteImporter.java @@ -17,7 +17,7 @@ import eu.itesla_project.ucte.network.ext.UcteSubstation; import eu.itesla_project.ucte.network.ext.UcteVoltageLevel; import eu.itesla_project.ucte.network.io.UcteReader; -import eu.itesla_project.ucte.util.UcteFileName; +import eu.itesla_project.entsoe.util.EntsoeFileName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -71,7 +71,7 @@ private static float getSusceptance(UcteElement ucteElement) { return b; } - private static void createBuses(UcteNetworkExt ucteNetwork, Network network, UcteFileName ucteFileName) { + private static void createBuses(UcteNetworkExt ucteNetwork, Network network, EntsoeFileName ucteFileName) { for (UcteSubstation ucteSubstation : ucteNetwork.getSubstations()) { // skip substations with only one Xnode @@ -499,7 +499,7 @@ private static void createPhaseTapChanger(UcteAngleRegulation ucteAngleRegulatio private static TwoWindingsTransformer createXnodeTransfo(UcteNetworkExt ucteNetwork, UcteTransformer ucteTransfo, boolean connected, UcteNodeCode xNodeCode, UcteNodeCode ucteOtherNodeCode, UcteVoltageLevel ucteOtherVoltageLevel, - Substation substation, UcteFileName ucteFileName) { + Substation substation, EntsoeFileName ucteFileName) { // transfo connected to a XNODE, create an intermediate YNODE and small impedance line // otherNode--transfo--XNODE => otherNode--transfo--YNODE--line--XNODE String xNodeName = xNodeCode.toString(); @@ -583,7 +583,7 @@ private static TwoWindingsTransformer createXnodeTransfo(UcteNetworkExt ucteNetw .add(); } - private static void createTransformers(UcteNetworkExt ucteNetwork, Network network, UcteFileName ucteFileName) { + private static void createTransformers(UcteNetworkExt ucteNetwork, Network network, EntsoeFileName ucteFileName) { for (UcteTransformer ucteTransfo : ucteNetwork.getTransformers()) { UcteNodeCode nodeCode1 = ucteTransfo.getId().getNodeCode1(); UcteNodeCode nodeCode2 = ucteTransfo.getId().getNodeCode2(); @@ -697,7 +697,7 @@ public Network import_(ReadOnlyDataSource dataSource, Properties parameters) { UcteNetworkExt ucteNetwork = new UcteNetworkExt(new UcteReader().read(reader), LINE_MIN_Z); String fileName = dataSource.getBaseName(); - UcteFileName ucteFileName = UcteFileName.parse(fileName); + EntsoeFileName ucteFileName = EntsoeFileName.parse(fileName); Network network = NetworkFactory.create(fileName, "UCTE"); network.setCaseDate(ucteFileName.getDate()); From 892305c0f6508214e5585c3550d6a82ee4ced05a Mon Sep 17 00:00:00 2001 From: Christian Biasuzzi Date: Tue, 18 Oct 2016 19:47:18 +0200 Subject: [PATCH 3/3] makes sure that the local computation manager tmpDir , defined in config, does really exist. --- .../computation/local/LocalComputationManager.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/computation-local/src/main/java/eu/itesla_project/computation/local/LocalComputationManager.java b/computation-local/src/main/java/eu/itesla_project/computation/local/LocalComputationManager.java index c5389154..03f31b56 100644 --- a/computation-local/src/main/java/eu/itesla_project/computation/local/LocalComputationManager.java +++ b/computation-local/src/main/java/eu/itesla_project/computation/local/LocalComputationManager.java @@ -92,6 +92,8 @@ public LocalComputationManager(LocalComputationConfig config) throws IOException this.config = Objects.requireNonNull(config, "config is null"); status = new LocalComputationResourcesStatus(config.getAvailableCore()); permits = new Semaphore(config.getAvailableCore()); + //make sure the localdir exists + Files.createDirectories(config.getLocalDir()); commonDir = new WorkingDirectory(config.getLocalDir(), "itesla_common_", false); LOGGER.info(config.toString()); }