From a1ce548145ff9f037014cbd3a3b1e21a9d99138d Mon Sep 17 00:00:00 2001 From: Marius Heine Date: Mon, 23 Feb 2026 15:37:00 +0100 Subject: [PATCH 1/6] filter relevant fma Grenzen properly for dweg --- .../set/feature/table/pt1/ssld/SsldTransformator.xtend | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssld/SsldTransformator.xtend b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssld/SsldTransformator.xtend index 3f2536763..37b83fc0d 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssld/SsldTransformator.xtend +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssld/SsldTransformator.xtend @@ -71,9 +71,11 @@ class SsldTransformator extends AbstractPlanPro2TableModelTransformator { def String getFreigemeldetLaenge(Fstr_DWeg dweg, BigDecimal maxLength) { val startSignal = dweg?.fstrFahrweg?.start - val fmas = dweg?.fmaAnlageFreimeldung?.map[fmaGrenzen]?.flatten.toSet. - filter[topGraphService.isInWirkrichtungOfSignal(startSignal, it)]. - toList + val fmas = dweg?.fmaAnlageFreimeldung?.map[fmaGrenzen]?.flatten?.toSet?. + filter [ + dweg.IDFstrFahrweg.value.contains(it) && + topGraphService.isInWirkrichtungOfSignal(startSignal, it) + ]?.toList val pathFromSignalToFMA = fmas?.map [ it -> getShortestPath(dweg?.fstrFahrweg?.start, it) ] From 7253d58f171eb2497d3e8b182309753555029cf0 Mon Sep 17 00:00:00 2001 From: Marius Heine Date: Tue, 24 Feb 2026 12:25:18 +0100 Subject: [PATCH 2/6] use tolerance for finding fmas --- .../table/pt1/ssld/SsldTransformator.xtend | 21 ++++++++++++------- .../extensions/BereichObjektExtensions.xtend | 2 +- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssld/SsldTransformator.xtend b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssld/SsldTransformator.xtend index 37b83fc0d..7294e2a67 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssld/SsldTransformator.xtend +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssld/SsldTransformator.xtend @@ -51,6 +51,8 @@ class SsldTransformator extends AbstractPlanPro2TableModelTransformator { val TopologicalGraphService topGraphService; + val FREIGEMELDET_LAENGE_TOLERANCE = BigDecimal.ONE; + new(Set cols, EnumTranslationService enumTranslationService, TopologicalGraphService topGraphService, EventAdmin eventAdmin) { @@ -71,11 +73,13 @@ class SsldTransformator extends AbstractPlanPro2TableModelTransformator { def String getFreigemeldetLaenge(Fstr_DWeg dweg, BigDecimal maxLength) { val startSignal = dweg?.fstrFahrweg?.start - val fmas = dweg?.fmaAnlageFreimeldung?.map[fmaGrenzen]?.flatten?.toSet?. - filter [ - dweg.IDFstrFahrweg.value.contains(it) && - topGraphService.isInWirkrichtungOfSignal(startSignal, it) - ]?.toList + val allFmas = dweg?.fmaAnlageFreimeldung?.map[fmaGrenzen]?.flatten?. + toSet + val fmas = allFmas?.filter [ + dweg?.fstrFahrweg?.contains(it, + FREIGEMELDET_LAENGE_TOLERANCE.doubleValue) && + topGraphService.isInWirkrichtungOfSignal(startSignal, it) + ]?.toList val pathFromSignalToFMA = fmas?.map [ it -> getShortestPath(dweg?.fstrFahrweg?.start, it) ] @@ -104,9 +108,10 @@ class SsldTransformator extends AbstractPlanPro2TableModelTransformator { } val distance = relevantFmas.map[value.length].max - return distance > maxLength.add(BigDecimal.ONE) - ? '''> «maxLength.toTableIntegerAgateDown»''' - : distance.toTableIntegerAgateDown + if (distance > maxLength.add(FREIGEMELDET_LAENGE_TOLERANCE)) { + return '''> «maxLength.toTableIntegerAgateDown»'''; + } + return distance.toTableIntegerAgateDown } override transformTableContent( diff --git a/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/BereichObjektExtensions.xtend b/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/BereichObjektExtensions.xtend index 8748bc288..a258cfe11 100644 --- a/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/BereichObjektExtensions.xtend +++ b/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/BereichObjektExtensions.xtend @@ -474,7 +474,7 @@ class BereichObjektExtensions extends BasisObjektExtensions { Punkt_Objekt object, double tolerance ) { - if (tolerance == 1) { + if (tolerance == 0) { return bereich.contains(object) } return bereich.bereichObjektTeilbereich.exists [ bo | From 28856a821d1337752a5696e15a0f22b88a0d5831 Mon Sep 17 00:00:00 2001 From: Marius Heine Date: Tue, 24 Feb 2026 12:25:31 +0100 Subject: [PATCH 3/6] update table references --- java/bundles/org.eclipse.set.swtbot/.gitignore | 1 + .../pphn_1_10_0_3/ESTW-A P-Hausen/ssld_reference.csv | 6 +++--- .../pphn_1_10_0_3/diffState/ssld_reference.csv | 6 +++--- .../pphn_1_10_0_3/finalState/ssld_reference.csv | 6 +++--- .../pphn_1_10_0_3/initialState/ssld_reference.csv | 6 +++--- 5 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 java/bundles/org.eclipse.set.swtbot/.gitignore diff --git a/java/bundles/org.eclipse.set.swtbot/.gitignore b/java/bundles/org.eclipse.set.swtbot/.gitignore new file mode 100644 index 000000000..1f2dd1bce --- /dev/null +++ b/java/bundles/org.eclipse.set.swtbot/.gitignore @@ -0,0 +1 @@ +diff/ \ No newline at end of file diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A P-Hausen/ssld_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A P-Hausen/ssld_reference.csv index 7ad36c86a..4e907671d 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A P-Hausen/ssld_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A P-Hausen/ssld_reference.csv @@ -49,7 +49,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku

60W32 ​(L)​

";"

";"

60G122

60G402

60W31

";"

□

";"

";"

□

";"

60G302

";"

561

";"

58

";"

" -15;"

60ZR2

";"

60ZU21

";"

";"

60ZU21

";"

D2

";"

160

";"

232

";"

270

";"

> ​270

";"

-​1.6

";"

60W31 ​(L)​ +15;"

60ZR2

";"

60ZU21

";"

";"

60ZU21

";"

D2

";"

160

";"

232

";"

270

";"

270

";"

-​1.6

";"

60W31 ​(L)​

60W32 ​(R)​

60W33 ​(R)​

60W35 ​(L)​

";"

";"

60G402 @@ -86,7 +86,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku

60W30

60W31

60W33

";"

□

";"

";"

□

";"

60G121

";"

267

";"

32

";"

" -21;"

60ZU22

";"

WA ​60W31

";"

";"

Gz ​60W30

";"

D1

";"

160

";"

250

";"

253

";"

> ​253

";"

-​2.5

";"

60W32 ​(L)​

";"

";"

60G122 +21;"

60ZU22

";"

WA ​60W31

";"

";"

Gz ​60W30

";"

D1

";"

160

";"

250

";"

253

";"

185

";"

-​2.5

";"

60W32 ​(L)​

";"

";"

60G122

60W31

";"

□

";"

";"

□

";"

60G222

";"

162

";"

32

";"

" 22;"

60ZU22

";"

Gz ​60W32

";"

";"

Gz ​60W32

";"

D2

";"

60

";"

125

";"

195

";"

185

";"

-​2.5

";"

";"

";"

60G122

";"

x

";"

";"

□

";"

60G222

";"

162

";"

32

";"

" 23;"

60N21

";"

Ra ​10 ​km: ​121,050

";"

";"

60FF

";"

D1

";"

160

";"

206

";"

412

";"

412

";"

-​0.3

";"

";"

";"

60G221

";"

□

";"

□

";"

□

";"

60G121

";"

267

";"

32

";"

" @@ -99,7 +99,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku 30;"

60ZR3

";"

Gz ​60W34

";"

";"

Gz ​60W34

";"

D1

";"

60

";"

100

";"

164

";"

154

";"

-​1.6

";"

60W29 ​(L)​

60W30 ​(L)​

";"

";"

60W29

60W30

";"

□

";"

";"

□

";"

60G103

";"

492

";"

50

";"

" -31;"

60ZR3

";"

WA ​60W32

";"

";"

60ZU22

";"

D2

";"

60

";"

116

";"

154

";"

> ​154

";"

-​1.6

";"

60W29 ​(L)​ +31;"

60ZR3

";"

WA ​60W32

";"

";"

60ZU22

";"

D2

";"

60

";"

116

";"

154

";"

107

";"

-​1.6

";"

60W29 ​(L)​

60W30 ​(R)​

60W31 ​(R)​

";"

";"

60W29

60W30 diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/diffState/ssld_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/diffState/ssld_reference.csv index 7ad36c86a..4e907671d 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/diffState/ssld_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/diffState/ssld_reference.csv @@ -49,7 +49,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku

60W32 ​(L)​

";"

";"

60G122

60G402

60W31

";"

□

";"

";"

□

";"

60G302

";"

561

";"

58

";"

" -15;"

60ZR2

";"

60ZU21

";"

";"

60ZU21

";"

D2

";"

160

";"

232

";"

270

";"

> ​270

";"

-​1.6

";"

60W31 ​(L)​ +15;"

60ZR2

";"

60ZU21

";"

";"

60ZU21

";"

D2

";"

160

";"

232

";"

270

";"

270

";"

-​1.6

";"

60W31 ​(L)​

60W32 ​(R)​

60W33 ​(R)​

60W35 ​(L)​

";"

";"

60G402 @@ -86,7 +86,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku

60W30

60W31

60W33

";"

□

";"

";"

□

";"

60G121

";"

267

";"

32

";"

" -21;"

60ZU22

";"

WA ​60W31

";"

";"

Gz ​60W30

";"

D1

";"

160

";"

250

";"

253

";"

> ​253

";"

-​2.5

";"

60W32 ​(L)​

";"

";"

60G122 +21;"

60ZU22

";"

WA ​60W31

";"

";"

Gz ​60W30

";"

D1

";"

160

";"

250

";"

253

";"

185

";"

-​2.5

";"

60W32 ​(L)​

";"

";"

60G122

60W31

";"

□

";"

";"

□

";"

60G222

";"

162

";"

32

";"

" 22;"

60ZU22

";"

Gz ​60W32

";"

";"

Gz ​60W32

";"

D2

";"

60

";"

125

";"

195

";"

185

";"

-​2.5

";"

";"

";"

60G122

";"

x

";"

";"

□

";"

60G222

";"

162

";"

32

";"

" 23;"

60N21

";"

Ra ​10 ​km: ​121,050

";"

";"

60FF

";"

D1

";"

160

";"

206

";"

412

";"

412

";"

-​0.3

";"

";"

";"

60G221

";"

□

";"

□

";"

□

";"

60G121

";"

267

";"

32

";"

" @@ -99,7 +99,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku 30;"

60ZR3

";"

Gz ​60W34

";"

";"

Gz ​60W34

";"

D1

";"

60

";"

100

";"

164

";"

154

";"

-​1.6

";"

60W29 ​(L)​

60W30 ​(L)​

";"

";"

60W29

60W30

";"

□

";"

";"

□

";"

60G103

";"

492

";"

50

";"

" -31;"

60ZR3

";"

WA ​60W32

";"

";"

60ZU22

";"

D2

";"

60

";"

116

";"

154

";"

> ​154

";"

-​1.6

";"

60W29 ​(L)​ +31;"

60ZR3

";"

WA ​60W32

";"

";"

60ZU22

";"

D2

";"

60

";"

116

";"

154

";"

107

";"

-​1.6

";"

60W29 ​(L)​

60W30 ​(R)​

60W31 ​(R)​

";"

";"

60W29

60W30 diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/finalState/ssld_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/finalState/ssld_reference.csv index 7ad36c86a..4e907671d 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/finalState/ssld_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/finalState/ssld_reference.csv @@ -49,7 +49,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku

60W32 ​(L)​

";"

";"

60G122

60G402

60W31

";"

□

";"

";"

□

";"

60G302

";"

561

";"

58

";"

" -15;"

60ZR2

";"

60ZU21

";"

";"

60ZU21

";"

D2

";"

160

";"

232

";"

270

";"

> ​270

";"

-​1.6

";"

60W31 ​(L)​ +15;"

60ZR2

";"

60ZU21

";"

";"

60ZU21

";"

D2

";"

160

";"

232

";"

270

";"

270

";"

-​1.6

";"

60W31 ​(L)​

60W32 ​(R)​

60W33 ​(R)​

60W35 ​(L)​

";"

";"

60G402 @@ -86,7 +86,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku

60W30

60W31

60W33

";"

□

";"

";"

□

";"

60G121

";"

267

";"

32

";"

" -21;"

60ZU22

";"

WA ​60W31

";"

";"

Gz ​60W30

";"

D1

";"

160

";"

250

";"

253

";"

> ​253

";"

-​2.5

";"

60W32 ​(L)​

";"

";"

60G122 +21;"

60ZU22

";"

WA ​60W31

";"

";"

Gz ​60W30

";"

D1

";"

160

";"

250

";"

253

";"

185

";"

-​2.5

";"

60W32 ​(L)​

";"

";"

60G122

60W31

";"

□

";"

";"

□

";"

60G222

";"

162

";"

32

";"

" 22;"

60ZU22

";"

Gz ​60W32

";"

";"

Gz ​60W32

";"

D2

";"

60

";"

125

";"

195

";"

185

";"

-​2.5

";"

";"

";"

60G122

";"

x

";"

";"

□

";"

60G222

";"

162

";"

32

";"

" 23;"

60N21

";"

Ra ​10 ​km: ​121,050

";"

";"

60FF

";"

D1

";"

160

";"

206

";"

412

";"

412

";"

-​0.3

";"

";"

";"

60G221

";"

□

";"

□

";"

□

";"

60G121

";"

267

";"

32

";"

" @@ -99,7 +99,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku 30;"

60ZR3

";"

Gz ​60W34

";"

";"

Gz ​60W34

";"

D1

";"

60

";"

100

";"

164

";"

154

";"

-​1.6

";"

60W29 ​(L)​

60W30 ​(L)​

";"

";"

60W29

60W30

";"

□

";"

";"

□

";"

60G103

";"

492

";"

50

";"

" -31;"

60ZR3

";"

WA ​60W32

";"

";"

60ZU22

";"

D2

";"

60

";"

116

";"

154

";"

> ​154

";"

-​1.6

";"

60W29 ​(L)​ +31;"

60ZR3

";"

WA ​60W32

";"

";"

60ZU22

";"

D2

";"

60

";"

116

";"

154

";"

107

";"

-​1.6

";"

60W29 ​(L)​

60W30 ​(R)​

60W31 ​(R)​

";"

";"

60W29

60W30 diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/initialState/ssld_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/initialState/ssld_reference.csv index 7ad36c86a..4e907671d 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/initialState/ssld_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/initialState/ssld_reference.csv @@ -49,7 +49,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku

60W32 ​(L)​

";"

";"

60G122

60G402

60W31

";"

□

";"

";"

□

";"

60G302

";"

561

";"

58

";"

" -15;"

60ZR2

";"

60ZU21

";"

";"

60ZU21

";"

D2

";"

160

";"

232

";"

270

";"

> ​270

";"

-​1.6

";"

60W31 ​(L)​ +15;"

60ZR2

";"

60ZU21

";"

";"

60ZU21

";"

D2

";"

160

";"

232

";"

270

";"

270

";"

-​1.6

";"

60W31 ​(L)​

60W32 ​(R)​

60W33 ​(R)​

60W35 ​(L)​

";"

";"

60G402 @@ -86,7 +86,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku

60W30

60W31

60W33

";"

□

";"

";"

□

";"

60G121

";"

267

";"

32

";"

" -21;"

60ZU22

";"

WA ​60W31

";"

";"

Gz ​60W30

";"

D1

";"

160

";"

250

";"

253

";"

> ​253

";"

-​2.5

";"

60W32 ​(L)​

";"

";"

60G122 +21;"

60ZU22

";"

WA ​60W31

";"

";"

Gz ​60W30

";"

D1

";"

160

";"

250

";"

253

";"

185

";"

-​2.5

";"

60W32 ​(L)​

";"

";"

60G122

60W31

";"

□

";"

";"

□

";"

60G222

";"

162

";"

32

";"

" 22;"

60ZU22

";"

Gz ​60W32

";"

";"

Gz ​60W32

";"

D2

";"

60

";"

125

";"

195

";"

185

";"

-​2.5

";"

";"

";"

60G122

";"

x

";"

";"

□

";"

60G222

";"

162

";"

32

";"

" 23;"

60N21

";"

Ra ​10 ​km: ​121,050

";"

";"

60FF

";"

D1

";"

160

";"

206

";"

412

";"

412

";"

-​0.3

";"

";"

";"

60G221

";"

□

";"

□

";"

□

";"

60G121

";"

267

";"

32

";"

" @@ -99,7 +99,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku 30;"

60ZR3

";"

Gz ​60W34

";"

";"

Gz ​60W34

";"

D1

";"

60

";"

100

";"

164

";"

154

";"

-​1.6

";"

60W29 ​(L)​

60W30 ​(L)​

";"

";"

60W29

60W30

";"

□

";"

";"

□

";"

60G103

";"

492

";"

50

";"

" -31;"

60ZR3

";"

WA ​60W32

";"

";"

60ZU22

";"

D2

";"

60

";"

116

";"

154

";"

> ​154

";"

-​1.6

";"

60W29 ​(L)​ +31;"

60ZR3

";"

WA ​60W32

";"

";"

60ZU22

";"

D2

";"

60

";"

116

";"

154

";"

107

";"

-​1.6

";"

60W29 ​(L)​

60W30 ​(R)​

60W31 ​(R)​

";"

";"

60W29

60W30 From c7a377cde3832332415ddac4cde281e87dbc2b97 Mon Sep 17 00:00:00 2001 From: Marius Heine Date: Tue, 24 Feb 2026 12:27:30 +0100 Subject: [PATCH 4/6] extend gitignore for swtbot test files --- java/bundles/org.eclipse.set.swtbot/.gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java/bundles/org.eclipse.set.swtbot/.gitignore b/java/bundles/org.eclipse.set.swtbot/.gitignore index 1f2dd1bce..90ec8ada3 100644 --- a/java/bundles/org.eclipse.set.swtbot/.gitignore +++ b/java/bundles/org.eclipse.set.swtbot/.gitignore @@ -1 +1,3 @@ -diff/ \ No newline at end of file +diff/ +*.planpro +!test_res/test_file/*.planpro \ No newline at end of file From 34af00fb0bfdc4177dbbdde8d345a0178e6d7a73 Mon Sep 17 00:00:00 2001 From: Marius Heine Date: Wed, 25 Feb 2026 00:01:23 +0100 Subject: [PATCH 5/6] handle ambiguous connection as not routable --- .../table/pt1/ssld/SsldTransformator.xtend | 19 ++++++------------- .../extensions/TopKanteExtensions.xtend | 10 +++++++--- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssld/SsldTransformator.xtend b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssld/SsldTransformator.xtend index 7294e2a67..3f2536763 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssld/SsldTransformator.xtend +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssld/SsldTransformator.xtend @@ -51,8 +51,6 @@ class SsldTransformator extends AbstractPlanPro2TableModelTransformator { val TopologicalGraphService topGraphService; - val FREIGEMELDET_LAENGE_TOLERANCE = BigDecimal.ONE; - new(Set cols, EnumTranslationService enumTranslationService, TopologicalGraphService topGraphService, EventAdmin eventAdmin) { @@ -73,13 +71,9 @@ class SsldTransformator extends AbstractPlanPro2TableModelTransformator { def String getFreigemeldetLaenge(Fstr_DWeg dweg, BigDecimal maxLength) { val startSignal = dweg?.fstrFahrweg?.start - val allFmas = dweg?.fmaAnlageFreimeldung?.map[fmaGrenzen]?.flatten?. - toSet - val fmas = allFmas?.filter [ - dweg?.fstrFahrweg?.contains(it, - FREIGEMELDET_LAENGE_TOLERANCE.doubleValue) && - topGraphService.isInWirkrichtungOfSignal(startSignal, it) - ]?.toList + val fmas = dweg?.fmaAnlageFreimeldung?.map[fmaGrenzen]?.flatten.toSet. + filter[topGraphService.isInWirkrichtungOfSignal(startSignal, it)]. + toList val pathFromSignalToFMA = fmas?.map [ it -> getShortestPath(dweg?.fstrFahrweg?.start, it) ] @@ -108,10 +102,9 @@ class SsldTransformator extends AbstractPlanPro2TableModelTransformator { } val distance = relevantFmas.map[value.length].max - if (distance > maxLength.add(FREIGEMELDET_LAENGE_TOLERANCE)) { - return '''> «maxLength.toTableIntegerAgateDown»'''; - } - return distance.toTableIntegerAgateDown + return distance > maxLength.add(BigDecimal.ONE) + ? '''> «maxLength.toTableIntegerAgateDown»''' + : distance.toTableIntegerAgateDown } override transformTableContent( diff --git a/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/TopKanteExtensions.xtend b/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/TopKanteExtensions.xtend index 17e2bad59..dc349765d 100644 --- a/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/TopKanteExtensions.xtend +++ b/java/bundles/org.eclipse.set.ppmodel.extensions/src/org/eclipse/set/ppmodel/extensions/TopKanteExtensions.xtend @@ -683,9 +683,13 @@ class TopKanteExtensions extends BasisObjektExtensions { } def static boolean isRoute(TOP_Kante topKante, TOP_Kante destination) { - val connectionNode = topKante.connectionTo(destination) - return connectionNode !== null && - topKante.isRoute(destination, connectionNode) + try { + val connectionNode = topKante.connectionTo(destination) + return connectionNode !== null && + topKante.isRoute(destination, connectionNode) + } catch (IllegalArgumentException e) { + return false + } } /** From 82e6c92cccc3a45edf70f0ecff4a4c6c7d8856b4 Mon Sep 17 00:00:00 2001 From: Marius Heine Date: Wed, 25 Feb 2026 00:13:15 +0100 Subject: [PATCH 6/6] update table references --- .../pphn_1_10_0_3/ESTW-A P-Hausen/ssld_reference.csv | 6 +++--- .../pphn_1_10_0_3/diffState/ssld_reference.csv | 6 +++--- .../pphn_1_10_0_3/finalState/ssld_reference.csv | 6 +++--- .../pphn_1_10_0_3/initialState/ssld_reference.csv | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A P-Hausen/ssld_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A P-Hausen/ssld_reference.csv index 4e907671d..7ad36c86a 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A P-Hausen/ssld_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A P-Hausen/ssld_reference.csv @@ -49,7 +49,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku

60W32 ​(L)​

";"

";"

60G122

60G402

60W31

";"

□

";"

";"

□

";"

60G302

";"

561

";"

58

";"

" -15;"

60ZR2

";"

60ZU21

";"

";"

60ZU21

";"

D2

";"

160

";"

232

";"

270

";"

270

";"

-​1.6

";"

60W31 ​(L)​ +15;"

60ZR2

";"

60ZU21

";"

";"

60ZU21

";"

D2

";"

160

";"

232

";"

270

";"

> ​270

";"

-​1.6

";"

60W31 ​(L)​

60W32 ​(R)​

60W33 ​(R)​

60W35 ​(L)​

";"

";"

60G402 @@ -86,7 +86,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku

60W30

60W31

60W33

";"

□

";"

";"

□

";"

60G121

";"

267

";"

32

";"

" -21;"

60ZU22

";"

WA ​60W31

";"

";"

Gz ​60W30

";"

D1

";"

160

";"

250

";"

253

";"

185

";"

-​2.5

";"

60W32 ​(L)​

";"

";"

60G122 +21;"

60ZU22

";"

WA ​60W31

";"

";"

Gz ​60W30

";"

D1

";"

160

";"

250

";"

253

";"

> ​253

";"

-​2.5

";"

60W32 ​(L)​

";"

";"

60G122

60W31

";"

□

";"

";"

□

";"

60G222

";"

162

";"

32

";"

" 22;"

60ZU22

";"

Gz ​60W32

";"

";"

Gz ​60W32

";"

D2

";"

60

";"

125

";"

195

";"

185

";"

-​2.5

";"

";"

";"

60G122

";"

x

";"

";"

□

";"

60G222

";"

162

";"

32

";"

" 23;"

60N21

";"

Ra ​10 ​km: ​121,050

";"

";"

60FF

";"

D1

";"

160

";"

206

";"

412

";"

412

";"

-​0.3

";"

";"

";"

60G221

";"

□

";"

□

";"

□

";"

60G121

";"

267

";"

32

";"

" @@ -99,7 +99,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku 30;"

60ZR3

";"

Gz ​60W34

";"

";"

Gz ​60W34

";"

D1

";"

60

";"

100

";"

164

";"

154

";"

-​1.6

";"

60W29 ​(L)​

60W30 ​(L)​

";"

";"

60W29

60W30

";"

□

";"

";"

□

";"

60G103

";"

492

";"

50

";"

" -31;"

60ZR3

";"

WA ​60W32

";"

";"

60ZU22

";"

D2

";"

60

";"

116

";"

154

";"

107

";"

-​1.6

";"

60W29 ​(L)​ +31;"

60ZR3

";"

WA ​60W32

";"

";"

60ZU22

";"

D2

";"

60

";"

116

";"

154

";"

> ​154

";"

-​1.6

";"

60W29 ​(L)​

60W30 ​(R)​

60W31 ​(R)​

";"

";"

60W29

60W30 diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/diffState/ssld_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/diffState/ssld_reference.csv index 4e907671d..7ad36c86a 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/diffState/ssld_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/diffState/ssld_reference.csv @@ -49,7 +49,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku

60W32 ​(L)​

";"

";"

60G122

60G402

60W31

";"

□

";"

";"

□

";"

60G302

";"

561

";"

58

";"

" -15;"

60ZR2

";"

60ZU21

";"

";"

60ZU21

";"

D2

";"

160

";"

232

";"

270

";"

270

";"

-​1.6

";"

60W31 ​(L)​ +15;"

60ZR2

";"

60ZU21

";"

";"

60ZU21

";"

D2

";"

160

";"

232

";"

270

";"

> ​270

";"

-​1.6

";"

60W31 ​(L)​

60W32 ​(R)​

60W33 ​(R)​

60W35 ​(L)​

";"

";"

60G402 @@ -86,7 +86,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku

60W30

60W31

60W33

";"

□

";"

";"

□

";"

60G121

";"

267

";"

32

";"

" -21;"

60ZU22

";"

WA ​60W31

";"

";"

Gz ​60W30

";"

D1

";"

160

";"

250

";"

253

";"

185

";"

-​2.5

";"

60W32 ​(L)​

";"

";"

60G122 +21;"

60ZU22

";"

WA ​60W31

";"

";"

Gz ​60W30

";"

D1

";"

160

";"

250

";"

253

";"

> ​253

";"

-​2.5

";"

60W32 ​(L)​

";"

";"

60G122

60W31

";"

□

";"

";"

□

";"

60G222

";"

162

";"

32

";"

" 22;"

60ZU22

";"

Gz ​60W32

";"

";"

Gz ​60W32

";"

D2

";"

60

";"

125

";"

195

";"

185

";"

-​2.5

";"

";"

";"

60G122

";"

x

";"

";"

□

";"

60G222

";"

162

";"

32

";"

" 23;"

60N21

";"

Ra ​10 ​km: ​121,050

";"

";"

60FF

";"

D1

";"

160

";"

206

";"

412

";"

412

";"

-​0.3

";"

";"

";"

60G221

";"

□

";"

□

";"

□

";"

60G121

";"

267

";"

32

";"

" @@ -99,7 +99,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku 30;"

60ZR3

";"

Gz ​60W34

";"

";"

Gz ​60W34

";"

D1

";"

60

";"

100

";"

164

";"

154

";"

-​1.6

";"

60W29 ​(L)​

60W30 ​(L)​

";"

";"

60W29

60W30

";"

□

";"

";"

□

";"

60G103

";"

492

";"

50

";"

" -31;"

60ZR3

";"

WA ​60W32

";"

";"

60ZU22

";"

D2

";"

60

";"

116

";"

154

";"

107

";"

-​1.6

";"

60W29 ​(L)​ +31;"

60ZR3

";"

WA ​60W32

";"

";"

60ZU22

";"

D2

";"

60

";"

116

";"

154

";"

> ​154

";"

-​1.6

";"

60W29 ​(L)​

60W30 ​(R)​

60W31 ​(R)​

";"

";"

60W29

60W30 diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/finalState/ssld_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/finalState/ssld_reference.csv index 4e907671d..7ad36c86a 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/finalState/ssld_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/finalState/ssld_reference.csv @@ -49,7 +49,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku

60W32 ​(L)​

";"

";"

60G122

60G402

60W31

";"

□

";"

";"

□

";"

60G302

";"

561

";"

58

";"

" -15;"

60ZR2

";"

60ZU21

";"

";"

60ZU21

";"

D2

";"

160

";"

232

";"

270

";"

270

";"

-​1.6

";"

60W31 ​(L)​ +15;"

60ZR2

";"

60ZU21

";"

";"

60ZU21

";"

D2

";"

160

";"

232

";"

270

";"

> ​270

";"

-​1.6

";"

60W31 ​(L)​

60W32 ​(R)​

60W33 ​(R)​

60W35 ​(L)​

";"

";"

60G402 @@ -86,7 +86,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku

60W30

60W31

60W33

";"

□

";"

";"

□

";"

60G121

";"

267

";"

32

";"

" -21;"

60ZU22

";"

WA ​60W31

";"

";"

Gz ​60W30

";"

D1

";"

160

";"

250

";"

253

";"

185

";"

-​2.5

";"

60W32 ​(L)​

";"

";"

60G122 +21;"

60ZU22

";"

WA ​60W31

";"

";"

Gz ​60W30

";"

D1

";"

160

";"

250

";"

253

";"

> ​253

";"

-​2.5

";"

60W32 ​(L)​

";"

";"

60G122

60W31

";"

□

";"

";"

□

";"

60G222

";"

162

";"

32

";"

" 22;"

60ZU22

";"

Gz ​60W32

";"

";"

Gz ​60W32

";"

D2

";"

60

";"

125

";"

195

";"

185

";"

-​2.5

";"

";"

";"

60G122

";"

x

";"

";"

□

";"

60G222

";"

162

";"

32

";"

" 23;"

60N21

";"

Ra ​10 ​km: ​121,050

";"

";"

60FF

";"

D1

";"

160

";"

206

";"

412

";"

412

";"

-​0.3

";"

";"

";"

60G221

";"

□

";"

□

";"

□

";"

60G121

";"

267

";"

32

";"

" @@ -99,7 +99,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku 30;"

60ZR3

";"

Gz ​60W34

";"

";"

Gz ​60W34

";"

D1

";"

60

";"

100

";"

164

";"

154

";"

-​1.6

";"

60W29 ​(L)​

60W30 ​(L)​

";"

";"

60W29

60W30

";"

□

";"

";"

□

";"

60G103

";"

492

";"

50

";"

" -31;"

60ZR3

";"

WA ​60W32

";"

";"

60ZU22

";"

D2

";"

60

";"

116

";"

154

";"

107

";"

-​1.6

";"

60W29 ​(L)​ +31;"

60ZR3

";"

WA ​60W32

";"

";"

60ZU22

";"

D2

";"

60

";"

116

";"

154

";"

> ​154

";"

-​1.6

";"

60W29 ​(L)​

60W30 ​(R)​

60W31 ​(R)​

";"

";"

60W29

60W30 diff --git a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/initialState/ssld_reference.csv b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/initialState/ssld_reference.csv index 4e907671d..7ad36c86a 100644 --- a/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/initialState/ssld_reference.csv +++ b/java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/initialState/ssld_reference.csv @@ -49,7 +49,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku

60W32 ​(L)​

";"

";"

60G122

60G402

60W31

";"

□

";"

";"

□

";"

60G302

";"

561

";"

58

";"

" -15;"

60ZR2

";"

60ZU21

";"

";"

60ZU21

";"

D2

";"

160

";"

232

";"

270

";"

270

";"

-​1.6

";"

60W31 ​(L)​ +15;"

60ZR2

";"

60ZU21

";"

";"

60ZU21

";"

D2

";"

160

";"

232

";"

270

";"

> ​270

";"

-​1.6

";"

60W31 ​(L)​

60W32 ​(R)​

60W33 ​(R)​

60W35 ​(L)​

";"

";"

60G402 @@ -86,7 +86,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku

60W30

60W31

60W33

";"

□

";"

";"

□

";"

60G121

";"

267

";"

32

";"

" -21;"

60ZU22

";"

WA ​60W31

";"

";"

Gz ​60W30

";"

D1

";"

160

";"

250

";"

253

";"

185

";"

-​2.5

";"

60W32 ​(L)​

";"

";"

60G122 +21;"

60ZU22

";"

WA ​60W31

";"

";"

Gz ​60W30

";"

D1

";"

160

";"

250

";"

253

";"

> ​253

";"

-​2.5

";"

60W32 ​(L)​

";"

";"

60G122

60W31

";"

□

";"

";"

□

";"

60G222

";"

162

";"

32

";"

" 22;"

60ZU22

";"

Gz ​60W32

";"

";"

Gz ​60W32

";"

D2

";"

60

";"

125

";"

195

";"

185

";"

-​2.5

";"

";"

";"

60G122

";"

x

";"

";"

□

";"

60G222

";"

162

";"

32

";"

" 23;"

60N21

";"

Ra ​10 ​km: ​121,050

";"

";"

60FF

";"

D1

";"

160

";"

206

";"

412

";"

412

";"

-​0.3

";"

";"

";"

60G221

";"

□

";"

□

";"

□

";"

60G121

";"

267

";"

32

";"

" @@ -99,7 +99,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku 30;"

60ZR3

";"

Gz ​60W34

";"

";"

Gz ​60W34

";"

D1

";"

60

";"

100

";"

164

";"

154

";"

-​1.6

";"

60W29 ​(L)​

60W30 ​(L)​

";"

";"

60W29

60W30

";"

□

";"

";"

□

";"

60G103

";"

492

";"

50

";"

" -31;"

60ZR3

";"

WA ​60W32

";"

";"

60ZU22

";"

D2

";"

60

";"

116

";"

154

";"

107

";"

-​1.6

";"

60W29 ​(L)​ +31;"

60ZR3

";"

WA ​60W32

";"

";"

60ZU22

";"

D2

";"

60

";"

116

";"

154

";"

> ​154

";"

-​1.6

";"

60W29 ​(L)​

60W30 ​(R)​

60W31 ​(R)​

";"

";"

60W29

60W30