Skip to content

Commit d2a4563

Browse files
committed
Final Image Search
1 parent 5ac708c commit d2a4563

File tree

5 files changed

+44
-230
lines changed

5 files changed

+44
-230
lines changed

ImageSearch.ipynb

Lines changed: 42 additions & 130 deletions
Large diffs are not rendered by default.

ImageSearch_Serial.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,9 @@ def ImageSearch(queryImage):
3333

3434
imageName, queryVector = extractFeatureVectors(queryImage_path)
3535

36-
# print("Features", features)
37-
# print()
38-
# print("Query", queryVector)
39-
# print()
4036
search = QuerySearch(queryVector, features)
41-
results = search.performSearch()
4237

38+
results = search.performSearch()
4339
results.sort(key=lambda res: res[1])
4440

4541
return results

ImageSearch_parallel.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,26 +41,21 @@ def getImg(img):
4141
return image
4242

4343

44-
# if __name__ == "__main__":
4544
def ImageSearch(queryImage):
4645

47-
start = time.perf_counter()
48-
4946
image_db_path = "Image_Database/"
5047
image_paths = []
5148
for img in os.listdir(image_db_path):
5249
image_paths.append(image_db_path+img)
5350

5451
features = ThreadedFeatureExtraction(image_paths)
5552

56-
# queryImage = sys.argv[1]
5753
queryImage_path = image_db_path+queryImage
58-
5954
imageName, queryVector = extractFeatureVectors(queryImage_path)
6055

6156
search = QuerySearch(queryVector, features)
62-
results = search.performSearch()
6357

58+
results = search.performSearch()
6459
results.sort(key=lambda res: res[1])
6560

6661
return results

multi.py

Lines changed: 0 additions & 45 deletions
This file was deleted.

thread.py

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)