initial refactorings / cleanups

Author: mtf90

algorithms/active/lstar/pom.xml

@@ -155,7 +155,23 @@ limitations under the License.
                     <configuration>
                         <!-- append to existing argLine to nicely work together with jacoco plugin -->
                         <!-- allow tests access to util and statistics -->
-                        <argLine>@{argLine} --add-reads=de.learnlib.algorithm.lstar=net.automatalib.util --add-reads=de.learnlib.algorithm.lstar=de.learnlib.filter.statistic
+                        <argLine>
+                            @{argLine}
+                            --add-reads=de.learnlib.algorithm.lstar=net.automatalib.util
+                            --add-reads=de.learnlib.algorithm.lstar=de.learnlib.filter.statistic
+                        </argLine>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <configuration>
+                        <!-- append to existing argLine to nicely work together with jacoco plugin -->
+                        <!-- allow tests access to util and statistics -->
+                        <argLine>
+                            @{argLine}
+                            --add-reads=de.learnlib.algorithm.lstar=net.automatalib.util
+                            --add-reads=de.learnlib.algorithm.lstar=de.learnlib.filter.statistic
                         </argLine>
                     </configuration>
                 </plugin>

…thm/lstar/mmlt/LStarLocalTimerMealy.java …ithm/lstar/mmlt/ExtensibleLStarMMLT.javaalgorithms/active/lstar/src/main/java/de/learnlib/algorithm/lstar/mmlt/LStarLocalTimerMealy.java renamed to algorithms/active/lstar/src/main/java/de/learnlib/algorithm/lstar/mmlt/ExtensibleLStarMMLT.java algorithms/active/lstar/src/main/java/de/learnlib/algorithm/lstar/mmlt/LStarLocalTimerMealy.java renamed to algorithms/active/lstar/src/main/java/de/learnlib/algorithm/lstar/mmlt/ExtensibleLStarMMLT.java

@@ -1,6 +1,6 @@
 package de.learnlib.algorithm.lstar.mmlt;
 
-import de.learnlib.algorithm.LocalTimerMealyModelParams;
+import de.learnlib.algorithm.MMLTModelParams;
 import de.learnlib.datastructure.observationtable.Row;
 import net.automatalib.alphabet.Alphabet;
 import net.automatalib.symbol.time.TimedInput;
@@ -20,16 +20,16 @@
  * @param <I> Input type for non-delaying inputs
  * @param <O> Output symbol type
  */
-class LStarLocalTimerMealyHypDataContainer<I, O> {
+class MMLTHypDataContainer<I, O> {
     private final Alphabet<TimedInput<I>> alphabet;
 
-    private final LocalTimerMealyObservationTable<I, O> table;
+    private final MMLTObservationTable<I, O> table;
     private final Map<Word<TimedInput<I>>, TimedOutput<O>> transitionOutputMap;
     private final Set<Word<TimedInput<I>>> transitionResetSet; // all transitions that trigger a reset
 
-    private final LocalTimerMealyModelParams<O> modelParams;
+    private final MMLTModelParams<O> modelParams;
 
-    public LStarLocalTimerMealyHypDataContainer(Alphabet<TimedInput<I>> alphabet, LocalTimerMealyModelParams<O> modelParams, LocalTimerMealyObservationTable<I, O> table) {
+    public MMLTHypDataContainer(Alphabet<TimedInput<I>> alphabet, MMLTModelParams<O> modelParams, MMLTObservationTable<I, O> table) {
         this.alphabet = alphabet;
         this.modelParams = modelParams;
         this.table = table;
@@ -49,7 +49,7 @@ protected TimedOutput<O> getTransitionOutput(Row<TimedInput<I>> stateRow, int in
     }
 
 
-    public LocalTimerMealyModelParams<O> getModelParams() {
+    public MMLTModelParams<O> getModelParams() {
         return modelParams;
     }
 
@@ -58,7 +58,7 @@ public Alphabet<TimedInput<I>> getAlphabet() {
     }
 
 
-    public LocalTimerMealyObservationTable<I, O> getTable() {
+    public MMLTObservationTable<I, O> getTable() {
         return table;
     }
 

algorithms/active/lstar/src/main/java/de/learnlib/algorithm/lstar/mmlt/LocalTimerMealyHypothesisBuilder.java

@@ -0,0 +1,83 @@
+package de.learnlib.algorithm.lstar.mmlt;
+
+import java.util.Map;
+
+import net.automatalib.alphabet.Alphabet;
+import net.automatalib.automaton.mmlt.State;
+import net.automatalib.automaton.mmlt.SymbolCombiner;
+import net.automatalib.automaton.mmlt.impl.CompactMMLT;
+import net.automatalib.symbol.time.TimeStepSequence;
+import net.automatalib.symbol.time.TimedInput;
+import net.automatalib.word.Word;
+
+/**
+ * An MMLT hypothesis that includes a prefix mapping. This mapping assigns a short prefix to each location.
+ *
+ * @param <I>
+ *         Input type for non-delaying inputs
+ * @param <O>
+ *         Output symbol type
+ */
+public class MMLTHypothesis<I, O> extends CompactMMLT<I, O> {
+
+    private final Map<Integer, Word<TimedInput<I>>> prefixMap; // location -> prefix
+
+    MMLTHypothesis(Alphabet<I> alphabet,
+                   int sizeHint,
+                   O silentOuput,
+                   SymbolCombiner<O> outputCombiner,
+                   Map<Integer, Word<TimedInput<I>>> prefixMap) {
+        super(alphabet, sizeHint, silentOuput, outputCombiner);
+        this.prefixMap = prefixMap;
+    }
+
+    /**
+     * Returns the prefix assigned to the provided configuration. The assigned prefix is the concatenation of the prefix
+     * assigned to the active location and the minimal number of time steps needed to reach the configuration after
+     * entering its location (= entry distance).
+     *
+     * @param configuration
+     *         Considered configuration
+     *
+     * @return Assigned prefix
+     */
+    public Word<TimedInput<I>> getPrefix(State<Integer, O> configuration) {
+        var locPrefix = getLocationPrefix(configuration);
+        if (configuration.isEntryConfig()) {
+            return locPrefix; // entry distance = 0
+        } else {
+            return locPrefix.append(new TimeStepSequence<>(configuration.getEntryDistance()));
+        }
+    }
+
+    public Word<TimedInput<I>> getPrefix(Word<TimedInput<I>> prefix) {
+        var resultingConfig = getSemantics().getState(prefix);
+        return getPrefix(resultingConfig);
+    }
+
+    /**
+     * Returns the prefix assigned to the location that is active in the provided configuration.
+     *
+     * @param configuration
+     *         Considered configuration
+     *
+     * @return Assigned prefix
+     */
+    public Word<TimedInput<I>> getLocationPrefix(State<Integer, O> configuration) {
+        var locPrefix = this.prefixMap.get(configuration.getLocation());
+        if (locPrefix == null) {throw new AssertionError();}
+        return locPrefix;
+    }
+
+    /**
+     * Returns a prefix for the given location. This prefix is deterministic in the RS learner.
+     *
+     * @param location
+     *         Location
+     *
+     * @return Location prefix
+     */
+    public Word<TimedInput<I>> getPrefix(Integer location) {
+        return prefixMap.get(location);
+    }
+}