Merge branch 'master' into stat_analysis

.travis.yml

@@ -16,7 +16,7 @@ install:
 
 script:
 - cd ${TRAVIS_BUILD_DIR}
-- mvn clean test jacoco:report coveralls:report
+- mvn clean verify jacoco:report coveralls:report
 
 addons:
   ssh_known_hosts: sftp.dc0.gpaas.net

EU2Mod_MB/src/main/java/itesla/converter/Block.java

@@ -23,11 +23,11 @@ public class Block {
     public Integer count;
     public List<Boolean> UsedInputPins = new ArrayList<Boolean>();
 
-    public Block(String[] param, String[] entries, String output, Integer GraphicalNumber, Integer idEu, Integer cont, Integer nInputPins) {
+    public Block(String[] param, String[] entries, String output, Integer graphicalNumber, Integer idEu, Integer cont, Integer nInputPins) {
         this.param = param;
         this.entries = entries;
         this.output = output;
-        this.GraphicalNumber = GraphicalNumber;
+        this.GraphicalNumber = graphicalNumber;
         this.idEu = idEu;
         this.count = cont;
         for (int i = 0; i < nInputPins; i++) {

EU2Mod_MB/src/main/java/itesla/converter/EU_MBparser.java

@@ -41,8 +41,8 @@ public class EU_MBparser {
      * nLinks: number of links.
      * link: nLinks x 3 array. Each row is a link: the output block and the input block.
      */
-    public EU_MBparser(File EUfile) {
-        this.EUfile = EUfile;
+    public EU_MBparser(File euFile) {
+        this.EUfile = euFile;
         try {
             parser();
         } catch (IOException e) {

EU2Mod_MB/src/main/java/itesla/converter/ModelicaModel.java

@@ -59,11 +59,11 @@ public class ModelicaModel {
      * init_friParameters: string list with the name of the parameters in the .fri.
      * init_InterfaceParameters: string list with the name of the initialization variables of the interface variables.
      */
-    public ModelicaModel(Block[] Blocks, Integer[][] Link, String pathEu, Hashtable<Integer, Element> CT, ParParser parData) {
-        this.Blocks = Blocks;
-        this.Link = Link;
+    public ModelicaModel(Block[] blocks, Integer[][] link, String pathEu, Hashtable<Integer, Element> correspondenceTable, ParParser parData) {
+        this.Blocks = blocks;
+        this.Link = link;
         this.pathEu = pathEu;
-        this.CT = CT;
+        this.CT = correspondenceTable;
         this.parData = parData;
         this.outputHeading = "";
         this.outputEnd = "";
@@ -80,7 +80,7 @@ public ModelicaModel(Block[] Blocks, Integer[][] Link, String pathEu, Hashtable<
         this.interfaceVariables = new HashMap<String, String>();
         this.init_friParameters = new ArrayList<String>();
         this.init_InterfaceParameters = new ArrayList<String>();
-        this.LinksBlocksId1 = new int[Blocks.length][7];
+        this.LinksBlocksId1 = new int[blocks.length][7];
 
         Heading();
         paramDeclaration();

checkstyle.xml

@@ -33,6 +33,9 @@
         <module name="NeedBraces"/>
         <module name="NoWhitespaceAfter"/>
         <module name="NoWhitespaceBefore"/>
+        <module name="OuterTypeFilename"/>
+        <module name="ParameterAssignment"/>
+        <module name="ParameterName"/>
         <module name="ParenPad"/>
         <module name="RedundantImport"/>
         <module name="RightCurly"/>

dymola-integration/src/main/java/eu/itesla_project/dymola/DymolaAdaptersMatParamsWriter.java

@@ -70,9 +70,9 @@ public List<MLArray> underovervoltageMLArray(Double p, Double d) {
         return mlarray;
     }
 
-    public List<MLArray> smallsignalMLArray(Double step_min, Double var_min, Double f1, Double f2, Double d1, Double d2, Double d3, Double nm, Double fInstant, Double fDuration) {
-        MLDouble mStepMin = new MLDouble("step_min", new double[]{step_min}, 1);
-        MLDouble mVarMin = new MLDouble("var_min", new double[]{var_min}, 1);
+    public List<MLArray> smallsignalMLArray(Double stepMin, Double varMin, Double f1, Double f2, Double d1, Double d2, Double d3, Double nm, Double fInstant, Double fDuration) {
+        MLDouble mStepMin = new MLDouble("step_min", new double[]{stepMin}, 1);
+        MLDouble mVarMin = new MLDouble("var_min", new double[]{varMin}, 1);
         MLDouble mF = new MLDouble("f", new double[]{f1, f2}, 1);
         MLDouble mD = new MLDouble("d", new double[]{d1, d2, d3}, 1);
         MLDouble mNm = new MLDouble("Nm", new double[]{nm}, 1);

eurostag-ech-export/src/main/java/eu/itesla_project/iidm/eurostag/export/BranchParallelIndexes.java

@@ -63,13 +63,14 @@ private BranchParallelIndexes(Map<String, Character> parallelIndexes) {
     }
 
     private static char incParallelIndex(char index) {
-        if (index == 'Z') {
+        char idx = index;
+        if (idx == 'Z') {
             throw new RuntimeException("Number max of parallel index reached");
         }
-        if (index == '9') {
+        if (idx == '9') {
             return 'A';
         } else {
-            return ++index;
+            return ++idx;
         }
     }
 

eurostag-step-up-transformer/pom.xml

@@ -62,6 +62,11 @@
         </dependency>
 
         <!-- Test dependencies -->
+        <dependency>
+            <groupId>com.google.jimfs</groupId>
+            <artifactId>jimfs</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-iidm-impl</artifactId>

eurostag-step-up-transformer/src/main/java/eu/itesla_project/iidm/ddb/eurostag/EurostagDDB.java

@@ -7,43 +7,66 @@
 package eu.itesla_project.iidm.ddb.eurostag;
 
 import java.io.IOException;
+import java.nio.file.FileVisitOption;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  *
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
 class EurostagDDB {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(EurostagDDB.class);
+
     private final Map<String, Path> generators = new HashMap<>();
 
     EurostagDDB(List<Path> ddbDirs) throws IOException {
         for (Path ddbDir : ddbDirs) {
+            ddbDir = readSymbolicLink(ddbDir);
             if (!Files.exists(ddbDir) && !Files.isDirectory(ddbDir)) {
                 throw new IllegalArgumentException(ddbDir + " must exist and be a dir");
             }
-            Files.walkFileTree(ddbDir, new SimpleFileVisitor<Path>() {
+            Files.walkFileTree(ddbDir, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, new SimpleFileVisitor<Path>() {
                 @Override
                 public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-                    if (Files.isRegularFile(file) && file.toString().endsWith(".tg")) {
-                        String fileName = file.getFileName().toString();
-                        generators.put(fileName.substring(0, fileName.length() - 3), file);
+                    String fileName = file.getFileName().toString();
+                    Path tmpfile = readSymbolicLink(file);
+                    if (Files.isDirectory(tmpfile)) {
+                        Files.walkFileTree(tmpfile, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, this);
+                    } else if (Files.isRegularFile(tmpfile) && fileName.endsWith(".tg")) {
+                        String key = fileName.substring(0, fileName.length() - 3);
+                        if (generators.containsKey(key)) {
+                            LOGGER.warn("the processing has detected that the file {} is present in {} and {}", fileName, tmpfile, generators.get(key));
+                        }
+                        generators.put(key, tmpfile);
                     }
                     return super.visitFile(file, attrs);
                 }
             });
         }
     }
 
-    Path findGenerator(String idDdb) throws IOException {
+    Path findGenerator(String idDdb) {
         return generators.get(idDdb);
     }
 
+    private static Path readSymbolicLink(Path link) throws IOException {
+        Path path = link;
+        while (Files.isSymbolicLink(path)) {
+            path = Files.readSymbolicLink(path);
+        }
+        return path;
+    }
+
 }

eurostag-step-up-transformer/src/main/java/eu/itesla_project/iidm/ddb/eurostag/EurostagStepUpTransformerInserter.java

@@ -1,15 +1,13 @@
 /**
  * Copyright (c) 2016, All partners of the iTesla project (http://www.itesla-project.eu/consortium)
+ * Copyright (c) 2017, RTE (http://www.rte-france.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
  * 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.iidm.ddb.eurostag;
 
 import com.powsybl.computation.ComputationManager;
-import eu.itesla_project.iidm.ddb.eurostag.model.PowerFlow;
-import eu.itesla_project.iidm.ddb.eurostag.model.StateVariable;
-import eu.itesla_project.iidm.ddb.eurostag.model.TransformerModel;
 import com.powsybl.iidm.network.*;
 import com.powsybl.iidm.network.ReactiveCapabilityCurve.Point;
 import com.powsybl.iidm.network.util.Identifiables;
@@ -18,6 +16,9 @@
 import com.powsybl.loadflow.LoadFlowFactory;
 import com.powsybl.loadflow.LoadFlowParameters;
 import com.powsybl.loadflow.LoadFlowResult;
+import eu.itesla_project.iidm.ddb.eurostag.model.PowerFlow;
+import eu.itesla_project.iidm.ddb.eurostag.model.StateVariable;
+import eu.itesla_project.iidm.ddb.eurostag.model.TransformerModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,7 +40,7 @@ public class EurostagStepUpTransformerInserter {
 
     private final static float SB = 100;
     private final static float ACCEPTABLE_VOLTAGE_DIFF = 0.1f;
-    private final static float INFINITE_REACTIVE_LIMIT = 9999f;
+    private final static float INFINITE_REACTIVE_LIMIT = 99999f;
 
     public enum InsertionStatus {
         OK("ok"),
@@ -301,7 +302,7 @@ private static void fillGeneratorState(Generator g, StateVariable sv) {
     }
 
     private static Generator moveGenerator(Generator srcGen, StateVariable srcSv, VoltageLevel destVl, Bus destBus, boolean connected,
-                                           Function<StateVariable, StateVariable> fct, EurostagStepUpTransformerConfig config) {
+                                           Function<StateVariable, StateVariable> fct, EurostagStepUpTransformerConfig config, TwoWindingsTransformer twt) {
 
         fillGeneratorState(srcGen, srcSv);
 
@@ -367,6 +368,17 @@ private static Generator moveGenerator(Generator srcGen, StateVariable srcSv, Vo
                         float newP = (float) -fct.apply(new StateVariable(-point.getP(), 0, srcSv.u, srcSv.theta)).p;
                         float newMinQ = config.isNoReactiveLimits() ? -INFINITE_REACTIVE_LIMIT : (float) -fct.apply(new StateVariable(srcSv.p, -point.getMinQ(), srcSv.u, srcSv.theta)).q;
                         float newMaxQ = config.isNoReactiveLimits() ? INFINITE_REACTIVE_LIMIT : (float) -fct.apply(new StateVariable(srcSv.p, -point.getMaxQ(), srcSv.u, srcSv.theta)).q;
+
+                        //test if the step-up transformer impedance is compatible with the reactive limit bounds: the maximun nominal power with a very high
+                        //short-circuit power should be higher than the reactive bounds. If not, remove the bounds
+                        float sMax = computeMaxRate(twt);
+                        if ((sMax < Math.abs(newMinQ)) || (sMax < Math.abs(newMaxQ))) {
+                            LOGGER.warn("Infinite limit mode activated for '{}': either abs({}) or abs({}) higher than {} (maximum nominal power with a short-circuit power of 40%)",
+                                    lvGen.getId(), newMinQ, newMaxQ, sMax);
+                            newMinQ = -INFINITE_REACTIVE_LIMIT;
+                            newMaxQ = INFINITE_REACTIVE_LIMIT;
+                        }
+
                         LOGGER.trace("Resizing reactive limits of '{}': [{}, {}] -> [{}, {}]",
                                 lvGen.getId(), point.getMinQ(), point.getMaxQ(), newMinQ, newMaxQ);
                         rcca.beginPoint()
@@ -455,13 +467,27 @@ public static InsertionStatus insert(Generator hvGen, TG tg, IdDictionary auxDic
         Function<StateVariable, StateVariable> fct = sv -> toLvGenPf(transformerModel, sv, hvAuxPf, lvAuxPf);
 
         StateVariable hvGenSv = new StateVariable();
-        moveGenerator(hvGen, hvGenSv, lvVl, lvBus, hvGenBus != null, fct, config);
+        moveGenerator(hvGen, hvGenSv, lvVl, lvBus, hvGenBus != null, fct, config, twt);
 
         stateBefore.injections.put(twt.getId(), new PowerFlow((float) (hvGenSv.p + hvAuxPf.p), (float) (hvGenSv.q + hvAuxPf.q)));
 
         return InsertionStatus.OK;
     }
 
+    /**
+     * Compute a reasonable maximum nominal power ('rate') for a TwoWindingsTransformer
+     * with a very high short-circuit power of 40%
+     *
+     * @param twt two winding transformer
+     * @return maximum nominal power
+     */
+    private static float computeMaxRate(TwoWindingsTransformer twt) {
+        Objects.requireNonNull(twt);
+        VoltageLevel u2 = twt.getTerminal2().getVoltageLevel();
+        float z = SV.getX(twt);
+        return 0.4f * (float) Math.pow(u2.getNominalV(), 2) / z;
+    }
+
     public static InsertionStatus insert(Generator g, Path ddbFile, IdDictionary auxDict, EurostagStepUpTransformerConfig config, StateBefore stateBefore) throws IOException {
         if (!Files.exists(ddbFile) && !Files.isRegularFile(ddbFile)) {
             throw new IllegalArgumentException(ddbFile + " must exist and be a file");
@@ -612,7 +638,7 @@ public void visitThreeWindingsTransformer(ThreeWindingsTransformer transformer,
                     boolean connected = twt.getTerminal1().isConnected() && twt.getTerminal2().isConnected() && lvGen.getTerminal().isConnected();
 
                     StateVariable lvGenSv = new StateVariable();
-                    moveGenerator(lvGen, lvGenSv, hvVl, hvBus, connected, fct, config);
+                    moveGenerator(lvGen, lvGenSv, hvVl, hvBus, connected, fct, config, twt);
                 }
 
                 for (Load aux : auxLs) {

eurostag-step-up-transformer/src/test/java/eu/itesla_project/iidm/ddb/eurostag/EurostagDDBTest.java

@@ -0,0 +1,76 @@
+package eu.itesla_project.iidm.ddb.eurostag;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.io.IOException;
+import java.nio.file.FileSystem;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.junit.Test;
+
+import com.google.common.jimfs.Configuration;
+import com.google.common.jimfs.Jimfs;
+
+public class EurostagDDBTest {
+
+    @Test
+    public void testEurostagDDB() throws IOException {
+        try (FileSystem fs = Jimfs.newFileSystem(Configuration.unix())) {
+            Path folder1 = Files.createDirectory(fs.getPath("/folder1"));
+            Path folder2 = Files.createDirectory(fs.getPath("/folder2"));
+            Path folder3 = Files.createDirectory(fs.getPath("/folder3"));
+
+            Path generator1 = Files.createFile(folder1.resolve("generator1.tg"));
+            Path generator2 = Files.createFile(folder1.resolve("generator2.tg"));
+
+            Files.createFile(folder2.resolve("generator3.tg.bck"));
+            Path link = Files.createSymbolicLink(folder2.resolve("folder3"), folder3);
+
+            Path generator4 = Files.createFile(link.resolve("generator4.tg"));
+            Path dataFile = Files.createFile(folder3.resolve("generator.data"));
+            Files.createSymbolicLink(folder3.resolve("generator5.tg"), dataFile);
+
+            EurostagDDB eurostagDDB = new EurostagDDB(Arrays.asList(folder1, folder2));
+            assertEquals(generator1, eurostagDDB.findGenerator("generator1"));
+            assertEquals(generator2, eurostagDDB.findGenerator("generator2"));
+            assertNull(eurostagDDB.findGenerator("generator3"));
+            assertEquals(generator4, eurostagDDB.findGenerator("generator4"));
+            assertEquals(dataFile, eurostagDDB.findGenerator("generator5"));
+        }
+    }
+
+    @Test
+    public void testLinkFiles() throws IOException {
+        try (FileSystem fs = Jimfs.newFileSystem(Configuration.unix())) {
+            Path folder = Files.createDirectory(fs.getPath("/tmp"));
+            Path dataFile = Files.createFile(folder.resolve("generator.data"));
+            Files.createSymbolicLink(folder.resolve("generator1.tg"), dataFile);
+            Files.createSymbolicLink(folder.resolve("generator2.tg"), dataFile);
+            Files.createSymbolicLink(folder.resolve("generator3.tg"), dataFile);
+            Path generator4 = Files.createFile(folder.resolve("generator4.tg"));
+
+            EurostagDDB eurostagDDB = new EurostagDDB(Collections.singletonList(folder));
+            assertEquals(dataFile, eurostagDDB.findGenerator("generator1"));
+            assertEquals(dataFile, eurostagDDB.findGenerator("generator2"));
+            assertEquals(dataFile, eurostagDDB.findGenerator("generator3"));
+            assertEquals(generator4, eurostagDDB.findGenerator("generator4"));
+        }
+    }
+
+    @Test
+    public void testLinkDirectory() throws IOException {
+        try (FileSystem fs = Jimfs.newFileSystem(Configuration.unix())) {
+            Path folder = Files.createDirectory(fs.getPath("/folder"));
+            Path file = Files.createFile(folder.resolve("generator.tg"));
+            Path linkFolder = Files.createSymbolicLink(fs.getPath("/work/folder.link"), folder);
+
+            EurostagDDB eurostagDDB = new EurostagDDB(Collections.singletonList(linkFolder));
+            assertEquals(file, eurostagDDB.findGenerator("generator"));
+        }
+    }
+
+}

fpf-integration/src/main/java/eu/itesla_project/fpf_integration/Converter.java

@@ -975,6 +975,7 @@ private static void printPowerSystemDataCFPFFormat(String outputFilePath, String
 
 
     // Main
+    @SuppressWarnings("checkstyle:parameterassignment")
     public static void main(String[] args) {
 
         // ********************************** Initializations ********************************** //