Ssld - bug with ambiguous connections in graph

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<ColumnDescriptor> 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(

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 |

java/bundles/org.eclipse.set.swtbot/.gitignore

@@ -0,0 +1,3 @@
+diff/
+*.planpro
+!test_res/test_file/*.planpro

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
 <br></br>60W32 ​(L)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>60G122
 <br></br>60G402
 <br></br>60W31</span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span>60G302</span></p>";"<p style=""text-align:center""><span>561</span></p>";"<p style=""text-align:center""><span>58</span></p>";"<p style=""text-align:left""></p>"
-15;"<p style=""text-align:left""><span>60ZR2</span></p>";"<p style=""text-align:left""><span>60ZU21</span></p>";"<p style=""text-align:left""><span></span></p>";"<p style=""text-align:left""><span>60ZU21</span></p>";"<p style=""text-align:center""><span>D2</span></p>";"<p style=""text-align:right""><span>160</span></p>";"<p style=""text-align:right""><span>232</span></p>";"<p style=""text-align:right""><span>270</span></p>";"<p style=""text-align:right""><span>&gt; ​270</span></p>";"<p style=""text-align:right""><span>-​1.6</span></p>";"<p style=""text-align:center""><span>60W31 ​(L)​
+15;"<p style=""text-align:left""><span>60ZR2</span></p>";"<p style=""text-align:left""><span>60ZU21</span></p>";"<p style=""text-align:left""><span></span></p>";"<p style=""text-align:left""><span>60ZU21</span></p>";"<p style=""text-align:center""><span>D2</span></p>";"<p style=""text-align:right""><span>160</span></p>";"<p style=""text-align:right""><span>232</span></p>";"<p style=""text-align:right""><span>270</span></p>";"<p style=""text-align:right""><span>270</span></p>";"<p style=""text-align:right""><span>-​1.6</span></p>";"<p style=""text-align:center""><span>60W31 ​(L)​
 <br></br>60W32 ​(R)​
 <br></br>60W33 ​(R)​
 <br></br>60W35 ​(L)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>60G402
@@ -86,7 +86,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku
 <br></br>60W30
 <br></br>60W31
 <br></br>60W33</span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span>60G121</span></p>";"<p style=""text-align:center""><span>267</span></p>";"<p style=""text-align:center""><span>32</span></p>";"<p style=""text-align:left""></p>"
-21;"<p style=""text-align:left""><span>60ZU22</span></p>";"<p style=""text-align:left""><span>WA ​60W31</span></p>";"<p style=""text-align:left""><span></span></p>";"<p style=""text-align:left""><span>Gz ​60W30</span></p>";"<p style=""text-align:center""><span>D1</span></p>";"<p style=""text-align:right""><span>160</span></p>";"<p style=""text-align:right""><span>250</span></p>";"<p style=""text-align:right""><span>253</span></p>";"<p style=""text-align:right""><span>&gt; ​253</span></p>";"<p style=""text-align:right""><span>-​2.5</span></p>";"<p style=""text-align:center""><span>60W32 ​(L)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>60G122
+21;"<p style=""text-align:left""><span>60ZU22</span></p>";"<p style=""text-align:left""><span>WA ​60W31</span></p>";"<p style=""text-align:left""><span></span></p>";"<p style=""text-align:left""><span>Gz ​60W30</span></p>";"<p style=""text-align:center""><span>D1</span></p>";"<p style=""text-align:right""><span>160</span></p>";"<p style=""text-align:right""><span>250</span></p>";"<p style=""text-align:right""><span>253</span></p>";"<p style=""text-align:right""><span>185</span></p>";"<p style=""text-align:right""><span>-​2.5</span></p>";"<p style=""text-align:center""><span>60W32 ​(L)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>60G122
 <br></br>60W31</span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span>60G222</span></p>";"<p style=""text-align:center""><span>162</span></p>";"<p style=""text-align:center""><span>32</span></p>";"<p style=""text-align:left""></p>"
 22;"<p style=""text-align:left""><span>60ZU22</span></p>";"<p style=""text-align:left""><span>Gz ​60W32</span></p>";"<p style=""text-align:left""><span></span></p>";"<p style=""text-align:left""><span>Gz ​60W32</span></p>";"<p style=""text-align:center""><span>D2</span></p>";"<p style=""text-align:right""><span>60</span></p>";"<p style=""text-align:right""><span>125</span></p>";"<p style=""text-align:right""><span>195</span></p>";"<p style=""text-align:right""><span>185</span></p>";"<p style=""text-align:right""><span>-​2.5</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>60G122</span></p>";"<p style=""text-align:center""><span>x</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span>60G222</span></p>";"<p style=""text-align:center""><span>162</span></p>";"<p style=""text-align:center""><span>32</span></p>";"<p style=""text-align:left""></p>"
 23;"<p style=""text-align:left""><span>60N21</span></p>";"<p style=""text-align:left""><span>Ra ​10 ​km: ​121,050</span></p>";"<p style=""text-align:left""><span></span></p>";"<p style=""text-align:left""><span>60FF</span></p>";"<p style=""text-align:center""><span>D1</span></p>";"<p style=""text-align:right""><span>160</span></p>";"<p style=""text-align:right""><span>206</span></p>";"<p style=""text-align:right""><span>412</span></p>";"<p style=""text-align:right""><span>412</span></p>";"<p style=""text-align:right""><span>-​0.3</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>60G221</span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span>60G121</span></p>";"<p style=""text-align:center""><span>267</span></p>";"<p style=""text-align:center""><span>32</span></p>";"<p style=""text-align:left""></p>"
@@ -99,7 +99,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku
 30;"<p style=""text-align:left""><span>60ZR3</span></p>";"<p style=""text-align:left""><span>Gz ​60W34</span></p>";"<p style=""text-align:left""><span></span></p>";"<p style=""text-align:left""><span>Gz ​60W34</span></p>";"<p style=""text-align:center""><span>D1</span></p>";"<p style=""text-align:right""><span>60</span></p>";"<p style=""text-align:right""><span>100</span></p>";"<p style=""text-align:right""><span>164</span></p>";"<p style=""text-align:right""><span>154</span></p>";"<p style=""text-align:right""><span>-​1.6</span></p>";"<p style=""text-align:center""><span>60W29 ​(L)​
 <br></br>60W30 ​(L)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>60W29
 <br></br>60W30</span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span>60G103</span></p>";"<p style=""text-align:center""><span>492</span></p>";"<p style=""text-align:center""><span>50</span></p>";"<p style=""text-align:left""></p>"
-31;"<p style=""text-align:left""><span>60ZR3</span></p>";"<p style=""text-align:left""><span>WA ​60W32</span></p>";"<p style=""text-align:left""><span></span></p>";"<p style=""text-align:left""><span>60ZU22</span></p>";"<p style=""text-align:center""><span>D2</span></p>";"<p style=""text-align:right""><span>60</span></p>";"<p style=""text-align:right""><span>116</span></p>";"<p style=""text-align:right""><span>154</span></p>";"<p style=""text-align:right""><span>&gt; ​154</span></p>";"<p style=""text-align:right""><span>-​1.6</span></p>";"<p style=""text-align:center""><span>60W29 ​(L)​
+31;"<p style=""text-align:left""><span>60ZR3</span></p>";"<p style=""text-align:left""><span>WA ​60W32</span></p>";"<p style=""text-align:left""><span></span></p>";"<p style=""text-align:left""><span>60ZU22</span></p>";"<p style=""text-align:center""><span>D2</span></p>";"<p style=""text-align:right""><span>60</span></p>";"<p style=""text-align:right""><span>116</span></p>";"<p style=""text-align:right""><span>154</span></p>";"<p style=""text-align:right""><span>107</span></p>";"<p style=""text-align:right""><span>-​1.6</span></p>";"<p style=""text-align:center""><span>60W29 ​(L)​
 <br></br>60W30 ​(R)​
 <br></br>60W31 ​(R)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>60W29
 <br></br>60W30

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
 <br></br>60W32 ​(L)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>60G122
 <br></br>60G402
 <br></br>60W31</span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span>60G302</span></p>";"<p style=""text-align:center""><span>561</span></p>";"<p style=""text-align:center""><span>58</span></p>";"<p style=""text-align:left""></p>"
-15;"<p style=""text-align:left""><span>60ZR2</span></p>";"<p style=""text-align:left""><span>60ZU21</span></p>";"<p style=""text-align:left""><span></span></p>";"<p style=""text-align:left""><span>60ZU21</span></p>";"<p style=""text-align:center""><span>D2</span></p>";"<p style=""text-align:right""><span>160</span></p>";"<p style=""text-align:right""><span>232</span></p>";"<p style=""text-align:right""><span>270</span></p>";"<p style=""text-align:right""><span>&gt; ​270</span></p>";"<p style=""text-align:right""><span>-​1.6</span></p>";"<p style=""text-align:center""><span>60W31 ​(L)​
+15;"<p style=""text-align:left""><span>60ZR2</span></p>";"<p style=""text-align:left""><span>60ZU21</span></p>";"<p style=""text-align:left""><span></span></p>";"<p style=""text-align:left""><span>60ZU21</span></p>";"<p style=""text-align:center""><span>D2</span></p>";"<p style=""text-align:right""><span>160</span></p>";"<p style=""text-align:right""><span>232</span></p>";"<p style=""text-align:right""><span>270</span></p>";"<p style=""text-align:right""><span>270</span></p>";"<p style=""text-align:right""><span>-​1.6</span></p>";"<p style=""text-align:center""><span>60W31 ​(L)​
 <br></br>60W32 ​(R)​
 <br></br>60W33 ​(R)​
 <br></br>60W35 ​(L)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>60G402
@@ -86,7 +86,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku
 <br></br>60W30
 <br></br>60W31
 <br></br>60W33</span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span>60G121</span></p>";"<p style=""text-align:center""><span>267</span></p>";"<p style=""text-align:center""><span>32</span></p>";"<p style=""text-align:left""></p>"
-21;"<p style=""text-align:left""><span>60ZU22</span></p>";"<p style=""text-align:left""><span>WA ​60W31</span></p>";"<p style=""text-align:left""><span></span></p>";"<p style=""text-align:left""><span>Gz ​60W30</span></p>";"<p style=""text-align:center""><span>D1</span></p>";"<p style=""text-align:right""><span>160</span></p>";"<p style=""text-align:right""><span>250</span></p>";"<p style=""text-align:right""><span>253</span></p>";"<p style=""text-align:right""><span>&gt; ​253</span></p>";"<p style=""text-align:right""><span>-​2.5</span></p>";"<p style=""text-align:center""><span>60W32 ​(L)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>60G122
+21;"<p style=""text-align:left""><span>60ZU22</span></p>";"<p style=""text-align:left""><span>WA ​60W31</span></p>";"<p style=""text-align:left""><span></span></p>";"<p style=""text-align:left""><span>Gz ​60W30</span></p>";"<p style=""text-align:center""><span>D1</span></p>";"<p style=""text-align:right""><span>160</span></p>";"<p style=""text-align:right""><span>250</span></p>";"<p style=""text-align:right""><span>253</span></p>";"<p style=""text-align:right""><span>185</span></p>";"<p style=""text-align:right""><span>-​2.5</span></p>";"<p style=""text-align:center""><span>60W32 ​(L)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>60G122
 <br></br>60W31</span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span>60G222</span></p>";"<p style=""text-align:center""><span>162</span></p>";"<p style=""text-align:center""><span>32</span></p>";"<p style=""text-align:left""></p>"
 22;"<p style=""text-align:left""><span>60ZU22</span></p>";"<p style=""text-align:left""><span>Gz ​60W32</span></p>";"<p style=""text-align:left""><span></span></p>";"<p style=""text-align:left""><span>Gz ​60W32</span></p>";"<p style=""text-align:center""><span>D2</span></p>";"<p style=""text-align:right""><span>60</span></p>";"<p style=""text-align:right""><span>125</span></p>";"<p style=""text-align:right""><span>195</span></p>";"<p style=""text-align:right""><span>185</span></p>";"<p style=""text-align:right""><span>-​2.5</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>60G122</span></p>";"<p style=""text-align:center""><span>x</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span>60G222</span></p>";"<p style=""text-align:center""><span>162</span></p>";"<p style=""text-align:center""><span>32</span></p>";"<p style=""text-align:left""></p>"
 23;"<p style=""text-align:left""><span>60N21</span></p>";"<p style=""text-align:left""><span>Ra ​10 ​km: ​121,050</span></p>";"<p style=""text-align:left""><span></span></p>";"<p style=""text-align:left""><span>60FF</span></p>";"<p style=""text-align:center""><span>D1</span></p>";"<p style=""text-align:right""><span>160</span></p>";"<p style=""text-align:right""><span>206</span></p>";"<p style=""text-align:right""><span>412</span></p>";"<p style=""text-align:right""><span>412</span></p>";"<p style=""text-align:right""><span>-​0.3</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>60G221</span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span>60G121</span></p>";"<p style=""text-align:center""><span>267</span></p>";"<p style=""text-align:center""><span>32</span></p>";"<p style=""text-align:left""></p>"
@@ -99,7 +99,7 @@ verzögerungszeit​​​​​​​​​​​​​​​​​​";Bemerku
 30;"<p style=""text-align:left""><span>60ZR3</span></p>";"<p style=""text-align:left""><span>Gz ​60W34</span></p>";"<p style=""text-align:left""><span></span></p>";"<p style=""text-align:left""><span>Gz ​60W34</span></p>";"<p style=""text-align:center""><span>D1</span></p>";"<p style=""text-align:right""><span>60</span></p>";"<p style=""text-align:right""><span>100</span></p>";"<p style=""text-align:right""><span>164</span></p>";"<p style=""text-align:right""><span>154</span></p>";"<p style=""text-align:right""><span>-​1.6</span></p>";"<p style=""text-align:center""><span>60W29 ​(L)​
 <br></br>60W30 ​(L)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>60W29
 <br></br>60W30</span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>□</span></p>";"<p style=""text-align:center""><span>60G103</span></p>";"<p style=""text-align:center""><span>492</span></p>";"<p style=""text-align:center""><span>50</span></p>";"<p style=""text-align:left""></p>"
-31;"<p style=""text-align:left""><span>60ZR3</span></p>";"<p style=""text-align:left""><span>WA ​60W32</span></p>";"<p style=""text-align:left""><span></span></p>";"<p style=""text-align:left""><span>60ZU22</span></p>";"<p style=""text-align:center""><span>D2</span></p>";"<p style=""text-align:right""><span>60</span></p>";"<p style=""text-align:right""><span>116</span></p>";"<p style=""text-align:right""><span>154</span></p>";"<p style=""text-align:right""><span>&gt; ​154</span></p>";"<p style=""text-align:right""><span>-​1.6</span></p>";"<p style=""text-align:center""><span>60W29 ​(L)​
+31;"<p style=""text-align:left""><span>60ZR3</span></p>";"<p style=""text-align:left""><span>WA ​60W32</span></p>";"<p style=""text-align:left""><span></span></p>";"<p style=""text-align:left""><span>60ZU22</span></p>";"<p style=""text-align:center""><span>D2</span></p>";"<p style=""text-align:right""><span>60</span></p>";"<p style=""text-align:right""><span>116</span></p>";"<p style=""text-align:right""><span>154</span></p>";"<p style=""text-align:right""><span>107</span></p>";"<p style=""text-align:right""><span>-​1.6</span></p>";"<p style=""text-align:center""><span>60W29 ​(L)​
 <br></br>60W30 ​(R)​
 <br></br>60W31 ​(R)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>60W29
 <br></br>60W30