aboutsummaryrefslogtreecommitdiffstats
path: root/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericTranslator.xtend
diff options
context:
space:
mode:
Diffstat (limited to 'Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericTranslator.xtend')
-rw-r--r--Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericTranslator.xtend6
1 files changed, 4 insertions, 2 deletions
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericTranslator.xtend b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericTranslator.xtend
index 791dd644..a11ae8a8 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericTranslator.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericTranslator.xtend
@@ -17,6 +17,7 @@ class NumericTranslator {
17 17
18 private XExpressionExtractor extractor = new XExpressionExtractor(); 18 private XExpressionExtractor extractor = new XExpressionExtractor();
19 private NumericProblemSolver numericSolver; 19 private NumericProblemSolver numericSolver;
20 private int timeout;
20 21
21 long formingProblemTime=0; 22 long formingProblemTime=0;
22 long solvingProblemTime=0; 23 long solvingProblemTime=0;
@@ -29,8 +30,9 @@ class NumericTranslator {
29 } 30 }
30 } 31 }
31 32
32 new(NumericProblemSolver numericProblemSolver){ 33 new(NumericProblemSolver numericProblemSolver, int timeout){
33 this.numericSolver = numericProblemSolver 34 this.numericSolver = numericProblemSolver
35 this.timeout = timeout;
34 } 36 }
35 37
36 def Map<JvmIdentifiableElement, PrimitiveElement> arrayToMap(Object[] tuple, ArrayList<JvmIdentifiableElement> variablesInOrder) { 38 def Map<JvmIdentifiableElement, PrimitiveElement> arrayToMap(Object[] tuple, ArrayList<JvmIdentifiableElement> variablesInOrder) {
@@ -63,7 +65,7 @@ class NumericTranslator {
63 val NumericDynamicProblemSolver dynamicSolver = numericSolver as NumericDynamicProblemSolver 65 val NumericDynamicProblemSolver dynamicSolver = numericSolver as NumericDynamicProblemSolver
64 return dynamicSolver.selectSolver(selection); 66 return dynamicSolver.selectSolver(selection);
65 } else{ 67 } else{
66 if (numericSolver instanceof NumericZ3ProblemSolver) return new NumericZ3ProblemSolver 68 if (numericSolver instanceof NumericZ3ProblemSolver) return new NumericZ3ProblemSolver(this.timeout)
67 return numericSolver; 69 return numericSolver;
68 } 70 }
69 } 71 }