Rename optimizer to simplifier

powsybl · Dec 13, 2023 · bbfc279 · bbfc279
1 parent 8f82818
commit bbfc279
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzContext.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzContext.java
@@ -75,8 +75,8 @@ public DynaWaltzContext(Network network, String workingVariantId, List<BlackBoxM
         this.parameters = Objects.requireNonNull(parameters);
         this.dynaWaltzParameters = Objects.requireNonNull(dynaWaltzParameters);
 
-        Iterator<ModelOptimizer> dataOptimizers = dynaWaltzParameters.isUseModelOptimizers() ? ServiceLoader.load(ModelOptimizer.class).iterator() : Collections.emptyIterator();
-        this.dynamicModels = runOptimizers(dataOptimizers,
+        Iterator<ModelsSimplifier> dataOptimizers = dynaWaltzParameters.isUseModelOptimizers() ? ServiceLoader.load(ModelsSimplifier.class).iterator() : Collections.emptyIterator();
+        this.dynamicModels = runSimplifiers(dataOptimizers,
                 Objects.requireNonNull(dynamicModels)
                 .stream()
                 .filter(distinctByDynamicId(reporter).and(distinctByStaticId(reporter))),
@@ -114,8 +114,8 @@ private FrequencySynchronizerModel setupFrequencySynchronizer(Function<List<Freq
                 .toList());
     }
 
-    private Stream<BlackBoxModel> runOptimizers(Iterator<ModelOptimizer> dataOptimizers, Stream<BlackBoxModel> inputData, Reporter reporter) {
-        return dataOptimizers.hasNext() ? runOptimizers(dataOptimizers, dataOptimizers.next().optimizeModels(inputData, dynaWaltzParameters, reporter), reporter) : inputData;
+    private Stream<BlackBoxModel> runSimplifiers(Iterator<ModelsSimplifier> dataOptimizers, Stream<BlackBoxModel> inputData, Reporter reporter) {
+        return dataOptimizers.hasNext() ? runSimplifiers(dataOptimizers, dataOptimizers.next().simplifyModels(inputData, dynaWaltzParameters, reporter), reporter) : inputData;
     }
 
     public Network getNetwork() {

diff --git a/...com/powsybl/dynawaltz/ModelOptimizer.java → ...m/powsybl/dynawaltz/ModelsSimplifier.java b/...com/powsybl/dynawaltz/ModelOptimizer.java → ...m/powsybl/dynawaltz/ModelsSimplifier.java
@@ -15,7 +15,7 @@
 /**
  * @author Laurent Issertial <laurent.issertial at rte-france.com>
  */
-public interface ModelOptimizer {
+public interface ModelsSimplifier {
 
-    Stream<BlackBoxModel> optimizeModels(Stream<BlackBoxModel> models, DynaWaltzParameters dynaWaltzParameters, Reporter reporter);
+    Stream<BlackBoxModel> simplifyModels(Stream<BlackBoxModel> models, DynaWaltzParameters dynaWaltzParameters, Reporter reporter);
 }
diff --git a/...powsybl/dynawaltz/ModelOptimizerTest.java → ...wsybl/dynawaltz/ModelsSimplifierTest.java b/...powsybl/dynawaltz/ModelOptimizerTest.java → ...wsybl/dynawaltz/ModelsSimplifierTest.java
@@ -30,16 +30,16 @@
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
  */
-class ModelOptimizerTest {
+class ModelsSimplifierTest {
 
     @Test
-    void loadOptimizer() {
-        List<ModelOptimizer> optimizers = Lists.newArrayList(ServiceLoader.load(ModelOptimizer.class));
-        assertEquals(2, optimizers.size());
+    void loadSimplifiers() {
+        List<ModelsSimplifier> simplifiers = Lists.newArrayList(ServiceLoader.load(ModelsSimplifier.class));
+        assertEquals(2, simplifiers.size());
     }
 
     @Test
-    void optimizeModels() {
+    void simplifyModels() {
         Network network = EurostagTutorialExample1Factory.create();
         DynamicSimulationParameters parameters = DynamicSimulationParameters.load();
         DynaWaltzParameters dynawoParameters = DynaWaltzParameters.load().setUseModelOptimizers(true);
@@ -53,18 +53,18 @@ void optimizeModels() {
         assertTrue(context.getBlackBoxDynamicModelStream().anyMatch(bbm -> bbm.getDynamicModelId().equalsIgnoreCase("newModel")));
     }
 
-    @AutoService(ModelOptimizer.class)
-    public static class ModelOptimizerFilter implements ModelOptimizer {
+    @AutoService(ModelsSimplifier.class)
+    public static class ModelsSimplifierFilter implements ModelsSimplifier {
         @Override
-        public Stream<BlackBoxModel> optimizeModels(Stream<BlackBoxModel> models, DynaWaltzParameters dynaWaltzParameters, Reporter reporter) {
+        public Stream<BlackBoxModel> simplifyModels(Stream<BlackBoxModel> models, DynaWaltzParameters dynaWaltzParameters, Reporter reporter) {
             return models.filter(m -> !m.getDynamicModelId().equalsIgnoreCase("BBM_LOAD"));
         }
     }
 
-    @AutoService(ModelOptimizer.class)
-    public static class ModelOptimizerSubstitution implements ModelOptimizer {
+    @AutoService(ModelsSimplifier.class)
+    public static class ModelsSimplifierSubstitution implements ModelsSimplifier {
         @Override
-        public Stream<BlackBoxModel> optimizeModels(Stream<BlackBoxModel> models, DynaWaltzParameters dynaWaltzParameters, Reporter reporter) {
+        public Stream<BlackBoxModel> simplifyModels(Stream<BlackBoxModel> models, DynaWaltzParameters dynaWaltzParameters, Reporter reporter) {
             return models.map(m -> {
                 if ("BBM_GEN".equalsIgnoreCase(m.getDynamicModelId()) && m instanceof AbstractGenerator gen) {
                     return new GeneratorFictitious("newModel", gen.getEquipment(), "G");