diff options
author | OszkarSemerath <semerath@mit.bme.hu> | 2021-07-30 10:04:27 +0200 |
---|---|---|
committer | OszkarSemerath <semerath@mit.bme.hu> | 2021-07-30 10:04:27 +0200 |
commit | aaa67b0ef8840d97b062a4f1383bf93410984af3 (patch) | |
tree | 2c07208bb6b5ab27b47bd477dfbcc6e77b50d623 /Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ViatraReasonerSolutionSaver.xtend | |
parent | Config updated and createSharedVersionedMapStores service (diff) | |
download | VIATRA-Generator-V4transformation.tar.gz VIATRA-Generator-V4transformation.tar.zst VIATRA-Generator-V4transformation.zip |
Numeric solver dreal hardcoding -> configV4transformation
Diffstat (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ViatraReasonerSolutionSaver.xtend')
-rw-r--r-- | Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ViatraReasonerSolutionSaver.xtend | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ViatraReasonerSolutionSaver.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ViatraReasonerSolutionSaver.xtend index e00f76ff..ac29c4ce 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ViatraReasonerSolutionSaver.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ViatraReasonerSolutionSaver.xtend | |||
@@ -33,7 +33,7 @@ class ViatraReasonerSolutionSaver implements ISolutionSaver, IObjectiveBoundsPro | |||
33 | val ObjectiveComparatorHelper comparatorHelper | 33 | val ObjectiveComparatorHelper comparatorHelper |
34 | val Map<SolutionTrajectory, Fitness> trajectories = new HashMap | 34 | val Map<SolutionTrajectory, Fitness> trajectories = new HashMap |
35 | 35 | ||
36 | @Accessors var NumericSolver numericSolver | 36 | @Accessors var NumericRefinementUnit numericSolver |
37 | @Accessors var Map<Object, Solution> solutionsCollection | 37 | @Accessors var Map<Object, Solution> solutionsCollection |
38 | 38 | ||
39 | new(IObjective[][] leveledExtremalObjectives, int numberOfRequiredSolutions, DiversityChecker diversityChecker) { | 39 | new(IObjective[][] leveledExtremalObjectives, int numberOfRequiredSolutions, DiversityChecker diversityChecker) { |
@@ -45,7 +45,7 @@ class ViatraReasonerSolutionSaver implements ISolutionSaver, IObjectiveBoundsPro | |||
45 | this.solutionCopier = new SolutionCopier | 45 | this.solutionCopier = new SolutionCopier |
46 | } | 46 | } |
47 | 47 | ||
48 | def setNumericSolver(NumericSolver numericSolver) { | 48 | def setNumericSolver(NumericRefinementUnit numericSolver) { |
49 | this.numericSolver = numericSolver | 49 | this.numericSolver = numericSolver |
50 | solutionCopier.numericSolver = numericSolver | 50 | solutionCopier.numericSolver = numericSolver |
51 | } | 51 | } |
@@ -63,7 +63,7 @@ class ViatraReasonerSolutionSaver implements ISolutionSaver, IObjectiveBoundsPro | |||
63 | if (!shouldSaveSolution(fitness, context)) { | 63 | if (!shouldSaveSolution(fitness, context)) { |
64 | return false | 64 | return false |
65 | } | 65 | } |
66 | println("Found: " + fitness) | 66 | //println("Found: " + fitness) |
67 | val dominatedTrajectories = newArrayList | 67 | val dominatedTrajectories = newArrayList |
68 | for (entry : trajectories.entrySet) { | 68 | for (entry : trajectories.entrySet) { |
69 | val isLastFitnessBetter = comparatorHelper.compare(fitness, entry.value) | 69 | val isLastFitnessBetter = comparatorHelper.compare(fitness, entry.value) |