From 77187228e52ebe4f53a1eea8df0dc303d3ebd47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20T=C3=A5quist?= Date: Fri, 13 Mar 2026 11:37:13 +0100 Subject: [PATCH 1/6] Rename RaStar to SLStar --- .../de/learnlib/ralib/ct/CTAutomatonBuilder.java | 8 ++++---- src/main/java/de/learnlib/ralib/ct/CTPath.java | 10 +++++----- .../de/learnlib/ralib/ct/ClassificationTree.java | 6 +++--- .../learnlib/ralib/learning/AutomatonBuilder.java | 10 +++++----- .../de/learnlib/ralib/learning/ralambda/SLCT.java | 4 ++-- .../de/learnlib/ralib/learning/rastar/Row.java | 2 +- .../learning/rastar/{RaStar.java => SLStar.java} | 8 ++++---- .../de/learnlib/ralib/tools/ClassAnalyzer.java | 4 ++-- .../java/de/learnlib/ralib/tools/IOSimulator.java | 4 ++-- .../ralib/RaLibLearningExperimentRunner.java | 4 ++-- .../de/learnlib/ralib/ct/CTConsistencyTest.java | 14 +++++++------- .../learning/rastar/LearnBoundedListTest.java | 2 +- .../ralib/learning/rastar/LearnLoginTest.java | 2 +- .../ralib/learning/rastar/LearnMixedIOTest.java | 2 +- .../ralib/learning/rastar/LearnPQIOTest.java | 2 +- .../ralib/learning/rastar/LearnPQTest.java | 2 +- .../learning/rastar/LearnPalindromeIOTest.java | 2 +- .../ralib/learning/rastar/LearnRepeaterTest.java | 2 +- .../ralib/learning/rastar/LearnSipIOTest.java | 2 +- 19 files changed, 45 insertions(+), 45 deletions(-) rename src/main/java/de/learnlib/ralib/learning/rastar/{RaStar.java => SLStar.java} (97%) diff --git a/src/main/java/de/learnlib/ralib/ct/CTAutomatonBuilder.java b/src/main/java/de/learnlib/ralib/ct/CTAutomatonBuilder.java index 39fded4d3..395658cea 100644 --- a/src/main/java/de/learnlib/ralib/ct/CTAutomatonBuilder.java +++ b/src/main/java/de/learnlib/ralib/ct/CTAutomatonBuilder.java @@ -23,7 +23,7 @@ import de.learnlib.ralib.data.VarMapping; import de.learnlib.ralib.data.util.SymbolicDataValueGenerator.ParameterGenerator; import de.learnlib.ralib.learning.AutomatonBuilder; -import de.learnlib.ralib.learning.rastar.RaStar; +import de.learnlib.ralib.learning.rastar.SLStar; import de.learnlib.ralib.oracles.Branching; import de.learnlib.ralib.smt.ConstraintSolver; import de.learnlib.ralib.smt.ReplacingValuesVisitor; @@ -91,13 +91,13 @@ public CTHypothesis buildHypothesis() { private void computeLocations() { // compute initial location - CTLeaf initial = ct.getLeaf(RaStar.EMPTY_PREFIX); + CTLeaf initial = ct.getLeaf(SLStar.EMPTY_PREFIX); RALocation l0 = hyp.addInitialState(initial.isAccepting()); - locations.put(RaStar.EMPTY_PREFIX, l0); + locations.put(SLStar.EMPTY_PREFIX, l0); for (Word sp : initial.getShortPrefixes()) { locations.put(sp, l0); } - hyp.setAccessSequence(l0, RaStar.EMPTY_PREFIX); + hyp.setAccessSequence(l0, SLStar.EMPTY_PREFIX); leaves.put(initial, l0); // compute non-initial locations diff --git a/src/main/java/de/learnlib/ralib/ct/CTPath.java b/src/main/java/de/learnlib/ralib/ct/CTPath.java index 8b9247f7d..855bb5bfe 100644 --- a/src/main/java/de/learnlib/ralib/ct/CTPath.java +++ b/src/main/java/de/learnlib/ralib/ct/CTPath.java @@ -9,7 +9,7 @@ import de.learnlib.ralib.data.DataValue; import de.learnlib.ralib.data.util.DataUtils; import de.learnlib.ralib.learning.SymbolicSuffix; -import de.learnlib.ralib.learning.rastar.RaStar; +import de.learnlib.ralib.learning.rastar.SLStar; import de.learnlib.ralib.oracles.TreeOracle; import de.learnlib.ralib.smt.ConstraintSolver; import de.learnlib.ralib.theory.SDT; @@ -54,7 +54,7 @@ public Map getSDTs() { } public boolean isAccepting() { - SDT s = sdts.get(RaStar.EMPTY_SUFFIX); + SDT s = sdts.get(SLStar.EMPTY_SUFFIX); return s.isAccepting(); } @@ -136,9 +136,9 @@ private static boolean equalTypeSizes(Set s1, Set s2) { */ public static CTPath computePath(TreeOracle oracle, Prefix prefix, List suffixes, boolean ioMode) { CTPath r = new CTPath(ioMode); - SDT sdt = prefix.getSDT(RaStar.EMPTY_SUFFIX); - sdt = sdt == null ? oracle.treeQuery(prefix, RaStar.EMPTY_SUFFIX) : sdt; - r.putSDT(RaStar.EMPTY_SUFFIX, sdt); + SDT sdt = prefix.getSDT(SLStar.EMPTY_SUFFIX); + sdt = sdt == null ? oracle.treeQuery(prefix, SLStar.EMPTY_SUFFIX) : sdt; + r.putSDT(SLStar.EMPTY_SUFFIX, sdt); for (SymbolicSuffix s : suffixes) { sdt = prefix.getSDT(s); if (sdt == null) { diff --git a/src/main/java/de/learnlib/ralib/ct/ClassificationTree.java b/src/main/java/de/learnlib/ralib/ct/ClassificationTree.java index b611595fb..1ba4d79fa 100644 --- a/src/main/java/de/learnlib/ralib/ct/ClassificationTree.java +++ b/src/main/java/de/learnlib/ralib/ct/ClassificationTree.java @@ -21,7 +21,7 @@ import de.learnlib.ralib.data.util.RemappingIterator; import de.learnlib.ralib.data.util.SymbolicDataValueGenerator.ParameterGenerator; import de.learnlib.ralib.learning.SymbolicSuffix; -import de.learnlib.ralib.learning.rastar.RaStar; +import de.learnlib.ralib.learning.rastar.SLStar; import de.learnlib.ralib.oracles.Branching; import de.learnlib.ralib.oracles.TreeOracle; import de.learnlib.ralib.oracles.mto.OptimizedSymbolicSuffixBuilder; @@ -79,7 +79,7 @@ public ClassificationTree(TreeOracle oracle, shortPrefixes = new LinkedHashSet<>(); outputs = outputSuffixes(inputs); - root = new CTInnerNode(null, RaStar.EMPTY_SUFFIX); + root = new CTInnerNode(null, SLStar.EMPTY_SUFFIX); } public Set getLeaves() { @@ -169,7 +169,7 @@ public Set> getExtensions(Word u, Paramet * Initialize the classification tree by sifting the empty prefix. */ public void initialize() { - sift(RaStar.EMPTY_PREFIX); + sift(SLStar.EMPTY_PREFIX); } /////////////////////////////////////////// diff --git a/src/main/java/de/learnlib/ralib/learning/AutomatonBuilder.java b/src/main/java/de/learnlib/ralib/learning/AutomatonBuilder.java index 670fe1bca..221d58d00 100644 --- a/src/main/java/de/learnlib/ralib/learning/AutomatonBuilder.java +++ b/src/main/java/de/learnlib/ralib/learning/AutomatonBuilder.java @@ -30,7 +30,7 @@ import de.learnlib.ralib.data.*; import de.learnlib.ralib.data.SymbolicDataValue.Parameter; import de.learnlib.ralib.data.SymbolicDataValue.Register; -import de.learnlib.ralib.learning.rastar.RaStar; +import de.learnlib.ralib.learning.rastar.SLStar; import de.learnlib.ralib.oracles.Branching; import de.learnlib.ralib.smt.ReplacingValuesVisitor; import de.learnlib.ralib.smt.SMTUtil; @@ -71,14 +71,14 @@ public Hypothesis toRegisterAutomaton() { } private void computeLocations() { - LocationComponent c = components.get(RaStar.EMPTY_PREFIX); + LocationComponent c = components.get(SLStar.EMPTY_PREFIX); LOGGER.debug(Category.EVENT, "{0}", c); RALocation loc = this.automaton.addInitialState(c.isAccepting()); - this.locations.put(RaStar.EMPTY_PREFIX, loc); - this.automaton.setAccessSequence(loc, RaStar.EMPTY_PREFIX); + this.locations.put(SLStar.EMPTY_PREFIX, loc); + this.automaton.setAccessSequence(loc, SLStar.EMPTY_PREFIX); for (Entry, LocationComponent> e : this.components.entrySet()) { - if (!e.getKey().equals(RaStar.EMPTY_PREFIX)) { + if (!e.getKey().equals(SLStar.EMPTY_PREFIX)) { LOGGER.debug(Category.EVENT, "{0}", e.getValue()); loc = this.automaton.addState(e.getValue().isAccepting()); this.locations.put(e.getKey(), loc); diff --git a/src/main/java/de/learnlib/ralib/learning/ralambda/SLCT.java b/src/main/java/de/learnlib/ralib/learning/ralambda/SLCT.java index 9e56a8c5e..f52a635ad 100644 --- a/src/main/java/de/learnlib/ralib/learning/ralambda/SLCT.java +++ b/src/main/java/de/learnlib/ralib/learning/ralambda/SLCT.java @@ -21,7 +21,7 @@ import de.learnlib.ralib.learning.RaLearningAlgorithm; import de.learnlib.ralib.learning.RaLearningAlgorithmName; import de.learnlib.ralib.learning.rastar.CEAnalysisResult; -import de.learnlib.ralib.learning.rastar.RaStar; +import de.learnlib.ralib.learning.rastar.SLStar; import de.learnlib.ralib.oracles.SDTLogicOracle; import de.learnlib.ralib.oracles.TreeOracle; import de.learnlib.ralib.oracles.TreeOracleFactory; @@ -72,7 +72,7 @@ public SLCT(TreeOracle sulOracle, TreeOracleFactory hypOracleFactory, SDTLogicOr counterexamples = new ArrayDeque<>(); hyp = null; ct = new ClassificationTree(sulOracle, solver, restrictionBuilder, suffixBuilder, consts, ioMode, inputs); - ct.sift(RaStar.EMPTY_PREFIX); + ct.sift(SLStar.EMPTY_PREFIX); } @Override diff --git a/src/main/java/de/learnlib/ralib/learning/rastar/Row.java b/src/main/java/de/learnlib/ralib/learning/rastar/Row.java index 516a78494..2ef86d6be 100644 --- a/src/main/java/de/learnlib/ralib/learning/rastar/Row.java +++ b/src/main/java/de/learnlib/ralib/learning/rastar/Row.java @@ -227,7 +227,7 @@ static Row computeRow(TreeOracle oracle, } boolean isAccepting() { - Cell c = this.cells.get(RaStar.EMPTY_SUFFIX); + Cell c = this.cells.get(SLStar.EMPTY_SUFFIX); return c.isAccepting(); } diff --git a/src/main/java/de/learnlib/ralib/learning/rastar/RaStar.java b/src/main/java/de/learnlib/ralib/learning/rastar/SLStar.java similarity index 97% rename from src/main/java/de/learnlib/ralib/learning/rastar/RaStar.java rename to src/main/java/de/learnlib/ralib/learning/rastar/SLStar.java index b1125873e..76ea0be5f 100644 --- a/src/main/java/de/learnlib/ralib/learning/rastar/RaStar.java +++ b/src/main/java/de/learnlib/ralib/learning/rastar/SLStar.java @@ -49,7 +49,7 @@ * * @author falk */ -public class RaStar implements RaLearningAlgorithm { +public class SLStar implements RaLearningAlgorithm { public static final Word EMPTY_PREFIX = Word.epsilon(); @@ -75,9 +75,9 @@ public class RaStar implements RaLearningAlgorithm { private final boolean ioMode; - private static final Logger LOGGER = LoggerFactory.getLogger(RaStar.class); + private static final Logger LOGGER = LoggerFactory.getLogger(SLStar.class); - public RaStar(TreeOracle oracle, TreeOracleFactory hypOracleFactory, + public SLStar(TreeOracle oracle, TreeOracleFactory hypOracleFactory, SDTLogicOracle sdtLogicOracle, Constants consts, boolean ioMode, ParameterizedSymbol ... inputs) { @@ -100,7 +100,7 @@ public RaStar(TreeOracle oracle, TreeOracleFactory hypOracleFactory, this.hypOracleFactory = hypOracleFactory; } - public RaStar(TreeOracle oracle, TreeOracleFactory hypOracleFactory, + public SLStar(TreeOracle oracle, TreeOracleFactory hypOracleFactory, SDTLogicOracle sdtLogicOracle, Constants consts, ParameterizedSymbol ... inputs) { diff --git a/src/main/java/de/learnlib/ralib/tools/ClassAnalyzer.java b/src/main/java/de/learnlib/ralib/tools/ClassAnalyzer.java index f9e546ab8..35b9aaafe 100644 --- a/src/main/java/de/learnlib/ralib/tools/ClassAnalyzer.java +++ b/src/main/java/de/learnlib/ralib/tools/ClassAnalyzer.java @@ -39,7 +39,7 @@ import de.learnlib.ralib.learning.RaLearningAlgorithm; import de.learnlib.ralib.learning.ralambda.SLCT; import de.learnlib.ralib.learning.ralambda.SLLambda; -import de.learnlib.ralib.learning.rastar.RaStar; +import de.learnlib.ralib.learning.rastar.SLStar; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.TreeOracle; @@ -246,7 +246,7 @@ public TreeOracle createTreeOracle(RegisterAutomaton hyp) { this.rastar = switch (this.learner) { case AbstractToolWithRandomWalk.LEARNER_SLSTAR -> - new RaStar(mto, hypFactory, mlo, consts, true, actions); + new SLStar(mto, hypFactory, mlo, consts, true, actions); case AbstractToolWithRandomWalk.LEARNER_SLLAMBDA -> new SLLambda(mto, teachers, consts, true, solver, actions); case AbstractToolWithRandomWalk.LEARNER_RADT -> diff --git a/src/main/java/de/learnlib/ralib/tools/IOSimulator.java b/src/main/java/de/learnlib/ralib/tools/IOSimulator.java index c8711fdf5..b3189fbc4 100644 --- a/src/main/java/de/learnlib/ralib/tools/IOSimulator.java +++ b/src/main/java/de/learnlib/ralib/tools/IOSimulator.java @@ -39,7 +39,7 @@ import de.learnlib.ralib.learning.RaLearningAlgorithm; import de.learnlib.ralib.learning.ralambda.SLCT; import de.learnlib.ralib.learning.ralambda.SLLambda; -import de.learnlib.ralib.learning.rastar.RaStar; +import de.learnlib.ralib.learning.rastar.SLStar; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.TreeOracle; @@ -215,7 +215,7 @@ public TreeOracle createTreeOracle(RegisterAutomaton hyp) { this.rastar = switch (this.learner) { case AbstractToolWithRandomWalk.LEARNER_SLSTAR -> - new RaStar(mto, hypFactory, mlo, consts, true, actions); + new SLStar(mto, hypFactory, mlo, consts, true, actions); case AbstractToolWithRandomWalk.LEARNER_SLLAMBDA -> new SLLambda(mto, teachers, consts, true, solver, actions); case AbstractToolWithRandomWalk.LEARNER_RADT -> diff --git a/src/test/java/de/learnlib/ralib/RaLibLearningExperimentRunner.java b/src/test/java/de/learnlib/ralib/RaLibLearningExperimentRunner.java index 73f6420d9..f7b48037c 100644 --- a/src/test/java/de/learnlib/ralib/RaLibLearningExperimentRunner.java +++ b/src/test/java/de/learnlib/ralib/RaLibLearningExperimentRunner.java @@ -20,7 +20,7 @@ import de.learnlib.ralib.learning.RaLearningAlgorithmName; import de.learnlib.ralib.learning.ralambda.SLCT; import de.learnlib.ralib.learning.ralambda.SLLambda; -import de.learnlib.ralib.learning.rastar.RaStar; +import de.learnlib.ralib.learning.rastar.SLStar; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.TreeOracleFactory; import de.learnlib.ralib.oracles.mto.MultiTheorySDTLogicOracle; @@ -115,7 +115,7 @@ public Hypothesis run(RaLearningAlgorithmName algorithmName, DataWordOracle data RaLearningAlgorithm learner; learner = switch (algorithmName) { case RASTAR -> - new RaStar(mto, hypFactory, mlo, consts, ioMode, actionSymbols); + new SLStar(mto, hypFactory, mlo, consts, ioMode, actionSymbols); case RALAMBDA -> new SLLambda(mto, teachers, consts, ioMode, solver, actionSymbols); case RADT -> diff --git a/src/test/java/de/learnlib/ralib/ct/CTConsistencyTest.java b/src/test/java/de/learnlib/ralib/ct/CTConsistencyTest.java index c874fa506..a52d34d56 100644 --- a/src/test/java/de/learnlib/ralib/ct/CTConsistencyTest.java +++ b/src/test/java/de/learnlib/ralib/ct/CTConsistencyTest.java @@ -27,7 +27,7 @@ import de.learnlib.ralib.data.SymbolicDataValue.Register; import de.learnlib.ralib.data.VarMapping; import de.learnlib.ralib.learning.SymbolicSuffix; -import de.learnlib.ralib.learning.rastar.RaStar; +import de.learnlib.ralib.learning.rastar.SLStar; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.mto.MultiTheoryTreeOracle; @@ -270,17 +270,17 @@ public void testRegisterConsistency() { new PSymbolInstance(BETA, dv2), new PSymbolInstance(BETA, dv1)); - SymbolicSuffix sa = new SymbolicSuffix(RaStar.EMPTY_PREFIX, a0); - SymbolicSuffix sb = new SymbolicSuffix(RaStar.EMPTY_PREFIX, b0); - SymbolicSuffix sab = new SymbolicSuffix(RaStar.EMPTY_PREFIX, a0b1); + SymbolicSuffix sa = new SymbolicSuffix(SLStar.EMPTY_PREFIX, a0); + SymbolicSuffix sb = new SymbolicSuffix(SLStar.EMPTY_PREFIX, b0); + SymbolicSuffix sab = new SymbolicSuffix(SLStar.EMPTY_PREFIX, a0b1); SymbolicSuffix sbb = new SymbolicSuffix(a0a1, b2b1); ClassificationTree ct = new ClassificationTree(mto, solver, restrBuilder, suffixBuilder, consts, false, ALPHA, BETA); ct.initialize(); - ct.refine(ct.getLeaf(RaStar.EMPTY_PREFIX), sa); - ct.refine(ct.getLeaf(RaStar.EMPTY_PREFIX), sb); - ct.refine(ct.getLeaf(RaStar.EMPTY_PREFIX), sab); + ct.refine(ct.getLeaf(SLStar.EMPTY_PREFIX), sa); + ct.refine(ct.getLeaf(SLStar.EMPTY_PREFIX), sb); + ct.refine(ct.getLeaf(SLStar.EMPTY_PREFIX), sab); ct.sift(a0a1a0); ct.sift(a0a1); diff --git a/src/test/java/de/learnlib/ralib/learning/rastar/LearnBoundedListTest.java b/src/test/java/de/learnlib/ralib/learning/rastar/LearnBoundedListTest.java index 0110aaeba..7d518c92d 100644 --- a/src/test/java/de/learnlib/ralib/learning/rastar/LearnBoundedListTest.java +++ b/src/test/java/de/learnlib/ralib/learning/rastar/LearnBoundedListTest.java @@ -78,7 +78,7 @@ private Hypothesis learnBoundedListDWOracle(int size, boolean useNull, Word alphabet = Arrays.asList(INSERT, PUSH, POP); - RaStar rastar = new RaStar(mto, hypFactory, mlo, consts, false, + SLStar rastar = new SLStar(mto, hypFactory, mlo, consts, false, alphabet.toArray(new ParameterizedSymbol[alphabet.size()])); rastar.learn(); diff --git a/src/test/java/de/learnlib/ralib/learning/rastar/LearnLoginTest.java b/src/test/java/de/learnlib/ralib/learning/rastar/LearnLoginTest.java index 9283e2d56..99812031a 100644 --- a/src/test/java/de/learnlib/ralib/learning/rastar/LearnLoginTest.java +++ b/src/test/java/de/learnlib/ralib/learning/rastar/LearnLoginTest.java @@ -76,7 +76,7 @@ public void testLearnLoginExample() { new MultiTheoryTreeOracle(new SimulatorOracle(hyp), teachers, new Constants(), solver); - RaStar rastar = new RaStar(mto, hypFactory, slo, + SLStar rastar = new SLStar(mto, hypFactory, slo, consts, I_LOGIN, I_LOGOUT, I_REGISTER); rastar.learn(); diff --git a/src/test/java/de/learnlib/ralib/learning/rastar/LearnMixedIOTest.java b/src/test/java/de/learnlib/ralib/learning/rastar/LearnMixedIOTest.java index eb034c382..7d15f3978 100644 --- a/src/test/java/de/learnlib/ralib/learning/rastar/LearnMixedIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/rastar/LearnMixedIOTest.java @@ -107,7 +107,7 @@ public void testLearnMixedIO() { TreeOracleFactory hypFactory = (RegisterAutomaton hyp) -> new MultiTheoryTreeOracle(new SimulatorOracle(hyp), teachers, consts, solver); - RaStar rastar = new RaStar(mto, hypFactory, mlo, consts, true, actions); + SLStar rastar = new SLStar(mto, hypFactory, mlo, consts, true, actions); IORandomWalk iowalk = new IORandomWalk(random, sul, diff --git a/src/test/java/de/learnlib/ralib/learning/rastar/LearnPQIOTest.java b/src/test/java/de/learnlib/ralib/learning/rastar/LearnPQIOTest.java index 367431205..72a52412a 100644 --- a/src/test/java/de/learnlib/ralib/learning/rastar/LearnPQIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/rastar/LearnPQIOTest.java @@ -82,7 +82,7 @@ public void testLearnLoginExampleIO() { TreeOracleFactory hypFactory = (RegisterAutomaton hyp) -> new MultiTheoryTreeOracle(new SimulatorOracle(hyp), teachers, consts, solver); - RaStar rastar = new RaStar(mto, hypFactory, mlo, + SLStar rastar = new SLStar(mto, hypFactory, mlo, consts, true, sul.getActionSymbols()); IORandomWalk iowalk = new IORandomWalk(random, diff --git a/src/test/java/de/learnlib/ralib/learning/rastar/LearnPQTest.java b/src/test/java/de/learnlib/ralib/learning/rastar/LearnPQTest.java index 085d5eb9b..cf9ae62f3 100644 --- a/src/test/java/de/learnlib/ralib/learning/rastar/LearnPQTest.java +++ b/src/test/java/de/learnlib/ralib/learning/rastar/LearnPQTest.java @@ -72,7 +72,7 @@ public void testPQExample() { TreeOracleFactory hypFactory = (RegisterAutomaton hyp) -> new MultiTheoryTreeOracle(new SimulatorOracle(hyp), teachers, new Constants(), solver); - RaStar rastar = new RaStar(mto, hypFactory, mlo, consts, OFFER, POLL); + SLStar rastar = new SLStar(mto, hypFactory, mlo, consts, OFFER, POLL); rastar.learn(); RegisterAutomaton hyp = rastar.getHypothesis(); logger.log(Level.FINE, "HYP1: {0}", hyp); diff --git a/src/test/java/de/learnlib/ralib/learning/rastar/LearnPalindromeIOTest.java b/src/test/java/de/learnlib/ralib/learning/rastar/LearnPalindromeIOTest.java index 992094866..64f1ba408 100644 --- a/src/test/java/de/learnlib/ralib/learning/rastar/LearnPalindromeIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/rastar/LearnPalindromeIOTest.java @@ -94,7 +94,7 @@ public void testLearnPalindromeIO() { TreeOracleFactory hypFactory = (RegisterAutomaton hyp) -> new MultiTheoryTreeOracle(new SimulatorOracle(hyp), teachers, consts, solver); - RaStar rastar = new RaStar(mto, hypFactory, mlo, consts, true, actions); + SLStar rastar = new SLStar(mto, hypFactory, mlo, consts, true, actions); IOEquivalenceTest ioEquiv = new IOEquivalenceTest( model, teachers, consts, true, actions); diff --git a/src/test/java/de/learnlib/ralib/learning/rastar/LearnRepeaterTest.java b/src/test/java/de/learnlib/ralib/learning/rastar/LearnRepeaterTest.java index 0e2bb5883..4d3055e45 100644 --- a/src/test/java/de/learnlib/ralib/learning/rastar/LearnRepeaterTest.java +++ b/src/test/java/de/learnlib/ralib/learning/rastar/LearnRepeaterTest.java @@ -61,7 +61,7 @@ public void testLearnRepeater() { Measurements measurements = new Measurements(); QueryStatistics stats = new QueryStatistics(measurements, ioOracle); - RaStar learner = new RaStar(mto, hypFactory, mlo, consts, true, sul.getActionSymbols()); + SLStar learner = new SLStar(mto, hypFactory, mlo, consts, true, sul.getActionSymbols()); learner.setStatisticCounter(stats); learner.learn(); diff --git a/src/test/java/de/learnlib/ralib/learning/rastar/LearnSipIOTest.java b/src/test/java/de/learnlib/ralib/learning/rastar/LearnSipIOTest.java index cf843e318..c501ecc79 100644 --- a/src/test/java/de/learnlib/ralib/learning/rastar/LearnSipIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/rastar/LearnSipIOTest.java @@ -106,7 +106,7 @@ public void testLearnSipIO() { TreeOracleFactory hypFactory = (RegisterAutomaton hyp) -> new MultiTheoryTreeOracle(new SimulatorOracle(hyp), teachers, consts, solver); - RaStar rastar = new RaStar(mto, hypFactory, mlo, consts, true, actions); + SLStar rastar = new SLStar(mto, hypFactory, mlo, consts, true, actions); IOEquivalenceTest ioEquiv = new IOEquivalenceTest(model, teachers, consts, true, actions); From 51d961bf87e708d020d5e6a2f70814151f9b1d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20T=C3=A5quist?= Date: Fri, 13 Mar 2026 11:41:46 +0100 Subject: [PATCH 2/6] Rename rastar and ralambda packages --- .../de/learnlib/ralib/ct/CTAutomatonBuilder.java | 6 +++--- src/main/java/de/learnlib/ralib/ct/CTPath.java | 6 +++--- .../de/learnlib/ralib/ct/ClassificationTree.java | 2 +- .../learnlib/ralib/learning/AutomatonBuilder.java | 2 +- .../ralib/learning/CounterexampleAnalysis.java | 2 +- .../ralib/learning/{ralambda => sllambda}/SLCT.java | 6 +++--- .../learning/{ralambda => sllambda}/SLLambda.java | 2 +- .../{rastar => slstar}/CEAnalysisResult.java | 2 +- .../ralib/learning/{rastar => slstar}/Cell.java | 2 +- .../learning/{rastar => slstar}/Component.java | 2 +- .../{rastar => slstar}/ObservationTable.java | 2 +- .../ralib/learning/{rastar => slstar}/Row.java | 2 +- .../ralib/learning/{rastar => slstar}/SLStar.java | 2 +- .../java/de/learnlib/ralib/tools/ClassAnalyzer.java | 6 +++--- .../java/de/learnlib/ralib/tools/IOSimulator.java | 6 +++--- .../ralib/RaLibLearningExperimentRunner.java | 6 +++--- .../de/learnlib/ralib/ct/CTConsistencyTest.java | 2 +- .../{ralambda => sllambda}/IOHandlingTest.java | 13 +++++++------ .../{ralambda => sllambda}/LearnABPOutputTest.java | 3 ++- .../{ralambda => sllambda}/LearnArrayListTest.java | 3 ++- .../{ralambda => sllambda}/LearnDtlsServerTest.java | 2 +- .../{ralambda => sllambda}/LearnEchoTest.java | 3 ++- .../{ralambda => sllambda}/LearnLoginTest.java | 3 ++- .../{ralambda => sllambda}/LearnMixedIOTest.java | 3 ++- .../{ralambda => sllambda}/LearnPQIOTest.java | 3 ++- .../{ralambda => sllambda}/LearnPQTest.java | 3 ++- .../{ralambda => sllambda}/LearnPadlock.java | 3 ++- .../LearnPalindromeIOTest.java | 3 ++- .../{ralambda => sllambda}/LearnRepeaterTest.java | 3 ++- .../{ralambda => sllambda}/LearnSipIOTest.java | 3 ++- .../{ralambda => sllambda}/LearnStackTest.java | 3 ++- .../TestDistinguishingSuffixOptimization.java | 3 ++- .../{ralambda => sllambda}/TestOutputSuffixes.java | 3 ++- .../{ralambda => sllambda}/TestQueryCount.java | 3 ++- .../TestSuffixOptimization.java | 3 ++- .../{ralambda => sllambda}/TestSymmetry.java | 3 ++- .../TestUnknownMemorable.java | 3 ++- .../ralib/learning/{rastar => slstar}/CellTest.java | 3 ++- .../{rastar => slstar}/LearnBoundedListTest.java | 3 ++- .../learning/{rastar => slstar}/LearnLoginTest.java | 3 ++- .../{rastar => slstar}/LearnMixedIOTest.java | 3 ++- .../learning/{rastar => slstar}/LearnPQIOTest.java | 3 ++- .../learning/{rastar => slstar}/LearnPQTest.java | 3 ++- .../{rastar => slstar}/LearnPalindromeIOTest.java | 3 ++- .../{rastar => slstar}/LearnRepeaterTest.java | 3 ++- .../learning/{rastar => slstar}/LearnSipIOTest.java | 3 ++- .../learning/{rastar => slstar}/LoggingOracle.java | 2 +- .../ralib/learning/{rastar => slstar}/RowTest.java | 3 ++- 48 files changed, 94 insertions(+), 65 deletions(-) rename src/main/java/de/learnlib/ralib/learning/{ralambda => sllambda}/SLCT.java (97%) rename src/main/java/de/learnlib/ralib/learning/{ralambda => sllambda}/SLLambda.java (99%) rename src/main/java/de/learnlib/ralib/learning/{rastar => slstar}/CEAnalysisResult.java (97%) rename src/main/java/de/learnlib/ralib/learning/{rastar => slstar}/Cell.java (98%) rename src/main/java/de/learnlib/ralib/learning/{rastar => slstar}/Component.java (99%) rename src/main/java/de/learnlib/ralib/learning/{rastar => slstar}/ObservationTable.java (99%) rename src/main/java/de/learnlib/ralib/learning/{rastar => slstar}/Row.java (99%) rename src/main/java/de/learnlib/ralib/learning/{rastar => slstar}/SLStar.java (99%) rename src/test/java/de/learnlib/ralib/learning/{ralambda => sllambda}/IOHandlingTest.java (96%) rename src/test/java/de/learnlib/ralib/learning/{ralambda => sllambda}/LearnABPOutputTest.java (98%) rename src/test/java/de/learnlib/ralib/learning/{ralambda => sllambda}/LearnArrayListTest.java (98%) rename src/test/java/de/learnlib/ralib/learning/{ralambda => sllambda}/LearnDtlsServerTest.java (98%) rename src/test/java/de/learnlib/ralib/learning/{ralambda => sllambda}/LearnEchoTest.java (96%) rename src/test/java/de/learnlib/ralib/learning/{ralambda => sllambda}/LearnLoginTest.java (98%) rename src/test/java/de/learnlib/ralib/learning/{ralambda => sllambda}/LearnMixedIOTest.java (98%) rename src/test/java/de/learnlib/ralib/learning/{ralambda => sllambda}/LearnPQIOTest.java (98%) rename src/test/java/de/learnlib/ralib/learning/{ralambda => sllambda}/LearnPQTest.java (98%) rename src/test/java/de/learnlib/ralib/learning/{ralambda => sllambda}/LearnPadlock.java (98%) rename src/test/java/de/learnlib/ralib/learning/{ralambda => sllambda}/LearnPalindromeIOTest.java (97%) rename src/test/java/de/learnlib/ralib/learning/{ralambda => sllambda}/LearnRepeaterTest.java (97%) rename src/test/java/de/learnlib/ralib/learning/{ralambda => sllambda}/LearnSipIOTest.java (97%) rename src/test/java/de/learnlib/ralib/learning/{ralambda => sllambda}/LearnStackTest.java (98%) rename src/test/java/de/learnlib/ralib/learning/{ralambda => sllambda}/TestDistinguishingSuffixOptimization.java (98%) rename src/test/java/de/learnlib/ralib/learning/{ralambda => sllambda}/TestOutputSuffixes.java (97%) rename src/test/java/de/learnlib/ralib/learning/{ralambda => sllambda}/TestQueryCount.java (97%) rename src/test/java/de/learnlib/ralib/learning/{ralambda => sllambda}/TestSuffixOptimization.java (98%) rename src/test/java/de/learnlib/ralib/learning/{ralambda => sllambda}/TestSymmetry.java (99%) rename src/test/java/de/learnlib/ralib/learning/{ralambda => sllambda}/TestUnknownMemorable.java (99%) rename src/test/java/de/learnlib/ralib/learning/{rastar => slstar}/CellTest.java (97%) rename src/test/java/de/learnlib/ralib/learning/{rastar => slstar}/LearnBoundedListTest.java (97%) rename src/test/java/de/learnlib/ralib/learning/{rastar => slstar}/LearnLoginTest.java (97%) rename src/test/java/de/learnlib/ralib/learning/{rastar => slstar}/LearnMixedIOTest.java (98%) rename src/test/java/de/learnlib/ralib/learning/{rastar => slstar}/LearnPQIOTest.java (98%) rename src/test/java/de/learnlib/ralib/learning/{rastar => slstar}/LearnPQTest.java (97%) rename src/test/java/de/learnlib/ralib/learning/{rastar => slstar}/LearnPalindromeIOTest.java (98%) rename src/test/java/de/learnlib/ralib/learning/{rastar => slstar}/LearnRepeaterTest.java (97%) rename src/test/java/de/learnlib/ralib/learning/{rastar => slstar}/LearnSipIOTest.java (98%) rename src/test/java/de/learnlib/ralib/learning/{rastar => slstar}/LoggingOracle.java (98%) rename src/test/java/de/learnlib/ralib/learning/{rastar => slstar}/RowTest.java (97%) diff --git a/src/main/java/de/learnlib/ralib/ct/CTAutomatonBuilder.java b/src/main/java/de/learnlib/ralib/ct/CTAutomatonBuilder.java index 395658cea..9e7ca46ce 100644 --- a/src/main/java/de/learnlib/ralib/ct/CTAutomatonBuilder.java +++ b/src/main/java/de/learnlib/ralib/ct/CTAutomatonBuilder.java @@ -23,7 +23,7 @@ import de.learnlib.ralib.data.VarMapping; import de.learnlib.ralib.data.util.SymbolicDataValueGenerator.ParameterGenerator; import de.learnlib.ralib.learning.AutomatonBuilder; -import de.learnlib.ralib.learning.rastar.SLStar; +import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.Branching; import de.learnlib.ralib.smt.ConstraintSolver; import de.learnlib.ralib.smt.ReplacingValuesVisitor; @@ -41,8 +41,8 @@ * Builder class for building a {@link CTHypothesis} from a {@link ClassificationTree}. * This class implements similar functionality as {@link AutomatonBuilder} and * {@link de.learnlib.ralib.learning.IOAutomatonBuilder}, - * but tailored for the {@link de.learnlib.ralib.learning.ralambda.SLLambda} and - * {@link de.learnlib.ralib.learning.ralambda.SLCT} learning algorithms. + * but tailored for the {@link de.learnlib.ralib.learning.sllambda.SLLambda} and + * {@link de.learnlib.ralib.learning.sllambda.SLCT} learning algorithms. * * {@code CTAutomatonBuilder} supports construction of automata from an incomplete classification tree, * so long as the classification tree is closed and consistent. diff --git a/src/main/java/de/learnlib/ralib/ct/CTPath.java b/src/main/java/de/learnlib/ralib/ct/CTPath.java index 855bb5bfe..fa34ea8ff 100644 --- a/src/main/java/de/learnlib/ralib/ct/CTPath.java +++ b/src/main/java/de/learnlib/ralib/ct/CTPath.java @@ -9,7 +9,7 @@ import de.learnlib.ralib.data.DataValue; import de.learnlib.ralib.data.util.DataUtils; import de.learnlib.ralib.learning.SymbolicSuffix; -import de.learnlib.ralib.learning.rastar.SLStar; +import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.TreeOracle; import de.learnlib.ralib.smt.ConstraintSolver; import de.learnlib.ralib.theory.SDT; @@ -17,11 +17,11 @@ /** * This data structure stores the SDTs from tree queries for a prefix along a path * in a {@link ClassificationTree}. It contains much of the same functionality as - * {@link de.learnlib.ralib.learning.rastar.Row}, but adapted for use with classification trees. + * {@link de.learnlib.ralib.learning.slstar.Row}, but adapted for use with classification trees. * * @author fredrik * @author falk - * @see de.learnlib.ralib.learning.rastar.Row + * @see de.learnlib.ralib.learning.slstar.Row */ public class CTPath { private final Map sdts; diff --git a/src/main/java/de/learnlib/ralib/ct/ClassificationTree.java b/src/main/java/de/learnlib/ralib/ct/ClassificationTree.java index 1ba4d79fa..d4398f0f3 100644 --- a/src/main/java/de/learnlib/ralib/ct/ClassificationTree.java +++ b/src/main/java/de/learnlib/ralib/ct/ClassificationTree.java @@ -21,7 +21,7 @@ import de.learnlib.ralib.data.util.RemappingIterator; import de.learnlib.ralib.data.util.SymbolicDataValueGenerator.ParameterGenerator; import de.learnlib.ralib.learning.SymbolicSuffix; -import de.learnlib.ralib.learning.rastar.SLStar; +import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.Branching; import de.learnlib.ralib.oracles.TreeOracle; import de.learnlib.ralib.oracles.mto.OptimizedSymbolicSuffixBuilder; diff --git a/src/main/java/de/learnlib/ralib/learning/AutomatonBuilder.java b/src/main/java/de/learnlib/ralib/learning/AutomatonBuilder.java index 221d58d00..8f1a4b1fd 100644 --- a/src/main/java/de/learnlib/ralib/learning/AutomatonBuilder.java +++ b/src/main/java/de/learnlib/ralib/learning/AutomatonBuilder.java @@ -30,7 +30,7 @@ import de.learnlib.ralib.data.*; import de.learnlib.ralib.data.SymbolicDataValue.Parameter; import de.learnlib.ralib.data.SymbolicDataValue.Register; -import de.learnlib.ralib.learning.rastar.SLStar; +import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.Branching; import de.learnlib.ralib.smt.ReplacingValuesVisitor; import de.learnlib.ralib.smt.SMTUtil; diff --git a/src/main/java/de/learnlib/ralib/learning/CounterexampleAnalysis.java b/src/main/java/de/learnlib/ralib/learning/CounterexampleAnalysis.java index 647dd6cc2..a93f54e99 100644 --- a/src/main/java/de/learnlib/ralib/learning/CounterexampleAnalysis.java +++ b/src/main/java/de/learnlib/ralib/learning/CounterexampleAnalysis.java @@ -24,7 +24,7 @@ import de.learnlib.ralib.data.DataValue; import de.learnlib.ralib.data.Mapping; -import de.learnlib.ralib.learning.rastar.CEAnalysisResult; +import de.learnlib.ralib.learning.slstar.CEAnalysisResult; import de.learnlib.ralib.oracles.Branching; import de.learnlib.ralib.oracles.SDTLogicOracle; import de.learnlib.ralib.oracles.TreeOracle; diff --git a/src/main/java/de/learnlib/ralib/learning/ralambda/SLCT.java b/src/main/java/de/learnlib/ralib/learning/sllambda/SLCT.java similarity index 97% rename from src/main/java/de/learnlib/ralib/learning/ralambda/SLCT.java rename to src/main/java/de/learnlib/ralib/learning/sllambda/SLCT.java index f52a635ad..58fb178cd 100644 --- a/src/main/java/de/learnlib/ralib/learning/ralambda/SLCT.java +++ b/src/main/java/de/learnlib/ralib/learning/sllambda/SLCT.java @@ -1,4 +1,4 @@ -package de.learnlib.ralib.learning.ralambda; +package de.learnlib.ralib.learning.sllambda; import java.util.ArrayDeque; import java.util.Deque; @@ -20,8 +20,8 @@ import de.learnlib.ralib.learning.QueryStatistics; import de.learnlib.ralib.learning.RaLearningAlgorithm; import de.learnlib.ralib.learning.RaLearningAlgorithmName; -import de.learnlib.ralib.learning.rastar.CEAnalysisResult; -import de.learnlib.ralib.learning.rastar.SLStar; +import de.learnlib.ralib.learning.slstar.CEAnalysisResult; +import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.SDTLogicOracle; import de.learnlib.ralib.oracles.TreeOracle; import de.learnlib.ralib.oracles.TreeOracleFactory; diff --git a/src/main/java/de/learnlib/ralib/learning/ralambda/SLLambda.java b/src/main/java/de/learnlib/ralib/learning/sllambda/SLLambda.java similarity index 99% rename from src/main/java/de/learnlib/ralib/learning/ralambda/SLLambda.java rename to src/main/java/de/learnlib/ralib/learning/sllambda/SLLambda.java index 097d0c001..06a119156 100644 --- a/src/main/java/de/learnlib/ralib/learning/ralambda/SLLambda.java +++ b/src/main/java/de/learnlib/ralib/learning/sllambda/SLLambda.java @@ -1,4 +1,4 @@ -package de.learnlib.ralib.learning.ralambda; +package de.learnlib.ralib.learning.sllambda; import java.util.ArrayDeque; import java.util.Deque; diff --git a/src/main/java/de/learnlib/ralib/learning/rastar/CEAnalysisResult.java b/src/main/java/de/learnlib/ralib/learning/slstar/CEAnalysisResult.java similarity index 97% rename from src/main/java/de/learnlib/ralib/learning/rastar/CEAnalysisResult.java rename to src/main/java/de/learnlib/ralib/learning/slstar/CEAnalysisResult.java index 6e1d952a9..ff8aec1c9 100644 --- a/src/main/java/de/learnlib/ralib/learning/rastar/CEAnalysisResult.java +++ b/src/main/java/de/learnlib/ralib/learning/slstar/CEAnalysisResult.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.learnlib.ralib.learning.rastar; +package de.learnlib.ralib.learning.slstar; import de.learnlib.ralib.learning.SymbolicSuffix; import de.learnlib.ralib.theory.SDT; diff --git a/src/main/java/de/learnlib/ralib/learning/rastar/Cell.java b/src/main/java/de/learnlib/ralib/learning/slstar/Cell.java similarity index 98% rename from src/main/java/de/learnlib/ralib/learning/rastar/Cell.java rename to src/main/java/de/learnlib/ralib/learning/slstar/Cell.java index 1a70b1599..ac890c0b6 100644 --- a/src/main/java/de/learnlib/ralib/learning/rastar/Cell.java +++ b/src/main/java/de/learnlib/ralib/learning/slstar/Cell.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.learnlib.ralib.learning.rastar; +package de.learnlib.ralib.learning.slstar; import java.util.Set; diff --git a/src/main/java/de/learnlib/ralib/learning/rastar/Component.java b/src/main/java/de/learnlib/ralib/learning/slstar/Component.java similarity index 99% rename from src/main/java/de/learnlib/ralib/learning/rastar/Component.java rename to src/main/java/de/learnlib/ralib/learning/slstar/Component.java index c22d11902..437c5a386 100644 --- a/src/main/java/de/learnlib/ralib/learning/rastar/Component.java +++ b/src/main/java/de/learnlib/ralib/learning/slstar/Component.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.learnlib.ralib.learning.rastar; +package de.learnlib.ralib.learning.slstar; import java.util.*; import java.util.Map.Entry; diff --git a/src/main/java/de/learnlib/ralib/learning/rastar/ObservationTable.java b/src/main/java/de/learnlib/ralib/learning/slstar/ObservationTable.java similarity index 99% rename from src/main/java/de/learnlib/ralib/learning/rastar/ObservationTable.java rename to src/main/java/de/learnlib/ralib/learning/slstar/ObservationTable.java index a8817bf3b..4d98e35bd 100644 --- a/src/main/java/de/learnlib/ralib/learning/rastar/ObservationTable.java +++ b/src/main/java/de/learnlib/ralib/learning/slstar/ObservationTable.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.learnlib.ralib.learning.rastar; +package de.learnlib.ralib.learning.slstar; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/src/main/java/de/learnlib/ralib/learning/rastar/Row.java b/src/main/java/de/learnlib/ralib/learning/slstar/Row.java similarity index 99% rename from src/main/java/de/learnlib/ralib/learning/rastar/Row.java rename to src/main/java/de/learnlib/ralib/learning/slstar/Row.java index 2ef86d6be..e84f3f04a 100644 --- a/src/main/java/de/learnlib/ralib/learning/rastar/Row.java +++ b/src/main/java/de/learnlib/ralib/learning/slstar/Row.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.learnlib.ralib.learning.rastar; +package de.learnlib.ralib.learning.slstar; import java.util.*; import java.util.Map.Entry; diff --git a/src/main/java/de/learnlib/ralib/learning/rastar/SLStar.java b/src/main/java/de/learnlib/ralib/learning/slstar/SLStar.java similarity index 99% rename from src/main/java/de/learnlib/ralib/learning/rastar/SLStar.java rename to src/main/java/de/learnlib/ralib/learning/slstar/SLStar.java index 76ea0be5f..a062ce3e4 100644 --- a/src/main/java/de/learnlib/ralib/learning/rastar/SLStar.java +++ b/src/main/java/de/learnlib/ralib/learning/slstar/SLStar.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.learnlib.ralib.learning.rastar; +package de.learnlib.ralib.learning.slstar; import java.util.ArrayDeque; import java.util.Deque; diff --git a/src/main/java/de/learnlib/ralib/tools/ClassAnalyzer.java b/src/main/java/de/learnlib/ralib/tools/ClassAnalyzer.java index 35b9aaafe..cde1b225f 100644 --- a/src/main/java/de/learnlib/ralib/tools/ClassAnalyzer.java +++ b/src/main/java/de/learnlib/ralib/tools/ClassAnalyzer.java @@ -37,9 +37,9 @@ import de.learnlib.ralib.equivalence.IORandomWalk; import de.learnlib.ralib.learning.Hypothesis; import de.learnlib.ralib.learning.RaLearningAlgorithm; -import de.learnlib.ralib.learning.ralambda.SLCT; -import de.learnlib.ralib.learning.ralambda.SLLambda; -import de.learnlib.ralib.learning.rastar.SLStar; +import de.learnlib.ralib.learning.sllambda.SLCT; +import de.learnlib.ralib.learning.sllambda.SLLambda; +import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.TreeOracle; diff --git a/src/main/java/de/learnlib/ralib/tools/IOSimulator.java b/src/main/java/de/learnlib/ralib/tools/IOSimulator.java index b3189fbc4..18b9fa229 100644 --- a/src/main/java/de/learnlib/ralib/tools/IOSimulator.java +++ b/src/main/java/de/learnlib/ralib/tools/IOSimulator.java @@ -37,9 +37,9 @@ import de.learnlib.ralib.learning.MeasuringOracle; import de.learnlib.ralib.learning.QueryStatistics; import de.learnlib.ralib.learning.RaLearningAlgorithm; -import de.learnlib.ralib.learning.ralambda.SLCT; -import de.learnlib.ralib.learning.ralambda.SLLambda; -import de.learnlib.ralib.learning.rastar.SLStar; +import de.learnlib.ralib.learning.sllambda.SLCT; +import de.learnlib.ralib.learning.sllambda.SLLambda; +import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.TreeOracle; diff --git a/src/test/java/de/learnlib/ralib/RaLibLearningExperimentRunner.java b/src/test/java/de/learnlib/ralib/RaLibLearningExperimentRunner.java index f7b48037c..68b7d175c 100644 --- a/src/test/java/de/learnlib/ralib/RaLibLearningExperimentRunner.java +++ b/src/test/java/de/learnlib/ralib/RaLibLearningExperimentRunner.java @@ -18,9 +18,9 @@ import de.learnlib.ralib.learning.MeasuringOracle; import de.learnlib.ralib.learning.RaLearningAlgorithm; import de.learnlib.ralib.learning.RaLearningAlgorithmName; -import de.learnlib.ralib.learning.ralambda.SLCT; -import de.learnlib.ralib.learning.ralambda.SLLambda; -import de.learnlib.ralib.learning.rastar.SLStar; +import de.learnlib.ralib.learning.sllambda.SLCT; +import de.learnlib.ralib.learning.sllambda.SLLambda; +import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.TreeOracleFactory; import de.learnlib.ralib.oracles.mto.MultiTheorySDTLogicOracle; diff --git a/src/test/java/de/learnlib/ralib/ct/CTConsistencyTest.java b/src/test/java/de/learnlib/ralib/ct/CTConsistencyTest.java index a52d34d56..e12a0a4ea 100644 --- a/src/test/java/de/learnlib/ralib/ct/CTConsistencyTest.java +++ b/src/test/java/de/learnlib/ralib/ct/CTConsistencyTest.java @@ -27,7 +27,7 @@ import de.learnlib.ralib.data.SymbolicDataValue.Register; import de.learnlib.ralib.data.VarMapping; import de.learnlib.ralib.learning.SymbolicSuffix; -import de.learnlib.ralib.learning.rastar.SLStar; +import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.mto.MultiTheoryTreeOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/ralambda/IOHandlingTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/IOHandlingTest.java similarity index 96% rename from src/test/java/de/learnlib/ralib/learning/ralambda/IOHandlingTest.java rename to src/test/java/de/learnlib/ralib/learning/sllambda/IOHandlingTest.java index a7728e417..35a06fa38 100644 --- a/src/test/java/de/learnlib/ralib/learning/ralambda/IOHandlingTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/IOHandlingTest.java @@ -1,10 +1,10 @@ -package de.learnlib.ralib.learning.ralambda; +package de.learnlib.ralib.learning.sllambda; -import static de.learnlib.ralib.learning.ralambda.IOHandlingTest.IORAExamples.ID; -import static de.learnlib.ralib.learning.ralambda.IOHandlingTest.IORAExamples.IN; -import static de.learnlib.ralib.learning.ralambda.IOHandlingTest.IORAExamples.NOK; -import static de.learnlib.ralib.learning.ralambda.IOHandlingTest.IORAExamples.OK; -import static de.learnlib.ralib.learning.ralambda.IOHandlingTest.IORAExamples.OUT; +import static de.learnlib.ralib.learning.sllambda.IOHandlingTest.IORAExamples.ID; +import static de.learnlib.ralib.learning.sllambda.IOHandlingTest.IORAExamples.IN; +import static de.learnlib.ralib.learning.sllambda.IOHandlingTest.IORAExamples.NOK; +import static de.learnlib.ralib.learning.sllambda.IOHandlingTest.IORAExamples.OK; +import static de.learnlib.ralib.learning.sllambda.IOHandlingTest.IORAExamples.OUT; import java.math.BigDecimal; import java.util.LinkedHashMap; @@ -33,6 +33,7 @@ import de.learnlib.ralib.data.util.SymbolicDataValueGenerator.ParameterGenerator; import de.learnlib.ralib.data.util.SymbolicDataValueGenerator.RegisterGenerator; import de.learnlib.ralib.equivalence.IOEquivalenceTest; +import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.io.IOCache; import de.learnlib.ralib.oracles.io.IOFilter; import de.learnlib.ralib.oracles.io.IOOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnABPOutputTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnABPOutputTest.java similarity index 98% rename from src/test/java/de/learnlib/ralib/learning/ralambda/LearnABPOutputTest.java rename to src/test/java/de/learnlib/ralib/learning/sllambda/LearnABPOutputTest.java index c70c2ba67..946a62a01 100644 --- a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnABPOutputTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnABPOutputTest.java @@ -1,4 +1,4 @@ -package de.learnlib.ralib.learning.ralambda; +package de.learnlib.ralib.learning.sllambda; import java.util.LinkedHashMap; import java.util.Map; @@ -21,6 +21,7 @@ import de.learnlib.ralib.equivalence.IOEquivalenceTest; import de.learnlib.ralib.equivalence.IORandomWalk; import de.learnlib.ralib.learning.Hypothesis; +import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.io.IOCache; import de.learnlib.ralib.oracles.io.IOFilter; import de.learnlib.ralib.oracles.io.IOOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnArrayListTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnArrayListTest.java similarity index 98% rename from src/test/java/de/learnlib/ralib/learning/ralambda/LearnArrayListTest.java rename to src/test/java/de/learnlib/ralib/learning/sllambda/LearnArrayListTest.java index 59591859a..437caed88 100644 --- a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnArrayListTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnArrayListTest.java @@ -1,4 +1,4 @@ -package de.learnlib.ralib.learning.ralambda; +package de.learnlib.ralib.learning.sllambda; import static de.learnlib.ralib.example.list.ArrayListDataWordOracle.ADD; import static de.learnlib.ralib.example.list.ArrayListDataWordOracle.REMOVE; @@ -22,6 +22,7 @@ import de.learnlib.ralib.example.list.ArrayListIODataWordOracle; import de.learnlib.ralib.example.list.ArrayListWrapper; import de.learnlib.ralib.learning.Hypothesis; +import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.mto.MultiTheoryTreeOracle; import de.learnlib.ralib.smt.ConstraintSolver; diff --git a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnDtlsServerTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnDtlsServerTest.java similarity index 98% rename from src/test/java/de/learnlib/ralib/learning/ralambda/LearnDtlsServerTest.java rename to src/test/java/de/learnlib/ralib/learning/sllambda/LearnDtlsServerTest.java index 962d57aa8..beab95f14 100644 --- a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnDtlsServerTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnDtlsServerTest.java @@ -1,4 +1,4 @@ -package de.learnlib.ralib.learning.ralambda; +package de.learnlib.ralib.learning.sllambda; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnEchoTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnEchoTest.java similarity index 96% rename from src/test/java/de/learnlib/ralib/learning/ralambda/LearnEchoTest.java rename to src/test/java/de/learnlib/ralib/learning/sllambda/LearnEchoTest.java index c7135eed5..d91d113dc 100644 --- a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnEchoTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnEchoTest.java @@ -1,4 +1,4 @@ -package de.learnlib.ralib.learning.ralambda; +package de.learnlib.ralib.learning.sllambda; import static de.learnlib.ralib.example.repeater.RepeaterSUL.IPUT; import static de.learnlib.ralib.example.repeater.RepeaterSUL.OECHO; @@ -19,6 +19,7 @@ import de.learnlib.ralib.data.DataValue; import de.learnlib.ralib.example.repeater.RepeaterSUL; import de.learnlib.ralib.learning.Hypothesis; +import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.io.IOCache; import de.learnlib.ralib.oracles.io.IOFilter; import de.learnlib.ralib.oracles.io.IOOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnLoginTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnLoginTest.java similarity index 98% rename from src/test/java/de/learnlib/ralib/learning/ralambda/LearnLoginTest.java rename to src/test/java/de/learnlib/ralib/learning/sllambda/LearnLoginTest.java index cc5da3950..c2ccade66 100644 --- a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnLoginTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnLoginTest.java @@ -1,4 +1,4 @@ -package de.learnlib.ralib.learning.ralambda; +package de.learnlib.ralib.learning.sllambda; import static de.learnlib.ralib.example.login.LoginAutomatonExample.AUTOMATON; import static de.learnlib.ralib.example.login.LoginAutomatonExample.I_LOGIN; @@ -26,6 +26,7 @@ import de.learnlib.ralib.learning.Hypothesis; import de.learnlib.ralib.learning.Measurements; import de.learnlib.ralib.learning.RaLearningAlgorithmName; +import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.mto.MultiTheoryTreeOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnMixedIOTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnMixedIOTest.java similarity index 98% rename from src/test/java/de/learnlib/ralib/learning/ralambda/LearnMixedIOTest.java rename to src/test/java/de/learnlib/ralib/learning/sllambda/LearnMixedIOTest.java index 3f6972949..78fdc76a6 100644 --- a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnMixedIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnMixedIOTest.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package de.learnlib.ralib.learning.ralambda; +package de.learnlib.ralib.learning.sllambda; import java.util.LinkedHashMap; import java.util.Map; @@ -39,6 +39,7 @@ import de.learnlib.ralib.equivalence.IOEquivalenceTest; import de.learnlib.ralib.equivalence.IORandomWalk; import de.learnlib.ralib.learning.Hypothesis; +import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.io.IOOracle; import de.learnlib.ralib.oracles.mto.MultiTheoryTreeOracle; import de.learnlib.ralib.smt.ConstraintSolver; diff --git a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnPQIOTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPQIOTest.java similarity index 98% rename from src/test/java/de/learnlib/ralib/learning/ralambda/LearnPQIOTest.java rename to src/test/java/de/learnlib/ralib/learning/sllambda/LearnPQIOTest.java index 7882e8954..615d0fb12 100644 --- a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnPQIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPQIOTest.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package de.learnlib.ralib.learning.ralambda; +package de.learnlib.ralib.learning.sllambda; import java.util.LinkedHashMap; import java.util.Map; @@ -40,6 +40,7 @@ import de.learnlib.ralib.equivalence.IORandomWalk; import de.learnlib.ralib.example.priority.PriorityQueueSUL; import de.learnlib.ralib.learning.Hypothesis; +import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.io.IOOracle; import de.learnlib.ralib.oracles.mto.MultiTheoryTreeOracle; import de.learnlib.ralib.smt.ConstraintSolver; diff --git a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnPQTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPQTest.java similarity index 98% rename from src/test/java/de/learnlib/ralib/learning/ralambda/LearnPQTest.java rename to src/test/java/de/learnlib/ralib/learning/sllambda/LearnPQTest.java index 3f6df81cc..fd8583bd0 100644 --- a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnPQTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPQTest.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package de.learnlib.ralib.learning.ralambda; +package de.learnlib.ralib.learning.sllambda; import static de.learnlib.ralib.example.priority.PriorityQueueOracle.OFFER; import static de.learnlib.ralib.example.priority.PriorityQueueOracle.POLL; @@ -41,6 +41,7 @@ import de.learnlib.ralib.data.DataValue; import de.learnlib.ralib.learning.Measurements; import de.learnlib.ralib.learning.RaLearningAlgorithmName; +import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.mto.MultiTheoryTreeOracle; import de.learnlib.ralib.smt.ConstraintSolver; diff --git a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnPadlock.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPadlock.java similarity index 98% rename from src/test/java/de/learnlib/ralib/learning/ralambda/LearnPadlock.java rename to src/test/java/de/learnlib/ralib/learning/sllambda/LearnPadlock.java index aa5e5568b..99ad4cf01 100644 --- a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnPadlock.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPadlock.java @@ -1,4 +1,4 @@ -package de.learnlib.ralib.learning.ralambda; +package de.learnlib.ralib.learning.sllambda; import java.math.BigDecimal; import java.util.LinkedHashMap; @@ -23,6 +23,7 @@ import de.learnlib.ralib.data.VarMapping; import de.learnlib.ralib.data.util.SymbolicDataValueGenerator.ParameterGenerator; import de.learnlib.ralib.data.util.SymbolicDataValueGenerator.RegisterGenerator; +import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.mto.MultiTheoryTreeOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnPalindromeIOTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPalindromeIOTest.java similarity index 97% rename from src/test/java/de/learnlib/ralib/learning/ralambda/LearnPalindromeIOTest.java rename to src/test/java/de/learnlib/ralib/learning/sllambda/LearnPalindromeIOTest.java index 6433a4920..2c6123f2c 100644 --- a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnPalindromeIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPalindromeIOTest.java @@ -1,4 +1,4 @@ -package de.learnlib.ralib.learning.ralambda; +package de.learnlib.ralib.learning.sllambda; import java.util.LinkedHashMap; import java.util.Map; @@ -16,6 +16,7 @@ import de.learnlib.ralib.data.DataType; import de.learnlib.ralib.equivalence.IOEquivalenceTest; import de.learnlib.ralib.learning.Hypothesis; +import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.io.IOCache; import de.learnlib.ralib.oracles.io.IOFilter; import de.learnlib.ralib.oracles.io.IOOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnRepeaterTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnRepeaterTest.java similarity index 97% rename from src/test/java/de/learnlib/ralib/learning/ralambda/LearnRepeaterTest.java rename to src/test/java/de/learnlib/ralib/learning/sllambda/LearnRepeaterTest.java index 35d439241..e5b99da37 100644 --- a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnRepeaterTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnRepeaterTest.java @@ -1,4 +1,4 @@ -package de.learnlib.ralib.learning.ralambda; +package de.learnlib.ralib.learning.sllambda; import static de.learnlib.ralib.example.repeater.RepeaterSUL.IPUT; import static de.learnlib.ralib.example.repeater.RepeaterSUL.OECHO; @@ -20,6 +20,7 @@ import de.learnlib.ralib.example.repeater.RepeaterSUL; import de.learnlib.ralib.learning.Measurements; import de.learnlib.ralib.learning.QueryStatistics; +import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.io.IOCache; import de.learnlib.ralib.oracles.io.IOFilter; import de.learnlib.ralib.oracles.io.IOOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnSipIOTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnSipIOTest.java similarity index 97% rename from src/test/java/de/learnlib/ralib/learning/ralambda/LearnSipIOTest.java rename to src/test/java/de/learnlib/ralib/learning/sllambda/LearnSipIOTest.java index c0fdd967b..5f5882f36 100644 --- a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnSipIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnSipIOTest.java @@ -1,4 +1,4 @@ -package de.learnlib.ralib.learning.ralambda; +package de.learnlib.ralib.learning.sllambda; import java.util.LinkedHashMap; import java.util.Map; @@ -20,6 +20,7 @@ import de.learnlib.ralib.equivalence.IOCounterexampleLoopRemover; import de.learnlib.ralib.equivalence.IOEquivalenceTest; import de.learnlib.ralib.learning.Hypothesis; +import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.io.IOCache; import de.learnlib.ralib.oracles.io.IOFilter; import de.learnlib.ralib.oracles.io.IOOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnStackTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnStackTest.java similarity index 98% rename from src/test/java/de/learnlib/ralib/learning/ralambda/LearnStackTest.java rename to src/test/java/de/learnlib/ralib/learning/sllambda/LearnStackTest.java index 9ad25f09e..69bf7acb4 100644 --- a/src/test/java/de/learnlib/ralib/learning/ralambda/LearnStackTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnStackTest.java @@ -1,4 +1,4 @@ -package de.learnlib.ralib.learning.ralambda; +package de.learnlib.ralib.learning.sllambda; import static de.learnlib.ralib.example.stack.StackAutomatonExample.AUTOMATON; import static de.learnlib.ralib.example.stack.StackAutomatonExample.I_POP; @@ -25,6 +25,7 @@ import de.learnlib.ralib.learning.Measurements; import de.learnlib.ralib.learning.MeasuringOracle; import de.learnlib.ralib.learning.RaLearningAlgorithmName; +import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.mto.MultiTheoryTreeOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/ralambda/TestDistinguishingSuffixOptimization.java b/src/test/java/de/learnlib/ralib/learning/sllambda/TestDistinguishingSuffixOptimization.java similarity index 98% rename from src/test/java/de/learnlib/ralib/learning/ralambda/TestDistinguishingSuffixOptimization.java rename to src/test/java/de/learnlib/ralib/learning/sllambda/TestDistinguishingSuffixOptimization.java index e4fc0a65e..d2a4e08e8 100644 --- a/src/test/java/de/learnlib/ralib/learning/ralambda/TestDistinguishingSuffixOptimization.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/TestDistinguishingSuffixOptimization.java @@ -1,4 +1,4 @@ -package de.learnlib.ralib.learning.ralambda; +package de.learnlib.ralib.learning.sllambda; import java.util.LinkedHashMap; import java.util.Map; @@ -20,6 +20,7 @@ import de.learnlib.ralib.data.SymbolicDataValue.Register; import de.learnlib.ralib.data.VarMapping; import de.learnlib.ralib.learning.SymbolicSuffix; +import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.mto.MultiTheoryTreeOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/ralambda/TestOutputSuffixes.java b/src/test/java/de/learnlib/ralib/learning/sllambda/TestOutputSuffixes.java similarity index 97% rename from src/test/java/de/learnlib/ralib/learning/ralambda/TestOutputSuffixes.java rename to src/test/java/de/learnlib/ralib/learning/sllambda/TestOutputSuffixes.java index 9ec6fd492..40b4aba88 100644 --- a/src/test/java/de/learnlib/ralib/learning/ralambda/TestOutputSuffixes.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/TestOutputSuffixes.java @@ -1,4 +1,4 @@ -package de.learnlib.ralib.learning.ralambda; +package de.learnlib.ralib.learning.sllambda; import java.util.Deque; import java.util.LinkedHashMap; @@ -19,6 +19,7 @@ import de.learnlib.ralib.data.Constants; import de.learnlib.ralib.data.DataType; import de.learnlib.ralib.learning.SymbolicSuffix; +import de.learnlib.ralib.learning.sllambda.SLCT; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.TreeOracleFactory; import de.learnlib.ralib.oracles.io.IOCache; diff --git a/src/test/java/de/learnlib/ralib/learning/ralambda/TestQueryCount.java b/src/test/java/de/learnlib/ralib/learning/sllambda/TestQueryCount.java similarity index 97% rename from src/test/java/de/learnlib/ralib/learning/ralambda/TestQueryCount.java rename to src/test/java/de/learnlib/ralib/learning/sllambda/TestQueryCount.java index 18e886aad..7b53f9d9a 100644 --- a/src/test/java/de/learnlib/ralib/learning/ralambda/TestQueryCount.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/TestQueryCount.java @@ -1,4 +1,4 @@ -package de.learnlib.ralib.learning.ralambda; +package de.learnlib.ralib.learning.sllambda; import java.math.BigDecimal; import java.util.LinkedHashMap; @@ -17,6 +17,7 @@ import de.learnlib.ralib.learning.Measurements; import de.learnlib.ralib.learning.MeasuringOracle; import de.learnlib.ralib.learning.QueryStatistics; +import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.io.IOOracle; import de.learnlib.ralib.smt.ConstraintSolver; import de.learnlib.ralib.sul.SULOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/ralambda/TestSuffixOptimization.java b/src/test/java/de/learnlib/ralib/learning/sllambda/TestSuffixOptimization.java similarity index 98% rename from src/test/java/de/learnlib/ralib/learning/ralambda/TestSuffixOptimization.java rename to src/test/java/de/learnlib/ralib/learning/sllambda/TestSuffixOptimization.java index 2e01a0ad4..407e711cd 100644 --- a/src/test/java/de/learnlib/ralib/learning/ralambda/TestSuffixOptimization.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/TestSuffixOptimization.java @@ -1,4 +1,4 @@ -package de.learnlib.ralib.learning.ralambda; +package de.learnlib.ralib.learning.sllambda; import static de.learnlib.ralib.example.priority.PriorityQueueOracle.OFFER; import static de.learnlib.ralib.example.priority.PriorityQueueOracle.POLL; @@ -26,6 +26,7 @@ import de.learnlib.ralib.learning.Measurements; import de.learnlib.ralib.learning.MeasuringOracle; import de.learnlib.ralib.learning.QueryStatistics; +import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.io.IOCache; import de.learnlib.ralib.oracles.io.IOFilter; diff --git a/src/test/java/de/learnlib/ralib/learning/ralambda/TestSymmetry.java b/src/test/java/de/learnlib/ralib/learning/sllambda/TestSymmetry.java similarity index 99% rename from src/test/java/de/learnlib/ralib/learning/ralambda/TestSymmetry.java rename to src/test/java/de/learnlib/ralib/learning/sllambda/TestSymmetry.java index 33fa1e582..77493b15d 100644 --- a/src/test/java/de/learnlib/ralib/learning/ralambda/TestSymmetry.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/TestSymmetry.java @@ -1,4 +1,4 @@ -package de.learnlib.ralib.learning.ralambda; +package de.learnlib.ralib.learning.sllambda; import java.math.BigDecimal; import java.util.LinkedHashMap; @@ -22,6 +22,7 @@ import de.learnlib.ralib.data.VarMapping; import de.learnlib.ralib.data.util.SymbolicDataValueGenerator; import de.learnlib.ralib.learning.Hypothesis; +import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.mto.MultiTheoryTreeOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/ralambda/TestUnknownMemorable.java b/src/test/java/de/learnlib/ralib/learning/sllambda/TestUnknownMemorable.java similarity index 99% rename from src/test/java/de/learnlib/ralib/learning/ralambda/TestUnknownMemorable.java rename to src/test/java/de/learnlib/ralib/learning/sllambda/TestUnknownMemorable.java index 2b4e978c1..168997ce3 100644 --- a/src/test/java/de/learnlib/ralib/learning/ralambda/TestUnknownMemorable.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/TestUnknownMemorable.java @@ -1,4 +1,4 @@ -package de.learnlib.ralib.learning.ralambda; +package de.learnlib.ralib.learning.sllambda; import java.math.BigDecimal; import java.util.ArrayDeque; @@ -32,6 +32,7 @@ import de.learnlib.ralib.data.SymbolicDataValue.Register; import de.learnlib.ralib.data.VarMapping; import de.learnlib.ralib.data.util.SymbolicDataValueGenerator; +import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.io.IOCache; import de.learnlib.ralib.oracles.io.IOFilter; import de.learnlib.ralib.oracles.io.IOOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/rastar/CellTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/CellTest.java similarity index 97% rename from src/test/java/de/learnlib/ralib/learning/rastar/CellTest.java rename to src/test/java/de/learnlib/ralib/learning/slstar/CellTest.java index 5042e667e..7c424657b 100644 --- a/src/test/java/de/learnlib/ralib/learning/rastar/CellTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/CellTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.learnlib.ralib.learning.rastar; +package de.learnlib.ralib.learning.slstar; import static de.learnlib.ralib.example.login.LoginAutomatonExample.I_LOGIN; import static de.learnlib.ralib.example.login.LoginAutomatonExample.I_LOGOUT; @@ -34,6 +34,7 @@ import de.learnlib.ralib.data.SDTRelabeling; import de.learnlib.ralib.example.sdts.LoginExampleTreeOracle; import de.learnlib.ralib.learning.SymbolicSuffix; +import de.learnlib.ralib.learning.slstar.Cell; import de.learnlib.ralib.words.PSymbolInstance; import net.automatalib.word.Word; diff --git a/src/test/java/de/learnlib/ralib/learning/rastar/LearnBoundedListTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnBoundedListTest.java similarity index 97% rename from src/test/java/de/learnlib/ralib/learning/rastar/LearnBoundedListTest.java rename to src/test/java/de/learnlib/ralib/learning/slstar/LearnBoundedListTest.java index 7d518c92d..e928bec23 100644 --- a/src/test/java/de/learnlib/ralib/learning/rastar/LearnBoundedListTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnBoundedListTest.java @@ -1,4 +1,4 @@ -package de.learnlib.ralib.learning.rastar; +package de.learnlib.ralib.learning.slstar; import static de.learnlib.ralib.example.list.BoundedListDataWordOracle.INSERT; import static de.learnlib.ralib.example.list.BoundedListDataWordOracle.INT_TYPE; @@ -23,6 +23,7 @@ import de.learnlib.ralib.example.list.BoundedList; import de.learnlib.ralib.example.list.BoundedListDataWordOracle; import de.learnlib.ralib.learning.Hypothesis; +import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.SDTLogicOracle; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.TreeOracleFactory; diff --git a/src/test/java/de/learnlib/ralib/learning/rastar/LearnLoginTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnLoginTest.java similarity index 97% rename from src/test/java/de/learnlib/ralib/learning/rastar/LearnLoginTest.java rename to src/test/java/de/learnlib/ralib/learning/slstar/LearnLoginTest.java index 99812031a..07c56d6d9 100644 --- a/src/test/java/de/learnlib/ralib/learning/rastar/LearnLoginTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnLoginTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.learnlib.ralib.learning.rastar; +package de.learnlib.ralib.learning.slstar; import static de.learnlib.ralib.example.login.LoginAutomatonExample.AUTOMATON; import static de.learnlib.ralib.example.login.LoginAutomatonExample.I_LOGIN; @@ -37,6 +37,7 @@ import de.learnlib.ralib.data.Constants; import de.learnlib.ralib.data.DataType; import de.learnlib.ralib.data.DataValue; +import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.SDTLogicOracle; import de.learnlib.ralib.oracles.SimulatorOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/rastar/LearnMixedIOTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnMixedIOTest.java similarity index 98% rename from src/test/java/de/learnlib/ralib/learning/rastar/LearnMixedIOTest.java rename to src/test/java/de/learnlib/ralib/learning/slstar/LearnMixedIOTest.java index 7d15f3978..14ace66cc 100644 --- a/src/test/java/de/learnlib/ralib/learning/rastar/LearnMixedIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnMixedIOTest.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package de.learnlib.ralib.learning.rastar; +package de.learnlib.ralib.learning.slstar; import java.util.LinkedHashMap; import java.util.Map; @@ -39,6 +39,7 @@ import de.learnlib.ralib.equivalence.IOEquivalenceTest; import de.learnlib.ralib.equivalence.IORandomWalk; import de.learnlib.ralib.learning.Hypothesis; +import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.TreeOracleFactory; import de.learnlib.ralib.oracles.io.IOOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/rastar/LearnPQIOTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnPQIOTest.java similarity index 98% rename from src/test/java/de/learnlib/ralib/learning/rastar/LearnPQIOTest.java rename to src/test/java/de/learnlib/ralib/learning/slstar/LearnPQIOTest.java index 72a52412a..03ada27e5 100644 --- a/src/test/java/de/learnlib/ralib/learning/rastar/LearnPQIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnPQIOTest.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package de.learnlib.ralib.learning.rastar; +package de.learnlib.ralib.learning.slstar; import java.util.LinkedHashMap; import java.util.Map; @@ -40,6 +40,7 @@ import de.learnlib.ralib.equivalence.IORandomWalk; import de.learnlib.ralib.example.priority.PriorityQueueSUL; import de.learnlib.ralib.learning.Hypothesis; +import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.TreeOracleFactory; import de.learnlib.ralib.oracles.io.IOOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/rastar/LearnPQTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnPQTest.java similarity index 97% rename from src/test/java/de/learnlib/ralib/learning/rastar/LearnPQTest.java rename to src/test/java/de/learnlib/ralib/learning/slstar/LearnPQTest.java index cf9ae62f3..7b0dbfdec 100644 --- a/src/test/java/de/learnlib/ralib/learning/rastar/LearnPQTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnPQTest.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package de.learnlib.ralib.learning.rastar; +package de.learnlib.ralib.learning.slstar; import static de.learnlib.ralib.example.priority.PriorityQueueOracle.*; @@ -36,6 +36,7 @@ import de.learnlib.ralib.data.Constants; import de.learnlib.ralib.data.DataType; import de.learnlib.ralib.data.DataValue; +import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.SDTLogicOracle; import de.learnlib.ralib.oracles.SimulatorOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/rastar/LearnPalindromeIOTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnPalindromeIOTest.java similarity index 98% rename from src/test/java/de/learnlib/ralib/learning/rastar/LearnPalindromeIOTest.java rename to src/test/java/de/learnlib/ralib/learning/slstar/LearnPalindromeIOTest.java index 64f1ba408..52bf2969f 100644 --- a/src/test/java/de/learnlib/ralib/learning/rastar/LearnPalindromeIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnPalindromeIOTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.learnlib.ralib.learning.rastar; +package de.learnlib.ralib.learning.slstar; import java.util.LinkedHashMap; import java.util.Map; @@ -32,6 +32,7 @@ import de.learnlib.ralib.data.DataType; import de.learnlib.ralib.equivalence.IOEquivalenceTest; import de.learnlib.ralib.learning.Hypothesis; +import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.TreeOracleFactory; import de.learnlib.ralib.oracles.io.IOCache; diff --git a/src/test/java/de/learnlib/ralib/learning/rastar/LearnRepeaterTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnRepeaterTest.java similarity index 97% rename from src/test/java/de/learnlib/ralib/learning/rastar/LearnRepeaterTest.java rename to src/test/java/de/learnlib/ralib/learning/slstar/LearnRepeaterTest.java index 4d3055e45..fe5bd3dc0 100644 --- a/src/test/java/de/learnlib/ralib/learning/rastar/LearnRepeaterTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnRepeaterTest.java @@ -1,4 +1,4 @@ -package de.learnlib.ralib.learning.rastar; +package de.learnlib.ralib.learning.slstar; import static de.learnlib.ralib.example.repeater.RepeaterSUL.*; @@ -19,6 +19,7 @@ import de.learnlib.ralib.example.repeater.RepeaterSUL; import de.learnlib.ralib.learning.Measurements; import de.learnlib.ralib.learning.QueryStatistics; +import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.TreeOracleFactory; import de.learnlib.ralib.oracles.io.IOCache; diff --git a/src/test/java/de/learnlib/ralib/learning/rastar/LearnSipIOTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnSipIOTest.java similarity index 98% rename from src/test/java/de/learnlib/ralib/learning/rastar/LearnSipIOTest.java rename to src/test/java/de/learnlib/ralib/learning/slstar/LearnSipIOTest.java index c501ecc79..96d2aaccd 100644 --- a/src/test/java/de/learnlib/ralib/learning/rastar/LearnSipIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnSipIOTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.learnlib.ralib.learning.rastar; +package de.learnlib.ralib.learning.slstar; import java.util.LinkedHashMap; import java.util.Map; @@ -36,6 +36,7 @@ import de.learnlib.ralib.equivalence.IOCounterexampleLoopRemover; import de.learnlib.ralib.equivalence.IOEquivalenceTest; import de.learnlib.ralib.learning.Hypothesis; +import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.TreeOracleFactory; import de.learnlib.ralib.oracles.io.IOCache; diff --git a/src/test/java/de/learnlib/ralib/learning/rastar/LoggingOracle.java b/src/test/java/de/learnlib/ralib/learning/slstar/LoggingOracle.java similarity index 98% rename from src/test/java/de/learnlib/ralib/learning/rastar/LoggingOracle.java rename to src/test/java/de/learnlib/ralib/learning/slstar/LoggingOracle.java index e2177321c..3617ed510 100644 --- a/src/test/java/de/learnlib/ralib/learning/rastar/LoggingOracle.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LoggingOracle.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.learnlib.ralib.learning.rastar; +package de.learnlib.ralib.learning.slstar; import java.util.Map; diff --git a/src/test/java/de/learnlib/ralib/learning/rastar/RowTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/RowTest.java similarity index 97% rename from src/test/java/de/learnlib/ralib/learning/rastar/RowTest.java rename to src/test/java/de/learnlib/ralib/learning/slstar/RowTest.java index 9b7361aa0..95f979083 100644 --- a/src/test/java/de/learnlib/ralib/learning/rastar/RowTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/RowTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.learnlib.ralib.learning.rastar; +package de.learnlib.ralib.learning.slstar; import static de.learnlib.ralib.example.login.LoginAutomatonExample.I_LOGIN; import static de.learnlib.ralib.example.login.LoginAutomatonExample.I_REGISTER; @@ -35,6 +35,7 @@ import de.learnlib.ralib.data.util.RemappingIterator; import de.learnlib.ralib.example.sdts.LoginExampleTreeOracle; import de.learnlib.ralib.learning.SymbolicSuffix; +import de.learnlib.ralib.learning.slstar.Row; import de.learnlib.ralib.words.PSymbolInstance; import net.automatalib.word.Word; From aa1aa74f85eafc94f7d21fff0cb7b4a7086d0366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20T=C3=A5quist?= Date: Fri, 13 Mar 2026 11:45:58 +0100 Subject: [PATCH 3/6] Apply spotless --- .../java/de/learnlib/ralib/learning/sllambda/IOHandlingTest.java | 1 - .../de/learnlib/ralib/learning/sllambda/LearnABPOutputTest.java | 1 - .../de/learnlib/ralib/learning/sllambda/LearnArrayListTest.java | 1 - .../java/de/learnlib/ralib/learning/sllambda/LearnEchoTest.java | 1 - .../java/de/learnlib/ralib/learning/sllambda/LearnLoginTest.java | 1 - .../de/learnlib/ralib/learning/sllambda/LearnMixedIOTest.java | 1 - .../java/de/learnlib/ralib/learning/sllambda/LearnPQIOTest.java | 1 - .../java/de/learnlib/ralib/learning/sllambda/LearnPQTest.java | 1 - .../java/de/learnlib/ralib/learning/sllambda/LearnPadlock.java | 1 - .../learnlib/ralib/learning/sllambda/LearnPalindromeIOTest.java | 1 - .../de/learnlib/ralib/learning/sllambda/LearnRepeaterTest.java | 1 - .../java/de/learnlib/ralib/learning/sllambda/LearnSipIOTest.java | 1 - .../java/de/learnlib/ralib/learning/sllambda/LearnStackTest.java | 1 - .../learning/sllambda/TestDistinguishingSuffixOptimization.java | 1 - .../de/learnlib/ralib/learning/sllambda/TestOutputSuffixes.java | 1 - .../java/de/learnlib/ralib/learning/sllambda/TestQueryCount.java | 1 - .../learnlib/ralib/learning/sllambda/TestSuffixOptimization.java | 1 - .../java/de/learnlib/ralib/learning/sllambda/TestSymmetry.java | 1 - .../learnlib/ralib/learning/sllambda/TestUnknownMemorable.java | 1 - src/test/java/de/learnlib/ralib/learning/slstar/CellTest.java | 1 - .../de/learnlib/ralib/learning/slstar/LearnBoundedListTest.java | 1 - .../java/de/learnlib/ralib/learning/slstar/LearnLoginTest.java | 1 - .../java/de/learnlib/ralib/learning/slstar/LearnMixedIOTest.java | 1 - .../java/de/learnlib/ralib/learning/slstar/LearnPQIOTest.java | 1 - src/test/java/de/learnlib/ralib/learning/slstar/LearnPQTest.java | 1 - .../de/learnlib/ralib/learning/slstar/LearnPalindromeIOTest.java | 1 - .../de/learnlib/ralib/learning/slstar/LearnRepeaterTest.java | 1 - .../java/de/learnlib/ralib/learning/slstar/LearnSipIOTest.java | 1 - src/test/java/de/learnlib/ralib/learning/slstar/RowTest.java | 1 - 29 files changed, 29 deletions(-) diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/IOHandlingTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/IOHandlingTest.java index 35a06fa38..f1f4d5d3a 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/IOHandlingTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/IOHandlingTest.java @@ -33,7 +33,6 @@ import de.learnlib.ralib.data.util.SymbolicDataValueGenerator.ParameterGenerator; import de.learnlib.ralib.data.util.SymbolicDataValueGenerator.RegisterGenerator; import de.learnlib.ralib.equivalence.IOEquivalenceTest; -import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.io.IOCache; import de.learnlib.ralib.oracles.io.IOFilter; import de.learnlib.ralib.oracles.io.IOOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnABPOutputTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnABPOutputTest.java index 946a62a01..f27bf10c7 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnABPOutputTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnABPOutputTest.java @@ -21,7 +21,6 @@ import de.learnlib.ralib.equivalence.IOEquivalenceTest; import de.learnlib.ralib.equivalence.IORandomWalk; import de.learnlib.ralib.learning.Hypothesis; -import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.io.IOCache; import de.learnlib.ralib.oracles.io.IOFilter; import de.learnlib.ralib.oracles.io.IOOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnArrayListTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnArrayListTest.java index 437caed88..76eb97150 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnArrayListTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnArrayListTest.java @@ -22,7 +22,6 @@ import de.learnlib.ralib.example.list.ArrayListIODataWordOracle; import de.learnlib.ralib.example.list.ArrayListWrapper; import de.learnlib.ralib.learning.Hypothesis; -import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.mto.MultiTheoryTreeOracle; import de.learnlib.ralib.smt.ConstraintSolver; diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnEchoTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnEchoTest.java index d91d113dc..d94e16cd2 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnEchoTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnEchoTest.java @@ -19,7 +19,6 @@ import de.learnlib.ralib.data.DataValue; import de.learnlib.ralib.example.repeater.RepeaterSUL; import de.learnlib.ralib.learning.Hypothesis; -import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.io.IOCache; import de.learnlib.ralib.oracles.io.IOFilter; import de.learnlib.ralib.oracles.io.IOOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnLoginTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnLoginTest.java index c2ccade66..b60ff7bbf 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnLoginTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnLoginTest.java @@ -26,7 +26,6 @@ import de.learnlib.ralib.learning.Hypothesis; import de.learnlib.ralib.learning.Measurements; import de.learnlib.ralib.learning.RaLearningAlgorithmName; -import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.mto.MultiTheoryTreeOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnMixedIOTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnMixedIOTest.java index 78fdc76a6..e2f5a69bc 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnMixedIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnMixedIOTest.java @@ -39,7 +39,6 @@ import de.learnlib.ralib.equivalence.IOEquivalenceTest; import de.learnlib.ralib.equivalence.IORandomWalk; import de.learnlib.ralib.learning.Hypothesis; -import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.io.IOOracle; import de.learnlib.ralib.oracles.mto.MultiTheoryTreeOracle; import de.learnlib.ralib.smt.ConstraintSolver; diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPQIOTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPQIOTest.java index 615d0fb12..9da78ffa0 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPQIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPQIOTest.java @@ -40,7 +40,6 @@ import de.learnlib.ralib.equivalence.IORandomWalk; import de.learnlib.ralib.example.priority.PriorityQueueSUL; import de.learnlib.ralib.learning.Hypothesis; -import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.io.IOOracle; import de.learnlib.ralib.oracles.mto.MultiTheoryTreeOracle; import de.learnlib.ralib.smt.ConstraintSolver; diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPQTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPQTest.java index fd8583bd0..daa49d31e 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPQTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPQTest.java @@ -41,7 +41,6 @@ import de.learnlib.ralib.data.DataValue; import de.learnlib.ralib.learning.Measurements; import de.learnlib.ralib.learning.RaLearningAlgorithmName; -import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.mto.MultiTheoryTreeOracle; import de.learnlib.ralib.smt.ConstraintSolver; diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPadlock.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPadlock.java index 99ad4cf01..560ab74c7 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPadlock.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPadlock.java @@ -23,7 +23,6 @@ import de.learnlib.ralib.data.VarMapping; import de.learnlib.ralib.data.util.SymbolicDataValueGenerator.ParameterGenerator; import de.learnlib.ralib.data.util.SymbolicDataValueGenerator.RegisterGenerator; -import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.mto.MultiTheoryTreeOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPalindromeIOTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPalindromeIOTest.java index 2c6123f2c..94bb2a92e 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPalindromeIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPalindromeIOTest.java @@ -16,7 +16,6 @@ import de.learnlib.ralib.data.DataType; import de.learnlib.ralib.equivalence.IOEquivalenceTest; import de.learnlib.ralib.learning.Hypothesis; -import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.io.IOCache; import de.learnlib.ralib.oracles.io.IOFilter; import de.learnlib.ralib.oracles.io.IOOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnRepeaterTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnRepeaterTest.java index e5b99da37..06cdd5f07 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnRepeaterTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnRepeaterTest.java @@ -20,7 +20,6 @@ import de.learnlib.ralib.example.repeater.RepeaterSUL; import de.learnlib.ralib.learning.Measurements; import de.learnlib.ralib.learning.QueryStatistics; -import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.io.IOCache; import de.learnlib.ralib.oracles.io.IOFilter; import de.learnlib.ralib.oracles.io.IOOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnSipIOTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnSipIOTest.java index 5f5882f36..5b2708d0c 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnSipIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnSipIOTest.java @@ -20,7 +20,6 @@ import de.learnlib.ralib.equivalence.IOCounterexampleLoopRemover; import de.learnlib.ralib.equivalence.IOEquivalenceTest; import de.learnlib.ralib.learning.Hypothesis; -import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.io.IOCache; import de.learnlib.ralib.oracles.io.IOFilter; import de.learnlib.ralib.oracles.io.IOOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnStackTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnStackTest.java index 69bf7acb4..9ba2dec10 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnStackTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnStackTest.java @@ -25,7 +25,6 @@ import de.learnlib.ralib.learning.Measurements; import de.learnlib.ralib.learning.MeasuringOracle; import de.learnlib.ralib.learning.RaLearningAlgorithmName; -import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.mto.MultiTheoryTreeOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/TestDistinguishingSuffixOptimization.java b/src/test/java/de/learnlib/ralib/learning/sllambda/TestDistinguishingSuffixOptimization.java index d2a4e08e8..8f80421bf 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/TestDistinguishingSuffixOptimization.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/TestDistinguishingSuffixOptimization.java @@ -20,7 +20,6 @@ import de.learnlib.ralib.data.SymbolicDataValue.Register; import de.learnlib.ralib.data.VarMapping; import de.learnlib.ralib.learning.SymbolicSuffix; -import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.mto.MultiTheoryTreeOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/TestOutputSuffixes.java b/src/test/java/de/learnlib/ralib/learning/sllambda/TestOutputSuffixes.java index 40b4aba88..715ce53ca 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/TestOutputSuffixes.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/TestOutputSuffixes.java @@ -19,7 +19,6 @@ import de.learnlib.ralib.data.Constants; import de.learnlib.ralib.data.DataType; import de.learnlib.ralib.learning.SymbolicSuffix; -import de.learnlib.ralib.learning.sllambda.SLCT; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.TreeOracleFactory; import de.learnlib.ralib.oracles.io.IOCache; diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/TestQueryCount.java b/src/test/java/de/learnlib/ralib/learning/sllambda/TestQueryCount.java index 7b53f9d9a..a2c26428b 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/TestQueryCount.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/TestQueryCount.java @@ -17,7 +17,6 @@ import de.learnlib.ralib.learning.Measurements; import de.learnlib.ralib.learning.MeasuringOracle; import de.learnlib.ralib.learning.QueryStatistics; -import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.io.IOOracle; import de.learnlib.ralib.smt.ConstraintSolver; import de.learnlib.ralib.sul.SULOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/TestSuffixOptimization.java b/src/test/java/de/learnlib/ralib/learning/sllambda/TestSuffixOptimization.java index 407e711cd..158fc02b1 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/TestSuffixOptimization.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/TestSuffixOptimization.java @@ -26,7 +26,6 @@ import de.learnlib.ralib.learning.Measurements; import de.learnlib.ralib.learning.MeasuringOracle; import de.learnlib.ralib.learning.QueryStatistics; -import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.io.IOCache; import de.learnlib.ralib.oracles.io.IOFilter; diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/TestSymmetry.java b/src/test/java/de/learnlib/ralib/learning/sllambda/TestSymmetry.java index 77493b15d..5f12d0786 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/TestSymmetry.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/TestSymmetry.java @@ -22,7 +22,6 @@ import de.learnlib.ralib.data.VarMapping; import de.learnlib.ralib.data.util.SymbolicDataValueGenerator; import de.learnlib.ralib.learning.Hypothesis; -import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.mto.MultiTheoryTreeOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/TestUnknownMemorable.java b/src/test/java/de/learnlib/ralib/learning/sllambda/TestUnknownMemorable.java index 168997ce3..2c08a268c 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/TestUnknownMemorable.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/TestUnknownMemorable.java @@ -32,7 +32,6 @@ import de.learnlib.ralib.data.SymbolicDataValue.Register; import de.learnlib.ralib.data.VarMapping; import de.learnlib.ralib.data.util.SymbolicDataValueGenerator; -import de.learnlib.ralib.learning.sllambda.SLLambda; import de.learnlib.ralib.oracles.io.IOCache; import de.learnlib.ralib.oracles.io.IOFilter; import de.learnlib.ralib.oracles.io.IOOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/slstar/CellTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/CellTest.java index 7c424657b..bbde844d1 100644 --- a/src/test/java/de/learnlib/ralib/learning/slstar/CellTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/CellTest.java @@ -34,7 +34,6 @@ import de.learnlib.ralib.data.SDTRelabeling; import de.learnlib.ralib.example.sdts.LoginExampleTreeOracle; import de.learnlib.ralib.learning.SymbolicSuffix; -import de.learnlib.ralib.learning.slstar.Cell; import de.learnlib.ralib.words.PSymbolInstance; import net.automatalib.word.Word; diff --git a/src/test/java/de/learnlib/ralib/learning/slstar/LearnBoundedListTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnBoundedListTest.java index e928bec23..856a8fcf9 100644 --- a/src/test/java/de/learnlib/ralib/learning/slstar/LearnBoundedListTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnBoundedListTest.java @@ -23,7 +23,6 @@ import de.learnlib.ralib.example.list.BoundedList; import de.learnlib.ralib.example.list.BoundedListDataWordOracle; import de.learnlib.ralib.learning.Hypothesis; -import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.SDTLogicOracle; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.TreeOracleFactory; diff --git a/src/test/java/de/learnlib/ralib/learning/slstar/LearnLoginTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnLoginTest.java index 07c56d6d9..4be079cb2 100644 --- a/src/test/java/de/learnlib/ralib/learning/slstar/LearnLoginTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnLoginTest.java @@ -37,7 +37,6 @@ import de.learnlib.ralib.data.Constants; import de.learnlib.ralib.data.DataType; import de.learnlib.ralib.data.DataValue; -import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.SDTLogicOracle; import de.learnlib.ralib.oracles.SimulatorOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/slstar/LearnMixedIOTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnMixedIOTest.java index 14ace66cc..46c71f886 100644 --- a/src/test/java/de/learnlib/ralib/learning/slstar/LearnMixedIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnMixedIOTest.java @@ -39,7 +39,6 @@ import de.learnlib.ralib.equivalence.IOEquivalenceTest; import de.learnlib.ralib.equivalence.IORandomWalk; import de.learnlib.ralib.learning.Hypothesis; -import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.TreeOracleFactory; import de.learnlib.ralib.oracles.io.IOOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/slstar/LearnPQIOTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnPQIOTest.java index 03ada27e5..2e3eb0156 100644 --- a/src/test/java/de/learnlib/ralib/learning/slstar/LearnPQIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnPQIOTest.java @@ -40,7 +40,6 @@ import de.learnlib.ralib.equivalence.IORandomWalk; import de.learnlib.ralib.example.priority.PriorityQueueSUL; import de.learnlib.ralib.learning.Hypothesis; -import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.TreeOracleFactory; import de.learnlib.ralib.oracles.io.IOOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/slstar/LearnPQTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnPQTest.java index 7b0dbfdec..2be8bcabf 100644 --- a/src/test/java/de/learnlib/ralib/learning/slstar/LearnPQTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnPQTest.java @@ -36,7 +36,6 @@ import de.learnlib.ralib.data.Constants; import de.learnlib.ralib.data.DataType; import de.learnlib.ralib.data.DataValue; -import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.DataWordOracle; import de.learnlib.ralib.oracles.SDTLogicOracle; import de.learnlib.ralib.oracles.SimulatorOracle; diff --git a/src/test/java/de/learnlib/ralib/learning/slstar/LearnPalindromeIOTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnPalindromeIOTest.java index 52bf2969f..a4c932ca2 100644 --- a/src/test/java/de/learnlib/ralib/learning/slstar/LearnPalindromeIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnPalindromeIOTest.java @@ -32,7 +32,6 @@ import de.learnlib.ralib.data.DataType; import de.learnlib.ralib.equivalence.IOEquivalenceTest; import de.learnlib.ralib.learning.Hypothesis; -import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.TreeOracleFactory; import de.learnlib.ralib.oracles.io.IOCache; diff --git a/src/test/java/de/learnlib/ralib/learning/slstar/LearnRepeaterTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnRepeaterTest.java index fe5bd3dc0..7d1cfe8f6 100644 --- a/src/test/java/de/learnlib/ralib/learning/slstar/LearnRepeaterTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnRepeaterTest.java @@ -19,7 +19,6 @@ import de.learnlib.ralib.example.repeater.RepeaterSUL; import de.learnlib.ralib.learning.Measurements; import de.learnlib.ralib.learning.QueryStatistics; -import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.TreeOracleFactory; import de.learnlib.ralib.oracles.io.IOCache; diff --git a/src/test/java/de/learnlib/ralib/learning/slstar/LearnSipIOTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnSipIOTest.java index 96d2aaccd..11a409dd4 100644 --- a/src/test/java/de/learnlib/ralib/learning/slstar/LearnSipIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnSipIOTest.java @@ -36,7 +36,6 @@ import de.learnlib.ralib.equivalence.IOCounterexampleLoopRemover; import de.learnlib.ralib.equivalence.IOEquivalenceTest; import de.learnlib.ralib.learning.Hypothesis; -import de.learnlib.ralib.learning.slstar.SLStar; import de.learnlib.ralib.oracles.SimulatorOracle; import de.learnlib.ralib.oracles.TreeOracleFactory; import de.learnlib.ralib.oracles.io.IOCache; diff --git a/src/test/java/de/learnlib/ralib/learning/slstar/RowTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/RowTest.java index 95f979083..25ce835cb 100644 --- a/src/test/java/de/learnlib/ralib/learning/slstar/RowTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/RowTest.java @@ -35,7 +35,6 @@ import de.learnlib.ralib.data.util.RemappingIterator; import de.learnlib.ralib.example.sdts.LoginExampleTreeOracle; import de.learnlib.ralib.learning.SymbolicSuffix; -import de.learnlib.ralib.learning.slstar.Row; import de.learnlib.ralib.words.PSymbolInstance; import net.automatalib.word.Word; From 02e13f34a8b868b0c7c1ea80ca27a6c40595cd6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20T=C3=A5quist?= Date: Fri, 13 Mar 2026 11:50:20 +0100 Subject: [PATCH 4/6] Rename learning algorithm name enums --- .../de/learnlib/ralib/learning/RaLearningAlgorithmName.java | 6 +++--- src/main/java/de/learnlib/ralib/learning/sllambda/SLCT.java | 2 +- .../java/de/learnlib/ralib/learning/sllambda/SLLambda.java | 2 +- src/main/java/de/learnlib/ralib/learning/slstar/SLStar.java | 2 +- .../de/learnlib/ralib/RaLibLearningExperimentRunner.java | 6 +++--- .../ralib/learning/sllambda/LearnDtlsServerTest.java | 2 +- .../de/learnlib/ralib/learning/sllambda/LearnLoginTest.java | 4 ++-- .../de/learnlib/ralib/learning/sllambda/LearnPQTest.java | 4 ++-- .../de/learnlib/ralib/learning/sllambda/LearnStackTest.java | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/de/learnlib/ralib/learning/RaLearningAlgorithmName.java b/src/main/java/de/learnlib/ralib/learning/RaLearningAlgorithmName.java index a56aab231..d3df8f77d 100644 --- a/src/main/java/de/learnlib/ralib/learning/RaLearningAlgorithmName.java +++ b/src/main/java/de/learnlib/ralib/learning/RaLearningAlgorithmName.java @@ -1,7 +1,7 @@ package de.learnlib.ralib.learning; public enum RaLearningAlgorithmName { - RASTAR, - RALAMBDA, - RADT + SLSTAR, + SLLAMBDA, + SLCT } diff --git a/src/main/java/de/learnlib/ralib/learning/sllambda/SLCT.java b/src/main/java/de/learnlib/ralib/learning/sllambda/SLCT.java index 58fb178cd..96f362aec 100644 --- a/src/main/java/de/learnlib/ralib/learning/sllambda/SLCT.java +++ b/src/main/java/de/learnlib/ralib/learning/sllambda/SLCT.java @@ -181,7 +181,7 @@ public QueryStatistics getQueryStatistics() { @Override public RaLearningAlgorithmName getName() { - return RaLearningAlgorithmName.RADT; + return RaLearningAlgorithmName.SLCT; } public ClassificationTree getCT() { diff --git a/src/main/java/de/learnlib/ralib/learning/sllambda/SLLambda.java b/src/main/java/de/learnlib/ralib/learning/sllambda/SLLambda.java index 06a119156..ab528c70e 100644 --- a/src/main/java/de/learnlib/ralib/learning/sllambda/SLLambda.java +++ b/src/main/java/de/learnlib/ralib/learning/sllambda/SLLambda.java @@ -196,7 +196,7 @@ public QueryStatistics getQueryStatistics() { @Override public RaLearningAlgorithmName getName() { - return RaLearningAlgorithmName.RALAMBDA; + return RaLearningAlgorithmName.SLLAMBDA; } public ClassificationTree getCT() { diff --git a/src/main/java/de/learnlib/ralib/learning/slstar/SLStar.java b/src/main/java/de/learnlib/ralib/learning/slstar/SLStar.java index a062ce3e4..c89786870 100644 --- a/src/main/java/de/learnlib/ralib/learning/slstar/SLStar.java +++ b/src/main/java/de/learnlib/ralib/learning/slstar/SLStar.java @@ -211,6 +211,6 @@ public QueryStatistics getQueryStatistics() { @Override public RaLearningAlgorithmName getName() { - return RaLearningAlgorithmName.RASTAR; + return RaLearningAlgorithmName.SLSTAR; } } diff --git a/src/test/java/de/learnlib/ralib/RaLibLearningExperimentRunner.java b/src/test/java/de/learnlib/ralib/RaLibLearningExperimentRunner.java index 68b7d175c..49f72d4e2 100644 --- a/src/test/java/de/learnlib/ralib/RaLibLearningExperimentRunner.java +++ b/src/test/java/de/learnlib/ralib/RaLibLearningExperimentRunner.java @@ -114,11 +114,11 @@ public Hypothesis run(RaLearningAlgorithmName algorithmName, DataWordOracle data RaLearningAlgorithm learner; learner = switch (algorithmName) { - case RASTAR -> + case SLSTAR -> new SLStar(mto, hypFactory, mlo, consts, ioMode, actionSymbols); - case RALAMBDA -> + case SLLAMBDA -> new SLLambda(mto, teachers, consts, ioMode, solver, actionSymbols); - case RADT -> + case SLCT -> new SLCT(mto, hypFactory, mlo, consts, ioMode, solver, actionSymbols); default -> throw new UnsupportedOperationException(String.format("Algorithm %s not supported", algorithmName)); diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnDtlsServerTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnDtlsServerTest.java index beab95f14..7e6561113 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnDtlsServerTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnDtlsServerTest.java @@ -50,7 +50,7 @@ public void testLearnDtlsServer() { IOEquivalenceTest eqOracle = new IOEquivalenceTest(model, teachers, consts, false, actions); runner.setEqOracle(eqOracle); runner.setIoMode(true); - Hypothesis result = runner.run(RaLearningAlgorithmName.RALAMBDA, dwOracle, teachers, consts, solver, actions); + Hypothesis result = runner.run(RaLearningAlgorithmName.SLLAMBDA, dwOracle, teachers, consts, solver, actions); DefaultQuery ce = eqOracle.findCounterExample(result, null); Assert.assertNull(ce); } diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnLoginTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnLoginTest.java index b60ff7bbf..8c68e1d3c 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnLoginTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnLoginTest.java @@ -96,7 +96,7 @@ public void testLearnLoginRandom() { runner.setMaxDepth(6); for (int seed = 0; seed < SEEDS; seed++) { runner.setSeed(seed); - Hypothesis hyp = runner.run(RaLearningAlgorithmName.RALAMBDA, dwOracle, teachers, consts, solver, new ParameterizedSymbol [] {I_LOGIN, I_LOGOUT, I_REGISTER}); + Hypothesis hyp = runner.run(RaLearningAlgorithmName.SLLAMBDA, dwOracle, teachers, consts, solver, new ParameterizedSymbol [] {I_LOGIN, I_LOGOUT, I_REGISTER}); measuresLambda[seed] = runner.getMeasurements(); runner.resetMeasurements(); @@ -104,7 +104,7 @@ public void testLearnLoginRandom() { Assert.assertEquals(hyp.getTransitions().size(), 14); logger.log(Level.FINE, "HYP: {0}", hyp); - hyp = runner.run(RaLearningAlgorithmName.RASTAR, dwOracle, teachers, consts, solver, new ParameterizedSymbol [] {I_LOGIN, I_LOGOUT, I_REGISTER}); + hyp = runner.run(RaLearningAlgorithmName.SLSTAR, dwOracle, teachers, consts, solver, new ParameterizedSymbol [] {I_LOGIN, I_LOGOUT, I_REGISTER}); measuresStar[seed] = runner.getMeasurements(); runner.resetMeasurements(); } diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPQTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPQTest.java index daa49d31e..1200530ab 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPQTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPQTest.java @@ -131,10 +131,10 @@ public void testLearnPQRandom() { Measurements[] rastarCount = new Measurements [SEEDS]; for (int i = 0; i < SEEDS; i++) { runner.setSeed(i); - runner.run(RaLearningAlgorithmName.RALAMBDA, dwOracle, teachers, consts, solver, new ParameterizedSymbol [] {OFFER, POLL}); + runner.run(RaLearningAlgorithmName.SLLAMBDA, dwOracle, teachers, consts, solver, new ParameterizedSymbol [] {OFFER, POLL}); ralambdaCount[i] = runner.getMeasurements(); runner.resetMeasurements(); - runner.run(RaLearningAlgorithmName.RASTAR, dwOracle, teachers, consts, solver, new ParameterizedSymbol [] {OFFER, POLL}); + runner.run(RaLearningAlgorithmName.SLSTAR, dwOracle, teachers, consts, solver, new ParameterizedSymbol [] {OFFER, POLL}); rastarCount[i] = runner.getMeasurements(); runner.resetMeasurements(); } diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnStackTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnStackTest.java index 9ba2dec10..f594b2591 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnStackTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnStackTest.java @@ -198,14 +198,14 @@ public void testLearnStackRandom() { runner.setMaxDepth(6); for (int seed = 0; seed < SEEDS; seed++) { runner.setSeed(seed); - Hypothesis hypLambda = runner.run(RaLearningAlgorithmName.RALAMBDA, dwOracle, teachers, consts, solver, new ParameterizedSymbol[]{I_PUSH, I_POP}); + Hypothesis hypLambda = runner.run(RaLearningAlgorithmName.SLLAMBDA, dwOracle, teachers, consts, solver, new ParameterizedSymbol[]{I_PUSH, I_POP}); measuresLambda[seed] = runner.getMeasurements(); runner.resetMeasurements(); Assert.assertEquals(hypLambda.getStates().size(), 4); Assert.assertEquals(hypLambda.getTransitions().size(), 10); - runner.run(RaLearningAlgorithmName.RASTAR, dwOracle, teachers, consts, solver, new ParameterizedSymbol[] {I_PUSH, I_POP}); + runner.run(RaLearningAlgorithmName.SLSTAR, dwOracle, teachers, consts, solver, new ParameterizedSymbol[] {I_PUSH, I_POP}); measuresStar[seed] = runner.getMeasurements(); runner.resetMeasurements(); } From a8466b5b7642d10fd742b3435dfc5741f4b6458f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20T=C3=A5quist?= Date: Fri, 13 Mar 2026 11:57:00 +0100 Subject: [PATCH 5/6] Rename rastar variable to learner in ClassAnalyzer and IOSimulator --- .../tools/AbstractToolWithRandomWalk.java | 4 ++-- .../de/learnlib/ralib/tools/ClassAnalyzer.java | 12 ++++++------ .../de/learnlib/ralib/tools/IOSimulator.java | 18 +++++++++--------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/de/learnlib/ralib/tools/AbstractToolWithRandomWalk.java b/src/main/java/de/learnlib/ralib/tools/AbstractToolWithRandomWalk.java index 5e4bcf59e..10c4fa552 100644 --- a/src/main/java/de/learnlib/ralib/tools/AbstractToolWithRandomWalk.java +++ b/src/main/java/de/learnlib/ralib/tools/AbstractToolWithRandomWalk.java @@ -157,7 +157,7 @@ public Level parse(Configuration c) throws ConfigurationException { protected ConstraintSolver solver; - protected String learner = LEARNER_SLSTAR; + protected String learnerName = LEARNER_SLSTAR; private static final Random RANDOM = new Random(); @@ -183,7 +183,7 @@ public void setup(Configuration config) throws ConfigurationException { this.exportModel = OPTION_EXPORT_MODEL.parse(config); this.useFresh = OPTION_USE_FRESH_VALUES.parse(config); - this.learner = OPTION_LEARNER.parse(config); + this.learnerName = OPTION_LEARNER.parse(config); String[] parsed = OPTION_TEACHERS.parse(config).split("\\+", -1); for (String s : parsed) { diff --git a/src/main/java/de/learnlib/ralib/tools/ClassAnalyzer.java b/src/main/java/de/learnlib/ralib/tools/ClassAnalyzer.java index cde1b225f..f2d728268 100644 --- a/src/main/java/de/learnlib/ralib/tools/ClassAnalyzer.java +++ b/src/main/java/de/learnlib/ralib/tools/ClassAnalyzer.java @@ -114,7 +114,7 @@ public class ClassAnalyzer extends AbstractToolWithRandomWalk { private IORandomWalk randomWalk = null; - private RaLearningAlgorithm rastar; + private RaLearningAlgorithm learner; private IOCounterexampleLoopRemover ceOptLoops; @@ -244,7 +244,7 @@ public TreeOracle createTreeOracle(RegisterAutomaton hyp) { } }; - this.rastar = switch (this.learner) { + this.learner = switch (this.learnerName) { case AbstractToolWithRandomWalk.LEARNER_SLSTAR -> new SLStar(mto, hypFactory, mlo, consts, true, actions); case AbstractToolWithRandomWalk.LEARNER_SLLAMBDA -> @@ -252,7 +252,7 @@ public TreeOracle createTreeOracle(RegisterAutomaton hyp) { case AbstractToolWithRandomWalk.LEARNER_RADT -> new SLCT(mto, hypFactory, mlo, consts, true, solver, actions); default -> - throw new ConfigurationException("Unknown Learning algorithm: " + this.learner); + throw new ConfigurationException("Unknown Learning algorithm: " + this.learnerName); }; if (findCounterexamples) { @@ -315,8 +315,8 @@ public void run() throws RaLibToolException { while (maxRounds < 0 || rounds < maxRounds) { rounds++; - rastar.learn(); - hyp = rastar.getHypothesis(); + learner.learn(); + hyp = learner.getHypothesis(); System.out.println("HYP:------------------------------------------------"); System.out.println(hyp); System.out.println("----------------------------------------------------"); @@ -363,7 +363,7 @@ public void run() throws RaLibToolException { System.out.println("### HYP TRACE: " + hypTrace); assert !hypTrace.equals(sysTrace); - rastar.addCounterexample(ce); + learner.addCounterexample(ce); } System.out.println("=============================== STOP ==============================="); diff --git a/src/main/java/de/learnlib/ralib/tools/IOSimulator.java b/src/main/java/de/learnlib/ralib/tools/IOSimulator.java index 18b9fa229..ff876f13f 100644 --- a/src/main/java/de/learnlib/ralib/tools/IOSimulator.java +++ b/src/main/java/de/learnlib/ralib/tools/IOSimulator.java @@ -109,7 +109,7 @@ public class IOSimulator extends AbstractToolWithRandomWalk { private IOEquivalenceTest eqTest; - private RaLearningAlgorithm rastar; + private RaLearningAlgorithm learner; private IOCounterexampleLoopRemover ceOptLoops; @@ -213,7 +213,7 @@ public TreeOracle createTreeOracle(RegisterAutomaton hyp) { } }; - this.rastar = switch (this.learner) { + this.learner = switch (this.learnerName) { case AbstractToolWithRandomWalk.LEARNER_SLSTAR -> new SLStar(mto, hypFactory, mlo, consts, true, actions); case AbstractToolWithRandomWalk.LEARNER_SLLAMBDA -> @@ -221,10 +221,10 @@ public TreeOracle createTreeOracle(RegisterAutomaton hyp) { case AbstractToolWithRandomWalk.LEARNER_RADT -> new SLCT(mto, hypFactory, mlo, consts, true, solver, actions); default -> - throw new ConfigurationException("Unknown Learning algorithm: " + this.learner); + throw new ConfigurationException("Unknown Learning algorithm: " + this.learnerName); }; QueryStatistics queryStats = new QueryStatistics(measurements, sulLearn, trackingSULTest); - this.rastar.setStatisticCounter(queryStats); + this.learner.setStatisticCounter(queryStats); this.eqTest = new IOEquivalenceTest(model, teachers, consts, true, actions); @@ -284,13 +284,13 @@ public void run() { ArrayList ceLengthsShortened = new ArrayList<>(); Hypothesis hyp = null; - QueryStatistics queryStats = rastar.getQueryStatistics(); + QueryStatistics queryStats = learner.getQueryStatistics(); int rounds = 0; while (maxRounds < 0 || rounds < maxRounds) { rounds++; - rastar.learn(); - hyp = rastar.getHypothesis(); + learner.learn(); + hyp = learner.getHypothesis(); System.out.println("HYP:------------------------------------------------"); System.out.println(hyp); System.out.println("----------------------------------------------------"); @@ -358,13 +358,13 @@ public void run() { assert model.accepts(ce.getInput()); assert !hyp.accepts(ce.getInput()); - rastar.addCounterexample(ce); + learner.addCounterexample(ce); } System.out.println("=============================== STOP ==============================="); SimpleProfiler.logResults(); - System.out.println("Learner: " + rastar.getClass().getSimpleName()); + System.out.println("Learner: " + learner.getClass().getSimpleName()); for (Entry e : teachers.entrySet()) { System.out.println("Theory: " + e.getKey() + " -> " + e.getValue().getClass().getName()); From a658aec4bb927fc1a0210b6da3fe8ec2d652ec28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20T=C3=A5quist?= Date: Fri, 13 Mar 2026 12:05:20 +0100 Subject: [PATCH 6/6] Rename rastar and ralambda variables to slstar and sllambda --- .../ralib/learning/sllambda/LearnPQTest.java | 12 ++++++------ .../ralib/learning/slstar/LearnBoundedListTest.java | 12 ++++++------ .../ralib/learning/slstar/LearnLoginTest.java | 12 ++++++------ .../ralib/learning/slstar/LearnMixedIOTest.java | 10 +++++----- .../ralib/learning/slstar/LearnPQIOTest.java | 10 +++++----- .../learnlib/ralib/learning/slstar/LearnPQTest.java | 12 ++++++------ .../ralib/learning/slstar/LearnPalindromeIOTest.java | 10 +++++----- .../ralib/learning/slstar/LearnSipIOTest.java | 10 +++++----- 8 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPQTest.java b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPQTest.java index 1200530ab..7944a0cae 100644 --- a/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPQTest.java +++ b/src/test/java/de/learnlib/ralib/learning/sllambda/LearnPQTest.java @@ -127,20 +127,20 @@ public void testLearnPQRandom() { RaLibLearningExperimentRunner runner = new RaLibLearningExperimentRunner(logger); runner.setMaxDepth(4); - Measurements[] ralambdaCount = new Measurements [SEEDS]; - Measurements[] rastarCount = new Measurements [SEEDS]; + Measurements[] sllambdaCount = new Measurements [SEEDS]; + Measurements[] slstarCount = new Measurements [SEEDS]; for (int i = 0; i < SEEDS; i++) { runner.setSeed(i); runner.run(RaLearningAlgorithmName.SLLAMBDA, dwOracle, teachers, consts, solver, new ParameterizedSymbol [] {OFFER, POLL}); - ralambdaCount[i] = runner.getMeasurements(); + sllambdaCount[i] = runner.getMeasurements(); runner.resetMeasurements(); runner.run(RaLearningAlgorithmName.SLSTAR, dwOracle, teachers, consts, solver, new ParameterizedSymbol [] {OFFER, POLL}); - rastarCount[i] = runner.getMeasurements(); + slstarCount[i] = runner.getMeasurements(); runner.resetMeasurements(); } // hard-coded results from first seed - Assert.assertEquals(Arrays.toString(ralambdaCount), "[{TQ: 88, Resets: 876, Inputs: 0}]"); - Assert.assertEquals(Arrays.toString(rastarCount), "[{TQ: 55, Resets: 5721, Inputs: 0}]"); + Assert.assertEquals(Arrays.toString(sllambdaCount), "[{TQ: 88, Resets: 876, Inputs: 0}]"); + Assert.assertEquals(Arrays.toString(slstarCount), "[{TQ: 55, Resets: 5721, Inputs: 0}]"); } } diff --git a/src/test/java/de/learnlib/ralib/learning/slstar/LearnBoundedListTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnBoundedListTest.java index 856a8fcf9..d17a42668 100644 --- a/src/test/java/de/learnlib/ralib/learning/slstar/LearnBoundedListTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnBoundedListTest.java @@ -78,16 +78,16 @@ private Hypothesis learnBoundedListDWOracle(int size, boolean useNull, Word alphabet = Arrays.asList(INSERT, PUSH, POP); - SLStar rastar = new SLStar(mto, hypFactory, mlo, consts, false, + SLStar slstar = new SLStar(mto, hypFactory, mlo, consts, false, alphabet.toArray(new ParameterizedSymbol[alphabet.size()])); - rastar.learn(); - Hypothesis hypothesis = rastar.getHypothesis(); + slstar.learn(); + Hypothesis hypothesis = slstar.getHypothesis(); for (Word ce : ces) { - rastar.addCounterexample(new DefaultQuery(ce, dwOracle.answerQuery(ce))); - rastar.learn(); - hypothesis = rastar.getHypothesis(); + slstar.addCounterexample(new DefaultQuery(ce, dwOracle.answerQuery(ce))); + slstar.learn(); + hypothesis = slstar.getHypothesis(); } return hypothesis; } diff --git a/src/test/java/de/learnlib/ralib/learning/slstar/LearnLoginTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnLoginTest.java index 4be079cb2..fe548f3b0 100644 --- a/src/test/java/de/learnlib/ralib/learning/slstar/LearnLoginTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnLoginTest.java @@ -76,11 +76,11 @@ public void testLearnLoginExample() { new MultiTheoryTreeOracle(new SimulatorOracle(hyp), teachers, new Constants(), solver); - SLStar rastar = new SLStar(mto, hypFactory, slo, + SLStar slstar = new SLStar(mto, hypFactory, slo, consts, I_LOGIN, I_LOGOUT, I_REGISTER); - rastar.learn(); - RegisterAutomaton hyp = rastar.getHypothesis(); + slstar.learn(); + RegisterAutomaton hyp = slstar.getHypothesis(); // System.out.println(hyp); logger.log(Level.FINE, "HYP1: {0}", hyp); @@ -90,10 +90,10 @@ public void testLearnLoginExample() { new PSymbolInstance(I_LOGIN, new DataValue(T_UID, BigDecimal.ONE), new DataValue(T_PWD, BigDecimal.ONE))); - rastar.addCounterexample(new DefaultQuery<>(ce, sul.accepts(ce))); + slstar.addCounterexample(new DefaultQuery<>(ce, sul.accepts(ce))); - rastar.learn(); - hyp = rastar.getHypothesis(); + slstar.learn(); + hyp = slstar.getHypothesis(); // System.out.println(hyp); logger.log(Level.FINE, "HYP2: {0}", hyp); diff --git a/src/test/java/de/learnlib/ralib/learning/slstar/LearnMixedIOTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnMixedIOTest.java index 46c71f886..698490c9b 100644 --- a/src/test/java/de/learnlib/ralib/learning/slstar/LearnMixedIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnMixedIOTest.java @@ -107,7 +107,7 @@ public void testLearnMixedIO() { TreeOracleFactory hypFactory = (RegisterAutomaton hyp) -> new MultiTheoryTreeOracle(new SimulatorOracle(hyp), teachers, consts, solver); - SLStar rastar = new SLStar(mto, hypFactory, mlo, consts, true, actions); + SLStar slstar = new SLStar(mto, hypFactory, mlo, consts, true, actions); IORandomWalk iowalk = new IORandomWalk(random, sul, @@ -127,8 +127,8 @@ public void testLearnMixedIO() { IOCounterExamplePrefixFinder pref = new IOCounterExamplePrefixFinder(ioOracle); for (int check = 0; check < 100; ++check) { - rastar.learn(); - Hypothesis hyp = rastar.getHypothesis(); + slstar.learn(); + Hypothesis hyp = slstar.getHypothesis(); DefaultQuery ce = iowalk.findCounterExample(hyp, null); if (ce == null) { @@ -142,10 +142,10 @@ public void testLearnMixedIO() { Assert.assertTrue(model.accepts(ce.getInput())); Assert.assertFalse(hyp.accepts(ce.getInput())); - rastar.addCounterexample(ce); + slstar.addCounterexample(ce); } - RegisterAutomaton hyp = rastar.getHypothesis(); + RegisterAutomaton hyp = slstar.getHypothesis(); IOEquivalenceTest checker = new IOEquivalenceTest(model, teachers, consts, true, actions); Assert.assertNull(checker.findCounterExample(hyp, null)); diff --git a/src/test/java/de/learnlib/ralib/learning/slstar/LearnPQIOTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnPQIOTest.java index 2e3eb0156..414064530 100644 --- a/src/test/java/de/learnlib/ralib/learning/slstar/LearnPQIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnPQIOTest.java @@ -82,7 +82,7 @@ public void testLearnLoginExampleIO() { TreeOracleFactory hypFactory = (RegisterAutomaton hyp) -> new MultiTheoryTreeOracle(new SimulatorOracle(hyp), teachers, consts, solver); - SLStar rastar = new SLStar(mto, hypFactory, mlo, + SLStar slstar = new SLStar(mto, hypFactory, mlo, consts, true, sul.getActionSymbols()); IORandomWalk iowalk = new IORandomWalk(random, @@ -103,8 +103,8 @@ public void testLearnLoginExampleIO() { IOCounterExamplePrefixFinder pref = new IOCounterExamplePrefixFinder(ioOracle); for (int check = 0; check < 100; ++check) { - rastar.learn(); - Hypothesis hyp = rastar.getHypothesis(); + slstar.learn(); + Hypothesis hyp = slstar.getHypothesis(); //System.out.println(hyp); DefaultQuery ce = iowalk.findCounterExample(hyp, null); @@ -116,10 +116,10 @@ public void testLearnLoginExampleIO() { ce = loops.optimizeCE(ce.getInput(), hyp); ce = asrep.optimizeCE(ce.getInput(), hyp); ce = pref.optimizeCE(ce.getInput(), hyp); - rastar.addCounterexample(ce); + slstar.addCounterexample(ce); } - RegisterAutomaton hyp = rastar.getHypothesis(); + RegisterAutomaton hyp = slstar.getHypothesis(); RegisterAutomatonImporter imp = TestUtil.getLoader( "/de/learnlib/ralib/automata/xml/pq3.xml"); diff --git a/src/test/java/de/learnlib/ralib/learning/slstar/LearnPQTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnPQTest.java index 2be8bcabf..c95652462 100644 --- a/src/test/java/de/learnlib/ralib/learning/slstar/LearnPQTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnPQTest.java @@ -72,9 +72,9 @@ public void testPQExample() { TreeOracleFactory hypFactory = (RegisterAutomaton hyp) -> new MultiTheoryTreeOracle(new SimulatorOracle(hyp), teachers, new Constants(), solver); - SLStar rastar = new SLStar(mto, hypFactory, mlo, consts, OFFER, POLL); - rastar.learn(); - RegisterAutomaton hyp = rastar.getHypothesis(); + SLStar slstar = new SLStar(mto, hypFactory, mlo, consts, OFFER, POLL); + slstar.learn(); + RegisterAutomaton hyp = slstar.getHypothesis(); logger.log(Level.FINE, "HYP1: {0}", hyp); Word ce = Word.fromSymbols( @@ -90,10 +90,10 @@ public void testPQExample() { DefaultQuery ceQuery = new DefaultQuery<>(ce); dwOracle.processQueries(Collections.singleton(ceQuery)); - rastar.addCounterexample(ceQuery); + slstar.addCounterexample(ceQuery); - rastar.learn(); - hyp = rastar.getHypothesis(); + slstar.learn(); + hyp = slstar.getHypothesis(); logger.log(Level.FINE, "HYP2: {0}", hyp); Assert.assertEquals(hyp.getStates().size(), 5); diff --git a/src/test/java/de/learnlib/ralib/learning/slstar/LearnPalindromeIOTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnPalindromeIOTest.java index a4c932ca2..913a3190c 100644 --- a/src/test/java/de/learnlib/ralib/learning/slstar/LearnPalindromeIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnPalindromeIOTest.java @@ -94,14 +94,14 @@ public void testLearnPalindromeIO() { TreeOracleFactory hypFactory = (RegisterAutomaton hyp) -> new MultiTheoryTreeOracle(new SimulatorOracle(hyp), teachers, consts, solver); - SLStar rastar = new SLStar(mto, hypFactory, mlo, consts, true, actions); + SLStar slstar = new SLStar(mto, hypFactory, mlo, consts, true, actions); IOEquivalenceTest ioEquiv = new IOEquivalenceTest( model, teachers, consts, true, actions); for (int check = 0; check < 10; ++check) { - rastar.learn(); - Hypothesis hyp = rastar.getHypothesis(); + slstar.learn(); + Hypothesis hyp = slstar.getHypothesis(); logger.log(Level.FINE, "HYP: {0}", hyp); DefaultQuery ce = ioEquiv.findCounterExample(hyp, null); @@ -114,10 +114,10 @@ public void testLearnPalindromeIO() { Assert.assertTrue(model.accepts(ce.getInput())); Assert.assertFalse(hyp.accepts(ce.getInput())); - rastar.addCounterexample(ce); + slstar.addCounterexample(ce); } - RegisterAutomaton hyp = rastar.getHypothesis(); + RegisterAutomaton hyp = slstar.getHypothesis(); logger.log(Level.FINE, "FINAL HYP: {0}", hyp); DefaultQuery ce = ioEquiv.findCounterExample(hyp, null); diff --git a/src/test/java/de/learnlib/ralib/learning/slstar/LearnSipIOTest.java b/src/test/java/de/learnlib/ralib/learning/slstar/LearnSipIOTest.java index 11a409dd4..571f7abc8 100644 --- a/src/test/java/de/learnlib/ralib/learning/slstar/LearnSipIOTest.java +++ b/src/test/java/de/learnlib/ralib/learning/slstar/LearnSipIOTest.java @@ -106,7 +106,7 @@ public void testLearnSipIO() { TreeOracleFactory hypFactory = (RegisterAutomaton hyp) -> new MultiTheoryTreeOracle(new SimulatorOracle(hyp), teachers, consts, solver); - SLStar rastar = new SLStar(mto, hypFactory, mlo, consts, true, actions); + SLStar slstar = new SLStar(mto, hypFactory, mlo, consts, true, actions); IOEquivalenceTest ioEquiv = new IOEquivalenceTest(model, teachers, consts, true, actions); @@ -115,8 +115,8 @@ public void testLearnSipIO() { IOCounterExamplePrefixFinder pref = new IOCounterExamplePrefixFinder(ioOracle); for (int check = 0; check < 100; ++check) { - rastar.learn(); - Hypothesis hyp = rastar.getHypothesis(); + slstar.learn(); + Hypothesis hyp = slstar.getHypothesis(); DefaultQuery ce = ioEquiv.findCounterExample(hyp, null); if (ce == null) { @@ -130,10 +130,10 @@ public void testLearnSipIO() { Assert.assertTrue(model.accepts(ce.getInput())); Assert.assertFalse(hyp.accepts(ce.getInput())); - rastar.addCounterexample(ce); + slstar.addCounterexample(ce); } - RegisterAutomaton hyp = rastar.getHypothesis(); + RegisterAutomaton hyp = slstar.getHypothesis(); logger.log(Level.FINE, "FINAL HYP: {0}", hyp); DefaultQuery ce = ioEquiv.findCounterExample(hyp, null); Assert.assertNull(ce);