aboutsummaryrefslogtreecommitdiffstats
path: root/subprojects/generator/src/main/java/tools/refinery/generator/ModelGenerator.java
diff options
context:
space:
mode:
Diffstat (limited to 'subprojects/generator/src/main/java/tools/refinery/generator/ModelGenerator.java')
-rw-r--r--subprojects/generator/src/main/java/tools/refinery/generator/ModelGenerator.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/subprojects/generator/src/main/java/tools/refinery/generator/ModelGenerator.java b/subprojects/generator/src/main/java/tools/refinery/generator/ModelGenerator.java
index 1515dceb..36190b76 100644
--- a/subprojects/generator/src/main/java/tools/refinery/generator/ModelGenerator.java
+++ b/subprojects/generator/src/main/java/tools/refinery/generator/ModelGenerator.java
@@ -9,6 +9,7 @@ import com.google.inject.Provider;
9import tools.refinery.language.model.problem.Problem; 9import tools.refinery.language.model.problem.Problem;
10import tools.refinery.language.semantics.ProblemTrace; 10import tools.refinery.language.semantics.ProblemTrace;
11import tools.refinery.language.semantics.SolutionSerializer; 11import tools.refinery.language.semantics.SolutionSerializer;
12import tools.refinery.logic.AbstractValue;
12import tools.refinery.store.dse.strategy.BestFirstStoreManager; 13import tools.refinery.store.dse.strategy.BestFirstStoreManager;
13import tools.refinery.store.map.Version; 14import tools.refinery.store.map.Version;
14import tools.refinery.store.model.ModelStore; 15import tools.refinery.store.model.ModelStore;
@@ -24,7 +25,7 @@ public class ModelGenerator extends ModelFacade {
24 private boolean lastGenerationSuccessful; 25 private boolean lastGenerationSuccessful;
25 26
26 ModelGenerator(ProblemTrace problemTrace, ModelStore store, ModelSeed modelSeed, 27 ModelGenerator(ProblemTrace problemTrace, ModelStore store, ModelSeed modelSeed,
27 Provider<SolutionSerializer> solutionSerializerProvider) { 28 Provider<SolutionSerializer> solutionSerializerProvider) {
28 super(problemTrace, store, modelSeed, Concreteness.CANDIDATE); 29 super(problemTrace, store, modelSeed, Concreteness.CANDIDATE);
29 this.solutionSerializerProvider = solutionSerializerProvider; 30 this.solutionSerializerProvider = solutionSerializerProvider;
30 initialVersion = getModel().commit(); 31 initialVersion = getModel().commit();
@@ -66,7 +67,8 @@ public class ModelGenerator extends ModelFacade {
66 } 67 }
67 68
68 @Override 69 @Override
69 public <A, C> PartialInterpretation<A, C> getPartialInterpretation(PartialSymbol<A, C> partialSymbol) { 70 public <A extends AbstractValue<A, C>, C> PartialInterpretation<A, C> getPartialInterpretation(
71 PartialSymbol<A, C> partialSymbol) {
70 checkSuccessfulGeneration(); 72 checkSuccessfulGeneration();
71 return super.getPartialInterpretation(partialSymbol); 73 return super.getPartialInterpretation(partialSymbol);
72 } 74 }