Merge commit 'da106058d0c4e58aee39ccb59c23ed1097741cb7'

Author: misberner

README.md

@@ -1,5 +1,7 @@
 LearnLib
 ===========
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/de.learnlib/learnlib-parent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/de.learnlib/learnlib-parent)
+
 LearnLib is a free, open source ([LGPLv3][1]) Java library for automata learning algorithms.
 
 About

algorithms/dhc/pom.xml

@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-algorithms</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.2</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 

algorithms/discrimination-tree/pom.xml

@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-algorithms</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.2</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 

algorithms/discrimination-tree/src/main/java/de/learnlib/algorithms/discriminationtree/dfa/DTLearnerDFA.java

@@ -34,6 +34,7 @@
 import de.learnlib.api.MembershipOracle;
 import de.learnlib.api.Query;
 import de.learnlib.counterexamples.LocalSuffixFinder;
+import de.learnlib.counterexamples.LocalSuffixFinders;
 import de.learnlib.discriminationtree.BinaryDTree;
 import de.learnlib.oracles.AbstractQuery;
 
@@ -46,8 +47,14 @@
  */
 public class DTLearnerDFA<I> extends AbstractDTLearner<DFA<?,I>, I, Boolean, Boolean, Void> implements DFALearner<I> {
 
-	public static class BuilderDefaults extends AbstractDTLearner.BuilderDefaults {
+	public static class BuilderDefaults {
 		public static boolean epsilonRoot() { return true; }
+		public static <I,O> LocalSuffixFinder<? super I,? super O> suffixFinder() {
+			return LocalSuffixFinders.RIVEST_SCHAPIRE;
+		}
+		public static boolean repeatedCounterexampleEvaluation() {
+			return true;
+		}
 	}
 
 	private final HypothesisWrapperDFA<I> hypWrapper;

algorithms/discrimination-tree/src/main/java/de/learnlib/algorithms/discriminationtree/mealy/DTLearnerMealy.java

@@ -16,6 +16,14 @@
  */
 package de.learnlib.algorithms.discriminationtree.mealy;
 
+import java.util.Map;
+
+import net.automatalib.automata.transout.MealyMachine;
+import net.automatalib.graphs.dot.EmptyDOTHelper;
+import net.automatalib.graphs.dot.GraphDOTHelper;
+import net.automatalib.words.Alphabet;
+import net.automatalib.words.Word;
+
 import com.github.misberner.buildergen.annotations.GenerateBuilder;
 
 import de.learnlib.algorithms.discriminationtree.AbstractDTLearner;
@@ -28,10 +36,6 @@
 import de.learnlib.discriminationtree.MultiDTree;
 import de.learnlib.oracles.AbstractQuery;
 
-import net.automatalib.automata.transout.MealyMachine;
-import net.automatalib.words.Alphabet;
-import net.automatalib.words.Word;
-
 /**
  * 
  * @author Malte Isberner 
@@ -82,4 +86,28 @@ public void answer(Word<O> output) {
 			}
 		};
 	}
+	
+	@Override
+	public GraphDOTHelper<HState<I, Word<O>, Void, O>, HTransition<I, Word<O>, Void, O>> getHypothesisDOTHelper() {
+		return new EmptyDOTHelper<HState<I,Word<O>,Void,O>,HTransition<I,Word<O>,Void,O>>() {
+			@Override
+			public boolean getEdgeProperties(HState<I, Word<O>, Void, O> src,
+					HTransition<I, Word<O>, Void, O> edge,
+					HState<I, Word<O>, Void, O> tgt,
+					Map<String, String> properties) {
+				if (!super.getEdgeProperties(src, edge, tgt, properties)) {
+					return false;
+				}
+				String label = String.valueOf(edge.getSymbol());
+				label += " / ";
+				if (edge.getProperty() != null) {
+					label += edge.getProperty();
+				}
+				properties.put(EdgeAttrs.LABEL, label);
+				
+				return true;
+			}
+
+		};
+	}
 }

algorithms/features/pom.xml

@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-algorithms</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.2</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 

algorithms/features/src/main/java/de/learnlib/algorithms/features/observationtable/ObservationTable.java

@@ -129,7 +129,6 @@ public static interface Row<I,D> extends Iterable<D> {
 		public D getCellContent(@Nonnegative int index) throws IndexOutOfBoundsException;
 	}
 
-	
 	/**
 	 * Representation of an inconsistency in the observation table.
 	 * <p>

algorithms/kearns-vazirani/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>de.learnlib</groupId>
     <artifactId>learnlib-algorithms</artifactId>
-    <version>0.11.1</version>
+    <version>0.11.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>learnlib-kearns-vazirani</artifactId>

algorithms/lstar-baseline/pom.xml

@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-algorithms</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.2</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>
 

algorithms/lstar-generic/pom.xml

@@ -23,7 +23,7 @@ http://www.gnu.de/documents/lgpl.en.html.
 	<parent>
 		<artifactId>learnlib-algorithms</artifactId>
 		<groupId>de.learnlib</groupId>
-		<version>0.11.1</version>
+		<version>0.11.2</version>
 		<relativePath>../pom.xml</relativePath>        
 	</parent>