Small fixes and comments

This commit is contained in:
seyffejn 2021-02-02 10:57:19 +01:00
parent 0c9278c54e
commit ff8f56425f
8 changed files with 6 additions and 5 deletions

View File

@ -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)

View File

@ -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: