FIxed a bug when creating feasible solutions

forsyde · Nov 2, 2023 · 65a5946 · 65a5946
1 parent 9f60940
commit 65a5946
Show file tree

Hide file tree

Showing 4 changed files with 1,846 additions and 569 deletions.
diff --git a/java-metaheuristics/src/main/java/idesyde/metaheuristics/CanExploreAADPMMMWithJenetics.java b/java-metaheuristics/src/main/java/idesyde/metaheuristics/CanExploreAADPMMMWithJenetics.java
@@ -228,12 +228,11 @@ default Stream<ExplorationSolution> exploreAADPMMM(
             jobIdxGraph.addEdge(src, dst);
         });
         var engine = Engine
-                .builder(g -> evaluateAADPMMM(g, jobs, jobIdxGraph, configuration), codec)
+                .builder(g -> evaluateAADPMMM(g, jobs, jobIdxGraph, configuration), allConstraints.constrain(codec))
                 .populationSize(decisionModel.partitionedMemMappableMulticore().runtimes().runtimes()
                         .size() * decisionModel.aperiodicAsynchronousDataflows().size() * 5)
                 .offspringSelector(new TournamentSelector<>(5))
                 .survivorsSelector(UFTournamentSelector.ofVec())
-                // .alterers(new Mutator<>(0.05))
                 .constraint(allConstraints)
                 .alterers(
                         new UniformCrossover<>(0.2, 0.25),
@@ -261,7 +260,6 @@ default Stream<ExplorationSolution> exploreAADPMMM(
         // ? decodedStream.limit(configuration.maximumSolutions)
         // : decodedStream;
         return limitedImprovementStream
-                .filter(sol -> allConstraints.test(sol.bestPhenotype()))
                 .map(sol -> {
                     var decoded = codec.decode(sol.bestPhenotype().genotype());
                     var solMap = new HashMap<String, Double>(sol.bestFitness().length());