Merge branch 'master' into multistates_test

itesla · Aug 28, 2017 · 00cad8b · 00cad8b
2 parents ec99814 + cd6ba24
commit 00cad8b
Show file tree

Hide file tree

Showing 367 changed files with 2,862 additions and 1,712 deletions.
diff --git a/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ActionDslAstTransformation.java b/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ActionDslAstTransformation.java
@@ -101,4 +101,4 @@ public Expression transform(Expression exp) {
             printAST(blockStatement);
         }
     }
-}
+}
diff --git a/.../dsl/AbstractActionDslLoaderObserver.java → ...n/dsl/DefaultActionDslLoaderObserver.java b/.../dsl/AbstractActionDslLoaderObserver.java → ...n/dsl/DefaultActionDslLoaderObserver.java
@@ -9,7 +9,7 @@
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public class AbstractActionDslLoaderObserver implements ActionDslLoaderObserver {
+public class DefaultActionDslLoaderObserver implements ActionDslLoaderObserver {
     @Override
     public void begin(String dslFile) {
     }

diff --git a/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/DslConstants.java b/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/DslConstants.java
@@ -13,4 +13,4 @@ public interface DslConstants {
 
     String SCRIPT_IS_RUNNING = "scriptIsRunning";
 
-}
+}
diff --git a/...action-dsl/src/main/java/eu/itesla_project/action/dsl/GroovyDslContingenciesProvider.java b/...action-dsl/src/main/java/eu/itesla_project/action/dsl/GroovyDslContingenciesProvider.java
@@ -15,6 +15,7 @@
 
 import java.io.IOException;
 import java.io.Reader;
+import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -39,7 +40,7 @@ public List<Contingency> getContingencies(Network network) {
                     .load(network);
             return ImmutableList.copyOf(actionDb.getContingencies());
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new UncheckedIOException(e);
         }
     }
 }
diff --git a/...ct/action/dsl/ast/BinaryOperatorNode.java → ...n/dsl/ast/AbstractBinaryOperatorNode.java b/...ct/action/dsl/ast/BinaryOperatorNode.java → ...n/dsl/ast/AbstractBinaryOperatorNode.java
@@ -11,13 +11,13 @@
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public abstract class BinaryOperatorNode implements ExpressionNode {
+public abstract class AbstractBinaryOperatorNode implements ExpressionNode {
 
     protected final ExpressionNode left;
 
     protected final ExpressionNode right;
 
-    protected BinaryOperatorNode(ExpressionNode left, ExpressionNode right) {
+    protected AbstractBinaryOperatorNode(ExpressionNode left, ExpressionNode right) {
         this.left = Objects.requireNonNull(left);
         this.right = Objects.requireNonNull(right);
     }

diff --git a/...a_project/action/dsl/ast/LiteralNode.java → ...t/action/dsl/ast/AbstractLiteralNode.java b/...a_project/action/dsl/ast/LiteralNode.java → ...t/action/dsl/ast/AbstractLiteralNode.java
@@ -9,7 +9,7 @@
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public abstract class LiteralNode implements ExpressionNode {
+public abstract class AbstractLiteralNode implements ExpressionNode {
 
     public abstract LiteralType getType();
 

diff --git a/...ect/action/dsl/ast/UnaryOperatorNode.java → ...on/dsl/ast/AbstractUnaryOperatorNode.java b/...ect/action/dsl/ast/UnaryOperatorNode.java → ...on/dsl/ast/AbstractUnaryOperatorNode.java
@@ -11,11 +11,11 @@
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public abstract class UnaryOperatorNode implements ExpressionNode {
+public abstract class AbstractUnaryOperatorNode implements ExpressionNode {
 
     protected final ExpressionNode child;
 
-    protected UnaryOperatorNode(ExpressionNode child) {
+    protected AbstractUnaryOperatorNode(ExpressionNode child) {
         this.child = Objects.requireNonNull(child);
     }
 

diff --git a/...tion-dsl/src/main/java/eu/itesla_project/action/dsl/ast/ArithmeticBinaryOperatorNode.java b/...tion-dsl/src/main/java/eu/itesla_project/action/dsl/ast/ArithmeticBinaryOperatorNode.java
@@ -11,7 +11,7 @@
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public class ArithmeticBinaryOperatorNode extends BinaryOperatorNode {
+public class ArithmeticBinaryOperatorNode extends AbstractBinaryOperatorNode {
 
     private final ArithmeticBinaryOperator operator;
 

diff --git a/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/BigDecimalLiteralNode.java b/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/BigDecimalLiteralNode.java
@@ -11,7 +11,7 @@
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public class BigDecimalLiteralNode extends LiteralNode {
+public class BigDecimalLiteralNode extends AbstractLiteralNode {
 
     private final BigDecimal value;
 

diff --git a/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/BooleanLiteralNode.java b/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/BooleanLiteralNode.java
@@ -9,7 +9,7 @@
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public class BooleanLiteralNode extends LiteralNode {
+public class BooleanLiteralNode extends AbstractLiteralNode {
 
     public static final BooleanLiteralNode TRUE = new BooleanLiteralNode(Boolean.TRUE);
     public static final BooleanLiteralNode FALSE = new BooleanLiteralNode(Boolean.FALSE);

diff --git a/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/ComparisonOperatorNode.java b/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/ComparisonOperatorNode.java
@@ -11,7 +11,7 @@
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public class ComparisonOperatorNode extends BinaryOperatorNode {
+public class ComparisonOperatorNode extends AbstractBinaryOperatorNode {
 
     private final ComparisonOperator operator;
 

diff --git a/...on/dsl/ast/AbstractExpressionVisitor.java → ...ion/dsl/ast/DefaultExpressionVisitor.java b/...on/dsl/ast/AbstractExpressionVisitor.java → ...ion/dsl/ast/DefaultExpressionVisitor.java
@@ -9,7 +9,7 @@
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public class AbstractExpressionVisitor<R, A> implements ExpressionVisitor<R, A> {
+public class DefaultExpressionVisitor<R, A> implements ExpressionVisitor<R, A> {
     @Override
     public R visitComparisonOperator(ComparisonOperatorNode node, A arg) {
         node.getLeft().accept(this, arg);
@@ -38,7 +38,7 @@ public R visitNotOperator(LogicalNotOperator node, A arg) {
     }
 
     @Override
-    public R visitLiteral(LiteralNode node, A arg) {
+    public R visitLiteral(AbstractLiteralNode node, A arg) {
         return null;
     }
 

diff --git a/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/DoubleLiteralNode.java b/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/DoubleLiteralNode.java
@@ -9,7 +9,7 @@
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public class DoubleLiteralNode extends LiteralNode {
+public class DoubleLiteralNode extends AbstractLiteralNode {
 
     private final double value;
 

diff --git a/...ction-dsl/src/main/java/eu/itesla_project/action/dsl/ast/ExpressionActionTakenLister.java b/...ction-dsl/src/main/java/eu/itesla_project/action/dsl/ast/ExpressionActionTakenLister.java
@@ -12,7 +12,7 @@
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public class ExpressionActionTakenLister extends AbstractExpressionVisitor<Void, List<String>> {
+public class ExpressionActionTakenLister extends DefaultExpressionVisitor<Void, List<String>> {
 
     public static List<String> list(ExpressionNode root) {
         List<String> actionIds = new ArrayList<>();

diff --git a/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/ExpressionEvaluator.java b/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/ExpressionEvaluator.java
@@ -18,7 +18,7 @@
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public class ExpressionEvaluator extends AbstractExpressionVisitor<Object, Void> {
+public class ExpressionEvaluator extends DefaultExpressionVisitor<Object, Void> {
 
     private final EvaluationContext context;
 
@@ -31,7 +31,7 @@ public static Object evaluate(ExpressionNode node, EvaluationContext context) {
     }
 
     @Override
-    public Object visitLiteral(LiteralNode node, Void arg) {
+    public Object visitLiteral(AbstractLiteralNode node, Void arg) {
         return node.getValue();
     }
 
@@ -163,7 +163,8 @@ public Object visitContingencyOccurred(ContingencyOccurredNode node, Void arg) {
     /**
      * Utility class to compare loading on one side of a branch to loading of one side of another branch
      */
-    private static class BranchAndSide implements Comparable<BranchAndSide> {
+    private static final class BranchAndSide implements Comparable<BranchAndSide> {
+
         private final TwoTerminalsConnectable branch;
         private final TwoTerminalsConnectable.Side side;
 
@@ -172,11 +173,11 @@ private BranchAndSide(TwoTerminalsConnectable branch, TwoTerminalsConnectable.Si
             this.side = Objects.requireNonNull(side);
         }
 
-        public TwoTerminalsConnectable getBranch() {
+        private TwoTerminalsConnectable getBranch() {
             return branch;
         }
 
-        public TwoTerminalsConnectable.Side getSide() {
+        private TwoTerminalsConnectable.Side getSide() {
             return side;
         }
 
@@ -209,8 +210,8 @@ private static int compare(BranchAndSide branchAndSide1, BranchAndSide branchAnd
                 c = 1;
             } else { // overload1 != null && overload2 != null
                 // first compare acceptable duration
-                c = - Integer.compare(overload1.getTemporaryLimit().getAcceptableDuration(),
-                                      overload2.getTemporaryLimit().getAcceptableDuration());
+                c = -Integer.compare(overload1.getTemporaryLimit().getAcceptableDuration(),
+                                     overload2.getTemporaryLimit().getAcceptableDuration());
                 if (c == 0) {
                     // and then overload based on temporary limit
                     c = compare(i1 / overload1.getTemporaryLimit().getValue(),

diff --git a/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/ExpressionHelper.java b/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/ExpressionHelper.java
@@ -12,7 +12,7 @@
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public class ExpressionHelper {
+public final class ExpressionHelper {
 
     private ExpressionHelper() {
     }

diff --git a/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/ExpressionPrinter.java b/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/ExpressionPrinter.java
@@ -11,14 +11,15 @@
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.StringWriter;
+import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Iterator;
 import java.util.Objects;
 
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public class ExpressionPrinter extends AbstractExpressionVisitor<Void, Void> {
+public class ExpressionPrinter extends DefaultExpressionVisitor<Void, Void> {
 
     private final PrintStream out;
 
@@ -30,7 +31,7 @@ public static String toString(ExpressionNode node) {
             try {
                 writer.close();
             } catch (IOException e) {
-                throw new RuntimeException(e);
+                throw new UncheckedIOException(e);
             }
         }
         return writer.toString();
@@ -101,7 +102,7 @@ public Void visitNetworkMethod(NetworkMethodNode node, Void arg) {
     }
 
     @Override
-    public Void visitLiteral(LiteralNode node, Void arg) {
+    public Void visitLiteral(AbstractLiteralNode node, Void arg) {
         out.print(node.getValue().toString());
         return null;
     }

diff --git a/...n/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/ExpressionVariableLister.java b/...n/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/ExpressionVariableLister.java
@@ -12,7 +12,7 @@
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public class ExpressionVariableLister extends AbstractExpressionVisitor<Void, List<NetworkNode>> {
+public class ExpressionVariableLister extends DefaultExpressionVisitor<Void, List<NetworkNode>> {
 
     public static List<NetworkNode> list(ExpressionNode root) {
         List<NetworkNode> variables = new ArrayList<>();

diff --git a/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/ExpressionVisitor.java b/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/ExpressionVisitor.java
@@ -11,7 +11,7 @@
  */
 public interface ExpressionVisitor<R, A> {
 
-    R visitLiteral(LiteralNode node, A arg);
+    R visitLiteral(AbstractLiteralNode node, A arg);
 
     R visitNetworkComponent(NetworkComponentNode node, A arg);
 

diff --git a/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/FloatLiteralNode.java b/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/FloatLiteralNode.java
@@ -9,7 +9,7 @@
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public class FloatLiteralNode extends LiteralNode {
+public class FloatLiteralNode extends AbstractLiteralNode {
 
     private final float value;
 

diff --git a/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/IntegerLiteralNode.java b/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/IntegerLiteralNode.java
@@ -9,7 +9,7 @@
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public class IntegerLiteralNode extends LiteralNode {
+public class IntegerLiteralNode extends AbstractLiteralNode {
 
     private final int value;
 

diff --git a/.../action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/LogicalBinaryOperatorNode.java b/.../action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/LogicalBinaryOperatorNode.java
@@ -11,7 +11,7 @@
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public class LogicalBinaryOperatorNode extends BinaryOperatorNode {
+public class LogicalBinaryOperatorNode extends AbstractBinaryOperatorNode {
 
     private final LogicalBinaryOperator operator;
 

diff --git a/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/LogicalNotOperator.java b/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/LogicalNotOperator.java
@@ -9,7 +9,7 @@
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public class LogicalNotOperator extends UnaryOperatorNode {
+public class LogicalNotOperator extends AbstractUnaryOperatorNode {
 
     public LogicalNotOperator(ExpressionNode child) {
         super(child);

diff --git a/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/StringLiteralNode.java b/action/action-dsl/src/main/java/eu/itesla_project/action/dsl/ast/StringLiteralNode.java
@@ -9,7 +9,7 @@
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public class StringLiteralNode extends LiteralNode {
+public class StringLiteralNode extends AbstractLiteralNode {
 
     private final String value;
 

diff --git a/action/action-dsl/src/test/java/eu/itesla_project/action/dsl/ActionDbTest.java b/action/action-dsl/src/test/java/eu/itesla_project/action/dsl/ActionDbTest.java
@@ -32,7 +32,7 @@ public void testContigencies() {
         try {
             actionDb.getContingency("id2");
             fail();
-        } catch (RuntimeException e) {
+        } catch (RuntimeException ignored) {
         }
     }
 
@@ -57,7 +57,7 @@ public void testActions() {
         try {
             actionDb.getAction("id2");
             fail();
-        } catch (RuntimeException e) {
+        } catch (RuntimeException ignored) {
         }
     }
 }
diff --git a/action/action-dsl/src/test/java/eu/itesla_project/action/dsl/ActionTest.java b/action/action-dsl/src/test/java/eu/itesla_project/action/dsl/ActionTest.java
@@ -53,7 +53,7 @@ private void testInvalid(String id, List<ModificationTask> tasks) {
         try {
             new Action(id, tasks);
             fail();
-        } catch (NullPointerException exc) {
+        } catch (NullPointerException ignored) {
         }
     }
 

diff --git a/action/action-dsl/src/test/java/eu/itesla_project/action/dsl/ConditionDslLoaderTest.java b/action/action-dsl/src/test/java/eu/itesla_project/action/dsl/ConditionDslLoaderTest.java
@@ -98,8 +98,8 @@ public void testCondition() throws IOException {
         loadAndAssert("true", "true");
         loadAndAssert("false", "true && false");
         for (String op : Arrays.asList("&&", "||")) {
-             loadAndAssert("(line('NHV1_NHV2_1').overloaded " + op + " true)", "line('NHV1_NHV2_1').overloaded " + op + " true");
-             loadAndAssert("(true " + op + " line('NHV1_NHV2_1').overloaded)", "true " + op + " line('NHV1_NHV2_1').overloaded");
+            loadAndAssert("(line('NHV1_NHV2_1').overloaded " + op + " true)", "line('NHV1_NHV2_1').overloaded " + op + " true");
+            loadAndAssert("(true " + op + " line('NHV1_NHV2_1').overloaded)", "true " + op + " line('NHV1_NHV2_1').overloaded");
         }
         loadAndAssert("false", "!true");
         loadAndAssert("!(line('NHV1_NHV2_1').overloaded)", "!line('NHV1_NHV2_1').overloaded");
@@ -347,4 +347,4 @@ public void testActionTakenLister() {
         assertTrue(actions.contains("action1"));
         assertTrue(actions.contains("action2"));
     }
-}
+}
diff --git a/...on-dsl/src/test/java/eu/itesla_project/action/dsl/GroovyDslContingenciesProviderTest.java b/...on-dsl/src/test/java/eu/itesla_project/action/dsl/GroovyDslContingenciesProviderTest.java
@@ -87,4 +87,4 @@ public void testAutomaticList() throws IOException {
         assertEquals(2, contingencies.size());
         assertEquals(Sets.newHashSet("NHV1_NHV2_1", "NHV1_NHV2_2"), contingencies.stream().map(Contingency::getId).collect(Collectors.toSet()));
     }
-}
+}
diff --git a/action/action-dsl/src/test/java/eu/itesla_project/action/dsl/RuleTest.java b/action/action-dsl/src/test/java/eu/itesla_project/action/dsl/RuleTest.java
@@ -51,7 +51,7 @@ private void testInvalid(String id, Condition condition, int life, List<String>
         try {
             new Rule(id, condition, life, actions);
             fail();
-        } catch (RuntimeException e) {
+        } catch (RuntimeException ignored) {
         }
 
     }

diff --git a/...tractLoadFlowActionSimulatorObserver.java → ...faultLoadFlowActionSimulatorObserver.java b/...tractLoadFlowActionSimulatorObserver.java → ...faultLoadFlowActionSimulatorObserver.java
@@ -17,7 +17,7 @@
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public class AbstractLoadFlowActionSimulatorObserver implements LoadFlowActionSimulatorObserver {
+public class DefaultLoadFlowActionSimulatorObserver implements LoadFlowActionSimulatorObserver {
     @Override
     public void beforePreContingencyAnalysis(Network network) {
     }