tramaps-java/afterma.patch at master · moosetraveller/tramaps-java · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
Index: src/main/java/ch/geomo/tramaps/map/displacement/alg/adjustment/CostCalculator.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/ch/geomo/tramaps/map/displacement/alg/adjustment/CostCalculator.java	(revision ab2c113928f8414ba5cf464dcad9168fc11bc3cc)
+++ src/main/java/ch/geomo/tramaps/map/displacement/alg/adjustment/CostCalculator.java	(revision )
@@ -10,8 +10,10 @@
 import ch.geomo.tramaps.map.displacement.alg.TraversedNodes;
 import ch.geomo.util.collection.list.EnhancedList;
 import ch.geomo.util.collection.set.EnhancedSet;
+import ch.geomo.util.logging.Loggers;
 import org.jetbrains.annotations.NotNull;

+import java.util.Arrays;
 import java.util.List;

 public enum CostCalculator {
Index: src/main/java/ch/geomo/tramaps/MainApp.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/ch/geomo/tramaps/MainApp.java	(revision ab2c113928f8414ba5cf464dcad9168fc11bc3cc)
+++ src/main/java/ch/geomo/tramaps/MainApp.java	(revision )
@@ -46,8 +46,8 @@
         stage.setTitle("Tramaps GUI");

         //map = new MetroMapChapterFive();
-        map = new MetroMapExampleGraph();
-        //map = new MetroMapZuerich();
+        //map = new MetroMapExampleGraph();
+        map = new MetroMapZuerich();

         //makeSpace(() -> new ScaleHandler(map));
         makeSpace(() -> new DisplaceLineSpaceHandler(map));
Index: src/main/java/ch/geomo/tramaps/example/MetroMapZuerich.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/ch/geomo/tramaps/example/MetroMapZuerich.java	(revision ab2c113928f8414ba5cf464dcad9168fc11bc3cc)
+++ src/main/java/ch/geomo/tramaps/example/MetroMapZuerich.java	(revision )
@@ -256,6 +256,19 @@
                 .station(schlieren)
                 .create();

+        Node schweighof = createNode("Schweighof", 85, 80);
+        Node triemli = createNode("Triemli", 80, 80);
+        Node urdorfWeihermatt = createNode("Urdorf Weihermatt", 30, 65);
+        Node bendUrdorfBirmensdorf = createBendNode(25, 60);
+        Node birmensdorf = createNode("Birmensdorf", 45, 35);
+
+        createEdge(friesenberg, schweighof, s10);
+        createEdge(triemli, schweighof, s10);
+
+        createEdge(urdorf, urdorfWeihermatt, s5, s14);
+        createEdge(bendUrdorfBirmensdorf, urdorfWeihermatt, s5, s14);
+        createEdge(bendUrdorfBirmensdorf, birmensdorf, s5, s14);
+
     }

     /**
Index: src/main/java/ch/geomo/tramaps/map/displacement/scale/ScaleHandler.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/ch/geomo/tramaps/map/displacement/scale/ScaleHandler.java	(revision ab2c113928f8414ba5cf464dcad9168fc11bc3cc)
+++ src/main/java/ch/geomo/tramaps/map/displacement/scale/ScaleHandler.java	(revision )
@@ -28,7 +28,7 @@
     /**
      * Max iteration until algorithm will be terminated when not found a non-conflict solution.
      */
-    private static final int MAX_ITERATIONS = 100;
+    private static final int MAX_ITERATIONS = 3;

     private final MetroMap map;