Changeset 34657 in osm for applications/editors/josm/plugins/OSMRecPlugin

Timestamp:

2018-09-15T14:27:03+02:00 (6 years ago)

Author:

donvip

Message:

fix UnnecessaryParentheses warnings

Location:

applications/editors/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec

Files:

• core/TrainWorker.java (modified) (7 diffs)
• extractor/Analyzer.java (modified) (1 diff)
• features/ClassFeatures.java (modified) (1 diff)
• features/OSMClassification.java (modified) (1 diff)
• parsers/OSMParser.java (modified) (1 diff)
• personalization/HistoryParser.java (modified) (1 diff)
• personalization/TrainByUser.java (modified) (1 diff)

applications/editors/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/core/TrainWorker.java

@@ -126 +126 @@
             System.out.println("fold1");
             crossValidateFold(0, 4, 4, 5, false, param); //4-1
-            setProgress(4*((5*(trainProgress++))/confParams.length));
+            setProgress(4*((5*trainProgress++)/confParams.length));
 
             foldScore1 = foldScore1 + score1;
@@ -134 +134 @@
             System.out.println("fold2");
             crossValidateFold(1, 5, 0, 1, false, param);
-            setProgress(4*((5*(trainProgress++))/confParams.length));
+            setProgress(4*((5*trainProgress++)/confParams.length));
 
             foldScore1 = foldScore1 + score1;
@@ -142 +142 @@
             System.out.println("fold3");
             crossValidateFold(0, 5, 1, 2, true, param);
-            setProgress(4*((5*(trainProgress++))/confParams.length));
+            setProgress(4*((5*trainProgress++)/confParams.length));
 
             foldScore1 = foldScore1 + score1;
@@ -150 +150 @@
             System.out.println("fold4");
             crossValidateFold(0, 5, 2, 3, true, param);
-            setProgress(4*((5*(trainProgress++))/confParams.length));
+            setProgress(4*((5*trainProgress++)/confParams.length));
 
             foldScore1 = foldScore1 + score1;
@@ -158 +158 @@
             System.out.println("fold5");
             crossValidateFold(0, 5, 3, 4, true, param);
-            setProgress(4*((5*(trainProgress++))/confParams.length));
+            setProgress(4*((5*trainProgress++)/confParams.length));
 
             foldScore1 = foldScore1 + score1;
@@ -170 +170 @@
 
         }
-        System.out.println(4*((5*(trainProgress++))/confParams.length));
+        System.out.println(4*((5*trainProgress++)/confParams.length));
         bestConfParam = bestC;
         System.out.println("best c param= " + bestC + ", score: " + bestScore/5);
@@ -182 +182 @@
         for (int g = a*testSize; g < b*testSize; g++) {  // 0~~1~~2~~3~~4~~5
             if (skip) {
-                if (g == (c)*testSize) {
+                if (g == c*testSize) {
                     g = (c+1)*testSize;
                 }

applications/editors/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/extractor/Analyzer.java

@@ -185 +185 @@
             @Override
             public int compare(Map.Entry<String, Integer> o1, Map.Entry<String, Integer> o2) {
-                return (o2.getValue()).compareTo(o1.getValue());
+                return o2.getValue().compareTo(o1.getValue());
             }
         });

applications/editors/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/features/ClassFeatures.java

@@ -56 +56 @@
                                 //so this condition check will remain for now
 
-                                if (!(sortedIndirectIDs.contains(indirectID))) {
+                                if (!sortedIndirectIDs.contains(indirectID)) {
                                     sortedIndirectIDs.add(indirectID);
                                     //wayNode.getIndexVector().put(indirectID, 1.0);

applications/editors/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/features/OSMClassification.java

@@ -54 +54 @@
                                 //so this condition check will remain for now
 
-                                if (!(sortedIndirectIDs.contains(indirectID))) {
+                                if (!sortedIndirectIDs.contains(indirectID)) {
                                     sortedIndirectIDs.add(indirectID);
                                     //wayNode.getIndexVector().put(indirectID, 1.0);

applications/editors/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/parsers/OSMParser.java

@@ -177 +177 @@
                 //the nodes must be more than 3, because jts does not allow a construction of a linear ring with less points.
 
-                if (!((wayTmp.getTagKeyValue().containsKey("barrier")) || wayTmp.getTagKeyValue().containsKey("highway"))) {
+                if (!(wayTmp.getTagKeyValue().containsKey("barrier") || wayTmp.getTagKeyValue().containsKey("highway"))) {
                     //this is not a barrier nor a road, so construct a polygon geometry
 

applications/editors/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/personalization/HistoryParser.java

@@ -191 +191 @@
                             //the nodes must be more than 3, because jts does not allow a construction of a linear ring with less points.
 
-                            if (!((wayTmp.getTagKeyValue().containsKey("barrier")) || wayTmp.getTagKeyValue().containsKey("highway"))) {
+                            if (!(wayTmp.getTagKeyValue().containsKey("barrier") || wayTmp.getTagKeyValue().containsKey("highway"))) {
                                 //this is not a barrier nor a road, so construct a polygon geometry
 

applications/editors/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/personalization/TrainByUser.java

@@ -188 +188 @@
         for (int g = a*testSize; g < b*testSize; g++) {  // 0~~1~~2~~3~~4~~5
             if (skip) {
-                if (g == (c)*testSize) {
+                if (g == c*testSize) {
                     g = (c+1)*testSize;
                 }