Changeset 28298 in osm for applications/editors

Timestamp:

2012-04-14T17:31:42+02:00 (13 years ago)

Author:

joshdoe

Message:

[josm_utilsplugin2] Check iteration count to prevent endless loop with Replace Geometry (#josm7295)

Location:

applications/editors/josm/plugins/utilsplugin2/src

Files:

• edu/princeton/cs/algs4/DijkstraSP.java (modified) (1 diff)
• org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java (modified) (1 diff)

applications/editors/josm/plugins/utilsplugin2/src/edu/princeton/cs/algs4/DijkstraSP.java

@@ -48 +48 @@
         pq = new IndexMinPQ<Double>(G.V());
         pq.insert(s, distTo[s]);
+        int count = 0;
         while (!pq.isEmpty()) {
             int v = pq.delMin();
             for (DirectedEdge e : G.adj(v))
                 relax(e);
+            count++;
+            if (count > G.V())
+                throw new RuntimeException("Exceeded limit");
         }
 

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java

@@ -293 +293 @@
                     }
                 }
-                AssignmentProblem assignment = new AssignmentProblem(cost);
-                for (int i = 0; i < N; i++) {
-                    int nIdx = i;
-                    int gIdx = assignment.sol(i);
-                    if (cost[nIdx][gIdx] != Double.MAX_VALUE) {
-                        nodeAssoc.put(geometryPool.get(gIdx), nodePool.get(nIdx));
+                AssignmentProblem assignment;
+                try {
+                    assignment = new AssignmentProblem(cost);
+                    for (int i = 0; i < N; i++) {
+                        int nIdx = i;
+                        int gIdx = assignment.sol(i);
+                        if (cost[nIdx][gIdx] != Double.MAX_VALUE) {
+                            nodeAssoc.put(geometryPool.get(gIdx), nodePool.get(nIdx));
+                        }
                     }
-                }
-                // node will be moved, remove from pool
-                for (Node n : nodeAssoc.values()) {
-                    nodePool.remove(n);
-                }
-            } else { // use simple, faster, but less robust assignment method
+                    // node will be moved, remove from pool
+                    for (Node n : nodeAssoc.values()) {
+                        nodePool.remove(n);
+                    }
+                }
+                catch (Exception e) {
+                    useRobust = false;
+                    JOptionPane.showMessageDialog(Main.parent,
+                            tr("Exceeded iteration limit for robust method, using simpler method."),
+                            TITLE, JOptionPane.WARNING_MESSAGE);
+                    nodeAssoc = new HashMap<Node, Node>();
+                }
+            }
+            if (!useRobust) { // use simple, faster, but less robust assignment method
                 for (Node n : geometryPool) {
                     Node nearest = findNearestNode(n, nodePool);