diff --git a/BachelorThesis/Software/PyPrecisionGUI/__pycache__/localization.cpython-38.pyc b/BachelorThesis/Software/PyPrecisionGUI/__pycache__/localization.cpython-38.pyc index 64b5918..2777866 100644 Binary files a/BachelorThesis/Software/PyPrecisionGUI/__pycache__/localization.cpython-38.pyc and b/BachelorThesis/Software/PyPrecisionGUI/__pycache__/localization.cpython-38.pyc differ diff --git a/BachelorThesis/Software/PyPrecisionGUI/calculated_positions/Recording_2_sf=0.001.npy b/BachelorThesis/Software/PyPrecisionGUI/calculated_positions/Recording_2_sf=0.001.npy index 019b8db..539130e 100644 Binary files a/BachelorThesis/Software/PyPrecisionGUI/calculated_positions/Recording_2_sf=0.001.npy and b/BachelorThesis/Software/PyPrecisionGUI/calculated_positions/Recording_2_sf=0.001.npy differ diff --git a/BachelorThesis/Software/PyPrecisionGUI/calculated_positions/Recording_2_sf=0.0015.npy b/BachelorThesis/Software/PyPrecisionGUI/calculated_positions/Recording_2_sf=0.0015.npy index d258d46..50f6cad 100644 Binary files a/BachelorThesis/Software/PyPrecisionGUI/calculated_positions/Recording_2_sf=0.0015.npy and b/BachelorThesis/Software/PyPrecisionGUI/calculated_positions/Recording_2_sf=0.0015.npy differ diff --git a/BachelorThesis/Software/PyPrecisionGUI/calculated_positions/Recording_2_sf=0.002.npy b/BachelorThesis/Software/PyPrecisionGUI/calculated_positions/Recording_2_sf=0.002.npy index bce3111..d5ee189 100644 Binary files a/BachelorThesis/Software/PyPrecisionGUI/calculated_positions/Recording_2_sf=0.002.npy and b/BachelorThesis/Software/PyPrecisionGUI/calculated_positions/Recording_2_sf=0.002.npy differ diff --git a/BachelorThesis/Software/PyPrecisionGUI/calculated_positions/Recording_2_sf=0.0025.npy b/BachelorThesis/Software/PyPrecisionGUI/calculated_positions/Recording_2_sf=0.0025.npy index 6efba20..87010d2 100644 Binary files a/BachelorThesis/Software/PyPrecisionGUI/calculated_positions/Recording_2_sf=0.0025.npy and b/BachelorThesis/Software/PyPrecisionGUI/calculated_positions/Recording_2_sf=0.0025.npy differ diff --git a/BachelorThesis/Software/PyPrecisionGUI/calculated_positions/Recording_2_sf=0.003.npy b/BachelorThesis/Software/PyPrecisionGUI/calculated_positions/Recording_2_sf=0.003.npy index d101cc9..e1a00aa 100644 Binary files a/BachelorThesis/Software/PyPrecisionGUI/calculated_positions/Recording_2_sf=0.003.npy and b/BachelorThesis/Software/PyPrecisionGUI/calculated_positions/Recording_2_sf=0.003.npy differ diff --git a/BachelorThesis/Software/PyPrecisionGUI/localization.py b/BachelorThesis/Software/PyPrecisionGUI/localization.py index a25a62b..49c4f5a 100644 --- a/BachelorThesis/Software/PyPrecisionGUI/localization.py +++ b/BachelorThesis/Software/PyPrecisionGUI/localization.py @@ -9,6 +9,7 @@ class Localization: #self.table = np.load('fingerprinting_tables/Julian_1cm_precision_corrected_antenas.npy') # corrected table made by Ihm (No ferrite) #self.table = np.load('fingerprinting_tables/SmallManualFingerprint_Ferrite.npy') # manual fingerprinting table (Ferrite) [A bit off] #self.table = np.load('fingerprinting_tables/Julian_BThesis_table2_switchedAnt5&6 and 7&8.npy') # Switched Ant5<->6 and 7<->8 in Excel (No Ferrite) [Does not work!] + self.table = np.load('fingerprinting_tables/Julian_THIS_ONE_IS_IT.npy') # 2cm precision this definetly worked for (No ferrite) self.data = np.load('recorded_data/current_recording.npy') @@ -26,10 +27,10 @@ class Localization: Output: - position [type = np.array[3]]: The estimated position of the object in this sample x,y,z """ - print("fv =", fv) + #print("fv =", fv) feature_vector = fv * self.scale_factor - print("table=", self.table) + repeated_feature_vector = np.square(self.table[:, 9:] - feature_vector) euclidean_distances = np.sum(repeated_feature_vector, 1) diff --git a/BachelorThesis/Software/PyPrecisionGUI/main_script.py b/BachelorThesis/Software/PyPrecisionGUI/main_script.py index f7d55d0..17edec9 100644 --- a/BachelorThesis/Software/PyPrecisionGUI/main_script.py +++ b/BachelorThesis/Software/PyPrecisionGUI/main_script.py @@ -165,11 +165,11 @@ plotting = Plotting() # Decide what scaling_factors and Recording -#scale_factors = np.arange(0.001, 0.0035, 0.0005) -scale_factors = [1] +scale_factors = np.arange(0.001, 0.0035, 0.0005) +#scale_factors = [1] localization.k_nearest = 15 -Recording = 5 # which ART Recording to pick +Recording = 2 # which ART Recording to pick for sf in scale_factors: