Skip to content

Fix determin banking value #2360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mariusheine merged 4 commits into from
Apr 23, 2026
+451 −429
Merged

Fix determin banking value #2360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2268412
Fix dertermin Bank value
TruongQuangSB Apr 23, 2026
b75ede6
fix
TruongQuangSB Apr 23, 2026
32d2ee6
Merge remote-tracking branch 'github/main' into fix-determin-banking-…
mariusheine Apr 23, 2026
60e3f5f
Update table reference
eclipse-set-bot Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions ...g.eclipse.set.application.test/src/org/eclipse/set/application/graph/BankServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/**
* Copyright (c) 2026 DB InfraGO AG and others
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v2.0 which is available at
* https://www.eclipse.org/legal/epl-2.0.
*
* SPDX-License-Identifier: EPL-2.0
*
*/
package org.eclipse.set.application.graph;

/**
*
*/
public class BankServiceTest {

}
Comment thread
mariusheine marked this conversation as resolved.
1 change: 1 addition & 0 deletions ...es/org.eclipse.set.application/src/org/eclipse/set/application/graph/BankServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@ private static BankingInformation getBankingInformation(
throw new IllegalArgumentException();
}
pathLength = pathLength
.add(TopKanteExtensions.getLaenge(currentEdge))
.add(getStartEndEdgeLength(endEdge, end, currentEdge));
sortedEdges.add(endEdge);
break;
Expand Down
11 changes: 7 additions & 4 deletions java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/graph/TopPath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,18 @@ private BigDecimal determintFirstEdgeLength() {
}
final TOP_Knoten connectTopKnoten = getConnectTopKnoten(firstEdge,
edges.get(1));
final BigDecimal connectTopKnotenDistance = connectTopKnoten == firstEdge
.getIDTOPKnotenA()
.getValue() ? BigDecimal.ZERO : edgeLength;
final boolean isTopKnotenA = firstEdge.getIDTOPKnotenA()
.getValue() == connectTopKnoten;
final BigDecimal connectTopKnotenDistance = isTopKnotenA
? BigDecimal.ZERO
: edgeLength;
// When the start node lie at TOP_Knoten_A or TOP_Knoten_B, then the
// first edge length is ZERO
if (startNode.distance().compareTo(connectTopKnotenDistance) == 0) {
return BigDecimal.ZERO;
}
return edgeLength.subtract(startNode.distance());
return isTopKnotenA ? startNode.distance()
: edgeLength.subtract(startNode.distance());
} catch (final Exception e) {
throw new IllegalArgumentException(
"Can\'t find first edge length of TopPath"); //$NON-NLS-1$
Expand Down
270 changes: 135 additions & 135 deletions ...ipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A P-Hausen/ssks_reference.csv
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...ipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/ESTW-A P-Hausen/sskx_reference.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@ Nr. (Bild)​​​​​​​​​​​​​";Bemerkung​​​​​​
41;"<p style=""text-align:left""><span>Bü ​4 ​km: ​0,827</span></p>";"<p style=""text-align:center""><span>8981</span></p>";"<p style=""text-align:right""><span>0,827</span></p>";"<p style=""text-align:center""><span>(1)​
<br></br>20</span></p>";"<p style=""text-align:center""><span>GC</span></p>";"<p style=""text-align:center""><span>0</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>Regelanordnung ​Mast ​hoch</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>Bü ​4</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:left""></p>"
42;"<p style=""text-align:left""><span>Lf ​7 ​&#39;5&#39; ​km: ​18,363</span></p>";"<p style=""text-align:center""><span>8982</span></p>";"<p style=""text-align:right""><span>18,363</span></p>";"<p style=""text-align:center""><span>23</span></p>";"<p style=""text-align:center""><span>GC</span></p>";"<p style=""text-align:center""><span>0</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>sonstige ​Regelanordnung ​hoch</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>Lf ​7 ​(5)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:left""></p>"
43;"<p style=""text-align:left""><span>Lf ​7 ​&#39;6&#39; ​km: ​18,718</span></p>";"<p style=""text-align:center""><span>8982</span></p>";"<p style=""text-align:right""><span>18,718</span></p>";"<p style=""text-align:center""><span>3</span></p>";"<p style=""text-align:center""><span>GC</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>sonstige ​Regelanordnung ​niedrig</span></p>";"<p style=""text-align:center""><span>S ​501.34.3 ​(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>Lf ​7 ​(6)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:left""></p>"
43;"<p style=""text-align:left""><span>Lf ​7 ​&#39;6&#39; ​km: ​18,718</span></p>";"<p style=""text-align:center""><span>8982</span></p>";"<p style=""text-align:right""><span>18,718</span></p>";"<p style=""text-align:center""><span>3</span></p>";"<p style=""text-align:center""><span>GC</span></p>";"<p style=""text-align:center""><span>0</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>sonstige ​Regelanordnung ​niedrig</span></p>";"<p style=""text-align:center""><span>S ​501.34.3 ​(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>Lf ​7 ​(6)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:left""></p>"
4 changes: 2 additions & 2 deletions ...rg.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/diffState/ssks_reference.csv
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...rg.eclipse.set.swtbot/test_res/table_reference/pphn_1_10_0_3/diffState/sskx_reference.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,4 @@ Nr. (Bild)​​​​​​​​​​​​​";Bemerkung​​​​​​
<br></br>20</span></p>";"<p style=""text-align:center""><span>GC</span></p>";"<p style=""text-align:center""><span>70</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>sonstige ​Regelanordnung ​hoch</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>Lf ​6 ​(2)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:left""></p>"
53;"<p style=""text-align:left""><span style=""color:rgb(255, 0, 0)"">Vorsignalbake ​km: ​17,027</span></p>";"<p style=""text-align:center""><span>8982</span></p>";"<p style=""text-align:right""><span>17,027</span></p>";"<p style=""text-align:center""><span>(1)​</span></p>";"<p style=""text-align:center""><span>GC</span></p>";"<p style=""text-align:center""><span>80</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>Pfahl</span></p>";"<p style=""text-align:center""><span>S ​526.2.6 ​(1)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>Ne ​3 ​1str</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:left""></p>"
54;"<p style=""text-align:left""><span>Lf ​7 ​&#39;5&#39; ​km: ​18,363</span></p>";"<p style=""text-align:center""><span>8982</span></p>";"<p style=""text-align:right""><span>18,363</span></p>";"<p style=""text-align:center""><span>23</span></p>";"<p style=""text-align:center""><span>GC</span></p>";"<p style=""text-align:center""><span>0</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>sonstige ​Regelanordnung ​hoch</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>Lf ​7 ​(5)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:left""></p>"
55;"<p style=""text-align:left""><span>Lf ​7 ​&#39;6&#39; ​km: ​18,718</span></p>";"<p style=""text-align:center""><span>8982</span></p>";"<p style=""text-align:right""><span>18,718</span></p>";"<p style=""text-align:center""><span>3</span></p>";"<p style=""text-align:center""><span>GC</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>sonstige ​Regelanordnung ​niedrig</span></p>";"<p style=""text-align:center""><span>S ​501.34.3 ​(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>Lf ​7 ​(6)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:left""></p>"
55;"<p style=""text-align:left""><span>Lf ​7 ​&#39;6&#39; ​km: ​18,718</span></p>";"<p style=""text-align:center""><span>8982</span></p>";"<p style=""text-align:right""><span>18,718</span></p>";"<p style=""text-align:center""><span>3</span></p>";"<p style=""text-align:center""><span>GC</span></p>";"<p style=""text-align:center""><span>0</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:center""><span>sonstige ​Regelanordnung ​niedrig</span></p>";"<p style=""text-align:center""><span>S ​501.34.3 ​(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>Lf ​7 ​(6)​</span></p>";"<p style=""text-align:center""><span></span></p>";"<p style=""text-align:left""></p>"
Loading
Loading