diff options
Diffstat (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/MultiplicityGoalConstraintCalculator.xtend')
-rw-r--r-- | Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/MultiplicityGoalConstraintCalculator.xtend | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/MultiplicityGoalConstraintCalculator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/MultiplicityGoalConstraintCalculator.xtend index 034420d6..b28cd584 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/MultiplicityGoalConstraintCalculator.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/MultiplicityGoalConstraintCalculator.xtend | |||
@@ -10,15 +10,13 @@ class MultiplicityGoalConstraintCalculator { | |||
10 | val String targetRelationName | 10 | val String targetRelationName |
11 | val IQuerySpecification<?> querySpecification | 11 | val IQuerySpecification<?> querySpecification |
12 | var ViatraQueryMatcher<?> matcher | 12 | var ViatraQueryMatcher<?> matcher |
13 | val int minValue | ||
14 | val boolean containment | 13 | val boolean containment |
15 | val int cost | 14 | val int cost |
16 | 15 | ||
17 | public new(String targetRelationName, IQuerySpecification<?> querySpecification, int minValue, boolean containment, int cost) { | 16 | public new(String targetRelationName, IQuerySpecification<?> querySpecification, boolean containment, int cost) { |
18 | this.targetRelationName = targetRelationName | 17 | this.targetRelationName = targetRelationName |
19 | this.querySpecification = querySpecification | 18 | this.querySpecification = querySpecification |
20 | this.matcher = null | 19 | this.matcher = null |
21 | this.minValue = minValue | ||
22 | this.containment = containment | 20 | this.containment = containment |
23 | this.cost = cost | 21 | this.cost = cost |
24 | } | 22 | } |
@@ -27,7 +25,6 @@ class MultiplicityGoalConstraintCalculator { | |||
27 | this.targetRelationName = other.targetRelationName | 25 | this.targetRelationName = other.targetRelationName |
28 | this.querySpecification = other.querySpecification | 26 | this.querySpecification = other.querySpecification |
29 | this.matcher = null | 27 | this.matcher = null |
30 | this.minValue = other.minValue | ||
31 | this.containment = other.containment | 28 | this.containment = other.containment |
32 | this.cost = other.cost | 29 | this.cost = other.cost |
33 | } | 30 | } |
@@ -49,14 +46,8 @@ class MultiplicityGoalConstraintCalculator { | |||
49 | var res = 0 | 46 | var res = 0 |
50 | val allMatches = this.matcher.allMatches | 47 | val allMatches = this.matcher.allMatches |
51 | for(match : allMatches) { | 48 | for(match : allMatches) { |
52 | val existingMultiplicity = match.get(4) as Integer | 49 | val missingMultiplicity = match.get(2) as Integer |
53 | if(existingMultiplicity < this.minValue) { | 50 | res += missingMultiplicity |
54 | val missingMultiplicity = this.minValue-existingMultiplicity | ||
55 | res += missingMultiplicity | ||
56 | } | ||
57 | // if(missingMultiplicity!=0) { | ||
58 | // println(targetRelationName+ " missing multiplicity: "+missingMultiplicity) | ||
59 | // } | ||
60 | } | 51 | } |
61 | // if(res>0) | 52 | // if(res>0) |
62 | // println(targetRelationName+ " all missing multiplicities: "+res + "*"+cost+"="+res*cost) | 53 | // println(targetRelationName+ " all missing multiplicities: "+res + "*"+cost+"="+res*cost) |