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..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,9 +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[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) ] @@ -102,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 | diff --git a/java/bundles/org.eclipse.set.swtbot/.gitignore b/java/bundles/org.eclipse.set.swtbot/.gitignore new file mode 100644 index 000000000..90ec8ada3 --- /dev/null +++ b/java/bundles/org.eclipse.set.swtbot/.gitignore @@ -0,0 +1,3 @@ +diff/ +*.planpro +!test_res/test_file/*.planpro \ 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