Added RGBHistogram vector to FeatureVectors

Author: Defcon27

FeatureVectors.py

@@ -1,3 +1,4 @@
+import cv2
 import numpy as np
 
 
@@ -22,10 +23,20 @@ def __getStdIntensity(self):
 
         return stdIntensity
 
+    def __getRGBHistogramVector(self):
+        histogram_3d = cv2.calcHist([self.image], [0, 1, 2], None,
+                                    [8, 8, 8], [0, 256, 0, 256, 0, 256])
+        histogram_3d = histogram_3d.ravel()
+        RGBHistogram = list(histogram_3d)
+
+        return RGBHistogram
+
     def getFeatureVector(self):
         featureVectors = []
         meanIntensity = self.__getMeanIntensity()
         stdIntensity = self.__getStdIntensity()
+        rgbHistogram = self.__getRGBHistogramVector()
 
-        featureVectors = meanIntensity+stdIntensity
+        colorVectors = meanIntensity+stdIntensity+rgbHistogram
+        featureVectors = colorVectors
         return featureVectors

ImageSearch.ipynb

@@ -19,15 +19,11 @@ def extractFeatureVectors(image_path):
 
 def ImageSearch(queryImage):
 
-    start = time.perf_counter()
-
     image_db_path = "Image_Database/"
     image_paths = []
     for img in os.listdir(image_db_path):
         image_paths.append(image_db_path+img)
 
-    lists = [image_paths, image_paths, image_paths, image_paths]
-
     features = {}
     for image in image_paths:
         imageName, vector = extractFeatureVectors(image)
@@ -44,13 +40,8 @@ def ImageSearch(queryImage):
     search = QuerySearch(queryVector, features)
     results = search.performSearch()
 
-    results.sort(key=lambda res: res[1])
-    print(results)
-
+    results.sort(key=lambda res: res[1], reverse=True)
     # for res in results:
     #     print(res)
 
     return results
-
-    end = time.perf_counter()
-    print(f"Time : {end-start}")