diff options
Diffstat (limited to 'Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model')
-rw-r--r-- | Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicSolver.xtend | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicSolver.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicSolver.xtend index f1d410d8..e62a3cb7 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicSolver.xtend +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicSolver.xtend | |||
@@ -34,7 +34,7 @@ public class LogicReasonerException extends Exception { | |||
34 | } | 34 | } |
35 | } | 35 | } |
36 | 36 | ||
37 | abstract class LogicSolverConfiguration { | 37 | abstract class SolverConfiguration { |
38 | public static val Unlimited = -1; | 38 | public static val Unlimited = -1; |
39 | public static val String UndefinedPath = null | 39 | public static val String UndefinedPath = null |
40 | 40 | ||
@@ -42,7 +42,7 @@ abstract class LogicSolverConfiguration { | |||
42 | public String solverPath = UndefinedPath | 42 | public String solverPath = UndefinedPath |
43 | /** Max runtime limit in seconds. */ | 43 | /** Max runtime limit in seconds. */ |
44 | public int runtimeLimit = Unlimited | 44 | public int runtimeLimit = Unlimited |
45 | /** Max runtime limit in seconds. */ | 45 | /** Max memory limit in megabytes. */ |
46 | public int memoryLimit = Unlimited | 46 | public int memoryLimit = Unlimited |
47 | /** Documentation level of the solver. */ | 47 | /** Documentation level of the solver. */ |
48 | public DocumentationLevel documentationLevel = DocumentationLevel::NONE | 48 | public DocumentationLevel documentationLevel = DocumentationLevel::NONE |
@@ -52,7 +52,9 @@ abstract class LogicSolverConfiguration { | |||
52 | * or via a listener registered by {@link progressMonitor.addCancelListener}</li> | 52 | * or via a listener registered by {@link progressMonitor.addCancelListener}</li> |
53 | */ | 53 | */ |
54 | public SolverProgressMonitor progressMonitor = new NullSolverProgressMonitor | 54 | public SolverProgressMonitor progressMonitor = new NullSolverProgressMonitor |
55 | } | ||
55 | 56 | ||
57 | abstract class LogicSolverConfiguration extends SolverConfiguration { | ||
56 | public var TypeScopes typeScopes = new TypeScopes; | 58 | public var TypeScopes typeScopes = new TypeScopes; |
57 | public var SolutionScope solutionScope = new SolutionScope | 59 | public var SolutionScope solutionScope = new SolutionScope |
58 | } | 60 | } |
@@ -157,7 +159,7 @@ public class TypeScopes { | |||
157 | */ | 159 | */ |
158 | public class SolutionScope { | 160 | public class SolutionScope { |
159 | public static val All = Integer.MAX_VALUE; | 161 | public static val All = Integer.MAX_VALUE; |
160 | public var numberOfRequiredSolution = 1 | 162 | public var numberOfRequiredSolutions = 1 |
161 | } | 163 | } |
162 | /** Progress monitor class for a solver to | 164 | /** Progress monitor class for a solver to |
163 | * <li>(optionally) report progress via {@link worked}</li> | 165 | * <li>(optionally) report progress via {@link worked}</li> |