diff options
2 files changed, 7 insertions, 7 deletions
diff --git a/subprojects/generator-cli/src/main/java/tools/refinery/generator/cli/commands/GenerateCommand.java b/subprojects/generator-cli/src/main/java/tools/refinery/generator/cli/commands/GenerateCommand.java index 0fb97316..bbb70fb0 100644 --- a/subprojects/generator-cli/src/main/java/tools/refinery/generator/cli/commands/GenerateCommand.java +++ b/subprojects/generator-cli/src/main/java/tools/refinery/generator/cli/commands/GenerateCommand.java | |||
@@ -76,7 +76,7 @@ public class GenerateCommand { | |||
76 | loader.extraPath(System.getProperty("user.dir")); | 76 | loader.extraPath(System.getProperty("user.dir")); |
77 | var problem = isStandardStream(inputPath) ? loader.loadStream(System.in) : loader.loadFile(inputPath); | 77 | var problem = isStandardStream(inputPath) ? loader.loadStream(System.in) : loader.loadFile(inputPath); |
78 | problem = loader.loadScopeConstraints(problem, scopes, overrideScopes); | 78 | problem = loader.loadScopeConstraints(problem, scopes, overrideScopes); |
79 | generatorFactory.partialInterpretationBasedNeighbourhoods(count >= 2); | 79 | generatorFactory.partialInterpretationBasedNeighborhoods(count >= 2); |
80 | var generator = generatorFactory.createGenerator(problem); | 80 | var generator = generatorFactory.createGenerator(problem); |
81 | generator.setRandomSeed(randomSeed); | 81 | generator.setRandomSeed(randomSeed); |
82 | generator.setMaxNumberOfSolutions(count); | 82 | generator.setMaxNumberOfSolutions(count); |
diff --git a/subprojects/generator/src/main/java/tools/refinery/generator/ModelGeneratorFactory.java b/subprojects/generator/src/main/java/tools/refinery/generator/ModelGeneratorFactory.java index ca9dd728..3bdc1266 100644 --- a/subprojects/generator/src/main/java/tools/refinery/generator/ModelGeneratorFactory.java +++ b/subprojects/generator/src/main/java/tools/refinery/generator/ModelGeneratorFactory.java | |||
@@ -38,7 +38,7 @@ public final class ModelGeneratorFactory { | |||
38 | 38 | ||
39 | private boolean debugPartialInterpretations; | 39 | private boolean debugPartialInterpretations; |
40 | 40 | ||
41 | private boolean partialInterpretationBasedNeighbourhoods; | 41 | private boolean partialInterpretationBasedNeighborhoods; |
42 | 42 | ||
43 | private int stateCoderDepth = NeighborhoodCalculator.DEFAULT_DEPTH; | 43 | private int stateCoderDepth = NeighborhoodCalculator.DEFAULT_DEPTH; |
44 | 44 | ||
@@ -52,9 +52,9 @@ public final class ModelGeneratorFactory { | |||
52 | return this; | 52 | return this; |
53 | } | 53 | } |
54 | 54 | ||
55 | public ModelGeneratorFactory partialInterpretationBasedNeighbourhoods( | 55 | public ModelGeneratorFactory partialInterpretationBasedNeighborhoods( |
56 | boolean partialInterpretationBasedNeighbourhoods) { | 56 | boolean partialInterpretationBasedNeighborhoods) { |
57 | this.partialInterpretationBasedNeighbourhoods = partialInterpretationBasedNeighbourhoods; | 57 | this.partialInterpretationBasedNeighborhoods = partialInterpretationBasedNeighborhoods; |
58 | return this; | 58 | return this; |
59 | } | 59 | } |
60 | 60 | ||
@@ -83,13 +83,13 @@ public final class ModelGeneratorFactory { | |||
83 | } | 83 | } |
84 | 84 | ||
85 | private Collection<Concreteness> getRequiredInterpretations() { | 85 | private Collection<Concreteness> getRequiredInterpretations() { |
86 | return debugPartialInterpretations || partialInterpretationBasedNeighbourhoods ? | 86 | return debugPartialInterpretations || partialInterpretationBasedNeighborhoods ? |
87 | Set.of(Concreteness.PARTIAL, Concreteness.CANDIDATE) : | 87 | Set.of(Concreteness.PARTIAL, Concreteness.CANDIDATE) : |
88 | Set.of(Concreteness.CANDIDATE); | 88 | Set.of(Concreteness.CANDIDATE); |
89 | } | 89 | } |
90 | 90 | ||
91 | private StateCodeCalculatorFactory getStateCoderCalculatorFactory() { | 91 | private StateCodeCalculatorFactory getStateCoderCalculatorFactory() { |
92 | return partialInterpretationBasedNeighbourhoods ? | 92 | return partialInterpretationBasedNeighborhoods ? |
93 | PartialNeighborhoodCalculator.factory(Concreteness.PARTIAL, stateCoderDepth) : | 93 | PartialNeighborhoodCalculator.factory(Concreteness.PARTIAL, stateCoderDepth) : |
94 | NeighborhoodCalculator.factory(stateCoderDepth); | 94 | NeighborhoodCalculator.factory(stateCoderDepth); |
95 | } | 95 | } |