From a3485c7747e763cf06e142ba0603d916d4c99aca Mon Sep 17 00:00:00 2001
From: Alexander Diewald <diewald@fortiss.org>
Date: Mon, 10 Jul 2017 13:07:34 +0000
Subject: [PATCH] - Optionally use opt4j eclipse plugins if they are available.
Otherwise fall back to shipped jars. This feature is useful to debug
optimizer framework issues (e.g., code hotswapping is available).
---
.../master/.classpath | 15 +---
.../master/META-INF/MANIFEST.MF | 77 +++++++++++++++----
.../master/build.properties | 4 +-
3 files changed, 70 insertions(+), 26 deletions(-)
diff --git a/org.fortiss.af3.exploration.alg/master/.classpath b/org.fortiss.af3.exploration.alg/master/.classpath
index a91da962..c8152f8c 100644
--- a/org.fortiss.af3.exploration.alg/master/.classpath
+++ b/org.fortiss.af3.exploration.alg/master/.classpath
@@ -1,21 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="lib/guava-19.0.jar" sourcepath="lib/guava-19.0-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"/>
@@ -24,5 +13,9 @@
<classpathentry kind="lib" path="lib/guice-assistedinject-4.0.jar" sourcepath="lib/guice-assistedinject-4.0-sources.jar"/>
<classpathentry kind="lib" path="lib/guice-4.0.jar" sourcepath="lib/guice-4.0-sources.jar"/>
<classpathentry kind="lib" path="lib/guice-multibindings-4.0.jar" sourcepath="lib/guice-multibindings-4.0-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-collections4-4.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/opt4j-optimizers-SNAPSHOT-20161110.jar" sourcepath="lib/opt4j-optimizers-SNAPSHOT-20161110-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/guava-19.0.jar" sourcepath="lib/guava-19.0-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/opt4j-core-3.1.3.jar"/>
<classpathentry kind="output" path="build"/>
</classpath>
diff --git a/org.fortiss.af3.exploration.alg/master/META-INF/MANIFEST.MF b/org.fortiss.af3.exploration.alg/master/META-INF/MANIFEST.MF
index ffe52180..e93a0577 100644
--- a/org.fortiss.af3.exploration.alg/master/META-INF/MANIFEST.MF
+++ b/org.fortiss.af3.exploration.alg/master/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@ Bundle-SymbolicName: org.fortiss.af3.exploration.alg;singleton:=true
Bundle-Version: 2.11.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,
@@ -16,7 +15,8 @@ Bundle-ClassPath: .,
lib/guice-multibindings-4.0.jar,
lib/commons-collections4-4.1.jar,
lib/opt4j-optimizers-SNAPSHOT-20161110.jar,
- lib/guava-19.0.jar
+ lib/guava-19.0.jar,
+ lib/opt4j-core-3.1.3.jar
Bundle-Vendor: fortiss GmbH
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -33,7 +33,10 @@ Require-Bundle: org.fortiss.tooling.base.ui;visibility:=reexport,
org.fortiss.af3.exploration;bundle-version="2.11.0";visibility:=reexport,
org.fortiss.af3.expression;visibility:=reexport,
org.fortiss.af3.platform;visibility:=reexport,
- org.fortiss.af3.project;visibility:=reexport
+ org.fortiss.af3.project;visibility:=reexport,
+ org.opt4j.core;resolution:=optional;visibility:=reexport,
+ org.opt4j.operators;resolution:=optional;visibility:=reexport,
+ org.opt4j.optimizers;resolution:=optional;visibility:=reexport
Export-Package: com.google.common.annotations,
com.google.common.base,
com.google.common.base.internal,
@@ -63,27 +66,76 @@ Export-Package: com.google.common.annotations,
org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.phenotype,
org.fortiss.af3.exploration.alg.dse.backend.opt4j.repair,
org.fortiss.af3.exploration.alg.dse.backend.opt4j.solution,
- org.fortiss.af3.exploration.alg.dse.evaluator;uses:="org.fortiss.af3.exploration.alg.dse.sysmodel.arch, org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.phenotype, org.fortiss.af3.exploration.model, org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.evaluate, org.opt4j.core",
- org.fortiss.af3.exploration.alg.dse.evaluator.constraint;uses:="org.fortiss.af3.exploration.alg.dse.backend.opt4j.solution, org.fortiss.af3.exploration.alg.dse.modeltransformation, org.fortiss.af3.exploration.alg.dse.sysmodel.arch, org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.phenotype, eu.dreamsproject.ikerlan.safetystandards.SafetyCompliance, org.fortiss.af3.exploration.model, org.fortiss.af3.exploration.alg.dse.evaluator",
- org.fortiss.af3.exploration.alg.dse.evaluator.objective;uses:="org.fortiss.af3.exploration.alg.dse.backend.opt4j.solution, org.fortiss.af3.exploration.alg.dse.sysmodel.arch.taskgraph, org.apfloat, org.fortiss.af3.exploration.alg.dse.sysmodel.arch, org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.phenotype, org.fortiss.af3.exploration.model, org.fortiss.af3.exploration.alg.dse.evaluator",
+ org.fortiss.af3.exploration.alg.dse.evaluator;
+ uses:="org.fortiss.af3.exploration.alg.dse.sysmodel.arch,
+ org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.phenotype,
+ org.fortiss.af3.exploration.model,
+ org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.evaluate,
+ org.opt4j.core",
+ org.fortiss.af3.exploration.alg.dse.evaluator.constraint;
+ uses:="org.fortiss.af3.exploration.alg.dse.backend.opt4j.solution,
+ org.fortiss.af3.exploration.alg.dse.modeltransformation,
+ org.fortiss.af3.exploration.alg.dse.sysmodel.arch,
+ org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.phenotype,
+ eu.dreamsproject.ikerlan.safetystandards.SafetyCompliance,
+ org.fortiss.af3.exploration.model,
+ org.fortiss.af3.exploration.alg.dse.evaluator",
+ org.fortiss.af3.exploration.alg.dse.evaluator.objective;
+ uses:="org.fortiss.af3.exploration.alg.dse.backend.opt4j.solution,
+ org.fortiss.af3.exploration.alg.dse.sysmodel.arch.taskgraph,
+ org.apfloat,
+ org.fortiss.af3.exploration.alg.dse.sysmodel.arch,
+ org.fortiss.af3.exploration.alg.dse.backend.opt4j.extensions.compositegene.phenotype,
+ org.fortiss.af3.exploration.model,
+ org.fortiss.af3.exploration.alg.dse.evaluator",
org.fortiss.af3.exploration.alg.dse.modeltransformation,
org.fortiss.af3.exploration.alg.dse.modeltransformation.base,
org.fortiss.af3.exploration.alg.dse.modeltransformation.comparch,
org.fortiss.af3.exploration.alg.dse.modeltransformation.deployment,
org.fortiss.af3.exploration.alg.dse.modeltransformation.element,
org.fortiss.af3.exploration.alg.dse.sysmodel,
- org.fortiss.af3.exploration.alg.dse.sysmodel.arch;uses:="org.eclipse.emf.ecore, org.fortiss.af3.exploration.alg.dse.sysmodel.arch.taskgraph, org.eclipse.emf.common.util, org.jgrapht",
- org.fortiss.af3.exploration.alg.dse.sysmodel.arch.af3;uses:="org.fortiss.tooling.base.model.element, eu.dreamsproject.application.model.annotation, org.fortiss.af3.component.model, org.fortiss.af3.exploration.alg.dse.sysmodel.arch.taskgraph, org.eclipse.emf.common.util, org.fortiss.af3.timing.model.annotation, org.fortiss.af3.exploration.alg.dse.sysmodel.arch, org.fortiss.af3.platform.model, eu.dreamsproject.platform.model.annotation",
+ org.fortiss.af3.exploration.alg.dse.sysmodel.arch;
+ uses:="org.eclipse.emf.ecore,
+ org.fortiss.af3.exploration.alg.dse.sysmodel.arch.taskgraph,
+ org.eclipse.emf.common.util,
+ org.jgrapht",
+ org.fortiss.af3.exploration.alg.dse.sysmodel.arch.af3;
+ uses:="org.fortiss.tooling.base.model.element,
+ eu.dreamsproject.application.model.annotation,
+ org.fortiss.af3.component.model,
+ org.fortiss.af3.exploration.alg.dse.sysmodel.arch.taskgraph,
+ org.eclipse.emf.common.util,
+ org.fortiss.af3.timing.model.annotation,
+ org.fortiss.af3.exploration.alg.dse.sysmodel.arch,
+ org.fortiss.af3.platform.model,
+ eu.dreamsproject.platform.model.annotation",
org.fortiss.af3.exploration.alg.dse.sysmodel.arch.af3.helper,
org.fortiss.af3.exploration.alg.dse.sysmodel.arch.taskgraph,
- org.fortiss.af3.exploration.alg.dse.sysmodel.comm;uses:="org.fortiss.af3.exploration.alg.dse.backend.opt4j.solution, org.fortiss.af3.exploration.alg.dse.backend.opt4j.encoding.taskmapping, org.fortiss.af3.exploration.alg.dse.sysmodel.arch, org.fortiss.af3.exploration.alg.dse.sysmodel.mapping, org.jgrapht",
+ org.fortiss.af3.exploration.alg.dse.sysmodel.comm;
+ uses:="org.fortiss.af3.exploration.alg.dse.backend.opt4j.solution,
+ org.fortiss.af3.exploration.alg.dse.backend.opt4j.encoding.taskmapping,
+ org.fortiss.af3.exploration.alg.dse.sysmodel.arch,
+ org.fortiss.af3.exploration.alg.dse.sysmodel.mapping,
+ org.jgrapht",
org.fortiss.af3.exploration.alg.dse.sysmodel.faultmodel,
org.fortiss.af3.exploration.alg.dse.sysmodel.mapping;uses:="org.fortiss.af3.exploration.alg.dse.sysmodel.arch",
org.fortiss.af3.exploration.alg.dse.sysmodel.mapping.comm,
org.fortiss.af3.exploration.alg.dse.sysmodel.random,
org.fortiss.af3.exploration.alg.dse.sysmodel.sched;uses:="org.fortiss.af3.exploration.alg.dse.backend.opt4j.solution,org.fortiss.af3.exploration.alg.dse.sysmodel.arch,org.fortiss.af3.exploration.model",
- org.fortiss.af3.exploration.alg.dse.sysmodel.sched.comm;uses:="org.fortiss.af3.exploration.alg.dse.backend.opt4j.solution, org.fortiss.af3.exploration.alg.dse.sysmodel.sched, org.fortiss.af3.exploration.alg.dse.sysmodel.arch, org.fortiss.af3.exploration.model, org.fortiss.af3.exploration.alg.dse.sysmodel.mapping.comm",
- org.fortiss.af3.exploration.alg.dse.sysmodel.sched.proc;uses:="org.fortiss.af3.exploration.alg.dse.backend.opt4j.solution, org.fortiss.af3.exploration.alg.dse.backend.opt4j.encoding.taskmapping.instantiatedmapping, org.fortiss.af3.exploration.alg.dse.backend.opt4j.encoding.taskmapping, org.apfloat, org.fortiss.af3.exploration.alg.dse.sysmodel.sched, org.fortiss.af3.exploration.alg.dse.sysmodel.arch, org.fortiss.af3.exploration.model",
+ org.fortiss.af3.exploration.alg.dse.sysmodel.sched.comm;
+ uses:="org.fortiss.af3.exploration.alg.dse.backend.opt4j.solution,
+ org.fortiss.af3.exploration.alg.dse.sysmodel.sched,
+ org.fortiss.af3.exploration.alg.dse.sysmodel.arch,
+ org.fortiss.af3.exploration.model,
+ org.fortiss.af3.exploration.alg.dse.sysmodel.mapping.comm",
+ org.fortiss.af3.exploration.alg.dse.sysmodel.sched.proc;
+ uses:="org.fortiss.af3.exploration.alg.dse.backend.opt4j.solution,
+ org.fortiss.af3.exploration.alg.dse.backend.opt4j.encoding.taskmapping.instantiatedmapping,
+ org.fortiss.af3.exploration.alg.dse.backend.opt4j.encoding.taskmapping,
+ org.apfloat,
+ org.fortiss.af3.exploration.alg.dse.sysmodel.sched,
+ org.fortiss.af3.exploration.alg.dse.sysmodel.arch,
+ org.fortiss.af3.exploration.model",
org.fortiss.af3.exploration.alg.exception,
org.fortiss.af3.exploration.alg.guava,
org.fortiss.af3.exploration.alg.service,
@@ -130,5 +182,4 @@ Export-Package: com.google.common.annotations,
org.fortiss.af3.exploration.moea.model.solutions.impl,
org.fortiss.af3.exploration.moea.model.solutions.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/master/build.properties b/org.fortiss.af3.exploration.alg/master/build.properties
index 023490b3..d52b576d 100644
--- a/org.fortiss.af3.exploration.alg/master/build.properties
+++ b/org.fortiss.af3.exploration.alg/master/build.properties
@@ -11,7 +11,6 @@ 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-satdecoding-3.1.3.jar,\
lib/opt4j-viewer-3.1.3.jar,\
@@ -22,7 +21,8 @@ bin.includes = .,\
lib/guice-multibindings-4.0.jar,\
lib/commons-collections4-4.1.jar,\
lib/opt4j-optimizers-SNAPSHOT-20161110.jar,\
- lib/guava-19.0.jar
+ lib/guava-19.0.jar,\
+ lib/opt4j-core-3.1.3.jar
source.. = src/, \
generated-src
output.. = build/
--
GitLab