Skip to content
Snippets Groups Projects
Commit aec89e55 authored by Paul Fiterau Brostean's avatar Paul Fiterau Brostean
Browse files

Fixed minor problems

parent 2e849910
No related branches found
No related merge requests found
......@@ -21,8 +21,8 @@ public class ComponentProvider {
public static class ComponentType<I,O> {
@SuppressWarnings("unchecked")
private Component<I,O> cast(Component<?,?> component) {
return (Component<I, O>) (component);
private Component<I,O> cast(Component<?,?> component) {
return (Component<I,O>) (component);
}
}
public static final ComponentType<DeterminedInput, DeterminedOutput> DIRECT = new ComponentType<>();
......@@ -32,7 +32,7 @@ public class ComponentProvider {
/**
* Instantiates a basic runnable component to interact with the SUT.
*/
public <I,O> Component<I, O> newComponentInstance(ComponentType<I,O> type) {
public <I,O> Component<I,O> newComponentInstance(ComponentType<I,O> type) {
if (type.equals(DIRECT)) {
return type.cast(
new ComponentBuilder(this.context).makeSut().makeDeterminizing().build());
......@@ -43,7 +43,7 @@ public class ComponentProvider {
if (type.equals(LOOKAHEAD))
return type.cast(
new ComponentBuilder(this.context).makeSut().makeDeterminizing().makeCaching().build());
new ComponentBuilder(this.context).makeSut().makeDeterminizing().makeLookahead().build());
throw new BugException("Cannot instantiate components of type "+ type);
}
......
......@@ -24,7 +24,9 @@ public class CanonicalizerComponent implements Component<DeterminedInput, Determ
sutTrace.add(determinedInput);
sutTrace = canonizer.canonicalize(sutTrace);
determinedInput = new DeterminedInput((InputAction)sutTrace.get(sutTrace.size()-1));
return this.determinedComponent.sendInput(determinedInput);
DeterminedOutput determinedOutput = this.determinedComponent.sendInput(determinedInput);
sutTrace.add(determinedOutput);
return determinedOutput;
}
@Override
......
......@@ -414,7 +414,7 @@ public class Main {
Context.setContext(constants, new StateVarNMapper(), ConfigurableValueStoreProvider.FRESH,
ConfigurableValueStoreProvider.INPUT, () -> new ConcreteDeterminizer(constants),
stateVarMapper, concreteTree, lookaheadStore, InconsistencyHandling.VERIFY_RESTART_LEARNING,
null, () -> SutInfo.newSutWrapper(), () -> null);
abstractionMapper, () -> SutInfo.newSutWrapper(), () -> null);
Context componentContext = Context.getContext();
ComponentProvider componentProvider = new ComponentProvider(componentContext);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment