Restore inverse punishSize

1 files changed, 7 insertions, 1 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend
index bc4fa42f..a549df00 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend
@@ -16,6 +16,7 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ScopePro
 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.CostObjectiveConfiguration

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.CostObjectiveElementConfiguration

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.DiversityDescriptor

+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.PunishSizeStrategy

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasoner

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasonerConfiguration

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.ObjectiveKind

@@ -110,7 +111,12 @@ class SolverLoader {
                                 }

                                 if (config.containsKey("fitness-punishSize")) {

                                         val stringValue = config.get("fitness-punishSize")

-                                        c.punishSize = Boolean.parseBoolean(stringValue)

+                                        c.punishSize = switch (stringValue) {

+                                                case "false": PunishSizeStrategy.NONE

+                                                case "true": PunishSizeStrategy.SMALLER_IS_BETTER

+                                                case "inverse": PunishSizeStrategy.LARGER_IS_BETTER

+                                                default: throw new IllegalArgumentException("Unknown punish size strategy: " + stringValue)

+                                        }

                                 }

                                 if (config.containsKey("fitness-scope")) {

                                         val stringValue = config.get("fitness-scope")