test(patchIntensityCentroid): found a bug in this function

Author: opatiny

src/Image.ts

@@ -333,6 +333,7 @@ export class Image {
     const start = (row * this.width + column) * this.channels;
     for (let i = 0; i < this.channels; i++) {
       this.data[start + i] = value[i];
+      console.log(this.data[start + i], value[i]);
     }
   }
 
@@ -345,6 +346,7 @@ export class Image {
    */
   public setVisiblePixel(column: number, row: number, value: number[]): void {
     if (column >= 0 && column < this.width && row >= 0 && row < this.height) {
+      console.log(value);
       this.setPixel(column, row, value);
     }
   }

src/featureMatching/keypoints/__tests__/__image_snapshots__/get-oriented-fast-keypoints-test-ts-angle-diff-should-be-90-1-snap.png

@@ -1,4 +1,5 @@
 import { ImageColorModel } from '../../../Image';
+import { drawKeypoints } from '../../visualize/drawKeypoints';
 import { getOrientedFastKeypoints } from '../getOrientedFastKeypoints';
 
 test('7x7 image, angle = 90°', () => {
@@ -148,3 +149,60 @@ test('check angle for different windowSize', () => {
     1,
   );
 });
+
+test('angle diff should be 90°', () => {
+  const windowSize = 15;
+  const markerSize = 15;
+
+  const image = testUtils
+    .load('featureMatching/polygons/betterScaleneTriangle.png')
+    .convertColor(ImageColorModel.GREY);
+
+  const rotated = testUtils
+    .load('featureMatching/polygons/betterScaleneTriangle90.png')
+    .convertColor(ImageColorModel.GREY);
+
+  const keypoints = getOrientedFastKeypoints(image, { windowSize });
+  const keypointsRotated = getOrientedFastKeypoints(rotated, { windowSize });
+  console.log(keypoints, keypointsRotated);
+
+  expect(
+    drawKeypoints(image, keypoints, { markerSize, showOrientation: true }),
+  ).toMatchImageSnapshot();
+  expect(
+    drawKeypoints(rotated, keypointsRotated, {
+      markerSize,
+      showOrientation: true,
+    }),
+  ).toMatchImageSnapshot();
+
+  expect([keypoints, keypointsRotated]).toBeDeepCloseTo(
+    [
+      [
+        {
+          origin: { row: 607, column: 132 },
+          score: 2680,
+          angle: 145.3,
+        },
+        {
+          origin: { row: 50, column: 292 },
+          score: 2662,
+          angle: -112.2,
+        },
+      ],
+      [
+        {
+          origin: { row: 607, column: 132 },
+          score: 2680,
+          angle: 123.7,
+        },
+        {
+          origin: { row: 50, column: 292 },
+          score: 2662,
+          angle: -95.4,
+        },
+      ],
+    ],
+    1,
+  );
+});

src/featureMatching/keypoints/__tests__/__image_snapshots__/get-oriented-fast-keypoints-test-ts-angle-diff-should-be-90-2-snap.png

@@ -1,8 +1,32 @@
-import { ImageColorModel, Image } from '../../../Image';
+import { ImageColorModel, Image, ImageCoordinates } from '../../../Image';
+import { round, sum } from '../../../utils/geometry/points';
 import { getPatchIntensityCentroid } from '../getPatchIntensityCentroid';
 
 test('3x3 empty image', () => {
   const image = new Image(7, 7, { colorModel: ImageColorModel.GREY });
   const result = getPatchIntensityCentroid(image);
   expect(result).toStrictEqual([{ column: 0, row: 0 }]);
 });
+
+test.only('patch, default options', () => {
+  const image = testUtils.load('featureMatching/patch.png');
+  console.log(image.colorModel);
+
+  const centroid = round(getPatchIntensityCentroid(image)[0]);
+  console.log(centroid);
+
+  const center = image.getCoordinates(ImageCoordinates.CENTER);
+
+  const point = sum(center, centroid);
+  console.log(point);
+
+  const result = image.convertColor(ImageColorModel.RGB);
+  for (let i = 14; i < 15; i++) {
+    result.drawPoints([{ row: i, column: i }], {
+      color: [0, 255, 0],
+      out: result,
+    });
+  }
+
+  expect(result).toMatchImageSnapshot();
+});

src/featureMatching/keypoints/__tests__/__image_snapshots__/get-patch-intensity-centroid-test-ts-patch-default-options-1-snap.png

@@ -26,7 +26,7 @@ export interface Point {
  * @param p2 - Second Point.
  * @returns Difference between the two points.
  */
-export function difference(p1: Point, p2: Point) {
+export function difference(p1: Point, p2: Point): Point {
   return { column: p1.column - p2.column, row: p1.row - p2.row };
 }
 
@@ -37,7 +37,7 @@ export function difference(p1: Point, p2: Point) {
  * @param p2 - Second Point.
  * @returns Sum of the two points.
  */
-export function sum(p1: Point, p2: Point) {
+export function sum(p1: Point, p2: Point): Point {
   return { column: p1.column + p2.column, row: p1.row + p2.row };
 }
 
@@ -47,7 +47,7 @@ export function sum(p1: Point, p2: Point) {
  * @param point - Point to normalize.
  * @returns - Normalized point.
  */
-export function normalize(point: Point) {
+export function normalize(point: Point): Point {
   let length = Math.sqrt(point.column ** 2 + point.row ** 2);
   return { column: point.column / length, row: point.row / length };
 }
@@ -83,3 +83,13 @@ export function rotate(radians: number, points: readonly Point[]): Point[] {
 export function dot(p1: Point, p2: Point) {
   return p1.column * p2.column + p1.row * p2.row;
 }
+
+/**
+ * Round the coordinates of the point.
+ *
+ * @param point - The point.
+ * @returns Rounded coordinates of the point.
+ */
+export function round(point: Point): Point {
+  return { column: Math.round(point.column), row: Math.round(point.row) };
+}

src/featureMatching/keypoints/__tests__/getOrientedFastKeypoints.test.ts

@@ -60,6 +60,7 @@ export type TestImagePath =
   | 'featureMatching/crop1.png'
   | 'featureMatching/crop2.png'
   | 'featureMatching/crop3.png'
+  | 'featureMatching/patch.png'
   | 'featureMatching/polygons/star.png'
   | 'featureMatching/polygons/betterScaleneTriangle.png'
   | 'featureMatching/polygons/betterScaleneTriangle90.png'