Merge pull request #35 from gingeleski/master

issue #31 address inconsistency from int cast rounding

Author: davewichers

src/main/java/org/owasp/benchmark/score/report/ScatterHome.java

@@ -321,7 +321,7 @@ private void makeLegend( Set<Report> toolResults, double x, double y, XYSeriesCo
                 String label = ( ch == 'I' || ch == 'i' ? ch + ":  " : ""+ch + ": " );
                 double score = or.getScore() * 100;
                 if (!BenchmarkScore.showAveOnlyMode) {
-	                String msg = "\u25A0 " + label + r.getToolNameAndVersion() + " (" + (int)score + "%)";
+	                String msg = "\u25A0 " + label + r.getToolNameAndVersion() + " (" + Math.round(score) + "%)";
 	                XYTextAnnotation stroketext4 = new XYTextAnnotation(msg, x, y + i * -3.3);
 	                stroketext4.setTextAnchor(TextAnchor.CENTER_LEFT);
 	                stroketext4.setBackgroundPaint(Color.white);
@@ -346,7 +346,7 @@ private void makeLegend( Set<Report> toolResults, double x, double y, XYSeriesCo
         if (commercialToolCount > 1 || (BenchmarkScore.showAveOnlyMode && commercialToolCount == 1)) {
             double averageScore = totalScore/commercialToolCount;
             XYTextAnnotation stroketext2 = new XYTextAnnotation("\u25A0 " + ch 
-            	+ ": Commercial Average" + " (" + (int)averageScore + "%)", x, y + i * -3.3);
+            	+ ": Commercial Average" + " (" + Math.round(averageScore) + "%)", x, y + i * -3.3);
             stroketext2.setTextAnchor(TextAnchor.CENTER_LEFT);
             stroketext2.setBackgroundPaint(Color.white);
             stroketext2.setPaint(Color.magenta);

src/main/java/org/owasp/benchmark/score/report/ScatterPlot.java

@@ -123,7 +123,7 @@ public static XYPointerAnnotation makePointer(int x, int y, String msg, TextAnch
 
     public void writeChartToFile(File f, int height) throws IOException {
         FileOutputStream stream = new FileOutputStream(f);
-        ChartUtilities.writeChartAsPNG(stream, chart, (int)(height*1.4), height);
+        ChartUtilities.writeChartAsPNG(stream, chart, (int)Math.round(height*1.4), height);
         stream.close();
     }
 

src/main/java/org/owasp/benchmark/score/report/ScatterTools.java

@@ -202,8 +202,8 @@ private void makeLegend(OverallResults or, double x, double y, XYSeriesCollectio
 			toolCount++;
             // Special hack to make it line up better if the letter is an 'I' or 'i'
             String label = ( ch == 'I' || ch == 'i' ? ch + ":  " : ""+ch + ": " );
-			int score = (int) (100 * (r.truePositiveRate - r.falsePositiveRate));
-			String msg = "\u25A0 " + label + r.category + " (" + score + "%)";
+			double score = 100 * (r.truePositiveRate - r.falsePositiveRate);
+			String msg = "\u25A0 " + label + r.category + " (" + Math.round(score) + "%)";
 			totalScore += score;
 			XYTextAnnotation stroketext = new XYTextAnnotation(msg, x, y + i * -3.3);
 			stroketext.setTextAnchor(TextAnchor.CENTER_LEFT);
@@ -218,7 +218,7 @@ private void makeLegend(OverallResults or, double x, double y, XYSeriesCollectio
 
 		if ( toolCount > 1 ) {
             double averageScore = totalScore/toolCount;
-    		XYTextAnnotation stroketext = new XYTextAnnotation("\u25A0 " + ch + ": Average Score for this Tool"+ " (" + (int)averageScore + "%)", x, y + i * -3.3);
+    		XYTextAnnotation stroketext = new XYTextAnnotation("\u25A0 " + ch + ": Average Score for this Tool"+ " (" + Math.round(averageScore) + "%)", x, y + i * -3.3);
     		stroketext.setTextAnchor(TextAnchor.CENTER_LEFT);
     		stroketext.setBackgroundPaint(Color.white);
     		stroketext.setPaint(Color.magenta);

src/main/java/org/owasp/benchmark/score/report/ScatterVulns.java

@@ -301,7 +301,7 @@ private void makeLegend(String category, Set<Report> toolResults, double x, doub
                 // Special hack to make it line up better if the letter is an 'I' or 'i'
                 String label = ( ch == 'I' || ch == 'i' ? ch + ":  " : ""+ch + ": " );
                 double score = or.getResults(category).score * 100;
-                String msg = "\u25A0 " + label + r.getToolNameAndVersion() + " (" + (int) score + "%)";
+                String msg = "\u25A0 " + label + r.getToolNameAndVersion() + " (" + Math.round(score) + "%)";
                 XYTextAnnotation stroketext3 = new XYTextAnnotation(msg, x, y + i * -3.3);
                 stroketext3.setTextAnchor(TextAnchor.CENTER_LEFT);
                 stroketext3.setBackgroundPaint(Color.white);
@@ -342,7 +342,7 @@ private void makeLegend(String category, Set<Report> toolResults, double x, doub
                 if (!BenchmarkScore.showAveOnlyMode) {
                     // Special hack to make it line up better if the letter is an 'I' or 'i'
                     String label = ( ch == 'I' || ch == 'i' ? ch + ":  " : ""+ch + ": " );
-	                String msg = "\u25A0 " + label + r.getToolNameAndVersion() + " (" + (int) score + "%)";
+	                String msg = "\u25A0 " + label + r.getToolNameAndVersion() + " (" + Math.round(score) + "%)";
 	                XYTextAnnotation stroketext4 = new XYTextAnnotation(msg, x, y + i * -3.3);
 	                stroketext4.setTextAnchor(TextAnchor.CENTER_LEFT);
 	                stroketext4.setBackgroundPaint(Color.white);
@@ -378,7 +378,7 @@ private void makeLegend(String category, Set<Report> toolResults, double x, doub
         if (commercialToolCount > 1 || (BenchmarkScore.showAveOnlyMode && commercialToolCount == 1)) {
             commercialAve = commercialTotal / commercialToolCount;
             XYTextAnnotation stroketext2 = new XYTextAnnotation("\u25A0 " + ch + ": Commercial Average" 
-               + " (" + (int) commercialAve + "%)", x, y + i * -3.3);
+               + " (" + Math.round(commercialAve) + "%)", x, y + i * -3.3);
             stroketext2.setTextAnchor(TextAnchor.CENTER_LEFT);
             stroketext2.setBackgroundPaint(Color.white);
             stroketext2.setPaint(Color.magenta);
@@ -413,19 +413,19 @@ public int getCommercialToolCount() {
     }
 
     public int getCommercialLow() {
-        return (int) commercialLow;
+        return (int) Math.round(commercialLow);
     }
 
     public TestResults.ToolType getCommercialLowToolType() {
         return commercialLowToolType;
     }
 
     public int getCommercialAve() {
-        return (int) commercialAve;
+        return (int) Math.round(commercialAve);
     }
 
     public int getCommercialHigh() {
-        return (int) commercialHigh;
+        return (int) Math.round(commercialHigh);
     }
 
     public TestResults.ToolType getCommercialHighToolType() {