Skip to content

Commit d315c63

Browse files
opatinytargos
opatiny
authored and
targos
committed
refactor(featureMatching): create subfolders
1 parent cb86367 commit d315c63

File tree

43 files changed

+77
-73
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+77
-73
lines changed

‎demo/components/testFunctions/testGetFastKeypoints.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Image, ImageColorModel } from '../../../src';
2-
import { getFastKeypoints } from '../../../src/featureMatching/getFastKeypoints';
2+
import { getFastKeypoints } from '../../../src/featureMatching/keypoints/getFastKeypoints';
33

44
/**
55
* Find the FAST keypoints in the video.

‎src/featureMatching/__tests__/__image_snapshots__/get-brief-descriptors-test-ts-alphabet-image-max-nb-features-10-1-snap.png renamed to ‎src/featureMatching/descriptors/__tests__/__image_snapshots__/get-brief-descriptors-test-ts-alphabet-image-max-nb-features-10-1-snap.png

File renamed without changes.

‎src/featureMatching/__tests__/__image_snapshots__/get-brief-descriptors-test-ts-should-work-with-small-patch-size-1-snap.png renamed to ‎src/featureMatching/descriptors/__tests__/__image_snapshots__/get-brief-descriptors-test-ts-should-work-with-small-patch-size-1-snap.png

File renamed without changes.

‎src/featureMatching/__tests__/__snapshots__/getBriefDescriptors.test.ts.snap renamed to ‎src/featureMatching/descriptors/__tests__/__snapshots__/getBriefDescriptors.test.ts.snap

File renamed without changes.

‎src/featureMatching/__tests__/getBriefDescriptors.test.ts renamed to ‎src/featureMatching/descriptors/__tests__/getBriefDescriptors.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { ImageColorModel, Image, ImageCoordinates } from '../../Image';
1+
import { ImageColorModel, Image, ImageCoordinates } from '../../../Image';
2+
import { getOrientedFastKeypoints } from '../../keypoints/getOrientedFastKeypoints';
23
import { getBriefDescriptors } from '../getBriefDescriptors';
3-
import { getOrientedFastKeypoints } from '../getOrientedFastKeypoints';
44

55
test('alphabet image, maxNbFeatures = 10', () => {
66
const image = testUtils.load('various/alphabet.jpg');

‎src/featureMatching/getBriefDescriptors.ts renamed to ‎src/featureMatching/descriptors/getBriefDescriptors.ts

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
import { Image, ImageColorModel, ImageCoordinates } from '../Image';
2-
import { GaussianBlurSigmaOptions } from '../filters';
3-
import checkProcessable from '../utils/checkProcessable';
4-
import { InterpolationType } from '../utils/interpolatePixel';
5-
6-
import { OrientedFastKeypoint } from './getOrientedFastKeypoints';
7-
import { checkBorderDistance } from './utils/checkBorderDistance';
8-
import { compareIntensity } from './utils/compareIntensity';
9-
import { extractSquareImage } from './utils/extractSquareImage';
1+
import { Image, ImageColorModel, ImageCoordinates } from '../../Image';
2+
import { GaussianBlurSigmaOptions } from '../../filters';
3+
import checkProcessable from '../../utils/checkProcessable';
4+
import { InterpolationType } from '../../utils/interpolatePixel';
5+
import { OrientedFastKeypoint } from '../keypoints/getOrientedFastKeypoints';
6+
import { checkBorderDistance } from '../utils/checkBorderDistance';
7+
import { compareIntensity } from '../utils/compareIntensity';
8+
import { extractSquareImage } from '../utils/extractSquareImage';
109
import {
1110
getGaussianPoints,
1211
GetGaussianPointsOptions,
13-
} from './utils/getGaussianPoints';
12+
} from '../utils/getGaussianPoints';
1413

1514
export interface GetBriefDescriptorsOptions {
1615
/**

‎src/featureMatching/__tests__/__image_snapshots__/draw-keypoints-test-ts-alphabet-image-with-score-coloring-1-snap.png renamed to ‎src/featureMatching/draw/__tests__/__image_snapshots__/draw-keypoints-test-ts-alphabet-image-with-score-coloring-1-snap.png

File renamed without changes.

‎src/featureMatching/__tests__/__image_snapshots__/draw-matches-test-ts-alphabet-image-as-source-and-destination-nb-keypoint-10-1-snap.png renamed to ‎src/featureMatching/draw/__tests__/__image_snapshots__/draw-matches-test-ts-alphabet-image-as-source-and-destination-nb-keypoint-10-1-snap.png

File renamed without changes.

‎src/featureMatching/__tests__/__image_snapshots__/draw-matches-test-ts-destination-rotated-10-1-snap.png renamed to ‎src/featureMatching/draw/__tests__/__image_snapshots__/draw-matches-test-ts-destination-rotated-10-1-snap.png

File renamed without changes.

‎src/featureMatching/__tests__/__image_snapshots__/draw-matches-test-ts-destination-rotated-2-1-snap.png renamed to ‎src/featureMatching/draw/__tests__/__image_snapshots__/draw-matches-test-ts-destination-rotated-2-1-snap.png

File renamed without changes.

‎src/featureMatching/__tests__/drawKeypoints.test.ts renamed to ‎src/featureMatching/draw/__tests__/drawKeypoints.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { ImageColorModel } from '../../Image';
1+
import { ImageColorModel } from '../../../Image';
2+
import { getOrientedFastKeypoints } from '../../keypoints/getOrientedFastKeypoints';
23
import { drawKeypoints } from '../drawKeypoints';
3-
import { getOrientedFastKeypoints } from '../getOrientedFastKeypoints';
44

55
test('alphabet image with score coloring', () => {
66
const image = testUtils.load('various/alphabet.jpg');

‎src/featureMatching/__tests__/drawMatches.test.ts renamed to ‎src/featureMatching/draw/__tests__/drawMatches.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { ImageColorModel } from '../../Image';
2-
import { bruteForceOneMatch } from '../bruteForceMatch';
1+
import { ImageColorModel } from '../../../Image';
2+
import { getBriefDescriptors } from '../../descriptors/getBriefDescriptors';
3+
import { getOrientedFastKeypoints } from '../../keypoints/getOrientedFastKeypoints';
4+
import { bruteForceOneMatch } from '../../matching/bruteForceMatch';
35
import { drawMatches } from '../drawMatches';
4-
import { getBriefDescriptors } from '../getBriefDescriptors';
5-
import { getOrientedFastKeypoints } from '../getOrientedFastKeypoints';
66

77
test('alphabet image as source and destination, nbKeypoint = 10', () => {
88
const source = testUtils.load('various/alphabet.jpg');

‎src/featureMatching/drawKeypoints.ts renamed to ‎src/featureMatching/draw/drawKeypoints.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import { Image, ImageColorModel } from '../Image';
2-
import { getOutputImage } from '../utils/getOutputImage';
3-
4-
import { FastKeypoint } from './getFastKeypoints';
5-
import { getKeypointColor } from './utils/getKeypointColor';
6-
import { getScoreColors, GetScoreColorsOptions } from './utils/getScoreColors';
1+
import { Image, ImageColorModel } from '../../Image';
2+
import { getOutputImage } from '../../utils/getOutputImage';
3+
import { FastKeypoint } from '../keypoints/getFastKeypoints';
4+
import { getKeypointColor } from '../utils/getKeypointColor';
5+
import { getScoreColors, GetScoreColorsOptions } from '../utils/getScoreColors';
76

87
export interface DrawKeypointsOptions {
98
/**

‎src/featureMatching/drawMatches.ts renamed to ‎src/featureMatching/draw/drawMatches.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import { Image, ImageColorModel } from '../Image';
2-
3-
import { Match } from './bruteForceMatch';
4-
import { FastKeypoint } from './getFastKeypoints';
5-
import { getKeypointColor } from './utils/getKeypointColor';
6-
import { getScoreColors, GetScoreColorsOptions } from './utils/getScoreColors';
1+
import { Image, ImageColorModel } from '../../Image';
2+
import { FastKeypoint } from '../keypoints/getFastKeypoints';
3+
import { Match } from '../matching/bruteForceMatch';
4+
import { getKeypointColor } from '../utils/getKeypointColor';
5+
import { getScoreColors, GetScoreColorsOptions } from '../utils/getScoreColors';
76

87
export interface DrawMatchesOptions {
98
/**

‎src/featureMatching/index.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
export * from './bruteForceMatch';
2-
export * from './drawKeypoints';
3-
export * from './drawMatches';
4-
export * from './getBriefDescriptors';
5-
export * from './getFastKeypoints';
6-
export * from './getIntensityCentroid';
7-
export * from './getOrientedFastKeypoints';
1+
export * from './matching/bruteForceMatch';
2+
export * from './draw/drawKeypoints';
3+
export * from './draw/drawMatches';
4+
export * from './descriptors/getBriefDescriptors';
5+
export * from './keypoints/getFastKeypoints';
6+
export * from './keypoints/getIntensityCentroid';
7+
export * from './keypoints/getOrientedFastKeypoints';

‎src/featureMatching/__tests__/__image_snapshots__/get-fast-keypoints-test-ts-alphabet-fast-radius-5-1-snap.png renamed to ‎src/featureMatching/keypoints/__tests__/__image_snapshots__/get-fast-keypoints-test-ts-alphabet-fast-radius-5-1-snap.png

File renamed without changes.

‎src/featureMatching/__tests__/__image_snapshots__/get-fast-keypoints-test-ts-alphabet-image-default-options-1-snap.png renamed to ‎src/featureMatching/keypoints/__tests__/__image_snapshots__/get-fast-keypoints-test-ts-alphabet-image-default-options-1-snap.png

File renamed without changes.

‎src/featureMatching/__tests__/__image_snapshots__/get-fast-keypoints-test-ts-alphabet-image-max-nb-features-50-1-snap.png renamed to ‎src/featureMatching/keypoints/__tests__/__image_snapshots__/get-fast-keypoints-test-ts-alphabet-image-max-nb-features-50-1-snap.png

File renamed without changes.

‎src/featureMatching/__tests__/__image_snapshots__/get-fast-keypoints-test-ts-alphabet-image-non-max-suppression-false-1-snap.png renamed to ‎src/featureMatching/keypoints/__tests__/__image_snapshots__/get-fast-keypoints-test-ts-alphabet-image-non-max-suppression-false-1-snap.png

File renamed without changes.

‎src/featureMatching/__tests__/__image_snapshots__/get-fast-keypoints-test-ts-alphabet-image-score-algorithm-harris-1-snap.png renamed to ‎src/featureMatching/keypoints/__tests__/__image_snapshots__/get-fast-keypoints-test-ts-alphabet-image-score-algorithm-harris-1-snap.png

File renamed without changes.

‎src/featureMatching/__tests__/__image_snapshots__/get-fast-keypoints-test-ts-alphabet-image-score-algorithm-harris-max-nb-features-50-1-snap.png renamed to ‎src/featureMatching/keypoints/__tests__/__image_snapshots__/get-fast-keypoints-test-ts-alphabet-image-score-algorithm-harris-max-nb-features-50-1-snap.png

File renamed without changes.

‎src/featureMatching/__tests__/__image_snapshots__/get-fast-keypoints-test-ts-alphabet-image-score-algorithm-harris-nms-false-normalize-scores-true-2-snap.png renamed to ‎src/featureMatching/keypoints/__tests__/__image_snapshots__/get-fast-keypoints-test-ts-alphabet-image-score-algorithm-harris-nms-false-normalize-scores-true-2-snap.png

File renamed without changes.

‎src/featureMatching/__tests__/__image_snapshots__/get-fast-keypoints-test-ts-alphabet-image-threshold-150-1-snap.png renamed to ‎src/featureMatching/keypoints/__tests__/__image_snapshots__/get-fast-keypoints-test-ts-alphabet-image-threshold-150-1-snap.png

File renamed without changes.

‎src/featureMatching/__tests__/__image_snapshots__/get-fast-keypoints-test-ts-grayscale-image-threshold-100-normalize-scores-true-2-snap.png renamed to ‎src/featureMatching/keypoints/__tests__/__image_snapshots__/get-fast-keypoints-test-ts-grayscale-image-threshold-100-normalize-scores-true-2-snap.png

File renamed without changes.

‎src/featureMatching/__tests__/__snapshots__/getFastKeypoints.test.ts.snap renamed to ‎src/featureMatching/keypoints/__tests__/__snapshots__/getFastKeypoints.test.ts.snap

File renamed without changes.

‎src/featureMatching/__tests__/getFastKeypoints.test.ts renamed to ‎src/featureMatching/keypoints/__tests__/getFastKeypoints.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { ImageColorModel } from '../../Image';
2-
import { drawKeypoints } from '../drawKeypoints';
1+
import { ImageColorModel } from '../../../Image';
2+
import { drawKeypoints } from '../../draw/drawKeypoints';
33
import { getFastKeypoints } from '../getFastKeypoints';
44

55
test('alphabet image, default options', () => {

‎src/featureMatching/__tests__/getHarrisScore.test.ts renamed to ‎src/featureMatching/keypoints/__tests__/getHarrisScore.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ImageColorModel, Image } from '../../Image';
1+
import { ImageColorModel, Image } from '../../../Image';
22
import { getHarrisScore } from '../getHarrisScore';
33

44
const fastRadius = 3;

‎src/featureMatching/__tests__/getIntensityCentroid.test.ts renamed to ‎src/featureMatching/keypoints/__tests__/getIntensityCentroid.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ImageColorModel, Image } from '../../Image';
1+
import { ImageColorModel, Image } from '../../../Image';
22
import { getIntensityCentroid } from '../getIntensityCentroid';
33

44
test('3x3 empty image', () => {

‎src/featureMatching/__tests__/getIntensityMoment.test.ts renamed to ‎src/featureMatching/keypoints/__tests__/getIntensityMoment.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ImageColorModel, Image } from '../../Image';
1+
import { ImageColorModel, Image } from '../../../Image';
22
import { getIntensityMoment } from '../getIntensityMoment';
33

44
test('3x3 empty image, 00', () => {

‎src/featureMatching/__tests__/getOrientedFastKeypoints.test.ts renamed to ‎src/featureMatching/keypoints/__tests__/getOrientedFastKeypoints.test.ts

File renamed without changes.

‎src/featureMatching/__tests__/isFastKeypoint.test.ts renamed to ‎src/featureMatching/keypoints/__tests__/isFastKeypoint.test.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
import { ImageColorModel, Image } from '../../Image';
2-
import { getCirclePoints, getCompassPoints } from '../../utils/getCirclePoints';
1+
import { ImageColorModel, Image } from '../../../Image';
2+
import {
3+
getCirclePoints,
4+
getCompassPoints,
5+
} from '../../../utils/getCirclePoints';
36
import { isFastKeypoint } from '../isFastKeypoint';
47

58
const fastRadius = 3;

‎src/featureMatching/getFastKeypoints.ts renamed to ‎src/featureMatching/keypoints/getFastKeypoints.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { Image } from '../Image';
2-
import { Point } from '../geometry';
3-
import checkProcessable from '../utils/checkProcessable';
4-
import { getCirclePoints, getCompassPoints } from '../utils/getCirclePoints';
5-
import { getIndex } from '../utils/getIndex';
6-
import { surroundingPixels } from '../utils/surroundingPixels';
1+
import { Image } from '../../Image';
2+
import { Point } from '../../geometry';
3+
import checkProcessable from '../../utils/checkProcessable';
4+
import { getCirclePoints, getCompassPoints } from '../../utils/getCirclePoints';
5+
import { getIndex } from '../../utils/getIndex';
6+
import { surroundingPixels } from '../../utils/surroundingPixels';
77

88
import { getFastScore } from './getFastScore';
99
import { getHarrisScore, GetHarrisScoreOptions } from './getHarrisScore';

‎src/featureMatching/getFastScore.ts renamed to ‎src/featureMatching/keypoints/getFastScore.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Image } from '../Image';
2-
import { Point } from '../geometry';
1+
import { Image } from '../../Image';
2+
import { Point } from '../../geometry';
33

44
/**
55
* Compute the score of a keypoint using the function described in the FAST article.

‎src/featureMatching/getHarrisScore.ts renamed to ‎src/featureMatching/keypoints/getHarrisScore.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import Matrix, { EigenvalueDecomposition, WrapperMatrix1D } from 'ml-matrix';
22

3-
import { Image } from '../Image';
4-
import { Point } from '../geometry';
5-
import { SOBEL_X, SOBEL_Y } from '../utils/constants/kernels';
3+
import { Image } from '../../Image';
4+
import { Point } from '../../geometry';
5+
import { SOBEL_X, SOBEL_Y } from '../../utils/constants/kernels';
66

77
export interface GetHarrisScoreOptions {
88
/**

‎src/featureMatching/getIntensityCentroid.ts renamed to ‎src/featureMatching/keypoints/getIntensityCentroid.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Image } from '../Image';
2-
import { Point } from '../geometry';
1+
import { Image } from '../../Image';
2+
import { Point } from '../../geometry';
33

44
import { getIntensityMoment } from './getIntensityMoment';
55

‎src/featureMatching/getIntensityMoment.ts renamed to ‎src/featureMatching/keypoints/getIntensityMoment.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Image, ImageCoordinates } from '../Image';
2-
import { Point } from '../geometry';
1+
import { Image, ImageCoordinates } from '../../Image';
2+
import { Point } from '../../geometry';
33

44
export interface GetIntensityMomentOptions {
55
/**

‎src/featureMatching/getOrientedFastKeypoints.ts renamed to ‎src/featureMatching/keypoints/getOrientedFastKeypoints.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { Image } from '../Image';
2-
import { getAngle } from '../maskAnalysis/utils/getAngle';
3-
import { toDegrees } from '../utils/geometry/angles';
1+
import { Image } from '../../Image';
2+
import { getAngle } from '../../maskAnalysis/utils/getAngle';
3+
import { toDegrees } from '../../utils/geometry/angles';
4+
import { checkBorderDistance } from '../utils/checkBorderDistance';
45

56
import {
67
FastKeypoint,
78
getFastKeypoints,
89
GetFastKeypointsOptions,
910
} from './getFastKeypoints';
1011
import { getIntensityCentroid } from './getIntensityCentroid';
11-
import { checkBorderDistance } from './utils/checkBorderDistance';
1212

1313
export interface GetOrientedFastKeypointsOptions
1414
extends GetFastKeypointsOptions {

‎src/featureMatching/isFastKeypoint.ts renamed to ‎src/featureMatching/keypoints/isFastKeypoint.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Image } from '../Image';
2-
import { Point } from '../geometry';
1+
import { Image } from '../../Image';
2+
import { Point } from '../../geometry';
33

44
export interface IsFastKeypointOptions {
55
/**

‎src/featureMatching/__tests__/bruteForceMatch.test.ts renamed to ‎src/featureMatching/matching/__tests__/bruteForceMatch.test.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
import { ImageColorModel, Image } from '../../Image';
1+
import { ImageColorModel, Image } from '../../../Image';
2+
import {
3+
BriefDescriptor,
4+
getBriefDescriptors,
5+
} from '../../descriptors/getBriefDescriptors';
6+
import { getOrientedFastKeypoints } from '../../keypoints/getOrientedFastKeypoints';
27
import { bruteForceOneMatch } from '../bruteForceMatch';
3-
import { BriefDescriptor, getBriefDescriptors } from '../getBriefDescriptors';
4-
import { getOrientedFastKeypoints } from '../getOrientedFastKeypoints';
58

69
function getDescriptors(image: Image): BriefDescriptor[] {
710
const grey = image.convertColor(ImageColorModel.GREY);

‎src/featureMatching/utils/__tests__/getHammingDistance.test.ts renamed to ‎src/featureMatching/matching/__tests__/getHammingDistance.test.ts

File renamed without changes.

‎src/featureMatching/bruteForceMatch.ts renamed to ‎src/featureMatching/matching/bruteForceMatch.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import { BriefDescriptor } from './getBriefDescriptors';
2-
import { getHammingDistance } from './utils/getHammingDistance';
1+
import { BriefDescriptor } from '../descriptors/getBriefDescriptors';
2+
3+
import { getHammingDistance } from './getHammingDistance';
34

45
// todo: implement bruteForceManyMatches -> N best matches for each source descriptor
56

‎src/featureMatching/utils/getHammingDistance.ts renamed to ‎src/featureMatching/matching/getHammingDistance.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { BriefDescriptor } from '../getBriefDescriptors';
1+
import { BriefDescriptor } from '../descriptors/getBriefDescriptors';
22

33
/**
44
* Compute the Hamming distance between two bit strings.

‎src/featureMatching/utils/getKeypointColor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FastKeypoint } from '../getFastKeypoints';
1+
import { FastKeypoint } from '../keypoints/getFastKeypoints';
22

33
/**
44
* Get the shade the keypoint with given index should have (the color is an indicator

0 commit comments

Comments
 (0)