Merge remote-tracking branch 'upstream/master'

1 files changed, 37 insertions, 0 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 3f0ba03f..e1d01cb5 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
@@ -87,6 +87,43 @@ class SolverLoader {
                                                 ]

                                         } catch (NumberFormatException e) {console.writeError('''Malformed number format: «e.message»''')}

                                 }

+                                if(config.containsKey("numeric-solver-at-end")) {

+                                        val stringValue = config.get("numeric-solver-at-end")

+                                        if(stringValue.equals("true")) {

+                                                println("numeric-solver-at-end")

+                                                c.runIntermediateNumericalConsistencyChecks= false

+                                        }

+                                }

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

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

+                                        try {

+                                                c.punishSize = Boolean.parseBoolean(stringValue)

+                                        } catch(Exception e) {}

+                                }

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

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

+                                        try {

+                                                c.scopeWeight = Integer.parseInt(stringValue)

+                                        } catch(Exception e) {}

+                                }

+                                if(config.containsKey("fitness-missing-containent")) {

+                                        val stringValue = config.get("fitness-missing-containent")

+                                        try {

+                                                c.conaintmentWeight = Integer.parseInt(stringValue)

+                                        } catch(Exception e) {}

+                                }

+                                if(config.containsKey("fitness-missing-noncontainent")) {

+                                        val stringValue = config.get("fitness-missing-noncontainent")

+                                        try {

+                                                c.nonContainmentWeight = Integer.parseInt(stringValue)

+                                        } catch(Exception e) {}

+                                }

+                                if(config.containsKey("fitness-missing-wf")) {

+                                        val stringValue = config.get("fitness-missing-wf")

+                                        try {

+                                                c.unfinishedWFWeight = Integer.parseInt(stringValue)

+                                        } catch(Exception e) {}

+                                }

                         ]

                 } else {

                         throw new UnsupportedOperationException('''Unknown solver: «solver»''')