Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

[Full changelog](https://github.com/LearnLib/learnlib/compare/learnlib-0.17.0...HEAD)

### Changed

* The `de.learnlib.tooling:learnlib-annotation-processor` module has been outsourced to a [standalone project](https://github.com/LearnLib/build-tools). As a result, the `learnlib-build-config` module is now part of the `de.learnlib` group again.
* The `ReuseOracleBuilder` and `ReuseTreeBuilder` classes are now auto-generated and therefore reside in the respective packages of their previously enclosing classes.


## [0.17.0] - 2023-11-15

Expand Down
4 changes: 2 additions & 2 deletions algorithms/active/adt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ limitations under the License.

<!-- build -->
<dependency>
<groupId>com.github.misberner.buildergen</groupId>
<artifactId>buildergen</artifactId>
<groupId>de.learnlib.tooling</groupId>
<artifactId>annotations</artifactId>
</dependency>

<!-- test -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import java.util.Set;
import java.util.stream.Collectors;

import com.github.misberner.buildergen.annotations.GenerateBuilder;
import de.learnlib.Resumable;
import de.learnlib.algorithm.LearningAlgorithm;
import de.learnlib.algorithm.adt.adt.ADT;
Expand All @@ -55,6 +54,7 @@
import de.learnlib.logging.Category;
import de.learnlib.oracle.SymbolQueryOracle;
import de.learnlib.query.DefaultQuery;
import de.learnlib.tooling.annotation.builder.GenerateBuilder;
import de.learnlib.util.MQUtil;
import net.automatalib.alphabet.Alphabet;
import net.automatalib.alphabet.Alphabets;
Expand All @@ -70,9 +70,9 @@
* The main learning algorithm.
*
* @param <I>
* input alphabet type
* input symbol type
* @param <O>
* output alphabet type
* output symbol type
*/
public class ADTLearner<I, O> implements LearningAlgorithm.MealyLearner<I, O>,
PartialTransitionAnalyzer<ADTState<I, O>, I>,
Expand Down
4 changes: 2 additions & 2 deletions algorithms/active/dhc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ limitations under the License.

<!-- build -->
<dependency>
<groupId>com.github.misberner.buildergen</groupId>
<artifactId>buildergen</artifactId>
<groupId>de.learnlib.tooling</groupId>
<artifactId>annotations</artifactId>
</dependency>

<!-- test -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import java.util.Queue;
import java.util.Set;

import com.github.misberner.buildergen.annotations.GenerateBuilder;
import com.google.common.collect.Interner;
import com.google.common.collect.Interners;
import com.google.common.collect.Sets;
Expand All @@ -39,6 +38,7 @@
import de.learnlib.counterexample.GlobalSuffixFinders;
import de.learnlib.oracle.MembershipOracle;
import de.learnlib.query.DefaultQuery;
import de.learnlib.tooling.annotation.builder.GenerateBuilder;
import net.automatalib.alphabet.Alphabet;
import net.automatalib.alphabet.Alphabets;
import net.automatalib.alphabet.SupportsGrowingAlphabet;
Expand All @@ -49,6 +49,14 @@
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;

/**
* The DHC learner.
*
* @param <I>
* input symbol type
* @param <O>
* output symbol type
*/
public class MealyDHC<I, O> implements MealyLearner<I, O>,
AccessSequenceTransformer<I>,
GlobalSuffixLearnerMealy<I, O>,
Expand Down Expand Up @@ -87,7 +95,7 @@ public MealyDHC(Alphabet<I> alphabet, MembershipOracle<I, Word<O>> oracle) {
* the initial set of splitters, {@code null} or an empty collection will result in the set of splitters
* being initialized as the set of alphabet symbols (interpreted as {@link Word}s)
*/
@GenerateBuilder(defaults = BuilderDefaults.class, builderFinal = false)
@GenerateBuilder(defaults = BuilderDefaults.class)
public MealyDHC(Alphabet<I> alphabet,
MembershipOracle<I, Word<O>> oracle,
GlobalSuffixFinder<? super I, ? super Word<O>> suffixFinder,
Expand Down
4 changes: 2 additions & 2 deletions algorithms/active/kearns-vazirani/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ limitations under the License.

<!-- build -->
<dependency>
<groupId>com.github.misberner.buildergen</groupId>
<artifactId>buildergen</artifactId>
<groupId>de.learnlib.tooling</groupId>
<artifactId>annotations</artifactId>
</dependency>

<!-- test -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import java.util.List;
import java.util.function.BooleanSupplier;

import com.github.misberner.buildergen.annotations.GenerateBuilder;
import de.learnlib.Resumable;
import de.learnlib.acex.AbstractBaseCounterexample;
import de.learnlib.acex.AcexAnalyzer;
Expand All @@ -36,6 +35,7 @@
import de.learnlib.logging.Category;
import de.learnlib.oracle.MembershipOracle;
import de.learnlib.query.DefaultQuery;
import de.learnlib.tooling.annotation.builder.GenerateBuilder;
import net.automatalib.alphabet.Alphabet;
import net.automatalib.alphabet.Alphabets;
import net.automatalib.alphabet.SupportsGrowingAlphabet;
Expand Down Expand Up @@ -74,7 +74,7 @@ public class KearnsVaziraniDFA<I>
* @param oracle
* the membership oracle
*/
@GenerateBuilder
@GenerateBuilder(defaults = BuilderDefaults.class)
public KearnsVaziraniDFA(Alphabet<I> alphabet,
MembershipOracle<I, Boolean> oracle,
boolean repeatedCounterexampleEvaluation,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import java.util.List;
import java.util.Objects;

import com.github.misberner.buildergen.annotations.GenerateBuilder;
import de.learnlib.Resumable;
import de.learnlib.acex.AbstractBaseCounterexample;
import de.learnlib.acex.AcexAnalyzer;
Expand All @@ -36,6 +35,7 @@
import de.learnlib.logging.Category;
import de.learnlib.oracle.MembershipOracle;
import de.learnlib.query.DefaultQuery;
import de.learnlib.tooling.annotation.builder.GenerateBuilder;
import de.learnlib.util.mealy.MealyUtil;
import net.automatalib.alphabet.Alphabet;
import net.automatalib.alphabet.Alphabets;
Expand Down Expand Up @@ -69,7 +69,7 @@ public class KearnsVaziraniMealy<I, O>
protected List<StateInfo<I, Word<O>>> stateInfos = new ArrayList<>();
private CompactMealy<I, O> hypothesis;

@GenerateBuilder
@GenerateBuilder(defaults = BuilderDefaults.class)
public KearnsVaziraniMealy(Alphabet<I> alphabet,
MembershipOracle<I, Word<O>> oracle,
boolean repeatedCounterexampleEvaluation,
Expand Down
4 changes: 2 additions & 2 deletions algorithms/active/lstar/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ limitations under the License.

<!-- build -->
<dependency>
<groupId>com.github.misberner.buildergen</groupId>
<artifactId>buildergen</artifactId>
<groupId>de.learnlib.tooling</groupId>
<artifactId>annotations</artifactId>
</dependency>

<!-- test -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@

import java.util.Collections;

import com.github.misberner.buildergen.annotations.GenerateBuilder;
import de.learnlib.algorithm.lstar.ce.ObservationTableCEXHandlers;
import de.learnlib.algorithm.lstar.closing.ClosingStrategies;
import de.learnlib.oracle.MembershipOracle;
import de.learnlib.tooling.annotation.builder.GenerateBuilder;
import net.automatalib.alphabet.Alphabet;
import net.automatalib.word.Word;

/**
* Implementation of the L* algorithm by Dana Angluin.
*
* @param <I>
* input symbol class.
* input symbol type.
*/
public class ClassicLStarDFA<I> extends ExtensibleLStarDFA<I> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import java.util.Collections;
import java.util.List;

import com.github.misberner.buildergen.annotations.GenerateBuilder;
import de.learnlib.algorithm.GlobalSuffixLearner.GlobalSuffixLearnerDFA;
import de.learnlib.algorithm.lstar.AbstractExtensibleAutomatonLStar;
import de.learnlib.algorithm.lstar.ce.ObservationTableCEXHandler;
Expand All @@ -27,6 +26,7 @@
import de.learnlib.datastructure.observationtable.ObservationTable;
import de.learnlib.datastructure.observationtable.Row;
import de.learnlib.oracle.MembershipOracle;
import de.learnlib.tooling.annotation.builder.GenerateBuilder;
import net.automatalib.alphabet.Alphabet;
import net.automatalib.automaton.concept.SuffixOutput;
import net.automatalib.automaton.fsa.CompactDFA;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import java.util.Collections;
import java.util.List;

import com.github.misberner.buildergen.annotations.GenerateBuilder;
import de.learnlib.algorithm.lstar.AbstractExtensibleAutomatonLStar;
import de.learnlib.algorithm.lstar.ce.ObservationTableCEXHandler;
import de.learnlib.algorithm.lstar.ce.ObservationTableCEXHandlers;
Expand All @@ -27,6 +26,7 @@
import de.learnlib.datastructure.observationtable.ObservationTable;
import de.learnlib.datastructure.observationtable.Row;
import de.learnlib.oracle.MembershipOracle;
import de.learnlib.tooling.annotation.builder.GenerateBuilder;
import net.automatalib.alphabet.Alphabet;
import net.automatalib.automaton.CompactTransition;
import net.automatalib.automaton.concept.SuffixOutput;
Expand All @@ -39,9 +39,9 @@
* thesis.
*
* @param <I>
* input symbol class
* input symbol type
* @param <O>
* output symbol class
* output symbol type
*/
public class ClassicLStarMealy<I, O>
extends AbstractExtensibleAutomatonLStar<MealyMachine<?, I, ?, O>, I, O, Integer, CompactTransition<O>, Void, O, CompactMealy<I, O>> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import java.util.Collections;
import java.util.List;

import com.github.misberner.buildergen.annotations.GenerateBuilder;
import de.learnlib.algorithm.GlobalSuffixLearner.GlobalSuffixLearnerMealy;
import de.learnlib.algorithm.lstar.AbstractExtensibleAutomatonLStar;
import de.learnlib.algorithm.lstar.ce.ObservationTableCEXHandler;
Expand All @@ -29,13 +28,22 @@
import de.learnlib.datastructure.observationtable.Row;
import de.learnlib.oracle.MembershipOracle;
import de.learnlib.query.DefaultQuery;
import de.learnlib.tooling.annotation.builder.GenerateBuilder;
import net.automatalib.alphabet.Alphabet;
import net.automatalib.automaton.CompactTransition;
import net.automatalib.automaton.concept.SuffixOutput;
import net.automatalib.automaton.transducer.CompactMealy;
import net.automatalib.automaton.transducer.MealyMachine;
import net.automatalib.word.Word;

/**
* A {@link MealyMachine}-based specialization of the extensible L* learner.
*
* @param <I>
* input symbol type
* @param <O>
* output symbol type
*/
public class ExtensibleLStarMealy<I, O>
extends AbstractExtensibleAutomatonLStar<MealyMachine<?, I, ?, O>, I, Word<O>, Integer, CompactTransition<O>, Void, O, CompactMealy<I, O>>
implements OTLearnerMealy<I, O>, GlobalSuffixLearnerMealy<I, O> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@

import java.util.List;

import com.github.misberner.buildergen.annotations.GenerateBuilder;
import de.learnlib.algorithm.lstar.AbstractExtensibleAutomatonLStar;
import de.learnlib.algorithm.lstar.ce.ObservationTableCEXHandler;
import de.learnlib.algorithm.lstar.closing.ClosingStrategy;
import de.learnlib.datastructure.observationtable.ObservationTable;
import de.learnlib.datastructure.observationtable.Row;
import de.learnlib.oracle.MembershipOracle;
import de.learnlib.tooling.annotation.builder.GenerateBuilder;
import net.automatalib.alphabet.Alphabet;
import net.automatalib.automaton.concept.SuffixOutput;
import net.automatalib.automaton.transducer.CompactMoore;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
import java.util.Collections;
import java.util.List;

import com.github.misberner.buildergen.annotations.GenerateBuilder;
import de.learnlib.algorithm.lstar.AbstractExtensibleAutomatonLStar;
import de.learnlib.algorithm.lstar.ce.ObservationTableCEXHandler;
import de.learnlib.algorithm.lstar.closing.ClosingStrategy;
import de.learnlib.datastructure.observationtable.OTLearner.OTLearnerMoore;
import de.learnlib.datastructure.observationtable.ObservationTable;
import de.learnlib.datastructure.observationtable.Row;
import de.learnlib.oracle.MembershipOracle;
import de.learnlib.tooling.annotation.builder.GenerateBuilder;
import net.automatalib.alphabet.Alphabet;
import net.automatalib.automaton.concept.SuffixOutput;
import net.automatalib.automaton.transducer.CompactMoore;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,24 @@
import java.util.Collections;
import java.util.List;

import com.github.misberner.buildergen.annotations.GenerateBuilder;
import de.learnlib.algorithm.lstar.AbstractExtensibleAutomatonLStar;
import de.learnlib.algorithm.lstar.ce.ObservationTableCEXHandlers;
import de.learnlib.algorithm.lstar.closing.ClosingStrategies;
import de.learnlib.algorithm.lstar.closing.ClosingStrategy;
import de.learnlib.algorithm.lstar.dfa.ExtensibleLStarDFA;
import de.learnlib.oracle.MembershipOracle;
import de.learnlib.tooling.annotation.builder.GenerateBuilder;
import net.automatalib.alphabet.Alphabet;
import net.automatalib.automaton.fsa.DFA;
import net.automatalib.word.Word;

/**
* A {@link DFA}-based specialization of the L* learner which uses the counterexample analysis strategy proposed by
* Maler &amp; Pnueli.
*
* @param <I>
* input symbol type
*/
public class MalerPnueliDFA<I> extends ExtensibleLStarDFA<I> {

public MalerPnueliDFA(Alphabet<I> alphabet, MembershipOracle<I, Boolean> oracle) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,26 @@
import java.util.Collections;
import java.util.List;

import com.github.misberner.buildergen.annotations.GenerateBuilder;
import de.learnlib.algorithm.lstar.AbstractExtensibleAutomatonLStar;
import de.learnlib.algorithm.lstar.ce.ObservationTableCEXHandlers;
import de.learnlib.algorithm.lstar.closing.ClosingStrategies;
import de.learnlib.algorithm.lstar.closing.ClosingStrategy;
import de.learnlib.algorithm.lstar.mealy.ExtensibleLStarMealy;
import de.learnlib.oracle.MembershipOracle;
import de.learnlib.tooling.annotation.builder.GenerateBuilder;
import net.automatalib.alphabet.Alphabet;
import net.automatalib.automaton.transducer.MealyMachine;
import net.automatalib.word.Word;

/**
* A {@link MealyMachine}-based specialization of the L* learner which uses the counterexample analysis strategy
* proposed by Maler &amp; Pnueli.
*
* @param <I>
* input symbol type
* @param <O>
* output symbol type
*/
public class MalerPnueliMealy<I, O> extends ExtensibleLStarMealy<I, O> {

public MalerPnueliMealy(Alphabet<I> alphabet, MembershipOracle<I, Word<O>> oracle) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,25 @@
import java.util.Collections;
import java.util.List;

import com.github.misberner.buildergen.annotations.GenerateBuilder;
import de.learnlib.algorithm.lstar.ce.ObservationTableCEXHandlers;
import de.learnlib.algorithm.lstar.closing.ClosingStrategies;
import de.learnlib.algorithm.lstar.closing.ClosingStrategy;
import de.learnlib.algorithm.lstar.moore.ExtensibleLStarMoore;
import de.learnlib.oracle.MembershipOracle;
import de.learnlib.tooling.annotation.builder.GenerateBuilder;
import net.automatalib.alphabet.Alphabet;
import net.automatalib.automaton.transducer.MooreMachine;
import net.automatalib.word.Word;

/**
* A {@link MooreMachine}-based specialization of the L* learner which uses the counterexample analysis strategy
* proposed by Maler &amp; Pnueli.
*
* @param <I>
* input symbol type
* @param <O>
* output symbol type
*/
public class MalerPnueliMoore<I, O> extends ExtensibleLStarMoore<I, O> {

public MalerPnueliMoore(Alphabet<I> alphabet, MembershipOracle<I, Word<O>> oracle) {
Expand Down
Loading