From 824c28a4ce187b27687659a3dfb2e0e17953c718 Mon Sep 17 00:00:00 2001 From: Markus Frohme Date: Thu, 8 Feb 2018 11:47:36 +0100 Subject: [PATCH 01/13] [maven-release-plugin] prepare for next development iteration --- algorithms/active/adt/pom.xml | 2 +- algorithms/active/dhc/pom.xml | 2 +- algorithms/active/discrimination-tree-vpda/pom.xml | 2 +- algorithms/active/discrimination-tree/pom.xml | 2 +- algorithms/active/kearns-vazirani/pom.xml | 2 +- algorithms/active/lstar/pom.xml | 2 +- algorithms/active/nlstar/pom.xml | 2 +- algorithms/active/pom.xml | 2 +- algorithms/active/ttt-vpda/pom.xml | 2 +- algorithms/active/ttt/pom.xml | 2 +- algorithms/passive/pom.xml | 2 +- algorithms/passive/rpni-edsm/pom.xml | 2 +- algorithms/passive/rpni-mdl/pom.xml | 2 +- algorithms/passive/rpni/pom.xml | 2 +- algorithms/pom.xml | 2 +- api/pom.xml | 2 +- archetypes/basic/pom.xml | 2 +- archetypes/complete/pom.xml | 2 +- archetypes/pom.xml | 2 +- build-parent/pom.xml | 2 +- build-tools/pom.xml | 2 +- commons/acex/pom.xml | 2 +- commons/counterexamples/pom.xml | 2 +- commons/pom.xml | 2 +- commons/settings/pom.xml | 2 +- commons/util/pom.xml | 2 +- datastructures/discrimination-tree/pom.xml | 2 +- datastructures/list/pom.xml | 2 +- datastructures/observation-table/pom.xml | 2 +- datastructures/pom.xml | 2 +- datastructures/pta/pom.xml | 2 +- distribution/pom.xml | 2 +- drivers/basic/pom.xml | 2 +- drivers/mapper/pom.xml | 2 +- drivers/pom.xml | 2 +- drivers/simulator/pom.xml | 2 +- examples/pom.xml | 2 +- oracles/equivalence-oracles/pom.xml | 2 +- oracles/filters/cache/pom.xml | 2 +- oracles/filters/pom.xml | 2 +- oracles/filters/reuse/pom.xml | 2 +- oracles/filters/statistics/pom.xml | 2 +- oracles/membership-oracles/pom.xml | 2 +- oracles/parallelism/pom.xml | 2 +- oracles/pom.xml | 2 +- pom.xml | 4 ++-- test-support/learner-it-support/pom.xml | 2 +- test-support/learning-examples/pom.xml | 2 +- test-support/pom.xml | 2 +- 49 files changed, 50 insertions(+), 50 deletions(-) diff --git a/algorithms/active/adt/pom.xml b/algorithms/active/adt/pom.xml index 56f90a48b3..56dd91b1fc 100644 --- a/algorithms/active/adt/pom.xml +++ b/algorithms/active/adt/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-active-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/algorithms/active/dhc/pom.xml b/algorithms/active/dhc/pom.xml index 70f2ef04c7..71931ab90d 100644 --- a/algorithms/active/dhc/pom.xml +++ b/algorithms/active/dhc/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-active-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/algorithms/active/discrimination-tree-vpda/pom.xml b/algorithms/active/discrimination-tree-vpda/pom.xml index 135780f1d7..d9dae35f3d 100644 --- a/algorithms/active/discrimination-tree-vpda/pom.xml +++ b/algorithms/active/discrimination-tree-vpda/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-active-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/algorithms/active/discrimination-tree/pom.xml b/algorithms/active/discrimination-tree/pom.xml index 8d939bc5ad..b52cbdbaea 100644 --- a/algorithms/active/discrimination-tree/pom.xml +++ b/algorithms/active/discrimination-tree/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-active-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/algorithms/active/kearns-vazirani/pom.xml b/algorithms/active/kearns-vazirani/pom.xml index 0f26aa2513..800b2ca51b 100644 --- a/algorithms/active/kearns-vazirani/pom.xml +++ b/algorithms/active/kearns-vazirani/pom.xml @@ -20,7 +20,7 @@ limitations under the License. de.learnlib learnlib-algorithms-active-parent - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml learnlib-kearns-vazirani diff --git a/algorithms/active/lstar/pom.xml b/algorithms/active/lstar/pom.xml index 4565d2b968..92d7a4c3be 100644 --- a/algorithms/active/lstar/pom.xml +++ b/algorithms/active/lstar/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-active-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/algorithms/active/nlstar/pom.xml b/algorithms/active/nlstar/pom.xml index 34529a8574..7eb5b0b6ac 100644 --- a/algorithms/active/nlstar/pom.xml +++ b/algorithms/active/nlstar/pom.xml @@ -20,7 +20,7 @@ limitations under the License. de.learnlib learnlib-algorithms-active-parent - 0.13.0 + 0.14.0-SNAPSHOT LearnLib :: Algorithms :: NL* learnlib-nlstar diff --git a/algorithms/active/pom.xml b/algorithms/active/pom.xml index c2da98e796..cf889b6310 100644 --- a/algorithms/active/pom.xml +++ b/algorithms/active/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/algorithms/active/ttt-vpda/pom.xml b/algorithms/active/ttt-vpda/pom.xml index 48e22d71cd..1af6ea2312 100644 --- a/algorithms/active/ttt-vpda/pom.xml +++ b/algorithms/active/ttt-vpda/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-active-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/algorithms/active/ttt/pom.xml b/algorithms/active/ttt/pom.xml index 1424df3706..1fca80b87a 100644 --- a/algorithms/active/ttt/pom.xml +++ b/algorithms/active/ttt/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-active-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/algorithms/passive/pom.xml b/algorithms/passive/pom.xml index 2e97a5d75f..c78365241e 100644 --- a/algorithms/passive/pom.xml +++ b/algorithms/passive/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/algorithms/passive/rpni-edsm/pom.xml b/algorithms/passive/rpni-edsm/pom.xml index a9560d3a75..5fd815dfd7 100644 --- a/algorithms/passive/rpni-edsm/pom.xml +++ b/algorithms/passive/rpni-edsm/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-passive-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/algorithms/passive/rpni-mdl/pom.xml b/algorithms/passive/rpni-mdl/pom.xml index 773b2478ce..00aa18ed4c 100644 --- a/algorithms/passive/rpni-mdl/pom.xml +++ b/algorithms/passive/rpni-mdl/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-passive-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/algorithms/passive/rpni/pom.xml b/algorithms/passive/rpni/pom.xml index 2abc6bc323..84563a466c 100644 --- a/algorithms/passive/rpni/pom.xml +++ b/algorithms/passive/rpni/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-passive-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/algorithms/pom.xml b/algorithms/pom.xml index bf16efa7d0..4876fe6039 100644 --- a/algorithms/pom.xml +++ b/algorithms/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-build-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../build-parent/pom.xml diff --git a/api/pom.xml b/api/pom.xml index b0e48c9ff4..e739c1e9fa 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ limitations under the License. de.learnlib learnlib-build-parent - 0.13.0 + 0.14.0-SNAPSHOT ../build-parent/pom.xml diff --git a/archetypes/basic/pom.xml b/archetypes/basic/pom.xml index 827dc6f61a..bedc3c594d 100644 --- a/archetypes/basic/pom.xml +++ b/archetypes/basic/pom.xml @@ -27,7 +27,7 @@ limitations under the License. de.learnlib.archetypes learnlib-archetypes-parent - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/archetypes/complete/pom.xml b/archetypes/complete/pom.xml index a7b496adbd..b508dca3a2 100644 --- a/archetypes/complete/pom.xml +++ b/archetypes/complete/pom.xml @@ -27,7 +27,7 @@ limitations under the License. de.learnlib.archetypes learnlib-archetypes-parent - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 72d09bc1b2..b26a55119d 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -28,7 +28,7 @@ limitations under the License. de.learnlib learnlib-build-parent - 0.13.0 + 0.14.0-SNAPSHOT ../build-parent/pom.xml diff --git a/build-parent/pom.xml b/build-parent/pom.xml index dd786bd0b3..ae41a6d765 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -30,7 +30,7 @@ limitations under the License. de.learnlib learnlib-parent - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/build-tools/pom.xml b/build-tools/pom.xml index 5256056f13..6a4abd3d22 100644 --- a/build-tools/pom.xml +++ b/build-tools/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/commons/acex/pom.xml b/commons/acex/pom.xml index 21da6a13f1..8df9b6e957 100644 --- a/commons/acex/pom.xml +++ b/commons/acex/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-commons-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/commons/counterexamples/pom.xml b/commons/counterexamples/pom.xml index 4ec4cb94f4..3be4ee4653 100644 --- a/commons/counterexamples/pom.xml +++ b/commons/counterexamples/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-commons-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/commons/pom.xml b/commons/pom.xml index 3a192c565f..bd3f3d4ece 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-build-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../build-parent/pom.xml diff --git a/commons/settings/pom.xml b/commons/settings/pom.xml index d4a30adfe2..53c392787d 100644 --- a/commons/settings/pom.xml +++ b/commons/settings/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-commons-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/commons/util/pom.xml b/commons/util/pom.xml index a559a61e74..970ce2c50f 100644 --- a/commons/util/pom.xml +++ b/commons/util/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-commons-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/datastructures/discrimination-tree/pom.xml b/datastructures/discrimination-tree/pom.xml index a34b9efb7a..0b8205a47d 100644 --- a/datastructures/discrimination-tree/pom.xml +++ b/datastructures/discrimination-tree/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-datastructures-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/datastructures/list/pom.xml b/datastructures/list/pom.xml index 7181a311ea..a1d29de12c 100644 --- a/datastructures/list/pom.xml +++ b/datastructures/list/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-datastructures-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/datastructures/observation-table/pom.xml b/datastructures/observation-table/pom.xml index 9cbd390944..1d4f61986f 100644 --- a/datastructures/observation-table/pom.xml +++ b/datastructures/observation-table/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-datastructures-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/datastructures/pom.xml b/datastructures/pom.xml index ce4b9cc9fe..145fd35bd2 100644 --- a/datastructures/pom.xml +++ b/datastructures/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-build-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../build-parent/pom.xml diff --git a/datastructures/pta/pom.xml b/datastructures/pta/pom.xml index 352a3e2fad..7ef320714d 100644 --- a/datastructures/pta/pom.xml +++ b/datastructures/pta/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-datastructures-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index 6e514826d7..71406580ed 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -20,7 +20,7 @@ limitations under the License. de.learnlib learnlib-build-parent - 0.13.0 + 0.14.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drivers/basic/pom.xml b/drivers/basic/pom.xml index 416345f7c1..1b309c1e17 100644 --- a/drivers/basic/pom.xml +++ b/drivers/basic/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-drivers-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/drivers/mapper/pom.xml b/drivers/mapper/pom.xml index 7150407cf1..63cc459828 100644 --- a/drivers/mapper/pom.xml +++ b/drivers/mapper/pom.xml @@ -20,7 +20,7 @@ limitations under the License. de.learnlib learnlib-drivers-parent - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/drivers/pom.xml b/drivers/pom.xml index d809aed7d4..2fb03abdfa 100644 --- a/drivers/pom.xml +++ b/drivers/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-build-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../build-parent/pom.xml diff --git a/drivers/simulator/pom.xml b/drivers/simulator/pom.xml index e0ff211adb..7c0774298e 100644 --- a/drivers/simulator/pom.xml +++ b/drivers/simulator/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-drivers-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index bf65310064..a9ee40d290 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-build-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../build-parent/pom.xml diff --git a/oracles/equivalence-oracles/pom.xml b/oracles/equivalence-oracles/pom.xml index e4062ba505..8505a4d7b7 100644 --- a/oracles/equivalence-oracles/pom.xml +++ b/oracles/equivalence-oracles/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-oracles-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/oracles/filters/cache/pom.xml b/oracles/filters/cache/pom.xml index 5fc95876b1..f891a47f5c 100644 --- a/oracles/filters/cache/pom.xml +++ b/oracles/filters/cache/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-filters-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/oracles/filters/pom.xml b/oracles/filters/pom.xml index 8bc053527e..1807460dad 100644 --- a/oracles/filters/pom.xml +++ b/oracles/filters/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-oracles-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/oracles/filters/reuse/pom.xml b/oracles/filters/reuse/pom.xml index 343638ed25..e90cfac27b 100644 --- a/oracles/filters/reuse/pom.xml +++ b/oracles/filters/reuse/pom.xml @@ -19,7 +19,7 @@ limitations under the License. learnlib-filters-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/oracles/filters/statistics/pom.xml b/oracles/filters/statistics/pom.xml index f06d22b31a..6105c37d0a 100644 --- a/oracles/filters/statistics/pom.xml +++ b/oracles/filters/statistics/pom.xml @@ -19,7 +19,7 @@ limitations under the License. learnlib-filters-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/oracles/membership-oracles/pom.xml b/oracles/membership-oracles/pom.xml index a85be42305..03c31363cf 100644 --- a/oracles/membership-oracles/pom.xml +++ b/oracles/membership-oracles/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-oracles-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/oracles/parallelism/pom.xml b/oracles/parallelism/pom.xml index 4c90367f84..26ba5dce9d 100644 --- a/oracles/parallelism/pom.xml +++ b/oracles/parallelism/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-oracles-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../pom.xml diff --git a/oracles/pom.xml b/oracles/pom.xml index d6e10de6c4..b95416301b 100644 --- a/oracles/pom.xml +++ b/oracles/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-build-parent de.learnlib - 0.13.0 + 0.14.0-SNAPSHOT ../build-parent/pom.xml diff --git a/pom.xml b/pom.xml index 75da7592f7..b4e2fc79d3 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ limitations under the License. --> de.learnlib learnlib-parent - 0.13.0 + 0.14.0-SNAPSHOT pom LearnLib http://learnlib.github.io/learnlib/maven-site/${project.version} @@ -129,7 +129,7 @@ limitations under the License. scm:git:git@github.com:LearnLib/learnlib.git scm:git:git@github.com:LearnLib/learnlib.git https://github.com/LearnLib/learnlib/tree/develop - learnlib-0.13.0 + HEAD - 0.7.0 + 0.8.0-SNAPSHOT 0.1 8.1 3.0.2 From ac99e3a26a6cef2abf573c0f836e47d39b84c8ac Mon Sep 17 00:00:00 2001 From: Markus Frohme Date: Mon, 26 Mar 2018 13:21:18 +0200 Subject: [PATCH 08/13] algorithms: correctly handle GrowingAlphabets Fix the behaviour of the `addAlphabetSymbol` method if the learners were initiliazed with a GrowingAlphabet already. Previously, due to sharing the alphabet instance with the hypothesis automaton, caching mechanisms prevented the correct propagation of the new alphabet symbol. (cherry picked from commit 87477d8186c544957ce0a6e7c95b7709dcc2eb98) --- .../algorithms/adt/learner/ADTLearner.java | 15 +++- .../discriminationtree/AbstractDTLearner.java | 7 +- .../hypothesis/DTLearnerHypothesis.java | 5 +- .../algorithms/kv/dfa/KearnsVaziraniDFA.java | 7 +- .../kv/mealy/KearnsVaziraniMealy.java | 7 +- .../lstar/AbstractAutomatonLStar.java | 7 +- .../algorithms/lstar/AbstractLStar.java | 8 +- .../ttt/base/AbstractTTTLearner.java | 7 +- .../AbstractGrowingAlphabetTest.java | 78 ++++++++++--------- 9 files changed, 89 insertions(+), 52 deletions(-) diff --git a/algorithms/active/adt/src/main/java/de/learnlib/algorithms/adt/learner/ADTLearner.java b/algorithms/active/adt/src/main/java/de/learnlib/algorithms/adt/learner/ADTLearner.java index 402c2924a6..b13f2740cc 100644 --- a/algorithms/active/adt/src/main/java/de/learnlib/algorithms/adt/learner/ADTLearner.java +++ b/algorithms/active/adt/src/main/java/de/learnlib/algorithms/adt/learner/ADTLearner.java @@ -65,6 +65,7 @@ import net.automatalib.words.Word; import net.automatalib.words.WordBuilder; import net.automatalib.words.impl.Alphabets; +import net.automatalib.words.impl.SymbolHidingAlphabet; /** * The main learning algorithm. @@ -101,7 +102,7 @@ public ADTLearner(final Alphabet alphabet, final ADTExtender adtExtender, final SubtreeReplacer subtreeReplacer) { - this.alphabet = alphabet; + this.alphabet = SymbolHidingAlphabet.wrapIfMutable(alphabet); this.observationTree = new ObservationTree<>(this.alphabet); this.oracle = new SQOOTBridge<>(this.observationTree, oracle, true); @@ -370,9 +371,17 @@ public void addAlphabetSymbol(I symbol) { return; } - this.alphabet = Alphabets.withNewSymbol(this.alphabet, symbol); this.hypothesis.addAlphabetSymbol(symbol); - this.observationTree.getObservationTree().addAlphabetSymbol(symbol); + + SymbolHidingAlphabet.runWhileHiding(alphabet, + symbol, + () -> this.observationTree.getObservationTree().addAlphabetSymbol(symbol)); + + // since we share the alphabet instance with our hypothesis, our alphabet might have already been updated (if it + // was already a GrowableAlphabet) + if (!this.alphabet.containsSymbol(symbol)) { + this.alphabet = Alphabets.withNewSymbol(this.alphabet, symbol); + } for (final ADTState s : this.hypothesis.getStates()) { this.openTransitions.add(this.hypothesis.createOpenTransition(s, symbol, this.adt.getRoot())); diff --git a/algorithms/active/discrimination-tree/src/main/java/de/learnlib/algorithms/discriminationtree/AbstractDTLearner.java b/algorithms/active/discrimination-tree/src/main/java/de/learnlib/algorithms/discriminationtree/AbstractDTLearner.java index cb34f0aab4..3a37bc0ceb 100644 --- a/algorithms/active/discrimination-tree/src/main/java/de/learnlib/algorithms/discriminationtree/AbstractDTLearner.java +++ b/algorithms/active/discrimination-tree/src/main/java/de/learnlib/algorithms/discriminationtree/AbstractDTLearner.java @@ -222,9 +222,14 @@ public void addAlphabetSymbol(I symbol) { final int newSymbolIdx = this.alphabet.size(); - this.alphabet = Alphabets.withNewSymbol(this.alphabet, symbol); this.hypothesis.addAlphabetSymbol(symbol); + // since we share the alphabet instance with our hypothesis, our alphabet might have already been updated (if it + // was already a GrowableAlphabet) + if (!this.alphabet.containsSymbol(symbol)) { + this.alphabet = Alphabets.withNewSymbol(this.alphabet, symbol); + } + for (final HState s : this.hypothesis.getStates()) { final HTransition newTrans = new HTransition<>(s, symbol, dtree.getRoot()); s.setTransition(newSymbolIdx, newTrans); diff --git a/algorithms/active/discrimination-tree/src/main/java/de/learnlib/algorithms/discriminationtree/hypothesis/DTLearnerHypothesis.java b/algorithms/active/discrimination-tree/src/main/java/de/learnlib/algorithms/discriminationtree/hypothesis/DTLearnerHypothesis.java index 41c5d30357..d43ece67ee 100644 --- a/algorithms/active/discrimination-tree/src/main/java/de/learnlib/algorithms/discriminationtree/hypothesis/DTLearnerHypothesis.java +++ b/algorithms/active/discrimination-tree/src/main/java/de/learnlib/algorithms/discriminationtree/hypothesis/DTLearnerHypothesis.java @@ -31,7 +31,6 @@ import net.automatalib.visualization.DefaultVisualizationHelper; import net.automatalib.visualization.VisualizationHelper; import net.automatalib.words.Alphabet; -import net.automatalib.words.GrowingAlphabet; import net.automatalib.words.Word; import net.automatalib.words.impl.Alphabets; @@ -132,8 +131,8 @@ public HState getSuccessor(HTransition trans) { @Override public void addAlphabetSymbol(I symbol) { - if (this.alphabet instanceof GrowingAlphabet) { - ((GrowingAlphabet) this.alphabet).addSymbol(symbol); + if (this.alphabet.containsSymbol(symbol)) { + return; } this.alphabet = Alphabets.withNewSymbol(this.alphabet, symbol); diff --git a/algorithms/active/kearns-vazirani/src/main/java/de/learnlib/algorithms/kv/dfa/KearnsVaziraniDFA.java b/algorithms/active/kearns-vazirani/src/main/java/de/learnlib/algorithms/kv/dfa/KearnsVaziraniDFA.java index fc9caad445..fcb51cf787 100644 --- a/algorithms/active/kearns-vazirani/src/main/java/de/learnlib/algorithms/kv/dfa/KearnsVaziraniDFA.java +++ b/algorithms/active/kearns-vazirani/src/main/java/de/learnlib/algorithms/kv/dfa/KearnsVaziraniDFA.java @@ -267,9 +267,14 @@ public void addAlphabetSymbol(I symbol) { } final int inputIdx = this.alphabet.size(); - this.alphabet = Alphabets.withNewSymbol(this.alphabet, symbol); this.hypothesis.addAlphabetSymbol(symbol); + // since we share the alphabet instance with our hypothesis, our alphabet might have already been updated (if it + // was already a GrowableAlphabet) + if (!this.alphabet.containsSymbol(symbol)) { + this.alphabet = Alphabets.withNewSymbol(this.alphabet, symbol); + } + // use new list to prevent concurrent modification exception for (final StateInfo si : new ArrayList<>(this.stateInfos)) { final int state = si.id; diff --git a/algorithms/active/kearns-vazirani/src/main/java/de/learnlib/algorithms/kv/mealy/KearnsVaziraniMealy.java b/algorithms/active/kearns-vazirani/src/main/java/de/learnlib/algorithms/kv/mealy/KearnsVaziraniMealy.java index a1a36620e8..74e0902b43 100644 --- a/algorithms/active/kearns-vazirani/src/main/java/de/learnlib/algorithms/kv/mealy/KearnsVaziraniMealy.java +++ b/algorithms/active/kearns-vazirani/src/main/java/de/learnlib/algorithms/kv/mealy/KearnsVaziraniMealy.java @@ -283,9 +283,14 @@ public void addAlphabetSymbol(I symbol) { } final int inputIdx = this.alphabet.size(); - this.alphabet = Alphabets.withNewSymbol(this.alphabet, symbol); this.hypothesis.addAlphabetSymbol(symbol); + // since we share the alphabet instance with our hypothesis, our alphabet might have already been updated (if it + // was already a GrowableAlphabet) + if (!this.alphabet.containsSymbol(symbol)) { + this.alphabet = Alphabets.withNewSymbol(this.alphabet, symbol); + } + // use new list to prevent concurrent modification exception for (final StateInfo> si : new ArrayList<>(this.stateInfos)) { final int state = si.id; diff --git a/algorithms/active/lstar/src/main/java/de/learnlib/algorithms/lstar/AbstractAutomatonLStar.java b/algorithms/active/lstar/src/main/java/de/learnlib/algorithms/lstar/AbstractAutomatonLStar.java index ed65ffbb04..d68b6043fb 100644 --- a/algorithms/active/lstar/src/main/java/de/learnlib/algorithms/lstar/AbstractAutomatonLStar.java +++ b/algorithms/active/lstar/src/main/java/de/learnlib/algorithms/lstar/AbstractAutomatonLStar.java @@ -28,6 +28,7 @@ import net.automatalib.automata.MutableDeterministic; import net.automatalib.commons.util.collections.CollectionsUtil; import net.automatalib.words.Alphabet; +import net.automatalib.words.impl.SymbolHidingAlphabet; /** * Abstract base class for algorithms that produce (subclasses of) {@link MutableDeterministic} automata. @@ -63,7 +64,7 @@ public abstract class AbstractAutomatonLStar alphabet, MembershipOracle oracle, AI internalHyp) { - super(alphabet, oracle); + super(SymbolHidingAlphabet.wrapIfMutable(alphabet), oracle); this.internalHyp = internalHyp; internalHyp.clear(); } @@ -191,8 +192,10 @@ public void addAlphabetSymbol(I symbol) { return; } - super.addAlphabetSymbol(symbol); this.internalHyp.addAlphabetSymbol(symbol); + + SymbolHidingAlphabet.runWhileHiding(alphabet, symbol, () -> super.addAlphabetSymbol(symbol)); + this.updateInternalHypothesis(); } diff --git a/algorithms/active/lstar/src/main/java/de/learnlib/algorithms/lstar/AbstractLStar.java b/algorithms/active/lstar/src/main/java/de/learnlib/algorithms/lstar/AbstractLStar.java index 1e9493cb0b..0af041d97b 100644 --- a/algorithms/active/lstar/src/main/java/de/learnlib/algorithms/lstar/AbstractLStar.java +++ b/algorithms/active/lstar/src/main/java/de/learnlib/algorithms/lstar/AbstractLStar.java @@ -232,10 +232,14 @@ public void addAlphabetSymbol(I symbol) { return; } - this.alphabet = Alphabets.withNewSymbol(this.alphabet, symbol); - final List>> unclosed = this.table.addAlphabetSymbol(symbol, oracle); + // since we share the alphabet instance with our observation table, our alphabet might have already been updated + // (if it was already a GrowableAlphabet) + if (!this.alphabet.containsSymbol(symbol)) { + this.alphabet = Alphabets.withNewSymbol(this.alphabet, symbol); + } + completeConsistentTable(unclosed, true); } } diff --git a/algorithms/active/ttt/src/main/java/de/learnlib/algorithms/ttt/base/AbstractTTTLearner.java b/algorithms/active/ttt/src/main/java/de/learnlib/algorithms/ttt/base/AbstractTTTLearner.java index 880ca1f894..e265e09a38 100644 --- a/algorithms/active/ttt/src/main/java/de/learnlib/algorithms/ttt/base/AbstractTTTLearner.java +++ b/algorithms/active/ttt/src/main/java/de/learnlib/algorithms/ttt/base/AbstractTTTLearner.java @@ -949,9 +949,14 @@ public void addAlphabetSymbol(I symbol) { final int newSymbolIdx = this.alphabet.size(); - this.alphabet = Alphabets.withNewSymbol(this.alphabet, symbol); this.hypothesis.addAlphabetSymbol(symbol); + // since we share the alphabet instance with our hypothesis, our alphabet might have already been updated (if it + // was already a GrowableAlphabet) + if (!this.alphabet.containsSymbol(symbol)) { + this.alphabet = Alphabets.withNewSymbol(this.alphabet, symbol); + } + for (final TTTState s : this.hypothesis.getStates()) { final TTTTransition trans = createTransition(s, symbol); trans.setNonTreeTarget(dtree.getRoot()); diff --git a/test-support/learner-it-support/src/main/java/de/learnlib/testsupport/AbstractGrowingAlphabetTest.java b/test-support/learner-it-support/src/main/java/de/learnlib/testsupport/AbstractGrowingAlphabetTest.java index 854597cbb9..00f1c6bc60 100644 --- a/test-support/learner-it-support/src/main/java/de/learnlib/testsupport/AbstractGrowingAlphabetTest.java +++ b/test-support/learner-it-support/src/main/java/de/learnlib/testsupport/AbstractGrowingAlphabetTest.java @@ -18,7 +18,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import java.util.Random; import de.learnlib.api.algorithm.LearningAlgorithm; import de.learnlib.api.algorithm.feature.SupportsGrowingAlphabet; @@ -28,7 +27,6 @@ import net.automatalib.util.automata.Automata; import net.automatalib.words.Alphabet; import net.automatalib.words.Word; -import net.automatalib.words.WordBuilder; import net.automatalib.words.impl.Alphabets; import net.automatalib.words.impl.SimpleAlphabet; import org.testng.Assert; @@ -43,15 +41,12 @@ */ public abstract class AbstractGrowingAlphabetTest & LearningAlgorithm, M extends UniversalDeterministicAutomaton & Output, OR, I, D> { - private static final int MAX_VERIFICATION_TRIES = 100; protected static final int RANDOM_SEED = 42; protected static final int DEFAULT_AUTOMATON_SIZE = 15; - private Random random; - private M target; - private L learner; + private OR oracle; private Alphabet initialAlphabet; @@ -59,8 +54,6 @@ public abstract class AbstractGrowingAlphabetTest getInitialAlphabet(); @@ -86,11 +77,41 @@ public void setup() { @Test public void testInitialAlphabet() { + testAlphabet(initialAlphabet); + } + + /** + * In case of passing a growing alphabet, the learners may use the existing + * {@link net.automatalib.words.GrowingAlphabet#addSymbol(Object)} functionality. Due to references, this may alter + * their behavior. Check it! + */ + @Test + public void testGrowingAlphabetAlphabet() { + testAlphabet(new SimpleAlphabet<>(initialAlphabet)); + } + + private void testAlphabet(Alphabet alphabet) { + final L learner = getLearner(oracle, alphabet); + learner.startLearning(); - this.performLearnLoop(initialAlphabet); + this.performLearnLoopAndCheck(learner, alphabet); + + final List currentAlphabet = new ArrayList<>(alphabet.size() + alphabetExtensions.size()); + currentAlphabet.addAll(alphabet); + + for (final I i : alphabetExtensions) { + currentAlphabet.add(i); + learner.addAlphabetSymbol(i); + + final UniversalDeterministicAutomaton hyp = learner.getHypothesisModel(); + + this.checkCompletenessOfHypothesis(hyp, currentAlphabet); + this.performLearnLoopAndCheck(learner, currentAlphabet); + } + } - private void performLearnLoop(final Alphabet effectiveAlphabet) { + private void performLearnLoopAndCheck(final L learner, final Collection effectiveAlphabet) { M hyp = learner.getHypothesisModel(); Word sepWord = Automata.findSeparatingWord(target, hyp, effectiveAlphabet); @@ -108,33 +129,14 @@ private void performLearnLoop(final Alphabet effectiveAlphabet) { Assert.assertTrue(Automata.testEquivalence(target, hyp, effectiveAlphabet)); } - @Test(dependsOnMethods = "testInitialAlphabet") - public void testAddingAlphabetSymbols() { - final Alphabet currentAlphabet = new SimpleAlphabet<>(initialAlphabet); - - for (final I i : alphabetExtensions) { - currentAlphabet.add(i); - learner.addAlphabetSymbol(i); - - this.checkCompletenessOfHypothesis(currentAlphabet); - this.performLearnLoop(currentAlphabet); - } - } - - private void checkCompletenessOfHypothesis(final Alphabet alphabet) { + private void checkCompletenessOfHypothesis(final UniversalDeterministicAutomaton hypothesis, final Collection alphabet) { + for (final S s : hypothesis.getStates()) { + for (final I i : alphabet) { + final T trans = hypothesis.getTransition(s, i); - final int alphabetSize = alphabet.size(); - final M hypothesis = learner.getHypothesisModel(); - - for (int i = 0; i < MAX_VERIFICATION_TRIES; i++) { - final WordBuilder testTraceBuilder = new WordBuilder<>(i); - - for (int j = 0; j < i; j++) { - testTraceBuilder.add(alphabet.getSymbol(random.nextInt(alphabetSize))); + Assert.assertNotNull(trans); + Assert.assertNotNull(hypothesis.getSuccessor(trans)); } - - // simply try to compute output without an exception - hypothesis.computeOutput(testTraceBuilder.toWord()); } } From 364fd967e6dd26770deb1b6c8fd87c09d45ac1eb Mon Sep 17 00:00:00 2001 From: Alexander Bainczyk Date: Mon, 26 Mar 2018 23:24:49 +0200 Subject: [PATCH 09/13] algorithms: make all learner state classes public Constructors and getters should be package private so that the suspend/resume logic cannot be interferred with. (cherry picked from commit 8415f9d4d12badcd36d91829e069c7a1b527c7cc) --- .../de/learnlib/algorithms/adt/learner/ADTLearnerState.java | 2 +- .../de/learnlib/algorithms/dhc/mealy/MealyDHCState.java | 2 +- .../learnlib/algorithms/kv/dfa/KearnsVaziraniDFAState.java | 2 +- .../algorithms/kv/mealy/KearnsVaziraniMealyState.java | 2 +- .../de/learnlib/algorithms/lstar/AbstractLStarState.java | 2 +- .../de/learnlib/algorithms/lstar/AutomatonLStarState.java | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/algorithms/active/adt/src/main/java/de/learnlib/algorithms/adt/learner/ADTLearnerState.java b/algorithms/active/adt/src/main/java/de/learnlib/algorithms/adt/learner/ADTLearnerState.java index d9b767cbc9..7441212109 100644 --- a/algorithms/active/adt/src/main/java/de/learnlib/algorithms/adt/learner/ADTLearnerState.java +++ b/algorithms/active/adt/src/main/java/de/learnlib/algorithms/adt/learner/ADTLearnerState.java @@ -37,7 +37,7 @@ public class ADTLearnerState implements Serializable { private final ADTHypothesis hypothesis; private final ADT adt; - public ADTLearnerState(ADTHypothesis hypothesis, ADT adt) { + ADTLearnerState(ADTHypothesis hypothesis, ADT adt) { this.hypothesis = hypothesis; this.adt = adt; } diff --git a/algorithms/active/dhc/src/main/java/de/learnlib/algorithms/dhc/mealy/MealyDHCState.java b/algorithms/active/dhc/src/main/java/de/learnlib/algorithms/dhc/mealy/MealyDHCState.java index efeba844cd..2edbf1a718 100644 --- a/algorithms/active/dhc/src/main/java/de/learnlib/algorithms/dhc/mealy/MealyDHCState.java +++ b/algorithms/active/dhc/src/main/java/de/learnlib/algorithms/dhc/mealy/MealyDHCState.java @@ -34,7 +34,7 @@ * * @author bainczyk */ -class MealyDHCState implements Serializable { +public class MealyDHCState implements Serializable { private final LinkedHashSet> splitters; private final CompactMealy hypothesis; diff --git a/algorithms/active/kearns-vazirani/src/main/java/de/learnlib/algorithms/kv/dfa/KearnsVaziraniDFAState.java b/algorithms/active/kearns-vazirani/src/main/java/de/learnlib/algorithms/kv/dfa/KearnsVaziraniDFAState.java index 421310b9fa..5ec0a18220 100644 --- a/algorithms/active/kearns-vazirani/src/main/java/de/learnlib/algorithms/kv/dfa/KearnsVaziraniDFAState.java +++ b/algorithms/active/kearns-vazirani/src/main/java/de/learnlib/algorithms/kv/dfa/KearnsVaziraniDFAState.java @@ -30,7 +30,7 @@ * * @author bainczyk */ -class KearnsVaziraniDFAState implements Serializable { +public class KearnsVaziraniDFAState implements Serializable { private final CompactDFA hypothesis; private final BinaryDTree> discriminationTree; diff --git a/algorithms/active/kearns-vazirani/src/main/java/de/learnlib/algorithms/kv/mealy/KearnsVaziraniMealyState.java b/algorithms/active/kearns-vazirani/src/main/java/de/learnlib/algorithms/kv/mealy/KearnsVaziraniMealyState.java index eba16b9840..8b59a4cc01 100644 --- a/algorithms/active/kearns-vazirani/src/main/java/de/learnlib/algorithms/kv/mealy/KearnsVaziraniMealyState.java +++ b/algorithms/active/kearns-vazirani/src/main/java/de/learnlib/algorithms/kv/mealy/KearnsVaziraniMealyState.java @@ -33,7 +33,7 @@ * * @author bainczyk */ -class KearnsVaziraniMealyState implements Serializable { +public class KearnsVaziraniMealyState implements Serializable { private final CompactMealy hypothesis; private final AbstractWordBasedDiscriminationTree, StateInfo>> discriminationTree; diff --git a/algorithms/active/lstar/src/main/java/de/learnlib/algorithms/lstar/AbstractLStarState.java b/algorithms/active/lstar/src/main/java/de/learnlib/algorithms/lstar/AbstractLStarState.java index 4f268fe65e..7a6b9418af 100644 --- a/algorithms/active/lstar/src/main/java/de/learnlib/algorithms/lstar/AbstractLStarState.java +++ b/algorithms/active/lstar/src/main/java/de/learnlib/algorithms/lstar/AbstractLStarState.java @@ -33,7 +33,7 @@ public abstract class AbstractLStarState implements Serializable { private final GenericObservationTable observationTable; - public AbstractLStarState(final GenericObservationTable observationTable) { + AbstractLStarState(final GenericObservationTable observationTable) { this.observationTable = observationTable; } diff --git a/algorithms/active/lstar/src/main/java/de/learnlib/algorithms/lstar/AutomatonLStarState.java b/algorithms/active/lstar/src/main/java/de/learnlib/algorithms/lstar/AutomatonLStarState.java index d63a678ade..8ad48478dd 100644 --- a/algorithms/active/lstar/src/main/java/de/learnlib/algorithms/lstar/AutomatonLStarState.java +++ b/algorithms/active/lstar/src/main/java/de/learnlib/algorithms/lstar/AutomatonLStarState.java @@ -40,9 +40,9 @@ public class AutomatonLStarState extends AbstractLStarState { private final AI hypothesis; private final List> stateInfos; - public AutomatonLStarState(final GenericObservationTable observationTable, - final AI hypothesis, - final List> stateInfos) { + AutomatonLStarState(final GenericObservationTable observationTable, + final AI hypothesis, + final List> stateInfos) { super(observationTable); this.hypothesis = hypothesis; this.stateInfos = stateInfos; From aede82a22b866494667b0c33d2802c51cdcbfd72 Mon Sep 17 00:00:00 2001 From: Markus Frohme Date: Tue, 27 Mar 2018 10:08:24 +0200 Subject: [PATCH 10/13] drop wagon-ssh extension This was required for the sftp upload to a custom FTP server, which has been removed from the deploy process. (cherry picked from commit 707ad277a39fa84b59ca5aa3286d235545a253be) --- pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pom.xml b/pom.xml index b0c791b4b6..8540acce4f 100644 --- a/pom.xml +++ b/pom.xml @@ -410,14 +410,6 @@ limitations under the License. - - - - org.apache.maven.wagon - wagon-ssh - 2.6 - - - 0.8.0-SNAPSHOT + 0.7.1 0.1 8.1 3.0.2 From b9c62aa79bd42ba723f3bbde978641c815b3326b Mon Sep 17 00:00:00 2001 From: Markus Frohme Date: Fri, 11 May 2018 17:42:40 +0200 Subject: [PATCH 13/13] [maven-release-plugin] prepare release learnlib-0.13.1 --- algorithms/active/adt/pom.xml | 2 +- algorithms/active/dhc/pom.xml | 2 +- algorithms/active/discrimination-tree-vpda/pom.xml | 2 +- algorithms/active/discrimination-tree/pom.xml | 2 +- algorithms/active/kearns-vazirani/pom.xml | 2 +- algorithms/active/lstar/pom.xml | 2 +- algorithms/active/nlstar/pom.xml | 2 +- algorithms/active/pom.xml | 2 +- algorithms/active/ttt-vpda/pom.xml | 2 +- algorithms/active/ttt/pom.xml | 2 +- algorithms/passive/pom.xml | 2 +- algorithms/passive/rpni-edsm/pom.xml | 2 +- algorithms/passive/rpni-mdl/pom.xml | 2 +- algorithms/passive/rpni/pom.xml | 2 +- algorithms/pom.xml | 2 +- api/pom.xml | 2 +- archetypes/basic/pom.xml | 2 +- archetypes/complete/pom.xml | 2 +- archetypes/pom.xml | 2 +- build-parent/pom.xml | 2 +- build-tools/pom.xml | 2 +- commons/acex/pom.xml | 2 +- commons/counterexamples/pom.xml | 2 +- commons/pom.xml | 2 +- commons/settings/pom.xml | 2 +- commons/util/pom.xml | 2 +- datastructures/discrimination-tree/pom.xml | 2 +- datastructures/list/pom.xml | 2 +- datastructures/observation-table/pom.xml | 2 +- datastructures/pom.xml | 2 +- datastructures/pta/pom.xml | 2 +- distribution/pom.xml | 2 +- drivers/basic/pom.xml | 2 +- drivers/mapper/pom.xml | 2 +- drivers/pom.xml | 2 +- drivers/simulator/pom.xml | 2 +- examples/pom.xml | 2 +- oracles/equivalence-oracles/pom.xml | 2 +- oracles/filters/cache/pom.xml | 2 +- oracles/filters/pom.xml | 2 +- oracles/filters/reuse/pom.xml | 2 +- oracles/filters/statistics/pom.xml | 2 +- oracles/membership-oracles/pom.xml | 2 +- oracles/parallelism/pom.xml | 2 +- oracles/pom.xml | 2 +- pom.xml | 4 ++-- test-support/learner-it-support/pom.xml | 2 +- test-support/learning-examples/pom.xml | 2 +- test-support/pom.xml | 2 +- 49 files changed, 50 insertions(+), 50 deletions(-) diff --git a/algorithms/active/adt/pom.xml b/algorithms/active/adt/pom.xml index 56dd91b1fc..1020275603 100644 --- a/algorithms/active/adt/pom.xml +++ b/algorithms/active/adt/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-active-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/algorithms/active/dhc/pom.xml b/algorithms/active/dhc/pom.xml index 71931ab90d..7211179719 100644 --- a/algorithms/active/dhc/pom.xml +++ b/algorithms/active/dhc/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-active-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/algorithms/active/discrimination-tree-vpda/pom.xml b/algorithms/active/discrimination-tree-vpda/pom.xml index d9dae35f3d..cbb42296a5 100644 --- a/algorithms/active/discrimination-tree-vpda/pom.xml +++ b/algorithms/active/discrimination-tree-vpda/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-active-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/algorithms/active/discrimination-tree/pom.xml b/algorithms/active/discrimination-tree/pom.xml index b52cbdbaea..874407f2d5 100644 --- a/algorithms/active/discrimination-tree/pom.xml +++ b/algorithms/active/discrimination-tree/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-active-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/algorithms/active/kearns-vazirani/pom.xml b/algorithms/active/kearns-vazirani/pom.xml index 800b2ca51b..5a2b08875c 100644 --- a/algorithms/active/kearns-vazirani/pom.xml +++ b/algorithms/active/kearns-vazirani/pom.xml @@ -20,7 +20,7 @@ limitations under the License. de.learnlib learnlib-algorithms-active-parent - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml learnlib-kearns-vazirani diff --git a/algorithms/active/lstar/pom.xml b/algorithms/active/lstar/pom.xml index 92d7a4c3be..ab86d1644b 100644 --- a/algorithms/active/lstar/pom.xml +++ b/algorithms/active/lstar/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-active-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/algorithms/active/nlstar/pom.xml b/algorithms/active/nlstar/pom.xml index 7eb5b0b6ac..124978483b 100644 --- a/algorithms/active/nlstar/pom.xml +++ b/algorithms/active/nlstar/pom.xml @@ -20,7 +20,7 @@ limitations under the License. de.learnlib learnlib-algorithms-active-parent - 0.14.0-SNAPSHOT + 0.13.1 LearnLib :: Algorithms :: NL* learnlib-nlstar diff --git a/algorithms/active/pom.xml b/algorithms/active/pom.xml index cf889b6310..a9653ce25b 100644 --- a/algorithms/active/pom.xml +++ b/algorithms/active/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/algorithms/active/ttt-vpda/pom.xml b/algorithms/active/ttt-vpda/pom.xml index 1af6ea2312..cf2daf847c 100644 --- a/algorithms/active/ttt-vpda/pom.xml +++ b/algorithms/active/ttt-vpda/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-active-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/algorithms/active/ttt/pom.xml b/algorithms/active/ttt/pom.xml index 1fca80b87a..71d3e2e498 100644 --- a/algorithms/active/ttt/pom.xml +++ b/algorithms/active/ttt/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-active-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/algorithms/passive/pom.xml b/algorithms/passive/pom.xml index c78365241e..47f483a8d7 100644 --- a/algorithms/passive/pom.xml +++ b/algorithms/passive/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/algorithms/passive/rpni-edsm/pom.xml b/algorithms/passive/rpni-edsm/pom.xml index 5fd815dfd7..c81b986d6e 100644 --- a/algorithms/passive/rpni-edsm/pom.xml +++ b/algorithms/passive/rpni-edsm/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-passive-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/algorithms/passive/rpni-mdl/pom.xml b/algorithms/passive/rpni-mdl/pom.xml index 00aa18ed4c..755a51262e 100644 --- a/algorithms/passive/rpni-mdl/pom.xml +++ b/algorithms/passive/rpni-mdl/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-passive-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/algorithms/passive/rpni/pom.xml b/algorithms/passive/rpni/pom.xml index 84563a466c..2068feca23 100644 --- a/algorithms/passive/rpni/pom.xml +++ b/algorithms/passive/rpni/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-algorithms-passive-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/algorithms/pom.xml b/algorithms/pom.xml index 4876fe6039..686a169ccf 100644 --- a/algorithms/pom.xml +++ b/algorithms/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-build-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../build-parent/pom.xml diff --git a/api/pom.xml b/api/pom.xml index e739c1e9fa..ebf60c1e05 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ limitations under the License. de.learnlib learnlib-build-parent - 0.14.0-SNAPSHOT + 0.13.1 ../build-parent/pom.xml diff --git a/archetypes/basic/pom.xml b/archetypes/basic/pom.xml index bedc3c594d..cd4c43efad 100644 --- a/archetypes/basic/pom.xml +++ b/archetypes/basic/pom.xml @@ -27,7 +27,7 @@ limitations under the License. de.learnlib.archetypes learnlib-archetypes-parent - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/archetypes/complete/pom.xml b/archetypes/complete/pom.xml index b508dca3a2..cbed117de2 100644 --- a/archetypes/complete/pom.xml +++ b/archetypes/complete/pom.xml @@ -27,7 +27,7 @@ limitations under the License. de.learnlib.archetypes learnlib-archetypes-parent - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/archetypes/pom.xml b/archetypes/pom.xml index b26a55119d..3d64afea06 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -28,7 +28,7 @@ limitations under the License. de.learnlib learnlib-build-parent - 0.14.0-SNAPSHOT + 0.13.1 ../build-parent/pom.xml diff --git a/build-parent/pom.xml b/build-parent/pom.xml index ae41a6d765..b496ab0083 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -30,7 +30,7 @@ limitations under the License. de.learnlib learnlib-parent - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/build-tools/pom.xml b/build-tools/pom.xml index 6a4abd3d22..13a407b42a 100644 --- a/build-tools/pom.xml +++ b/build-tools/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/commons/acex/pom.xml b/commons/acex/pom.xml index 8df9b6e957..dfd80e677f 100644 --- a/commons/acex/pom.xml +++ b/commons/acex/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-commons-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/commons/counterexamples/pom.xml b/commons/counterexamples/pom.xml index 3be4ee4653..7f7201fd5b 100644 --- a/commons/counterexamples/pom.xml +++ b/commons/counterexamples/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-commons-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/commons/pom.xml b/commons/pom.xml index bd3f3d4ece..19a7ae9788 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-build-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../build-parent/pom.xml diff --git a/commons/settings/pom.xml b/commons/settings/pom.xml index 53c392787d..9d50ceb028 100644 --- a/commons/settings/pom.xml +++ b/commons/settings/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-commons-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/commons/util/pom.xml b/commons/util/pom.xml index 970ce2c50f..4dcef41ff5 100644 --- a/commons/util/pom.xml +++ b/commons/util/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-commons-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/datastructures/discrimination-tree/pom.xml b/datastructures/discrimination-tree/pom.xml index 0b8205a47d..e6297ad84b 100644 --- a/datastructures/discrimination-tree/pom.xml +++ b/datastructures/discrimination-tree/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-datastructures-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/datastructures/list/pom.xml b/datastructures/list/pom.xml index a1d29de12c..dabdccf9c2 100644 --- a/datastructures/list/pom.xml +++ b/datastructures/list/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-datastructures-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/datastructures/observation-table/pom.xml b/datastructures/observation-table/pom.xml index 1d4f61986f..1ed5fcd8dd 100644 --- a/datastructures/observation-table/pom.xml +++ b/datastructures/observation-table/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-datastructures-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/datastructures/pom.xml b/datastructures/pom.xml index 145fd35bd2..39a6c92c97 100644 --- a/datastructures/pom.xml +++ b/datastructures/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-build-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../build-parent/pom.xml diff --git a/datastructures/pta/pom.xml b/datastructures/pta/pom.xml index 7ef320714d..a55afa3ff8 100644 --- a/datastructures/pta/pom.xml +++ b/datastructures/pta/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-datastructures-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index ad829628fb..efd3dfb1a3 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -20,7 +20,7 @@ limitations under the License. de.learnlib learnlib-build-parent - 0.14.0-SNAPSHOT + 0.13.1 ../build-parent/pom.xml diff --git a/drivers/basic/pom.xml b/drivers/basic/pom.xml index 1b309c1e17..374fef6b8a 100644 --- a/drivers/basic/pom.xml +++ b/drivers/basic/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-drivers-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/drivers/mapper/pom.xml b/drivers/mapper/pom.xml index 63cc459828..1f22d446f9 100644 --- a/drivers/mapper/pom.xml +++ b/drivers/mapper/pom.xml @@ -20,7 +20,7 @@ limitations under the License. de.learnlib learnlib-drivers-parent - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/drivers/pom.xml b/drivers/pom.xml index 2fb03abdfa..bf4bc7d9e9 100644 --- a/drivers/pom.xml +++ b/drivers/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-build-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../build-parent/pom.xml diff --git a/drivers/simulator/pom.xml b/drivers/simulator/pom.xml index 7c0774298e..c3a70769e0 100644 --- a/drivers/simulator/pom.xml +++ b/drivers/simulator/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-drivers-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index a9ee40d290..e64a8bc930 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-build-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../build-parent/pom.xml diff --git a/oracles/equivalence-oracles/pom.xml b/oracles/equivalence-oracles/pom.xml index 8505a4d7b7..b2dffeb6f3 100644 --- a/oracles/equivalence-oracles/pom.xml +++ b/oracles/equivalence-oracles/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-oracles-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/oracles/filters/cache/pom.xml b/oracles/filters/cache/pom.xml index f891a47f5c..a993738db4 100644 --- a/oracles/filters/cache/pom.xml +++ b/oracles/filters/cache/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-filters-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/oracles/filters/pom.xml b/oracles/filters/pom.xml index 1807460dad..4f1a586db0 100644 --- a/oracles/filters/pom.xml +++ b/oracles/filters/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-oracles-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/oracles/filters/reuse/pom.xml b/oracles/filters/reuse/pom.xml index e90cfac27b..7a74fd692d 100644 --- a/oracles/filters/reuse/pom.xml +++ b/oracles/filters/reuse/pom.xml @@ -19,7 +19,7 @@ limitations under the License. learnlib-filters-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/oracles/filters/statistics/pom.xml b/oracles/filters/statistics/pom.xml index 6105c37d0a..2c0a90cd07 100644 --- a/oracles/filters/statistics/pom.xml +++ b/oracles/filters/statistics/pom.xml @@ -19,7 +19,7 @@ limitations under the License. learnlib-filters-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/oracles/membership-oracles/pom.xml b/oracles/membership-oracles/pom.xml index 03c31363cf..ecd694090f 100644 --- a/oracles/membership-oracles/pom.xml +++ b/oracles/membership-oracles/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-oracles-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/oracles/parallelism/pom.xml b/oracles/parallelism/pom.xml index 26ba5dce9d..91698999c1 100644 --- a/oracles/parallelism/pom.xml +++ b/oracles/parallelism/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-oracles-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../pom.xml diff --git a/oracles/pom.xml b/oracles/pom.xml index b95416301b..8fa0d6a20c 100644 --- a/oracles/pom.xml +++ b/oracles/pom.xml @@ -22,7 +22,7 @@ limitations under the License. learnlib-build-parent de.learnlib - 0.14.0-SNAPSHOT + 0.13.1 ../build-parent/pom.xml diff --git a/pom.xml b/pom.xml index ba0a371167..53c914e0da 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ limitations under the License. --> de.learnlib learnlib-parent - 0.14.0-SNAPSHOT + 0.13.1 pom LearnLib http://learnlib.github.io/learnlib/maven-site/${project.version} @@ -129,7 +129,7 @@ limitations under the License. scm:git:git@github.com:LearnLib/learnlib.git scm:git:git@github.com:LearnLib/learnlib.git https://github.com/LearnLib/learnlib/tree/develop - HEAD + learnlib-0.13.1