From 4f9214360fffadd86fb767f3b2322d657567851d Mon Sep 17 00:00:00 2001 From: nunzip Date: Fri, 15 Feb 2019 16:41:07 +0000 Subject: Remove line from failed merge --- report/paper.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/report/paper.md b/report/paper.md index 43411bc..e44444b 100644 --- a/report/paper.md +++ b/report/paper.md @@ -10,11 +10,7 @@ Both training and testing use 15 randomly selected images from the 10 available ## Vocabulary size -<<<<<<< HEAD The number of clusters or the number of centroids determines the vocabulary size when creating the codebook with the K-means method. Each descriptor is mapped to the nearest centroid, and each descriptor belonging to that cluster is mapped to the same *visual word*. This allows similar descriptors to be mapped to the same word, allowing for comparison through bag-of-words techniques. -======= -The number of clusters or the number of centroids determine the vocabulary size when creating a codebook with the K-means the method. Each descriptor is mapped to the nearest centroid, and each descriptor belonging to that cluster is mapped to the same *visual word*. This allows similar descriptors to be mapped to the same word, allowing for comparison through bag-of-words techniques. ->>>>>>> b052905b323972a69fbf04fd621a6d88c44c40a1 ## Bag-of-words histogram of descriptor vectors -- cgit v1.2.3-54-g00ecf