Skip to content

Commit f93bd23

Browse files
Fixed incorrect formula
1 parent 6bd7c5a commit f93bd23

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public void pngRoundTripTest() throws IOException {
169169
Assertions.assertEquals(originalImage.getWidth(), roundTrippedImage.getWidth());
170170
Assertions.assertEquals(originalImage.getHeight(), roundTrippedImage.getHeight());
171171
double accuracy = TestResults2DLinePlot.getAccuracyPercentage(originalImage, roundTrippedImage);
172-
Assertions.assertTrue(accuracy > ACCURACY_THRESHOLD, String.format("accuracy: %f !> %f", accuracy, ACCURACY_THRESHOLD));
172+
Assertions.assertTrue(accuracy > ACCURACY_THRESHOLD, String.format("accuracy: %f !> %f; file: %s", accuracy, ACCURACY_THRESHOLD, dupe.getCanonicalPath()));
173173
}
174174

175175
@Test

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ private double luminanceCalculation(double originalPSM, double contenderPSM){
7575
}
7676

7777
private double contrastCalculation(double originalVariance, double contenderVariance){
78-
double ovSquared = originalVariance * originalVariance;
79-
double cvSquared = contenderVariance * contenderVariance;
80-
double numerator = 2 * originalVariance * contenderVariance + this.CONTRAST_STABILIZER;
81-
double denominator = ovSquared + cvSquared + this.CONTRAST_STABILIZER;
78+
double originalSD = Math.sqrt(originalVariance);
79+
double contenderSD = Math.sqrt(contenderVariance);
80+
double numerator = 2 * originalSD * contenderSD + this.CONTRAST_STABILIZER;
81+
double denominator = originalVariance + contenderVariance + this.CONTRAST_STABILIZER;
8282
return numerator / denominator;
8383
}
8484

0 commit comments

Comments
 (0)