Merge branch '14-brute-force-mock-file-structure' into 'master'

Resolve "Brute force mock file structure"

Closes #14

See merge request !17

.gitignore

@@ -5,3 +5,4 @@ __pycache__
 algorithm/train_src/dlc_model
 img_analyze/*.png
 env
+male
\ No newline at end of file

algorithm/main_src/new_matching.py

+import os
+
 from cv2 import cv2
 from Salamander import Salamander
 from SalamanderImage import SalamanderImage
@@ -49,10 +51,24 @@ def match_single_image(input_image, match_image) -> bool:
     goodmatch = []
     for m, n in match:
         if m.distance < match_dist * n.distance:
-            print("Match!")
             goodmatch.append([m])
-        else:
-            print("Not match!")
-    print(len(goodmatch))
+    # print(len(goodmatch))
+    if len(goodmatch) > min_good_match:
+        return True
+    return False
+
+
+def match_file_structure(input_image, match_directory) -> int:
+    for folder in os.listdir(match_directory):
+        current_dir = match_directory + "\\" + folder
+        for filename in os.listdir(current_dir):
+            if filename.endswith("_str.png"):
+                match_image = current_dir + "\\" + filename
+                res = match_single_image(input_image, match_image)
+                if res:
+                    return int(folder)
+                return -1
+
 
-res = match_single_image("..\\..\\img_analyze\\img40Edit_str.png", "..\\..\\img_analyze\\img43_str.png")
+print(match_file_structure("..\\..\\img_analyze\\img81_str.png", "..\\..\\Male"))
+# res = match_single_image("..\\..\\img_analyze\\img40Edit_str.png", "..\\..\\img_analyze\\img43_str.png")