Bump learnlib-distribution from 0.14.0 to 0.16.0

.github/dependabot.yml

@@ -28,3 +28,4 @@ updates:
     - dependencies
   ignore:
     - dependency-name: "org.uma.jmetal*"
+    - dependency-name: "jmetal-*"

pom.xml

@@ -235,7 +235,7 @@
         <dependency>
             <groupId>de.learnlib.distribution</groupId>
             <artifactId>learnlib-distribution</artifactId>
-            <version>0.14.0</version>
+            <version>0.16.0</version>
             <type>pom</type>
         </dependency>
 
@@ -315,11 +315,24 @@
             <artifactId>jmetal-problem</artifactId>
             <version>5.9</version>
         </dependency>
+
         <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>1.18.20</version>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.jacoco/jacoco-maven-plugin -->
+        <dependency>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <version>0.8.7</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
     </dependencies>
 </project>

src/main/java/org/group_mmm/BlackBoxVerifier.java

@@ -47,7 +47,7 @@ class BlackBoxVerifier {
     private List<MealyMachine<?, String, ?, String>> cexMealy;
     private Alphabet<String> inputAlphabet;
     private LearningAlgorithm.MealyLearner<String, String> learner;
-    private EQOracleChain.MealyEQOracleChain<String, String> eqOracle;
+    private MealyEQOracleChain<String, String> eqOracle;
     private List<String> properties;
     private List<Word<String>> cexInput;
     private List<String> cexProperty;
@@ -95,8 +95,8 @@ class BlackBoxVerifier {
         }
 
         // create an equivalence oracle, that first searches for a counter example using the ltl properties, and next
-        this.eqOracle = new EQOracleChain.MealyEQOracleChain<>(
-                new CExFirstOracle.MealyCExFirstOracle<>(ltlFormulas));
+        this.eqOracle = new MealyEQOracleChain<>(
+                new MealyCExFirstOracle<>(ltlFormulas));
     }
 
     ArrayList<PropertyOracle.MealyPropertyOracle<String, String, String>> getLtlFormulas() {
@@ -113,15 +113,15 @@ public MembershipOracle.MealyMembershipOracle<String, String> getMemOracle() {
     }
 
     void addWpMethodEQOracle(int maxDepth) {
-        addEqOracle(new WpMethodEQOracle.MealyWpMethodEQOracle<>(memOracle, maxDepth));
+        addEqOracle(new MealyWpMethodEQOracle<>(memOracle, maxDepth));
     }
 
     void addBFOracle(double multiplier) {
         addEqOracle(new MealyBFInclusionOracle<>(memOracle, multiplier));
     }
 
     void addRandomWordEQOracle(int minLength, int maxLength, int maxTests, Random random, int batchSize) {
-        addEqOracle(new RandomWordsEQOracle.MealyRandomWordsEQOracle<>(
+        addEqOracle(new MealyRandomWordsEQOracle<>(
                 memOracle, minLength, maxLength, maxTests, random, batchSize));
     }
 
@@ -131,7 +131,7 @@ void addRandomWalkEQOracle(double restartProbability, long maxSteps, Random rand
     }
 
     void addCompleteExplorationEQOracle(int minDepth, int maxDepth, int batchSize) {
-        addEqOracle(new CompleteExplorationEQOracle.MealyCompleteExplorationEQOracle<>(
+        addEqOracle(new MealyCompleteExplorationEQOracle<>(
                 memOracle, minDepth, maxDepth, batchSize));
     }
 

src/main/java/org/group_mmm/SimulinkSULMapper.java

@@ -5,7 +5,7 @@
 import lombok.extern.slf4j.Slf4j;
 import net.automatalib.words.Alphabet;
 import net.automatalib.words.Word;
-import net.automatalib.words.impl.SimpleAlphabet;
+import net.automatalib.words.impl.GrowingMapAlphabet;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -130,10 +130,10 @@ public List<Double> mapConcrete(List<Double> concreteOutput) {
     }
 
     Alphabet<String> constructAbstractAlphabet() {
-        return new SimpleAlphabet<>(this.inputMapper.keySet());
+        return new GrowingMapAlphabet<>(this.inputMapper.keySet());
     }
 
     Alphabet<List<Double>> constructConcreteAlphabet() {
-        return new SimpleAlphabet<>(this.inputMapper.values());
+        return new GrowingMapAlphabet<>(this.inputMapper.values());
     }
 }

src/main/java/org/group_mmm/SimulinkSteadyStateGeneticAlgorithm.java

@@ -22,13 +22,20 @@ public class SimulinkSteadyStateGeneticAlgorithm extends SteadyStateGeneticAlgor
     private EQSearchProblem problem;
     private PropertyOracle.MealyPropertyOracle<String, String, String> ltlOracle;
 
-    SimulinkSteadyStateGeneticAlgorithm(EQSearchProblem problem, int maxEvaluations, int populationSize, CrossoverOperator<IntegerSolution> crossoverOperator, MutationOperator<IntegerSolution> mutationOperator, SelectionOperator<List<IntegerSolution>, IntegerSolution> selectionOperator, SolutionListEvaluator<IntegerSolution> evaluator, PropertyOracle.MealyPropertyOracle<String, String, String> ltlOracle) {
+    SimulinkSteadyStateGeneticAlgorithm(EQSearchProblem problem, int maxEvaluations, int populationSize,
+                                        CrossoverOperator<IntegerSolution> crossoverOperator,
+                                        MutationOperator<IntegerSolution> mutationOperator,
+                                        SelectionOperator<List<IntegerSolution>, IntegerSolution> selectionOperator,
+                                        SolutionListEvaluator<IntegerSolution> evaluator,
+                                        PropertyOracle.MealyPropertyOracle<String, String, String> ltlOracle) {
         super(problem, maxEvaluations, populationSize, crossoverOperator, mutationOperator, selectionOperator);
         this.problem = problem;
         this.ltlOracle = ltlOracle;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     @Override
     protected boolean isStoppingConditionReached() {
         if (super.isStoppingConditionReached()) {
@@ -40,7 +47,7 @@ protected boolean isStoppingConditionReached() {
 
     /**
      * {@inheritDoc}
-     *
+     * <p>
      * Create initial population only for the initial run
      */
     @Override