Skip to content
Snippets Groups Projects
Commit a73cf7df authored by Alexander Diewald's avatar Alexander Diewald
Browse files

Opt4J: Update to revived official version (3.2) with D3SE patches

parent d320ebd5
No related branches found
No related tags found
No related merge requests found
Showing
with 18 additions and 18 deletions
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/opt4j/opt4j-core-SNAPSHOT-20190111.jar" sourcepath="lib/opt4j/opt4j-core-SNAPSHOT-20190111-sources.jar">
<classpathentry exported="true" kind="lib" path="lib/opt4j/opt4j-core-v3.2-36-g53be465-SNAPSHOT.jar" sourcepath="lib/opt4j/opt4j-core-v3.2-36-g53be465-SNAPSHOT-sources.jar">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/org.fortiss.af3.exploration.alg/lib/opt4j/opt4j-core-SNAPSHOT-20190111-javadoc.jar!/"/>
<attribute name="javadoc_location" value="jar:platform:/resource/org.fortiss.af3.exploration.alg/lib/opt4j/opt4j-core-v3.2-36-g53be465-SNAPSHOT-javadoc.jar!/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/opt4j/opt4j-operators-SNAPSHOT-20190111.jar" sourcepath="lib/opt4j/opt4j-operators-SNAPSHOT-20190111-sources.jar">
<classpathentry exported="true" kind="lib" path="lib/opt4j/opt4j-operators-v3.2-36-g53be465-SNAPSHOT.jar" sourcepath="lib/opt4j/opt4j-operators-v3.2-36-g53be465-SNAPSHOT-sources.jar">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/org.fortiss.af3.exploration.alg/lib/opt4j/opt4j-operators-SNAPSHOT-20190111-javadoc.jar!/"/>
<attribute name="javadoc_location" value="jar:platform:/resource/org.fortiss.af3.exploration.alg/lib/opt4j/opt4j-operators-v3.2-36-g53be465-SNAPSHOT-javadoc.jar!/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/opt4j/opt4j-optimizers-SNAPSHOT-20190111.jar" sourcepath="lib/opt4j/opt4j-optimizers-SNAPSHOT-20190111-sources.jar">
<classpathentry exported="true" kind="lib" path="lib/opt4j/opt4j-optimizers-v3.2-36-g53be465-SNAPSHOT.jar" sourcepath="lib/opt4j/opt4j-optimizers-v3.2-36-g53be465-SNAPSHOT-sources.jar">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/org.fortiss.af3.exploration.alg/lib/opt4j/opt4j-optimizers-SNAPSHOT-20190111-javadoc.jar!/"/>
<attribute name="javadoc_location" value="jar:platform:/resource/org.fortiss.af3.exploration.alg/lib/opt4j/opt4j-optimizers-v3.2-36-g53be465-SNAPSHOT-javadoc.jar!/"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/guava-25.1-jre.jar" sourcepath="lib/guava-25.1-jre-sources.jar"/>
......
......@@ -16,9 +16,9 @@ Bundle-ClassPath: .,
lib/jfreechart-1.0.19.jar,
lib/jcommon-1.0.23.jar,
lib/guava-25.1-jre.jar,
lib/opt4j/opt4j-core-SNAPSHOT-20190111.jar,
lib/opt4j/opt4j-operators-SNAPSHOT-20190111.jar,
lib/opt4j/opt4j-optimizers-SNAPSHOT-20190111.jar
lib/opt4j/opt4j-core-v3.2-36-g53be465-SNAPSHOT.jar,
lib/opt4j/opt4j-operators-v3.2-36-g53be465-SNAPSHOT.jar,
lib/opt4j/opt4j-optimizers-v3.2-36-g53be465-SNAPSHOT.jar
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
......
File deleted
File added
File deleted
File added
Opt4JDseTask.java b5cb9e664e7a8fc2b5157bcdcaca740c2fa85336 YELLOW
Opt4JDseTaskProvider.java b331b9b75b8893f8baf9f0326f0dfd7c1e57175a YELLOW
Opt4JExplorationSolutionTransformer.java 9c5124210fff60c833c2d390bb4a09b9ace639ff RED
Opt4JExplorerBackend.java e9b27d72a1c680a7db1043d00c66ed9f4a6aea5a RED
Opt4JDseTask.java b5cb9e664e7a8fc2b5157bcdcaca740c2fa85336 YELLOW
Opt4JDseTaskProvider.java b331b9b75b8893f8baf9f0326f0dfd7c1e57175a YELLOW
Opt4JExplorationSolutionTransformer.java 9c5124210fff60c833c2d390bb4a09b9ace639ff RED
Opt4JExplorerBackend.java 8d74894b1f0c5f8646fad069168acb801a3ea685 RED
......@@ -209,20 +209,20 @@ public class Opt4JExplorerBackend extends ExplorerBackendBase<EAOptimizer> {
EvolutionaryAlgorithmModule eaModule = new EvolutionaryAlgorithmModule();
// Fix values.
eaModule.setGenerations(eaParameters.getIterations());
eaModule.setAlpha(eaParameters.getAlpha());
eaModule.setPopulationSize(eaParameters.getAlpha());
eaModule.setCrossoverRate(0.3);
// Derived values if not set by a user.
if(eaParameters.getLambda() != null) {
eaModule.setLambda(eaParameters.getLambda());
eaModule.setOffspringsPerGeneration(eaParameters.getLambda());
} else {
// First five iterations using only created (non-modified) genotypes.
eaModule.setLambda(eaModule.getAlpha() / 5);
eaModule.setOffspringsPerGeneration(eaModule.getPopulationSize() / 5);
}
if(eaParameters.getMu() != null) {
eaModule.setMu(eaParameters.getMu());
eaModule.setParentsPerGeneration(eaParameters.getMu());
} else {
// Support Elitism.
eaModule.setMu(eaModule.getLambda() / 2);
eaModule.setParentsPerGeneration(eaModule.getOffspringsPerGeneration() / 2);
}
return eaModule;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment