Commits · c840d2fccb05aebbcc2c2502b970a22f02756131 · af3 / exploration-alg

Mar 21, 2019


Issue-Ref: 3482
Signed-off-by: Alexander Diewald <diewald@fortiss.org>

c840d2fc

Merge branch '3842' into 'master' · 1cd852cb
Alexander Diewald authored 5 years ago
```
3842

See merge request !11
```
1cd852cb

Merge remote-tracking branch 'origin/master' into 3842 · d4ba26b4

Alexander Diewald authored 5 years ago

Conflicts:
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/backend/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/backend/Opt4JDseBackend.java
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/evaluator/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/evaluator/constraint/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/evaluator/objective/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/dseinternal/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/dseinternal/TaskToPartitionTransformation.java
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/AF3SystemModelAdapter.java
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/plot/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/util/TransformationUtils.java

Signed-off-by: Alexander Diewald <diewald@fortiss.org>

d4ba26b4

Align with MM renaming · 51071bb5

Alexander Diewald authored 5 years ago

The rating will be taken from the master branch --> no rating in this
commit.

Issue-Ref: 3482
Issue-Url: https://af3-developer.fortiss.org/issues/3482


Signed-off-by: Alexander Diewald <diewald@fortiss.org>

51071bb5

Mar 20, 2019

Merge branch 'TaskMappingEncodingCleanup' into 'master' · 5e682339
Alexander Diewald authored 5 years ago
```
Task mapping encoding cleanup

See merge request !10
```
5e682339

Merge remote-tracking branch 'origin/master' into · 42a86dae

Alexander Diewald authored 5 years ago

TaskMappingEncodingCleanup

Conflicts:
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/deployment/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/deployment/DeploymentFinalizer.java
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/deployment/ExplorationSolutionToDeployment.java
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/AF3SystemModelAdapter.java
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/plot/XYPlotter.java
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/util/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/util/TransformationUtils.java

Signed-off-by: Alexander Diewald <diewald@fortiss.org>

42a86dae

Extensive rework of mapping and instantiation encodings · e884d9ee
Alexander Diewald authored 5 years ago
```
Signed-off-by: Alexander Diewald <diewald@fortiss.org>
```
e884d9ee

Merge remote-tracking branch 'origin/master' into 3842 · 2d40671d

Alexander Diewald authored 5 years ago

Conflicts:
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/partition/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/plot/.ratings

Signed-off-by: Alexander Diewald <diewald@fortiss.org>

2d40671d

Mar 18, 2019
- Merge branch '3337' into 'master' · deaee3d3
  Alexander Diewald authored 5 years ago
  
  3337: exploration.alog See merge request !9
  deaee3d3
- Merge branch 'master' of https://git.fortiss.org/af3/exploration-alg into 3337 · ea14887d
  Simon Barner authored 5 years ago
  
  ea14887d
Mar 15, 2019
- Move the create strategy from the Partition encoding to the creator · 99224e71
  Alexander Diewald authored 6 years ago
  
  Signed-off-by: Alexander Diewald <diewald@fortiss.org>
  99224e71
- Move more generic allocation methods to the MappingEncoding · 45c2266a
  Alexander Diewald authored 6 years ago
  
  Signed-off-by: Alexander Diewald <diewald@fortiss.org>
  45c2266a
Mar 14, 2019

Clean the TaskMappingEncoding · a9e9a844

Alexander Diewald authored 6 years ago


* Generalize and commonize several methods.
* Be more explicit about the target types of a mapping (Generics!).

Signed-off-by: Alexander Diewald <diewald@fortiss.org>

a9e9a844

Mar 13, 2019
- Remove unused code. · fca8aee2
  Alexander Diewald authored 6 years ago
  
  Signed-off-by: Alexander Diewald <diewald@fortiss.org>
  fca8aee2
Mar 12, 2019

Merge branch 'master' of https://git.fortiss.org/af3/exploration-alg into 3337 · 9d093224
Simon Barner authored 6 years ago

9d093224
Merge branch '3620' into 'master' · c2c701b2
Alexander Diewald authored 6 years ago
```
3620: Java 11 Adaptions

See merge request !8
```
c2c701b2

Remove outdated EMF builder spec · d7ee7bdb

Simon Barner authored 6 years ago

Issue-Ref: 3620
Issue-Url: https://af3-developer.fortiss.org/issues/3620



Signed-off-by: Simon Barner <barner@fortiss.org>

d7ee7bdb

Remove outdated buildCommands · d943c5b1

Simon Barner authored 6 years ago

Issue-Ref: 3620
Issue-Url: https://af3-developer.fortiss.org/issues/3620



Signed-off-by: Simon Barner <barner@fortiss.org>

d943c5b1

Maven: Remove traces of old build (non-pomless) · 0ef523e2

Simon Barner authored 6 years ago

Issue-Ref: 3620
Issue-Url: https://af3-developer.fortiss.org/issues/3620



Signed-off-by: Simon Barner <barner@fortiss.org>

0ef523e2

Adjust classpath and manifest for JDK-11 · b2d8e3d0

Simon Barner authored 6 years ago

Issue-Ref: 3620
Issue-Url: https://af3-developer.fortiss.org/issues/3620



Signed-off-by: Simon Barner <barner@fortiss.org>

b2d8e3d0

Merge branch 'master' of https://git.fortiss.org/af3/exploration-alg · 3309f481

Simon Barner authored 6 years ago

into 3337

Conflicts:
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/comparch/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/deployment/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/deployment/DeploymentFinalizer.java
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/AF3SystemModelAdapter.java
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/plot/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/util/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/util/TransformationUtils.java

Signed-off-by: Simon Barner <barner@fortiss.org>

3309f481

Mar 11, 2019
- Merge branch '3620' into 'master' · 1fb1a3b9
  Alexander Diewald authored 6 years ago
  
  3620 See merge request !7
  1fb1a3b9
Mar 02, 2019

Rework the message TimeSlot insertion logic. · 226834f8

Alexander Diewald authored 6 years ago


* Simplify the insertion logic.
* Delegate the shifting of TimeSlots of the same resource to the
  now separated ResourceSchedule.
* Several code-improvements/deletion of unused code.

Signed-off-by: Alexander Diewald <diewald@fortiss.org>

226834f8

Mar 01, 2019
- Fix an NPE in the repair service · 553fd03a
  Alexander Diewald authored 6 years ago
  
  Signed-off-by: Alexander Diewald <diewald@fortiss.org>
  553fd03a
Feb 27, 2019

Fix the input validation for objective existence · 5deae02e

Alexander Diewald authored 6 years ago

Issue-Ref: 3482
Issue-Url: https://af3-developer.fortiss.org/issues/3482


Signed-off-by: Alexander Diewald <diewald@fortiss.org>

5deae02e

Feb 26, 2019

Align with updated IDSEBackend service · d591c212

Alexander Diewald authored 6 years ago

Issue-Ref: 3482
Issue-Url: https://af3-developer.fortiss.org/issues/3482


Signed-off-by: Alexander Diewald <diewald@fortiss.org>

d591c212

Feb 24, 2019

Name the SingleExplorationSolutions · 51467f6a

Alexander Diewald authored 6 years ago

Issue-Ref: 3482
Issue-Url: https://af3-developer.fortiss.org/issues/3482


Signed-off-by: Alexander Diewald <diewald@fortiss.org>

51467f6a

Align with changed partition alloc table factory methods · cc590ee7

Alexander Diewald authored 6 years ago

Issue-Ref: 3482
Issue-Url: https://af3-developer.fortiss.org/issues/3482


Signed-off-by: Alexander Diewald <diewald@fortiss.org>

cc590ee7

Feb 22, 2019

Set the solution state for each single solution. · 6adf2d48

Alexander Diewald authored 6 years ago

Issue-Ref: 3482
Issue-Url: https://af3-developer.fortiss.org/issues/3482


Signed-off-by: Alexander Diewald <diewald@fortiss.org>

6adf2d48

Feb 20, 2019

Return consistent Exploration Solution representations · df7bd09d

Alexander Diewald authored 6 years ago

Issue-Ref: 3482
Issue-Url: https://af3-developer.fortiss.org/issues/3482


Signed-off-by: Alexander Diewald <diewald@fortiss.org>

df7bd09d

Merge remote-tracking branch 'origin/master' into 3842 · 294ddc1c

Alexander Diewald authored 6 years ago


Conflicts:
	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/backend/opt4j/.ratings


Signed-off-by: Alexander Diewald <diewald@fortiss.org>

294ddc1c

Feb 18, 2019

Add a hack to retrieve the TimingSpec from the updated DSE-Prj · b7d6572e

Alexander Diewald authored 6 years ago

Issue-Ref: 3482
Issue-Url: https://af3-developer.fortiss.org/issues/3482


Signed-off-by: Alexander Diewald <diewald@fortiss.org>

b7d6572e

Feb 14, 2019
- Remove unused methods from util classes. · a7907183
  Alexander Diewald authored 6 years ago
  
  Signed-off-by: Alexander Diewald <diewald@fortiss.org>
  a7907183
Feb 13, 2019
- Update plugin settings to include the correct opt4j jars. · c4e98c31
  Alexander Diewald authored 6 years ago
  
  Signed-off-by: Alexander Diewald <diewald@fortiss.org>
  c4e98c31
- Remove invalid import · 4132bdf5
  Alexander Diewald authored 6 years ago
  
  Signed-off-by: Alexander Diewald <diewald@fortiss.org>
  4132bdf5
Jan 22, 2019
- Opt4J: Update to revived official version (3.2) with D3SE patches · a73cf7df
  Alexander Diewald authored 6 years ago
  
  Signed-off-by: Alexander Diewald <diewald@fortiss.org>
  a73cf7df
Jan 18, 2019

Merge remote-tracking branch 'origin/master' into 3842 · 1c6781ab

Alexander Diewald authored 6 years ago

Conflicts:
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/CompositeExplorationSolution.java
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/backend/opt4j/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/backend/opt4j/Opt4JExplorationSolutionSet.java
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/dseinternal/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/plot/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/service/.ratings
org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/service/ExplorationTransformationInputs.java

Signed-off-by: Alexander Diewald <diewald@fortiss.org>

1c6781ab

Jan 16, 2019
- Transform the PreservablePhenotypeHolder to a Guice Singleton · d320ebd5
  Alexander Diewald authored 6 years ago
  
  Signed-off-by: Alexander Diewald <diewald@fortiss.org>
  d320ebd5
Jan 14, 2019

Remove references to af3.deployment · cb61f410

Simon Barner authored 6 years ago

* Export of explorations to be re-implemented (e.g., based on
  TaskToExecutionUnitAllocationTables)

Issue-Ref: 3337
Issue-Url: https://af3-developer.fortiss.org/issues/3337



Signed-off-by: Simon Barner <barner@fortiss.org>

cb61f410

Merge branch 'master' of https://git.fortiss.org/af3/exploration-alg.git into 3337 · 78279bd0
Simon Barner authored 6 years ago

78279bd0