aboutsummaryrefslogtreecommitdiffstats
path: root/Solvers
diff options
context:
space:
mode:
authorLibravatar Oszkar Semerath <semerath@mit.bme.hu>2020-05-11 04:21:58 +0200
committerLibravatar Oszkar Semerath <semerath@mit.bme.hu>2020-05-11 04:21:58 +0200
commiteae32efa9e202025cab8d2e0cb53a425e467c902 (patch)
tree82e81defe87ca3b06b983f1f01114ae7d73bed86 /Solvers
parentMerge branch 'master' of https://github.com/viatra/VIATRA-Generator (diff)
downloadVIATRA-Generator-eae32efa9e202025cab8d2e0cb53a425e467c902.tar.gz
VIATRA-Generator-eae32efa9e202025cab8d2e0cb53a425e467c902.tar.zst
VIATRA-Generator-eae32efa9e202025cab8d2e0cb53a425e467c902.zip
temporally removed check expressions for real values
Diffstat (limited to 'Solvers')
-rw-r--r--Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PConstraintTransformer.xtend6
1 files changed, 5 insertions, 1 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PConstraintTransformer.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PConstraintTransformer.xtend
index 423bb204..4a8da38c 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PConstraintTransformer.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PConstraintTransformer.xtend
@@ -235,8 +235,10 @@ class PConstraintTransformer {
235 «ENDFOR» 235 «ENDFOR»
236 check( 236 check(
237 «FOR variable: e.affectedVariables SEPARATOR " || "»!«variable.valueSetted»«ENDFOR» 237 «FOR variable: e.affectedVariables SEPARATOR " || "»!«variable.valueSetted»«ENDFOR»
238 «IF variable2Type.values.filter(RealTypeReference).empty»
238 || 239 ||
239 («expressionGenerator.translateExpression(expression,e.affectedVariables.toInvertedMap[valueVariable],variable2Type)») 240 («expressionGenerator.translateExpression(expression,e.affectedVariables.toInvertedMap[valueVariable],variable2Type)»)
241 «ENDIF»
240 ); 242 );
241 ''' 243 '''
242 } else { // Must or Current 244 } else { // Must or Current
@@ -244,7 +246,9 @@ class PConstraintTransformer {
244 «FOR variable: e.affectedVariables» 246 «FOR variable: e.affectedVariables»
245 PrimitiveElement.valueSet(«variable.canonizeName»,true); «hasValueExpression(variableMapping,variable,variable.valueVariable)» 247 PrimitiveElement.valueSet(«variable.canonizeName»,true); «hasValueExpression(variableMapping,variable,variable.valueVariable)»
246 «ENDFOR» 248 «ENDFOR»
247 check(«expressionGenerator.translateExpression(expression,e.affectedVariables.toInvertedMap[valueVariable],variable2Type)»); 249 «IF variable2Type.values.filter(RealTypeReference).empty»
250 check(«expressionGenerator.translateExpression(expression,e.affectedVariables.toInvertedMap[valueVariable],variable2Type)»);
251 «ENDIF»
248 ''' 252 '''
249 } 253 }
250 } 254 }