Split modules Maven project

itesla · Sep 29, 2016 · cc952a5 · cc952a5
1 parent c779b7f
commit cc952a5
Show file tree

Hide file tree

Showing 239 changed files with 814 additions and 992 deletions.
diff --git a/...ava/eu/itesla_project/modules/Module.java → ...u/itesla_project/commons/Versionable.java b/...ava/eu/itesla_project/modules/Module.java → ...u/itesla_project/commons/Versionable.java
@@ -4,13 +4,13 @@
  * 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.modules;
+package eu.itesla_project.commons;
 
 /**
  *
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public interface Module {
+public interface Versionable {
 
     String getName();
 

diff --git a/contingency-api/pom.xml b/contingency-api/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2016, 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/.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>itesla-parent</artifactId>
+        <groupId>eu.itesla_project</groupId>
+        <version>0.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>contingency-api</artifactId>
+
+    <name>Contingency API</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>eu.itesla_project</groupId>
+            <artifactId>iidm-network-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/contingency-api/src/main/java/eu/itesla_project/contingency/ContingenciesProvider.java b/contingency-api/src/main/java/eu/itesla_project/contingency/ContingenciesProvider.java
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) 2016, 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.contingency;
+
+import eu.itesla_project.iidm.network.Network;
+
+import java.util.List;
+
+/**
+ * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
+ */
+public interface ContingenciesProvider {
+
+    List<Contingency> getContingencies(Network network);
+
+}
diff --git a/...oject/modules/security/SecurityIssue.java → ...ingency/ContingenciesProviderFactory.java b/...oject/modules/security/SecurityIssue.java → ...ingency/ContingenciesProviderFactory.java
@@ -1,16 +1,15 @@
 /**
- * Copyright (c) 2016, All partners of the iTesla project (http://www.itesla-project.eu/consortium)
+ * Copyright (c) 2016, 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.modules.security;
+package eu.itesla_project.contingency;
 
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public interface SecurityIssue {
-
-    SecurityIssueType getIssueType();
+public interface ContingenciesProviderFactory {
 
+    <T extends ContingenciesProvider> T create();
 }
diff --git a/...ct/modules/contingencies/Contingency.java → ...esla_project/contingency/Contingency.java b/...ct/modules/contingencies/Contingency.java → ...esla_project/contingency/Contingency.java
@@ -4,11 +4,11 @@
  * 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.modules.contingencies;
+package eu.itesla_project.contingency;
 
 import java.util.Collection;
 
-import eu.itesla_project.modules.contingencies.tasks.ModificationTask;
+import eu.itesla_project.contingency.tasks.ModificationTask;
 
 /**
  *
@@ -19,9 +19,7 @@ public interface Contingency {
     String getId();
 
     Collection<ContingencyElement> getElements();
-
-    Collection<String> getZones();
-
+
     ModificationTask toTask();
 
 }
diff --git a/...les/contingencies/ContingencyElement.java → ...oject/contingency/ContingencyElement.java b/...les/contingencies/ContingencyElement.java → ...oject/contingency/ContingencyElement.java
@@ -4,9 +4,9 @@
  * 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.modules.contingencies;
+package eu.itesla_project.contingency;
 
-import eu.itesla_project.modules.contingencies.tasks.ModificationTask;
+import eu.itesla_project.contingency.tasks.ModificationTask;
 
 /**
  *
@@ -19,7 +19,5 @@ public interface ContingencyElement {
     ContingencyElementType getType();
 
     ModificationTask toTask();
-
-
 
 }
diff --git a/...t/modules/security/SecurityIssueType.java → ...t/contingency/ContingencyElementType.java b/...t/modules/security/SecurityIssueType.java → ...t/contingency/ContingencyElementType.java
@@ -4,12 +4,12 @@
  * 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.modules.security;
+package eu.itesla_project.contingency;
 
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public enum SecurityIssueType {
-    LIMIT,
-    POST_CONTINGENCY_RULE
+public enum ContingencyElementType {
+    LINE,
+    GENERATOR
 }
diff --git a/...s/contingencies/impl/ContingencyImpl.java → ..._project/contingency/ContingencyImpl.java b/...s/contingencies/impl/ContingencyImpl.java → ..._project/contingency/ContingencyImpl.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.modules.contingencies.impl;
+package eu.itesla_project.contingency;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -13,10 +13,8 @@
 import java.util.List;
 import java.util.Set;
 
-import eu.itesla_project.modules.contingencies.Contingency;
-import eu.itesla_project.modules.contingencies.ContingencyElement;
-import eu.itesla_project.modules.contingencies.tasks.CompoundModificationTask;
-import eu.itesla_project.modules.contingencies.tasks.ModificationTask;
+import eu.itesla_project.contingency.tasks.CompoundModificationTask;
+import eu.itesla_project.contingency.tasks.ModificationTask;
 
 /**
  *
@@ -27,8 +25,6 @@ public class ContingencyImpl implements Contingency {
     private final String id;
 
     private final List<ContingencyElement> elements;
-
-    private Set<String> zones; 
 
     public ContingencyImpl(String id, ContingencyElement elements) {
         this(id, Arrays.asList(elements));
@@ -37,13 +33,6 @@ public ContingencyImpl(String id, ContingencyElement elements) {
     public ContingencyImpl(String id, List<ContingencyElement> elements) {
         this.id = id;
         this.elements = elements;
-
-    }
-
-    public ContingencyImpl(String id, List<ContingencyElement> elements, List<String> zones) {
-        this.id = id;
-        this.elements = elements;
-        this.zones = new HashSet<String>(zones);
     }
 
     @Override
@@ -55,12 +44,6 @@ public String getId() {
     public Collection<ContingencyElement> getElements() {
         return elements;
     }
-
-    @Override
-    public Collection<String> getZones() 
-    {
-    	return zones;
-    }
 
     @Override
     public ModificationTask toTask() {

diff --git a/...s/contingencies/GeneratorContingency.java → ...ect/contingency/GeneratorContingency.java b/...s/contingencies/GeneratorContingency.java → ...ect/contingency/GeneratorContingency.java
@@ -4,10 +4,10 @@
  * 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.modules.contingencies;
+package eu.itesla_project.contingency;
 
-import eu.itesla_project.modules.contingencies.tasks.GeneratorTripping;
-import eu.itesla_project.modules.contingencies.tasks.ModificationTask;
+import eu.itesla_project.contingency.tasks.GeneratorTripping;
+import eu.itesla_project.contingency.tasks.ModificationTask;
 
 /**
  *

diff --git a/...odules/contingencies/LineContingency.java → ..._project/contingency/LineContingency.java b/...odules/contingencies/LineContingency.java → ..._project/contingency/LineContingency.java
@@ -4,10 +4,10 @@
  * 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.modules.contingencies;
+package eu.itesla_project.contingency;
 
-import eu.itesla_project.modules.contingencies.tasks.BranchTripping;
-import eu.itesla_project.modules.contingencies.tasks.ModificationTask;
+import eu.itesla_project.contingency.tasks.BranchTripping;
+import eu.itesla_project.contingency.tasks.ModificationTask;
 
 /**
  *

diff --git a/...s/contingencies/tasks/BranchTripping.java → ...ect/contingency/tasks/BranchTripping.java b/...s/contingencies/tasks/BranchTripping.java → ...ect/contingency/tasks/BranchTripping.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.modules.contingencies.tasks;
+package eu.itesla_project.contingency.tasks;
 
 import eu.itesla_project.commons.ITeslaException;
 import eu.itesla_project.iidm.network.Network;

diff --git a/...ncies/tasks/CompoundModificationTask.java → ...gency/tasks/CompoundModificationTask.java b/...ncies/tasks/CompoundModificationTask.java → ...gency/tasks/CompoundModificationTask.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.modules.contingencies.tasks;
+package eu.itesla_project.contingency.tasks;
 
 import eu.itesla_project.iidm.network.Network;
 import java.util.Arrays;

diff --git a/...ontingencies/tasks/GeneratorTripping.java → .../contingency/tasks/GeneratorTripping.java b/...ontingencies/tasks/GeneratorTripping.java → .../contingency/tasks/GeneratorTripping.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.modules.contingencies.tasks;
+package eu.itesla_project.contingency.tasks;
 
 import eu.itesla_project.commons.ITeslaException;
 import eu.itesla_project.iidm.network.Generator;

diff --git a/...contingencies/tasks/ModificationTask.java → ...t/contingency/tasks/ModificationTask.java b/...contingencies/tasks/ModificationTask.java → ...t/contingency/tasks/ModificationTask.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.modules.contingencies.tasks;
+package eu.itesla_project.contingency.tasks;
 
 import eu.itesla_project.iidm.network.Network;
 

diff --git a/dymola-integration/pom.xml b/dymola-integration/pom.xml
@@ -70,35 +70,10 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>iidm-network-impl</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>eu.itesla_project.iidm-ddb</groupId>
             <artifactId>iidm-ddb-eurostag-import-export</artifactId>
             <version>0.0.1-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cim1-import</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>computation-local</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>computation-mpi</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -107,7 +82,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>modules</artifactId>
+            <artifactId>simulation-api</artifactId>
             <version>${project.version}</version>
         </dependency>
 

diff --git a/dymola-integration/src/main/java/eu/itesla_project/dymola/DymolaFactory.java b/dymola-integration/src/main/java/eu/itesla_project/dymola/DymolaFactory.java
@@ -7,13 +7,11 @@
 package eu.itesla_project.dymola;
 
 import eu.itesla_project.computation.ComputationManager;
+import eu.itesla_project.contingency.ContingenciesProvider;
 import eu.itesla_project.iidm.network.Network;
-import eu.itesla_project.modules.contingencies.ContingenciesAndActionsDatabaseClient;
-import eu.itesla_project.modules.ddb.DynamicDatabaseClient;
-import eu.itesla_project.modules.ddb.DynamicDatabaseClientFactory;
-import eu.itesla_project.modules.simulation.ImpactAnalysis;
-import eu.itesla_project.modules.simulation.SimulatorFactory;
-import eu.itesla_project.modules.simulation.Stabilization;
+import eu.itesla_project.simulation.ImpactAnalysis;
+import eu.itesla_project.simulation.SimulatorFactory;
+import eu.itesla_project.simulation.Stabilization;
 
 /**
  *
@@ -22,13 +20,13 @@
 public class DymolaFactory implements SimulatorFactory {
 
     @Override
-    public Stabilization createStabilization(Network network, ComputationManager computationManager, int priority, DynamicDatabaseClientFactory ddbClientFactory) {
-        return new DymolaStabilization(network, computationManager, priority, ddbClientFactory);
+    public Stabilization createStabilization(Network network, ComputationManager computationManager, int priority) {
+        return new DymolaStabilization(network, computationManager, priority);
     }
 
     @Override
-    public ImpactAnalysis createImpactAnalysis(Network network, ComputationManager computationManager, int priority, ContingenciesAndActionsDatabaseClient cadbClient) {
-        return new DymolaImpactAnalysis(network, computationManager, priority, cadbClient);
+    public ImpactAnalysis createImpactAnalysis(Network network, ComputationManager computationManager, int priority, ContingenciesProvider contingenciesProvider) {
+        return new DymolaImpactAnalysis(network, computationManager, priority, contingenciesProvider);
     }
 
 }