Commits · master · af3 / af3

28 Sep, 2020 3 commits

Merge branch '4022' into 'master' · 4cf97247
Johannes Eder authored Sep 28, 2020
```
4022

See merge request !338
```
4cf97247

GREEN · 5eff3135

Johannes Eder authored Sep 28, 2020


Issue-Ref: 4022
Issue-Url: https://af3-developer.fortiss.org/issues/4022Signed-off-by: Johannes Eder <eder@fortiss.org>

5eff3135

Merge branch 'master' into 4022 · 7c7b092f

Johannes Eder authored Sep 28, 2020

Conflicts:
org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/.ratings
org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/DashboardWizardSelectPlatformArchitecture.java
org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/targetdef/constraint/pattern/.ratings
org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/targetdef/constraint/pattern/SafetyPatternFXController.java
Signed-off-by: Johannes Eder <eder@fortiss.org>

7c7b092f

16 Sep, 2020 2 commits

Merge branch '4059' into 'master' · 7c7c6d67
Simon Barner authored Sep 16, 2020
```
Project: Fix Internal References for Imported Projects

See merge request !369
```
7c7c6d67

GREEN · 38b840f2

Simon Barner authored Sep 16, 2020

Issue-Ref: 4059
Issue-Url: https://af3-developer.fortiss.org/issues/4059Signed-off-by: Simon Barner <barner@fortiss.org>

38b840f2

15 Sep, 2020 8 commits
- Merge branch 'master' of https://git.fortiss.org/af3/af3.git into 4059 · d32266dd
  Simon Barner authored Sep 15, 2020
  
  d32266dd
- Merge branch '4048' into 'master' · fee1eb05
  Simon Barner authored Sep 15, 2020
```
4048

See merge request !356
```
  fee1eb05
- Include test case ID in DSE root element and initial import step · 330c39dc
  Simon Barner authored Sep 15, 2020
```
Issue-Ref: 4048
Issue-Url: https://af3-developer.fortiss.org/issues/4048Signed-off-by: Simon Barner <barner@fortiss.org>
```
  330c39dc
- GREEN · 7a6bfbc1
  Simon Barner authored Sep 15, 2020
```
Issue-Ref: 4048
Issue-Url: https://af3-developer.fortiss.org/issues/4048Signed-off-by: Simon Barner <barner@fortiss.org>
```
  7a6bfbc1
- Merge branch 'master' of https://git.fortiss.org/af3/af3.git into 4048 · d17d364d
  Simon Barner authored Sep 15, 2020
  
  d17d364d
- DSE-TCgen: Reference the Correct PlatArch in the Alloc Tables · 618a054b
  Alexander Diewald authored Sep 15, 2020
```
Issue-Ref: 4048
Issue-Url: https://af3-developer.fortiss.org/issues/4048Signed-off-by: Alexander Diewald <diewald@fortiss.org>
```
  618a054b
- Merge branch '4062' into 'master' · 99ee765f
  Alexander Diewald authored Sep 15, 2020
```
4062

See merge request !370
```
  99ee765f
- GREEN · 06075ff7
  Tiziano Munaro authored Sep 15, 2020
```
Issue-Ref: 4062
Issue-Url: https://af3-developer.fortiss.org/issues/4062Signed-off-by: Tiziano Munaro <munaro@fortiss.org>
```
  06075ff7
14 Sep, 2020 11 commits

DSE.UI: Sort synth category names alphabetically · 6c431b53

Alexander Diewald authored Sep 14, 2020

Issue-Ref: 4062
Issue-Url: https://af3-developer.fortiss.org/issues/4062Signed-off-by: Alexander Diewald <diewald@fortiss.org>

6c431b53

DSE.UI: Register the Pattern Editors to Listen for Events · 66f5c928

Alexander Diewald authored Sep 14, 2020

Issue-Ref: 4059
Issue-Url: https://af3-developer.fortiss.org/issues/4059Signed-off-by: Alexander Diewald <diewald@fortiss.org>

66f5c928

Merge branch '4058' into 'master' · 1afa8a0d
Simon Barner authored Sep 14, 2020
```
4058

See merge request !365
```
1afa8a0d

GREEN · e56fb20f

Simon Barner authored Sep 14, 2020

Issue-Ref: 4048
Issue-Url: https://af3-developer.fortiss.org/issues/4048Signed-off-by: Simon Barner <barner@fortiss.org>

e56fb20f

GREEN · f01eab82

Simon Barner authored Sep 14, 2020

Issue-Ref: 4048
Issue-Url: https://af3-developer.fortiss.org/issues/4048Signed-off-by: Simon Barner <barner@fortiss.org>

f01eab82

Fix warnings · 4f4c2536

Simon Barner authored Sep 14, 2020

Issue-Ref: 4048
Issue-Url: https://af3-developer.fortiss.org/issues/4048Signed-off-by: Simon Barner <barner@fortiss.org>

4f4c2536

Change type of FLASH_MAX_UTIL to double (for more readable code) · 99cf5f9a

Simon Barner authored Sep 14, 2020

Issue-Ref: 4048
Issue-Url: https://af3-developer.fortiss.org/issues/4048Signed-off-by: Simon Barner <barner@fortiss.org>

99cf5f9a

YELLOW: Fix merge errors · 9a736bd1

Alexander Diewald authored Sep 14, 2020

Issue-Ref: 4048
Issue-Url: https://af3-developer.fortiss.org/issues/4048Signed-off-by: Alexander Diewald <diewald@fortiss.org>

9a736bd1

YELLOW · 1fe806b8

Alexander Diewald authored Sep 14, 2020

Issue-Ref: 4048
Issue-Url: https://af3-developer.fortiss.org/issues/4048Signed-off-by: Alexander Diewald <diewald@fortiss.org>

1fe806b8

Merge remote-tracking branch 'origin/master' into 4048 · 10dd6868

Alexander Diewald authored Sep 14, 2020

Conflicts:
org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/testgenerator/util/.ratings
org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/testgenerator/util/DseUtils.java
Signed-off-by: Alexander Diewald <diewald@fortiss.org>

10dd6868

Project: Fix Internal References for Imported Projects · e1ad7a01

Alexander Diewald authored Sep 14, 2020

Issue-Ref: 4059
Issue-Url: https://af3-developer.fortiss.org/issues/4059Signed-off-by: Alexander Diewald <diewald@fortiss.org>

e1ad7a01

11 Sep, 2020 10 commits

DSE.Validation: Dump Results in a JSON File · e6959da7

Alexander Diewald authored Sep 11, 2020

Issue-Ref: 4058
Issue-Url: https://af3-developer.fortiss.org/issues/4058Signed-off-by: Alexander Diewald <diewald@fortiss.org>

e6959da7

Merge remote-tracking branch 'origin/master' into 4058 · adab45c9

Alexander Diewald authored Sep 11, 2020

Conflicts:
	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/modeltransformation/.ratings
	org.fortiss.af3.exploration/model/.ratings
Signed-off-by: Alexander Diewald <diewald@fortiss.org>

adab45c9

DSE-CLI: Avoid exceptions in the validator · ed9768f4

Alexander Diewald authored Sep 11, 2020

Issue-Ref: 4058
Issue-Url: https://af3-developer.fortiss.org/issues/4058Signed-off-by: Alexander Diewald <diewald@fortiss.org>

ed9768f4

Merge branch '4057' into 'master' · db8810ae
Alexander Diewald authored Sep 11, 2020
```
4057

See merge request !364
```
db8810ae
Merge branch '3541' into 'master' · 72e48dd1
Simon Barner authored Sep 11, 2020
```
3541

See merge request !363
```
72e48dd1

Merge remote-tracking branch 'origin/3541' into 4058 · 1c09226f

Alexander Diewald authored Sep 11, 2020

Conflicts:
org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/backend/.ratings
org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/modeltransformation/.ratings
org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/solver/.ratings
org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/solver/SolverRun.java
org.fortiss.af3.exploration/model/.ratings
Signed-off-by: Alexander Diewald <diewald@fortiss.org>

1c09226f

GREEN · 688c122a

Simon Barner authored Sep 11, 2020

* With a few additional comments provided by Alexander Diewald

Issue-Ref: 3541
Issue-Url: https://af3-developer.fortiss.org/issues/3541Signed-off-by: Simon Barner <barner@fortiss.org>

688c122a

DSE-MM: Doc for DSE solver settings · 6585f4f9

Alexander Diewald authored Sep 11, 2020

Issue-Ref: 3541
Issue-Url: https://af3-developer.fortiss.org/issues/3541Signed-off-by: Alexander Diewald <diewald@fortiss.org>

6585f4f9

DSE.SMT: Avoid warning · 99b3ada6

Alexander Diewald authored Sep 11, 2020

Issue-Ref: 3541
Issue-Url: https://af3-developer.fortiss.org/issues/3541Signed-off-by: Alexander Diewald <diewald@fortiss.org>

99b3ada6

SMT-Transf: Use reals as defaults for SMT opt variables · 1b1e4d8c

Alexander Diewald authored Sep 11, 2020

We are now using reals by default! If relations between model elements
are expressed, we cannot directly determine the value type. Therefore,
two equivalently named functions would be created, one for ints, one
for reals. The function that is defined last dominates the other such
that the resulting specification is incomplete. Fixed with this commit.

Issue-Ref: 3541
Issue-Url: https://af3-developer.fortiss.org/issues/3541Signed-off-by: Alexander Diewald <diewald@fortiss.org>

1b1e4d8c

10 Sep, 2020 6 commits

DSE.UI JFX: Enable/Disable RS Buttons. · 5fe287cb

Alexander Diewald authored Sep 10, 2020

Issue-Ref: 3541
Issue-Url: https://af3-developer.fortiss.org/issues/3541Signed-off-by: Alexander Diewald <diewald@fortiss.org>

5fe287cb

GREEN · a183241e

Simon Barner authored Sep 10, 2020

Issue-Ref: 4057
Issue-Url: https://af3-developer.fortiss.org/issues/4057Signed-off-by: Simon Barner <barner@fortiss.org>

a183241e

Merge branch '3541' of https://git.fortiss.org/af3/af3.git into 4057 · 3b87bf19
Simon Barner authored Sep 10, 2020

3b87bf19

JFX UI Providers: Enable per Item Styles. · e3e8f0e1

Alexander Diewald authored Sep 10, 2020

Issue-Ref: 3541
Issue-Url: https://af3-developer.fortiss.org/issues/3541Signed-off-by: Alexander Diewald <diewald@fortiss.org>

e3e8f0e1

Merge branch '4060' into 'master' · cb09957f

Simon Barner authored Sep 10, 2020

[4060] Double clicking on a Raspberry Pi platform element causes an exception to be thrown

See merge request !366

cb09957f

Actually reference (already existing) icons · 31b904a0

Simon Barner authored Sep 10, 2020

Issue-Ref: 4060
Issue-Url: https://af3-developer.fortiss.org/issues/4060Signed-off-by: Simon Barner <barner@fortiss.org>

31b904a0