Fixed analysis warning about if statements in PlateHorizontalGraph. Changed empty if statements to while statements. Removed unused argument count. Removed unused field handle. Changed Plate.java to reflect this change.

Author: FridaTveit

src/main/java/net/sf/javaanpr/imageanalysis/Plate.java

@@ -127,7 +127,7 @@ private BufferedImage cutTopBottom(BufferedImage origin, PlateVerticalGraph grap
 
     private BufferedImage cutLeftRight(BufferedImage origin, PlateHorizontalGraph graph) {
         graph.applyProbabilityDistributor(new Graph.ProbabilityDistributor(0f, 0f, 2, 2));
-        Vector<Graph.Peak> peaks = graph.findPeak(3);
+        Vector<Graph.Peak> peaks = graph.findPeak();
         if (peaks.size() != 0) {
             Graph.Peak p = peaks.elementAt(0);
             return origin.getSubimage(p.getLeft(), 0, p.getDiff(), getImage().getHeight());
@@ -162,7 +162,7 @@ private PlateVerticalGraph histogramYaxis(BufferedImage bi) {
     }
 
     private PlateHorizontalGraph histogramXaxis(BufferedImage bi) {
-        PlateHorizontalGraph graph = new PlateHorizontalGraph(this);
+        PlateHorizontalGraph graph = new PlateHorizontalGraph();
         int w = bi.getWidth();
         int h = bi.getHeight();
         for (int x = 0; x < w; x++) {

src/main/java/net/sf/javaanpr/imageanalysis/PlateHorizontalGraph.java

@@ -25,46 +25,42 @@ public class PlateHorizontalGraph extends Graph {
     private static int horizontalDetectionType =
             Configurator.getConfigurator().getIntProperty("platehorizontalgraph_detectionType");
 
-    private Plate handle;
-
-    public PlateHorizontalGraph(Plate handle) {
-        this.handle = handle;
-    }
-
     public float derivation(int index1, int index2) {
         return this.yValues.elementAt(index1) - this.yValues.elementAt(index2);
     }
 
-    public Vector<Peak> findPeak(int count) {
+    public Vector<Peak> findPeak() {
         if (PlateHorizontalGraph.horizontalDetectionType == 1) {
-            return this.findPeak_edgedetection(count);
+            return this.findPeak_edgedetection();
         }
-        return this.findPeak_derivative(count);
+        return this.findPeak_derivative();
     }
 
-    public Vector<Peak> findPeak_derivative(int count) {
-        int a, b;
+    public Vector<Peak> findPeak_derivative() {
+        int a = 2;
+        int b = this.yValues.size() - 1 - 2;
         float maxVal = this.getMaxValue();
-        for (a = 2; (-this.derivation(a, a + 4) < (maxVal * 0.2)) && (a < (this.yValues.size() - 2 - 2 - 4)); a++) {
-            // intentionally empty
+        while ((-this.derivation(a, a + 4) < (maxVal * 0.2)) && (a < (this.yValues.size() - 2 - 2 - 4))) {
+            a++;
         }
-        for (b = this.yValues.size() - 1 - 2; (this.derivation(b - 4, b) < (maxVal * 0.2)) && (b > (a + 2)); b--) {
-            // intentionally empty
+        while ((this.derivation(b - 4, b) < (maxVal * 0.2)) && (b > (a + 2))) {
+            b--;
         }
         Vector<Peak> outPeaks = new Vector<Peak>();
         outPeaks.add(new Peak(a, b));
         super.peaks = outPeaks;
         return outPeaks;
     }
 
-    public Vector<Peak> findPeak_edgedetection(int count) {
+    public Vector<Peak> findPeak_edgedetection() {
         float average = this.getAverageValue();
-        int a, b;
-        for (a = 0; this.yValues.elementAt(a) < average; a++) {
-            // intentionally empty
+        int a = 0;
+        int b = this.yValues.size() - 1;
+        while (this.yValues.elementAt(a) < average) {
+            a++;
         }
-        for (b = this.yValues.size() - 1; this.yValues.elementAt(b) < average; b--) {
-            // intentionally empty
+        while (this.yValues.elementAt(b) < average) {
+            b--;
         }
         Vector<Peak> outPeaks = new Vector<Peak>();
         a = Math.max(a - 5, 0);