diff --git a/org.fortiss.af3.exploration.alg/.classpath b/org.fortiss.af3.exploration.alg/.classpath
index ae52f8810f47bb7665bb82499932e72e6c09d90c..371de5fdd2cc52c7db498a6697c11891bcf95a0d 100644
--- a/org.fortiss.af3.exploration.alg/.classpath
+++ b/org.fortiss.af3.exploration.alg/.classpath
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry exported="true" kind="lib" path="lib/guava-25.1-jre.jar" sourcepath="lib/guava-25.1-jre-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/opt4j-optimizers-SNAPSHOT-20161110.jar" sourcepath="lib/opt4j-optimizers-SNAPSHOT-20161110-sources.jar"/>
- <classpathentry kind="lib" path="lib/commons-collections4-4.1.jar">
- <attributes>
- <attribute name="javadoc_location" value="jar:platform:/resource/org.fortiss.af3.exploration.alg/lib/commons-collections4-4.1-javadoc.jar!/"/>
- </attributes>
- <accessrules>
- <accessrule kind="nonaccessible" pattern="*"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="generated-src"/>
- <classpathentry kind="lib" path="lib/jgrapht-core-0.9.0.jar" sourcepath="lib/jgrapht-0.9.0-src.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/opt4j-core-3.1.3.jar" sourcepath="lib/opt4j-source-3.1.3.jar"/>
- <classpathentry kind="lib" path="lib/opt4j-operators-3.1.3.jar" sourcepath="lib/opt4j-source-3.1.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/apfloat.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jgrapht-ext-0.9.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jgraphx-2.0.0.1.jar"/>
- <classpathentry kind="lib" path="lib/guice-assistedinject-4.2.0.jar" sourcepath="lib/guice-assistedinject-4.2.0-sources.jar"/>
- <classpathentry kind="lib" path="lib/guice-4.2.0.jar" sourcepath="lib/guice-4.2.0-sources.jar"/>
- <classpathentry kind="lib" path="lib/guice-multibindings-4.2.0.jar" sourcepath="lib/guice-multibindings-4.2.0-sources.jar"/>
- <classpathentry kind="lib" path="lib/jcommon-1.0.23.jar"/>
- <classpathentry kind="lib" path="lib/jfreechart-1.0.19.jar" sourcepath="lib/jfreechart-1.0.19-src.jar"/>
- <classpathentry kind="output" path="build"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry exported="true" kind="lib" path="lib/guava-25.1-jre.jar" sourcepath="lib/guava-25.1-jre-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/opt4j-optimizers-SNAPSHOT-20161110.jar" sourcepath="lib/opt4j-optimizers-SNAPSHOT-20161110-sources.jar"/>
+ <classpathentry kind="lib" path="lib/commons-collections4-4.1.jar">
+ <attributes>
+ <attribute name="javadoc_location" value="jar:platform:/resource/org.fortiss.af3.exploration.alg/lib/commons-collections4-4.1-javadoc.jar!/"/>
+ </attributes>
+ <accessrules>
+ <accessrule kind="nonaccessible" pattern="*"/>
+ </accessrules>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="generated-src"/>
+ <classpathentry kind="lib" path="lib/jgrapht-core-0.9.0.jar" sourcepath="lib/jgrapht-0.9.0-src.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/opt4j-core-SNAPSHOT-20180714.jar" sourcepath="lib/opt4j-source-3.1.3.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/opt4j-operators-SNAPSHOT-20180714.jar" sourcepath="lib/opt4j-source-3.1.3.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/apfloat.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jgrapht-ext-0.9.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jgraphx-2.0.0.1.jar"/>
+ <classpathentry kind="lib" path="lib/guice-assistedinject-4.2.0.jar" sourcepath="lib/guice-assistedinject-4.2.0-sources.jar"/>
+ <classpathentry kind="lib" path="lib/guice-4.2.0.jar" sourcepath="lib/guice-4.2.0-sources.jar"/>
+ <classpathentry kind="lib" path="lib/guice-multibindings-4.2.0.jar" sourcepath="lib/guice-multibindings-4.2.0-sources.jar"/>
+ <classpathentry kind="lib" path="lib/jcommon-1.0.23.jar"/>
+ <classpathentry kind="lib" path="lib/jfreechart-1.0.19.jar" sourcepath="lib/jfreechart-1.0.19-src.jar"/>
+ <classpathentry kind="output" path="build"/>
+</classpath>
diff --git a/org.fortiss.af3.exploration.alg/META-INF/MANIFEST.MF b/org.fortiss.af3.exploration.alg/META-INF/MANIFEST.MF
index 09f8c53a3b162cd0326ecf00f355a9ab4c345908..e826057a6a95078009cd3643eeb654ec982a5ede 100644
--- a/org.fortiss.af3.exploration.alg/META-INF/MANIFEST.MF
+++ b/org.fortiss.af3.exploration.alg/META-INF/MANIFEST.MF
@@ -5,8 +5,6 @@ Bundle-SymbolicName: org.fortiss.af3.exploration.alg;singleton:=true
Bundle-Version: 2.13.0.qualifier
Bundle-ClassPath: .,
lib/jgrapht-core-0.9.0.jar,
- lib/opt4j-core-3.1.3.jar,
- lib/opt4j-operators-3.1.3.jar,
lib/aopalliance-1.0.jar,
lib/apfloat.jar,
lib/jgrapht-ext-0.9.0.jar,
@@ -18,7 +16,9 @@ Bundle-ClassPath: .,
lib/opt4j-optimizers-SNAPSHOT-20161110.jar,
lib/guava-25.1-jre.jar,
lib/jfreechart-1.0.19.jar,
- lib/jcommon-1.0.23.jar
+ lib/jcommon-1.0.23.jar,
+ lib/opt4j-core-SNAPSHOT-20180714.jar,
+ lib/opt4j-operators-SNAPSHOT-20180714.jar
Bundle-Vendor: fortiss GmbH
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -167,5 +167,4 @@ Export-Package: org.fortiss.af3.exploration.alg,
org.fortiss.af3.exploration.moea.model.predefined.impl,
org.fortiss.af3.exploration.moea.model.predefined.util,
org.fortiss.af3.exploration.moea.model.util,
- org.fortiss.af3.exploration.util,
- org.opt4j.core;uses:="com.google.inject,org.opt4j.core.problem"
+ org.fortiss.af3.exploration.util
diff --git a/org.fortiss.af3.exploration.alg/build.properties b/org.fortiss.af3.exploration.alg/build.properties
index 1f70bf83180e2bc0ed93890bcfe9a4f6266dc38b..60e7d0cdc7a6fc47e05cb5ac131590a589772395 100644
--- a/org.fortiss.af3.exploration.alg/build.properties
+++ b/org.fortiss.af3.exploration.alg/build.properties
@@ -8,8 +8,8 @@ bin.includes = .,\
lib/apfloat.jar,\
lib/jgrapht-core-0.9.0.jar,\
lib/licenses/,\
- lib/opt4j-core-3.1.3.jar,\
- lib/opt4j-operators-3.1.3.jar,\
+ lib/opt4j-core-SNAPSHOT-20180714.jar,\
+ lib/opt4j-operators-SNAPSHOT-20180714.jar,\
lib/opt4j-satdecoding-3.1.3.jar,\
lib/opt4j-viewer-3.1.3.jar,\
lib/jgrapht-ext-0.9.0.jar,\
diff --git a/org.fortiss.af3.exploration.alg/lib/opt4j-core-3.1.3.jar b/org.fortiss.af3.exploration.alg/lib/opt4j-core-3.1.3.jar
deleted file mode 100644
index 715589f9c201ae455c5cf71bf53d508e6ca247b1..0000000000000000000000000000000000000000
Binary files a/org.fortiss.af3.exploration.alg/lib/opt4j-core-3.1.3.jar and /dev/null differ
diff --git a/org.fortiss.af3.exploration.alg/lib/opt4j-core-SNAPSHOT-20180714.jar b/org.fortiss.af3.exploration.alg/lib/opt4j-core-SNAPSHOT-20180714.jar
new file mode 100644
index 0000000000000000000000000000000000000000..97de383e9d35a8e836a767bc71aaf45b3a452d56
Binary files /dev/null and b/org.fortiss.af3.exploration.alg/lib/opt4j-core-SNAPSHOT-20180714.jar differ
diff --git a/org.fortiss.af3.exploration.alg/lib/opt4j-operators-3.1.3.jar b/org.fortiss.af3.exploration.alg/lib/opt4j-operators-3.1.3.jar
deleted file mode 100644
index e35f0fd3a5a749882d2173321607a438b43c1334..0000000000000000000000000000000000000000
Binary files a/org.fortiss.af3.exploration.alg/lib/opt4j-operators-3.1.3.jar and /dev/null differ
diff --git a/org.fortiss.af3.exploration.alg/lib/opt4j-operators-SNAPSHOT-20180714.jar b/org.fortiss.af3.exploration.alg/lib/opt4j-operators-SNAPSHOT-20180714.jar
new file mode 100644
index 0000000000000000000000000000000000000000..5489068f85fccae2262db1e00c715cc8f9497c21
Binary files /dev/null and b/org.fortiss.af3.exploration.alg/lib/opt4j-operators-SNAPSHOT-20180714.jar differ