Commits · 251065dd0db50cc6f4e9975ec45a062843da3517 · af3 / AF3

18 Jul, 2018 3 commits

<Sub-system>:Context <Summary> · 251065dd

Ludwig Dickmanns authored Jul 18, 2018

* Context for variable definition added

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


Signed-off-by: Ludwig Dickmanns <dickmanns@fortiss.org>

251065dd

<Sub-system>: FormalRequirementMCDC in this branch. <Summary> · 11118b4f

Ludwig Dickmanns authored Jul 18, 2018

* FormalRequirementMCDC was used previous to the merge.

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


Signed-off-by: Ludwig Dickmanns <dickmanns@fortiss.org>

11118b4f

<Sub-system>: Clean-up MCDCUtils <Summary> · bcbbcf91

Ludwig Dickmanns authored Jul 18, 2018

* Prefix for e.g. old test cases added as parameter of toZ3
* Clean transformation of the DoubleConst value to String
* Exchanged VariableScopeUtils.getVarDefinition with
VariableScopeUtils.getVarType (getVarDefinition was the wrong method)
* Extracted VariableScopeUtils.getVarType from the if statements into a
variable

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


Signed-off-by: Ludwig Dickmanns <dickmanns@fortiss.org>

bcbbcf91

12 Jul, 2018 1 commit

<Sub-system>: Initial implementation of toZ3(...) <Summary> · cfc9be09

Ludwig Dickmanns authored Jul 12, 2018

* toZ3 for Consts, Vars, PredefinedFunctions, Assignments and the
FormalRequirementMCDC itself.
* Helper methods for unary, binary and operators with multiple Arguments
* null is returned for every unmatched case

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


Signed-off-by: Ludwig Dickmanns <dickmanns@fortiss.org>

cfc9be09

06 Jul, 2018 4 commits

Merge branch '2920-scheduling_reworked' into 'master' · 2675240d
Alexander Diewald authored Jul 06, 2018
```
2920 scheduling reworked

See merge request af3!13
```
2675240d

DSE-Schedule: GREEN · f3ff3172

Alexander Diewald authored Jul 06, 2018

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


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

f3ff3172

YELLOW · 2610d853

Simon Barner authored Jul 06, 2018

* Improve log message to include file name to which SMT script is dumped

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



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

2610d853

YELLOW · cb32b2b3

Simon Barner authored Jul 06, 2018

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



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

cb32b2b3

05 Jul, 2018 6 commits

DSE-Schedule: RED · 21cee716

Alexander Diewald authored Jul 05, 2018

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


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

21cee716

DSE-Schedule: GREEN · ec73a90b

Alexander Diewald authored Jul 05, 2018

* Except UI.

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


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

ec73a90b

YELLOW · 999a6ef1

Simon Barner authored Jul 05, 2018

* Add reference to #3473

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



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

999a6ef1

GREEN · 776b192e

Simon Barner authored Jul 05, 2018

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



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

776b192e

YELLOW · 0afbdc07

Simon Barner authored Jul 05, 2018

* Add tickets for TODOs where needed

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



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

0afbdc07

Merge branch 'master' of https://git.fortiss.org/af3/af3.git into 2920-scheduling_reworked · 3ef0117a
Simon Barner authored Jul 05, 2018

3ef0117a

03 Jul, 2018 10 commits

Revert "Merge branch '3418' into 'master'" · 0ccf14fd

Alexander Diewald authored Jul 03, 2018

This reverts commit 2aaf90eb, reversing
changes made to 2b913d93

.

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

0ccf14fd

RED · edc96894

Hernan Ponce de Leon authored Jul 03, 2018



Issue-Ref:3468


Signed-off-by: Hernan Ponce de Leon <ponce@fortiss.org>

edc96894

Merge branch '3418' into 'master' · 2aaf90eb
Hernan Ponce de Leon authored Jul 03, 2018
```
3418

See merge request !25
```
2aaf90eb
RED: updated outdated ratings · ac1b3654
Hernan Ponce de Leon authored Jul 03, 2018
```
Issue-Ref:3418


Signed-off-by: Hernan Ponce de Leon <ponce@fortiss.org>
```
ac1b3654

GREEN · 50a471e9

Vivek Nigam authored Jul 03, 2018



Issue-Ref:3418

Signed-off-by: Vivek Nigam <nigam@fortiss.org>

50a471e9

Merge branch 'master' into 3418 · c1609949
Vivek Nigam authored Jul 03, 2018

c1609949

GREEN · 0bb07c6d

Hernan Ponce de Leon authored Jul 03, 2018



Issue-Ref: 3418


Signed-off-by: Hernan Ponce de Leon <ponce@fortiss.org>

0bb07c6d

mira : Safety Aspects · 9e051d8c

Vivek Nigam authored Jul 03, 2018



* Corrected pending TODOs.

Issue-Ref: 3418
Signed-off-by: Vivek Nigam <nigam@fortiss.org>

9e051d8c

RED: method emptyOrAlreadyExists is implemented in several classes and · 2b913d93

Hernan Ponce de Leon authored Jul 03, 2018


the only difference is a string message. This change has been requested
in branch 3418. I'm just adding in this branch the TODO to every class
and updating the ratings.

Issue-Ref: 3418


Signed-off-by: Hernan Ponce de Leon <ponce@fortiss.org>

2b913d93

RED: several TODOs added · 51878105
Hernan Ponce de Leon authored Jul 03, 2018
```
Issue-Ref:3418


Signed-off-by: Hernan Ponce de Leon <ponce@fortiss.org>
```
51878105

02 Jul, 2018 16 commits

Sanitize progress monitor · d74c44e9

Simon Barner authored Jul 02, 2018

* Assign 1 work item for each optimized run
* One work item for the (optional) non-optimized run and post-processing

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



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

d74c44e9

Merge branch 'master' of https://git.fortiss.org/af3/af3.git into 2920-scheduling_reworked · 19d4f45c
Simon Barner authored Jul 02, 2018

19d4f45c

Factorize createStartSet() and createDurationSet() · e142cf27

Simon Barner authored Jul 02, 2018

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



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

e142cf27

Factorize creation of start time and duration set · 234fd5db

Simon Barner authored Jul 02, 2018

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



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

234fd5db

Cleanup · 67c3fcc2

Simon Barner authored Jul 02, 2018

* Remove commented code
* Add references to issues where appropriate

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



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

67c3fcc2

Factorize lookup of model element registered with · 599f90fd

Simon Barner authored Jul 02, 2018

IDSMLTransformationService

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



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

599f90fd

SolverRun: Factorize common interface method solve() · 3401d415

Simon Barner authored Jul 02, 2018

* Make solveOptimized() and solveNonOptimized() private
* Introduce abstract method transformSolution()
* Cleanup (remove unused method, sort, ...)

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

3401d415

GREEN code review · 019a0be0
Johannes Eder authored Jun 28, 2018 and Simon Barner committed Jul 02, 2018
```
Signed-off-by: Johannes Eder <eder@fortiss.org>
```
019a0be0

JavaFX: YELLOW · 06ea76fc

Alexander Diewald authored Jun 28, 2018 and

Simon Barner committed Jul 02, 2018

* "initialize" is now an abstract method in the base class.
* Updated comments.

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


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

06ea76fc

RED code review · bce97967
Johannes Eder authored Jun 28, 2018 and Simon Barner committed Jul 02, 2018

bce97967

GREEN · 1a26f5f0

Hernan Ponce de Leon authored Jun 28, 2018 and

Simon Barner committed Jul 02, 2018

Rating was missing from 3399. But the other branch was closed so I push
it directly to master

Issue-Ref:3399

1a26f5f0

GREEN · f246e60c
Hernan Ponce de Leon authored Jun 28, 2018 and Simon Barner committed Jul 02, 2018
```
Issue-Ref:3399
Signed-off-by: Hernan Ponce de Leon <ponce@fortiss.org>
```
f246e60c

ComponentToTaskAllocationTable: Fix documentation of getTasks() · d328c2e2

Simon Barner authored Jun 28, 2018


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



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

d328c2e2

JavaFX: Single-Control view (Use case). · 87069ea3

Alexander Diewald authored Jun 28, 2018 and

Simon Barner committed Jul 02, 2018

* Adjust the FX playground classes to the AF3FXViewPart changes in the
  kernel.
* Modify the "FXNavigator" to provide a use case for single-control/node
  views.

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


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

87069ea3

GREEN · 89c9312b
Hernan Ponce de Leon authored Jun 26, 2018 and Simon Barner committed Jul 02, 2018
```
Issue-Ref:3398
Signed-off-by: Hernan Ponce de Leon <ponce@fortiss.org>
```
89c9312b
GREEN · 4e15515e
Hernan Ponce de Leon authored Jun 26, 2018 and Simon Barner committed Jul 02, 2018
```
Issue-Ref:3399
Signed-off-by: Hernan Ponce de Leon <ponce@fortiss.org>
```
4e15515e