Visually inspected results; look correct, getting detailed breakdown

Author: CodeByDrescher

vcell-cli/src/test/java/org/vcell/cli/run/plotting/TestResults2DLinePlot.java

@@ -168,7 +168,7 @@ public void pngRoundTripTest() throws IOException {
         BufferedImage roundTrippedImage = ImageIO.read(dupe);
         Assertions.assertEquals(originalImage.getWidth(), roundTrippedImage.getWidth());
         Assertions.assertEquals(originalImage.getHeight(), roundTrippedImage.getHeight());
-        double accuracy = TestResults2DLinePlot.getAccuracyPercentage(originalImage, roundTrippedImage);
+        double accuracy = TestResults2DLinePlot.getAccuracy(originalImage, roundTrippedImage).product();
         Assertions.assertTrue(accuracy > ACCURACY_THRESHOLD, String.format("accuracy: %f !> %f; file: %s", accuracy, ACCURACY_THRESHOLD, dupe.getCanonicalPath()));
     }
 
@@ -189,7 +189,7 @@ public void pngLibraryLevelTest() throws IOException {
         BufferedImage currentImage = chart.createBufferedImage(1000,1000);
         Assertions.assertEquals(currentImage.getWidth(), standardImage.getWidth());
         Assertions.assertEquals(currentImage.getHeight(), standardImage.getHeight());
-        double accuracy = TestResults2DLinePlot.getAccuracyPercentage(standardImage, currentImage);
+        double accuracy = TestResults2DLinePlot.getAccuracy(standardImage, currentImage).product();
         Assertions.assertTrue(accuracy > ACCURACY_THRESHOLD, String.format("accuracy: %f !> %f", accuracy, ACCURACY_THRESHOLD));
     }
 
@@ -237,14 +237,16 @@ public void pngExecutionLevelTest() throws IOException {
         Assertions.assertEquals(standardImage1.getWidth(), generatedImage1.getWidth());
         Assertions.assertEquals(standardImage1.getHeight(), generatedImage1.getHeight());
 
-
-        double accuracy0 = TestResults2DLinePlot.getAccuracyPercentage(standardImage0, generatedImage0);
-        double accuracy1 = TestResults2DLinePlot.getAccuracyPercentage(standardImage1, generatedImage1);
-        String errMsg = String.format("Values Threshold (%f):\n\tTest0 - accuracy: %f; file: %s\n\tTest1 - accuracy: %f; file: %s", ACCURACY_THRESHOLD, accuracy0, generatedPlot0.getCanonicalPath(), accuracy1, generatedPlot1.getCanonicalPath());
-        Assertions.assertTrue(accuracy0 > ACCURACY_THRESHOLD && accuracy1 > ACCURACY_THRESHOLD, errMsg);
+        SSIMComparisonTool.Results results0 = TestResults2DLinePlot.getAccuracy(standardImage0, generatedImage0);
+        SSIMComparisonTool.Results results1 = TestResults2DLinePlot.getAccuracy(standardImage1, generatedImage1);
+        String errMsg = String.format("Values Threshold (%f):\n\tTest0 - accuracy: %f (%f/%f/%f); file: %s\n\tTest1 - accuracy: %f ((%f/%f/%f)); file: %s",
+                ACCURACY_THRESHOLD,
+                results0.product(), results0.luminanceComponent(), results0.contrastComponent(), results0.structureComponent(), generatedPlot0.getCanonicalPath(),
+                results1.product(), results1.luminanceComponent(), results1.contrastComponent(), results1.structureComponent(), generatedPlot1.getCanonicalPath());
+        Assertions.assertTrue(results0.product() > ACCURACY_THRESHOLD && results1.product() > ACCURACY_THRESHOLD, errMsg);
     }
 
-    private static double getAccuracyPercentage(BufferedImage original, BufferedImage generated){
+    private static SSIMComparisonTool.Results getAccuracy(BufferedImage original, BufferedImage generated){
         SSIMComparisonTool ssim = new SSIMComparisonTool();
         return ssim.performSSIMComparison(original, generated);
     }

vcell-cli/src/test/java/org/vcell/cli/testsupport/SSIMComparisonTool.java

@@ -49,7 +49,7 @@ public SSIMComparisonTool(double luminanceStabilizer, double contrastStabilizer,
         this.STRUCTURE_STABILIZER = structureStabilizer;
     }
 
-    public double performSSIMComparison(BufferedImage original, BufferedImage contender){
+    public Results performSSIMComparison(BufferedImage original, BufferedImage contender){
         double[][] originalGrayscaleData = SSIMComparisonTool.getGrayScaleData(original);
         double[][] contenderGrayscaleData = SSIMComparisonTool.getGrayScaleData(contender);
         double originalPSM = SSIMComparisonTool.pixelSampleMean(originalGrayscaleData);
@@ -63,7 +63,8 @@ public double performSSIMComparison(BufferedImage original, BufferedImage conten
         double weightedLuminance = Math.pow(luminance, SSIMComparisonTool.ALPHA_WEIGHT);
         double weightedContrast = Math.pow(contrast, SSIMComparisonTool.BETA_WEIGHT);
         double weightedStructure = Math.pow(structure, SSIMComparisonTool.GAMMA_WEIGHT);
-        return weightedLuminance * weightedContrast * weightedStructure;
+        double product = weightedLuminance * weightedContrast * weightedStructure
+        return new Results(product, weightedLuminance, weightedContrast, weightedStructure);
     }
 
     private double luminanceCalculation(double originalPSM, double contenderPSM){
@@ -133,4 +134,6 @@ private static double[][] getGrayScaleData(BufferedImage image){
         }
         return convertedData;
     }
+
+    public record Results (double product, double luminanceComponent, double contrastComponent, double structureComponent) {}
 }