diff options
author | Rebus Farkas <rebus.detenyleg@gmail.com> | 2018-09-14 16:49:11 +0200 |
---|---|---|
committer | Rebus Farkas <rebus.detenyleg@gmail.com> | 2018-09-14 16:49:11 +0200 |
commit | 12f540b293fec104db29fe78a4b50ca60a49e417 (patch) | |
tree | 25fad118952232204aff027c39b01aca8de46b9b /Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ScopeObjective.xtend | |
parent | Merge branch 'master' into hypergraphs (diff) | |
parent | Updated progress monitor for huge amount instance generation processes (diff) | |
download | VIATRA-Generator-12f540b293fec104db29fe78a4b50ca60a49e417.tar.gz VIATRA-Generator-12f540b293fec104db29fe78a4b50ca60a49e417.tar.zst VIATRA-Generator-12f540b293fec104db29fe78a4b50ca60a49e417.zip |
Merge branch 'master' into hypergraphs
Diffstat (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ScopeObjective.xtend')
-rw-r--r-- | Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ScopeObjective.xtend | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ScopeObjective.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ScopeObjective.xtend index d3497ef2..69efe0d7 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ScopeObjective.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ScopeObjective.xtend | |||
@@ -23,8 +23,11 @@ class ScopeObjective implements IObjective{ | |||
23 | 23 | ||
24 | override getFitness(ThreadContext context) { | 24 | override getFitness(ThreadContext context) { |
25 | val interpretation = context.model as PartialInterpretation | 25 | val interpretation = context.model as PartialInterpretation |
26 | val res = interpretation.minNewElements | 26 | var res = interpretation.minNewElements.doubleValue |
27 | return res.doubleValue | 27 | for(scope : interpretation.scopes) { |
28 | res += scope.minNewElements*2 | ||
29 | } | ||
30 | return res | ||
28 | } | 31 | } |
29 | 32 | ||
30 | override isHardObjective() { true } | 33 | override isHardObjective() { true } |