From 931cc6de2ab952e63490fcbfc8fe481958261123 Mon Sep 17 00:00:00 2001 From: anqili426 Date: Wed, 15 Apr 2020 02:59:15 -0400 Subject: Added test methods with running time measurement --- .../viatra2logic/ExpressionEvaluation2Logic.xtend | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/ExpressionEvaluation2Logic.xtend') diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/ExpressionEvaluation2Logic.xtend b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/ExpressionEvaluation2Logic.xtend index adecf1d4..569414f0 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/ExpressionEvaluation2Logic.xtend +++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/ExpressionEvaluation2Logic.xtend @@ -13,11 +13,6 @@ import org.eclipse.xtext.xbase.XNumberLiteral import org.eclipse.xtext.xbase.XUnaryOperation import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.* -import com.microsoft.z3.BoolExpr -import java.util.Set -import java.util.List -import org.eclipse.xtext.common.types.JvmIdentifiableElement -import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PrimitiveElement class ExpressionEvaluation2Logic { val extension LogicProblemBuilder builder = new LogicProblemBuilder @@ -28,8 +23,11 @@ class ExpressionEvaluation2Logic { } def Term transformEval(PVariable target, XExpression expression, Map variable2Variable) { - numericSolver.test(expression); -// numericSolver.isSatisfiable(null) +// numericSolver.testIsNotSat(expression, expression.transform(variable2Variable)); +// numericSolver.testGetOneSol(expression, expression.transform(variable2Variable)); + numericSolver.testGetOneSol2(expression, expression.transform(variable2Variable)); +// numericSolver.testIsSat(expression, expression.transform(variable2Variable)); + return expression.transform(variable2Variable) } -- cgit v1.2.3-70-g09d2