From d90cf875dfba890f0b134abe6fd0a3a98e911329 Mon Sep 17 00:00:00 2001
From: HappyZ <zhuyanzi@gmail.com>
Date: Thu, 1 Feb 2018 22:46:09 -0600
Subject: [PATCH] re-calibrate based on new indoor data

---
 calibration_plot.m | 27 +++++++++++++++++----------
 iw_parser.py       |  1 -
 libMeasurement.py  |  2 +-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/calibration_plot.m b/calibration_plot.m
index 1643681..a469252 100644
--- a/calibration_plot.m
+++ b/calibration_plot.m
@@ -1,7 +1,7 @@
 clear all;
 
 folder = 'calibration_data/new_indoor/';
-files = dir(folder);
+files = dir(folder); files = files(3:end);  % remove . and ..
 targets = zeros(1, length(files));
 for i = length(files):-1:1
     if (~contains(files(i).name, 'result') ||...
@@ -23,6 +23,7 @@ median_result = zeros(1, length(files));
 mean_result = zeros(1, length(files));
 all_data = [];
 figure(1); clf; hold on;
+% figure(2); clf; hold on;
 for i = 1:length(files)
     filename = [folder, files(i).name];
 
@@ -34,17 +35,18 @@ for i = 1:length(files)
     data = fscanf(fileID, formatSpec, [9 Inf]);
     fclose(fileID);
     if isempty(data)
-        data = readtable(filename);
+        data = readtable(filename, 'ReadVariableNames', 0);
         if isempty(data)
             continue
         end
-        caliDist = table2array(data(:, 2))';
-        rawRTT = table2array(data(:, 3))';
-        rawRTTVar = table2array(data(:, 4))';
-        rawDist = table2array(data(:, 5))';
-        rawDistVar = table2array(data(:, 6))';
-        rssi = table2array(data(:, 7))';
-        time = table2array(data(:, 8))';
+        data = data(2:end, :);
+        caliDist = str2double(table2array(data(:, 2)))';
+        rawRTT = str2double(table2array(data(:, 3)))';
+        rawRTTVar = str2double(table2array(data(:, 4)))';
+        rawDist = str2double(table2array(data(:, 5)))';
+        rawDistVar = str2double(table2array(data(:, 6)))';
+        rssi = str2double(table2array(data(:, 7)))';
+        time = str2double(table2array(data(:, 8)))';
     else
         % get rid of invalid data
         data(:, data(7, :) ~= 0) = [];
@@ -61,6 +63,11 @@ for i = 1:length(files)
     fprintf('* std: %.2f (uncalibrated)\n', std(rawDist));
 
     figure(1); cdfplot(rawDist);
+%     figure(2);
+%     scatter3(...
+%         sqrt(rawDistVar),...
+%         rssi,...
+%         rawDist - targets(i));
     
     all_data = [...
         all_data,...
@@ -95,7 +102,7 @@ end
 %     size(all_data, 2));
 
 
-figure(2); clf; hold on;
+figure(3); clf; hold on;
 scatter(all_data(1, :), all_data(2, :), 'b.');
 plot(median_result, targets, 'r', 'LineWidth', 2)
 
diff --git a/iw_parser.py b/iw_parser.py
index 3d3acd4..1b05e6e 100755
--- a/iw_parser.py
+++ b/iw_parser.py
@@ -71,7 +71,6 @@ def main():
         '--cali',
         nargs=2,
         default=(0.9376, 558.0551),
-        # default=(0.9234, 534.7103),
         type=float,
         help="calibrate final result"
     )
diff --git a/libMeasurement.py b/libMeasurement.py
index 23da4e8..d586762 100755
--- a/libMeasurement.py
+++ b/libMeasurement.py
@@ -192,7 +192,7 @@ def main():
     p.add_argument(
         '--cali',
         nargs=2,
-        # default=(0.9234, 534.7103),  # indoor
+        # default=(0.9376, 558.0551),  # indoor
         default=(0.8324, 583.7435),  # outdoor
         type=float,
         help="calibrate final result"