From 66cc2cc3b2f24d403167fd4e35cd69011d334b00 Mon Sep 17 00:00:00 2001 From: Oszkar Semerath Date: Sun, 10 May 2020 18:38:20 +0200 Subject: measurement time statistics + activation selection strategies --- .../reasoner/dse/ModelGenerationCompositeObjective.xtend | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ModelGenerationCompositeObjective.xtend') diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ModelGenerationCompositeObjective.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ModelGenerationCompositeObjective.xtend index 2489c751..a75ddf76 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ModelGenerationCompositeObjective.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ModelGenerationCompositeObjective.xtend @@ -50,20 +50,22 @@ class ModelGenerationCompositeObjective implements IObjective{ override getComparator() { Comparators.LOWER_IS_BETTER } override getFitness(ThreadContext context) { - var sum = 0.0 + val scopeFitnes = scopeObjective.getFitness(context) //val unfinishedMultiplicitiesFitneses = unfinishedMultiplicityObjectives.map[x|x.getFitness(context)] val unfinishedWFsFitness = unfinishedWFObjective.getFitness(context) - sum+=scopeFitnes + var multiplicity = 0.0 for(multiplicityObjective : unfinishedMultiplicityObjectives) { - multiplicity+=multiplicityObjective.getFitness(context)//*0.5 + multiplicity+=multiplicityObjective.getFitness(context) } - sum+=multiplicity + var sum = 0.0 + sum += scopeFitnes + sum +=Math.sqrt(multiplicity *0.1) sum += unfinishedWFsFitness//*0.5 - //println('''Sum=«sum»|Scope=«scopeFitnes»|Multiplicity=«multiplicity»|WFs=«unfinishedWFsFitness»''') + println('''Sum=«sum»|Scope=«scopeFitnes»|Multiplicity=«multiplicity»|WFs=«unfinishedWFsFitness»''') return sum } -- cgit v1.2.3-54-g00ecf