fixes cut naming strategy (making it dico-values aware)

itesla · Dec 14, 2017 · 856c992 · 856c992
1 parent 30fec2a
commit 856c992
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/...xport/src/main/java/eu/itesla_project/iidm/eurostag/export/CutEurostagNamingStrategy.java b/...xport/src/main/java/eu/itesla_project/iidm/eurostag/export/CutEurostagNamingStrategy.java
@@ -9,6 +9,8 @@
 
 import com.google.common.base.Strings;
 
+import java.util.Collections;
+import java.util.Objects;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -17,6 +19,18 @@
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
 public class CutEurostagNamingStrategy implements EurostagNamingStrategy {
+
+    private Set<String> forbiddenEsgIds;
+
+    public CutEurostagNamingStrategy() {
+        forbiddenEsgIds = Collections.emptySet();
+    }
+
+    public CutEurostagNamingStrategy(final Set<String> forbiddenEsgIds) {
+        Objects.requireNonNull(forbiddenEsgIds);
+        this.forbiddenEsgIds = forbiddenEsgIds;
+    }
+
     @Override
     public void fillDictionary(EurostagDictionary dictionary, NameType nameType, Set<String> iidmIds) {
         EurostagEchExportConfig config = dictionary.getConfig();
@@ -40,7 +54,7 @@ private String getEsgId(EurostagDictionary dictionary, NameType nameType, String
             esgId = esgId.replaceAll(regex, repl);
         }
         int counter = 0;
-        while (dictionary.esgIdExists(esgId)) {
+        while (dictionary.esgIdExists(esgId) || forbiddenEsgIds.contains(esgId)) {
             String counterStr = Integer.toString(counter++);
             if (counterStr.length() > nameType.getLength()) {
                 throw new RuntimeException("Renaming fatal error " + iidmId + " -> " + esgId);

diff --git a/...port/src/main/java/eu/itesla_project/iidm/eurostag/export/DicoEurostagNamingStrategy.java b/...port/src/main/java/eu/itesla_project/iidm/eurostag/export/DicoEurostagNamingStrategy.java
@@ -30,7 +30,7 @@ public class DicoEurostagNamingStrategy implements EurostagNamingStrategy {
 
     private BiMap<String, String> dicoMap = HashBiMap.create();
 
-    private final CutEurostagNamingStrategy defaultStrategy = new CutEurostagNamingStrategy();
+    private final CutEurostagNamingStrategy defaultStrategy;
 
     class DicoCsvReader {
 
@@ -91,6 +91,7 @@ public DicoEurostagNamingStrategy(Path dicoFile) {
                 }
                 dicoMap.put(iidmId, esgId);
             }
+            defaultStrategy = new CutEurostagNamingStrategy(new HashSet(dicoMap.values()));
         }
     }