Changeset 34659 in osm for applications

Timestamp:

2018-09-15T14:36:13+02:00 (6 years ago)

Author:

donvip

Message:

fix UnnecessaryParentheses warnings

Location:

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker

Files:

• commandlineinterface/CLI.java (modified) (3 diffs)
• datastructure/OSMEntity.java (modified) (1 diff)
• junctionchecking/JMinimality.java (modified) (2 diffs)
• junctionchecking/JunctionChecker.java (modified) (1 diff)
• util/RelationProducer.java (modified) (1 diff)

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/commandlineinterface/CLI.java

@@ -131 +131 @@
             measuredTime = 0;
             jcf = 0;
-            //System.out.println("maxchannel: " + i);
             for (int j = 0; j < runs; j++) {
-                //System.out.println("run: " +j);
                 subset.clear();
                 do {
                     seed = cdgb.getDigraph()
                     .getChannelAtPosition(
-                            (int) ((cdgb.getDigraph().getChannels()
-                                    .size()) * Math.random()));
+                            (int) (cdgb.getDigraph().getChannels().size() * Math.random()));
                 }
                 while (!seed.isStrongConnected());
                 subset.add(seed);
-                //System.out.println("Seed: " + seed.getNewid());
                 vorChannel = seed;
                 for (int k = 0; k < i - 1; k++) {
@@ -151 +147 @@
                         if (!subset.contains(tempChannel)) {
                             subset.add(tempChannel);
-                            //System.out.println("zugefügt: " + tempChannel.getNewid());
                             seed = tempChannel;
                             isIn = true;
@@ -163 +158 @@
                 jc.junctionSearch(subset);
                 measuredTime += (System.currentTimeMillis() - start);
-                //System.out.println("jc beendet");
                 measuredIterateThroughTime += jc.getMeasuredIterateTime();
                 measuredGenerateSubColumnTime += jc.getMeasuredGenerateTime();
                 jcf = jcf + jc.getJunctions().size();
             }
-            System.out.println("Channels: " + (i) +
+            System.out.println("Channels: " + i +
                     " Time(Iterate): " + (measuredIterateThroughTime/runs) +
                     " Time(Generate): " + (measuredGenerateSubColumnTime/runs) +

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMEntity.java

@@ -171 +171 @@
 
     protected String valuestoString() {
-        return ("ID: " + (id) + "\n" + "User: " + user + "\n");
+        return ("ID: " + id + "\n" + "User: " + user + "\n");
     }
 }

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JMinimality.java

@@ -163 +163 @@
                 int missing = 0;
                 boolean smallerjunction = false;
-                for (int k = 0; k < ans; k++) { //Makes sure that subset of m columns contains an n*n subgrid, because ans = m over n would be 0 otherwise
+                //Makes sure that subset of m columns contains an n*n subgrid, because ans = m over n would be 0 otherwise
+                for (int k = 0; k < ans; k++) {
                     for (int y = 0; y < n; y++) { //Iterates over all rows of subgrid k
                         missing = 0;    //test = "";
                         for (int x = 0; x < c.data.length; x++) { //Iterates over all columns of subgrid k
                             x_i = ((Integer) L.get((int) (lindex-m+c.data[x])).get(0)); //columnindex in grid
-                            v = ((int[][]) (L.get((int) (lindex-m+c.data[x])).get(2))); //subcolumn of grid
+                            v = ((int[][]) L.get((int) (lindex-m+c.data[x])).get(2)); //subcolumn of grid
                             y_j = v[y][0]; //rowindex in grid
                             if (v[y][1] == 0) {
@@ -175 +176 @@
                                 CandidateK.add(new int[]{y_j, x_i});
                             } //save entry/exit tuple
-                            if (!smallerjunction && ((!OrEn.contains(E.get(v[y][0])))
-                                    && (!OrEx.contains(E.get(x_i))))) { // Tests, whether y or x is not an original entry/exit
+                            if (!smallerjunction && (!OrEn.contains(E.get(v[y][0]))
+                                    && !OrEx.contains(E.get(x_i)))) { // Tests, whether y or x is not an original entry/exit
                                 smallerjunction = true; //Then k identifies a different junction than the original one
                             }

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JunctionChecker.java

@@ -147 +147 @@
         for (int y = 0; y < E.size(); y++) {
             for (int x = 0; x < E.size(); x++) {
-                if (x != y && !(entries.contains(E.get(x)))
-                        && !(exits.contains(E.get(y)))
+                if (x != y && !entries.contains(E.get(x))
+                        && !exits.contains(E.get(y))
                         && E.get(y).getReachableNodes().contains(E.get(x))) {
                     Grid[y][x] = 1;
-                    //log.trace("Grid-Position auf 1 gesetzT (y/x): " + y + ":"
-                    //        + x + "(Entry/exit):" + E.get(y).getNewid() + ":" +
-                    //        E.get(x).getNewid());
                 } else {
                     Grid[y][x] = 0;

applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/util/RelationProducer.java

@@ -37 +37 @@
             Channel c = cit.next();
             // System.out.println(c.getWay().getId());
-            if (!(ways.contains(plugin.getOsmlayer().data.getPrimitiveById(c
-                    .getWay().getId(), OsmPrimitiveType.WAY)))) {
+            if (!ways.contains(plugin.getOsmlayer().data.getPrimitiveById(c
+                    .getWay().getId(), OsmPrimitiveType.WAY))) {
                 ways.add(plugin.getOsmlayer().data.getPrimitiveById(c.getWay()
                         .getId(), OsmPrimitiveType.WAY));