Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add diff percentage to output #24

Merged
merged 1 commit into from
Apr 1, 2021
Merged

Add diff percentage to output #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions bin/Main.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ let main =
</Pastel>,
}

| Pixel((diffOutput, diffCount)) when diffCount == 0 => {
| Pixel((diffOutput, diffCount, _diffPercentage)) when diffCount == 0 => {
exitCode: 0,
diff: Some(diffOutput),
message:
Expand All @@ -72,7 +72,7 @@ let main =
</Pastel>,
}

| Pixel((diffOutput, diffCount)) =>
| Pixel((diffOutput, diffCount, diffPercentage)) =>
IO1.saveImage(diffOutput, diffPath);

{
Expand All @@ -83,7 +83,9 @@ let main =
<Pastel color=Red bold=true> "Failure! " </Pastel>
"Images are different.\n"
"Different pixels: "
<Pastel color=Red bold=true> {Int.to_string(diffCount)} </Pastel>
<Pastel color=Red bold=true>
{Printf.sprintf("%i (%f%%)", diffCount, diffPercentage)}
</Pastel>
</Pastel>,
};
};
Expand Down
9 changes: 7 additions & 2 deletions src/Diff.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ let maxYIQPossibleDelta = 35215.;

type diffVariant('a) =
| Layout
| Pixel(('a, int));
| Pixel(('a, int, float));

module MakeDiff = (IO1: ImageIO.ImageIO, IO2: ImageIO.ImageIO) => {
let compare =
Expand Down Expand Up @@ -53,7 +53,12 @@ module MakeDiff = (IO1: ImageIO.ImageIO, IO2: ImageIO.ImageIO) => {
};
};

(diffOutput, diffCount^);
let diffPercentage =
100.0
*. Float.of_int(diffCount^)
/. (Float.of_int(base.width) *. Float.of_int(base.height));

(diffOutput, diffCount^, diffPercentage);
};

let diff =
Expand Down
17 changes: 11 additions & 6 deletions test/PngTests.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,30 @@ describe("Png comparing", ({test, _}) => {
let img1 = PureC_IO.IO.loadImage("test/test-images/orange.png");
let img2 = PureC_IO.IO.loadImage("test/test-images/orange_changed.png");

let (_, diffPixels) = Diff.compare(img1, img2, ());
let (_, diffPixels, diffPercentage) = Diff.compare(img1, img2, ());
expect.int(diffPixels).toBe(1430);
expect.float(diffPercentage).toBeCloseTo(1.20);
});

test("uses provided threshold", ({expect, _}) => {
let img1 = PureC_IO.IO.loadImage("test/test-images/orange.png");
let img2 = PureC_IO.IO.loadImage("test/test-images/orange_changed.png");

let (_, diffPixels) = Diff.compare(img1, img2, ~threshold=0.5, ());
let (_, diffPixels, diffPercentage) =
Diff.compare(img1, img2, ~threshold=0.5, ());
expect.int(diffPixels).toBe(222);
expect.float(diffPercentage).toBeCloseTo(0.19);
});

test("creates the right diff output image", ({expect, _}) => {
let img1 = PureC_IO.IO.loadImage("test/test-images/orange.png");
let img2 = PureC_IO.IO.loadImage("test/test-images/orange_changed.png");

let (diffOutput, _) = Diff.compare(img1, img2, ());
let (diffOutput, _, _) = Diff.compare(img1, img2, ());

let originalDiff =
PureC_IO.IO.loadImage("test/test-images/orange_diff.png");
let (diffMaskOfDiff, diffOfDiffPixels) =
let (diffMaskOfDiff, diffOfDiffPixels, diffOfDiffPercentage) =
Diff.compare(originalDiff, diffOutput, ());

if (diffOfDiffPixels > 0) {
Expand All @@ -40,6 +43,7 @@ describe("Png comparing", ({test, _}) => {
};

expect.int(diffOfDiffPixels).toBe(0);
expect.float(diffOfDiffPercentage).toBeCloseTo(0.0);
});

test(
Expand All @@ -48,12 +52,12 @@ describe("Png comparing", ({test, _}) => {
let img1 = PureC_IO.IO.loadImage("test/test-images/orange.png");
let img2 = PureC_IO.IO.loadImage("test/test-images/orange_changed.png");

let (diffOutput, _) =
let (diffOutput, _, _) =
Diff.compare(img1, img2, ~diffPixel=(0, 255, 0), ());

let originalDiff =
PureC_IO.IO.loadImage("test/test-images/orange_diff_green.png");
let (diffMaskOfDiff, diffOfDiffPixels) =
let (diffMaskOfDiff, diffOfDiffPixels, diffOfDiffPercentage) =
Diff.compare(originalDiff, diffOutput, ());

if (diffOfDiffPixels > 0) {
Expand All @@ -68,5 +72,6 @@ describe("Png comparing", ({test, _}) => {
};

expect.int(diffOfDiffPixels).toBe(0);
expect.float(diffOfDiffPercentage).toBeCloseTo(0.0);
});
});