Skip to content

Commit 5ac708c

Browse files
committed
Increase RGB vector space
1 parent 243d6fd commit 5ac708c

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

FeatureVectors.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
import cv2
22
import numpy as np
3+
from Image_Filters.NoiseReduction import NoiseReduction
4+
from Image_Filters.ConvolutionalFilters import ConvolutionFilter
35

46

57
class FeatureVectors():
68

79
def __init__(self, image):
8-
self.image = image
10+
self.filter = NoiseReduction(image)
11+
self.image = self.filter.applyGaussianBlur()
912

1013
def __getMeanIntensity(self):
1114
meanIntensity = []
@@ -25,12 +28,19 @@ def __getStdIntensity(self):
2528

2629
def __getRGBHistogramVector(self):
2730
histogram_3d = cv2.calcHist([self.image], [0, 1, 2], None,
28-
[8, 8, 8], [0, 256, 0, 256, 0, 256])
31+
[12, 12, 12], [0, 256, 0, 256, 0, 256])
2932
histogram_3d = histogram_3d.ravel()
3033
RGBHistogram = list(histogram_3d)
3134

3235
return RGBHistogram
3336

37+
def __getHuMoments(self):
38+
filter = ConvolutionFilter(self.image)
39+
canny_filtered = filter.applyCannyEdge()
40+
canny_huMoments = cv2.HuMoments(cv2.moments(canny_filtered)).flatten()
41+
huVector = list(canny_huMoments.ravel())
42+
return huVector
43+
3444
def getFeatureVector(self):
3545
featureVectors = []
3646
meanIntensity = self.__getMeanIntensity()

QuerySearch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def performSearch(self):
4141
for image in self.features:
4242
queryVector = self.queryFeature
4343
vector = self.features[image]
44-
cosine_similarity = self.__SAD_distance(queryVector, vector)
44+
cosine_similarity = self.__chi2_distance(queryVector, vector)
4545

4646
searchSimilarityScores.append((image, cosine_similarity))
4747

0 commit comments

Comments
 (0)