Update src/helper.py

src/helper.py

@@ -22,12 +22,17 @@ def euclidean_distance(x, y):
     return d
 
 def merge_features(feature1, feature2):
-    # pad or truncate hist_color and hist_lbp to the same length
-    max_length = max(feature1.shape[0], feature2.shape[0])
-    feature1_padded = np.pad(hist_color, (0, max_length - hist_color.shape[0]))
-    feature2_padded = np.pad(hist_lbp, (0, max_length - hist_lbp.shape[0]))
+    """
+    Combine two feature vectors of color descriptors and LBP.
 
-    # concatenate the padded feature vectors
-    return np.hstack((hist_color_padded, hist_lbp_padded))
+    Parameters:
+    color_features (list): List of color descriptor features.
+    lbp_features (list): List of LBP features.
+
+    Returns:
+    list: Concatenated feature vector.
+    """
+    combined_features = feature1 + feature2
+    return combined_features