From 1de8438b569e798a78d5f7dbea335539ebf68620 Mon Sep 17 00:00:00 2001 From: Julian Picht Date: Tue, 20 Dec 2016 19:50:49 +0100 Subject: pulse level debug version --- tools/disambiguate/Makefile | 2 +- tools/disambiguate/disambiguate.c | 175 ++++++++++++++++++++++++++++---------- 2 files changed, 131 insertions(+), 46 deletions(-) (limited to 'tools') diff --git a/tools/disambiguate/Makefile b/tools/disambiguate/Makefile index dd5a42b..e719469 100644 --- a/tools/disambiguate/Makefile +++ b/tools/disambiguate/Makefile @@ -1,5 +1,5 @@ disambiguate: disambiguate.c - gcc -g -o $@ $^ -lm + gcc -Wall -Wextra -Werror -g -o $@ $^ -lm test: disambiguate ./disambiguate | head -n 100 diff --git a/tools/disambiguate/disambiguate.c b/tools/disambiguate/disambiguate.c index 30034f9..581e964 100644 --- a/tools/disambiguate/disambiguate.c +++ b/tools/disambiguate/disambiguate.c @@ -3,35 +3,117 @@ #include #include -long times[64]; -int scores[64]; - -void discard(long age) { - for (int i = 0; i < sizeof(times)/sizeof(times[0]); ++i) { - if (times[i] != 0 && times[i] < age) { - times[i] = 0; - scores[i] = 0; +#define DIS_NUM_VALUES 64 + +typedef enum { + D_SYNC_J0 = 0, + D_SYNC_K0 = 1, + D_SYNC_J1 = 2, + D_SYNC_K1 = 3, + D_SYNC_J2 = 4, + D_SYNC_K2 = 5, + D_SYNC_J3 = 6, + D_SYNC_K3 = 7, +} sync_pulse; + +typedef enum { + D_STATE_INVALID = 0, + D_STATE_LOCKED = 1, + D_STATE_UNLOCKED = -1, +} dis_state; + +typedef enum { + P_UNKNOWN = 0, + P_SYNC = 1, + P_SWEEP = 2, +} pulse_type; + +typedef struct disambiguator_ { + long times[DIS_NUM_VALUES]; + int scores[DIS_NUM_VALUES]; + dis_state state; + long last; +} disambiguator; + +typedef struct classified_pulse_ { + pulse_type t; + int length; +} classified_pulse; + +void disambiguator_init(disambiguator * d) { + memset(&(d->times), 0x0, sizeof(d->times)); + memset(&(d->scores), 0x0, sizeof(d->times)); + d->state = D_STATE_UNLOCKED; + d->last = 0; +} + +void disambiguator_discard(disambiguator * d, long age) { + for (unsigned int i = 0; i < DIS_NUM_VALUES; ++i) { + if (d->times[i] != 0 && d->times[i] < age) { + d->times[i] = 0; + d->scores[i] = 0; } } } -int findNearest(long time) { - int diff = 1000; // max allowed diff for a match +int disambiguator_find_nearest(disambiguator * d, long time, int max_diff) { + int diff = max_diff; // max allowed diff for a match int idx = -1; - for (int i = 0; i < sizeof(times)/sizeof(times[0]); ++i) { - if (times[i] == 0) continue; + for (unsigned int i = 0; i < DIS_NUM_VALUES; ++i) { + if (d->times[i] == 0) continue; - int a = abs(times[i] - time); + int a = abs(d->times[i] - time); if (a < diff) { idx = i; diff = a; } + } + + return idx; +} +pulse_type disambiguator_step(disambiguator * d, long time, int length) { + if (length < 2750) { + return d->state == D_STATE_LOCKED ? P_SWEEP : P_UNKNOWN; } - //printf("DIFF: %d %d\n", diff, idx); + disambiguator_discard(d, time - 10000000); + int idx = disambiguator_find_nearest(d, time - 400000, 100); - return idx; + if (time - d->last > 401000) { + d->state = D_STATE_UNLOCKED; + } + + if (idx == -1) { + for (int i = 0; i < DIS_NUM_VALUES; ++i) { + if (d->times[i] == 0) { + d->times[i] = time; + break; + } + } + + return d->state == D_STATE_LOCKED ? P_SWEEP : P_UNKNOWN; + } else { + // double l = length; + // char cc = round(l / 500) - 6; + // printf("MATCH: %li %d %d (0b%d%d%d)\n", time - d->times[idx], d->scores[idx], length, (cc >> 2) & 0x1, (cc >> 1) & 0x1, cc & 0x1); + d->scores[idx]++; + if (d->scores[idx] >= 30) { + d->state = D_STATE_LOCKED; + // printf("MATCH: %li %d\n", time - d->times[idx], scores[idx]); + return P_SYNC; + } + d->times[idx] = time; + d->last = time; + return d->state == D_STATE_LOCKED ? P_SYNC : P_UNKNOWN; + } + + return d->state == D_STATE_LOCKED ? P_SWEEP : P_UNKNOWN; +} + +sync_pulse length_to_pulse(int length) { + double l = length - 3000; + return round(l/500); } int main() { @@ -41,48 +123,51 @@ int main() { fprintf(stderr, "ERROR OPENING INPUT FILE\n"); return -1; } - memset(×, 0, sizeof( times )); - memset(&scores, 0, sizeof( scores )); - long offset = 0, last = 0; + long last = 0; + int num = 0; + long data[12]; + memset(&data, 0x0, sizeof(data)); + disambiguator d; + disambiguator_init(&d); for (;;) { char controller[10]; int sensor; int unknown; int length; long time; + if (fscanf(f, "%s %d %d %d %li", controller, &sensor, &unknown, &length, &time) != 5) { break; } - /*if (time - last < 10000) { - offset += 0x100000000; - }*/ - time += offset; - last = time; - - if (length < 2750) continue; - - discard(time - 10000000); - int idx = findNearest(time - 800000); - if (idx == -1) { - for (int i = 0; i < sizeof(times)/sizeof(times[0]); ++i) { - if (times[i] == 0) { -// printf("ADD: %d %li\n", i, time); - times[i] = time; - break; - } - } - } else { - double l = length; - char cc = round(l / 500) - 6; - printf("MATCH: %li %d %d (0b%d%d%d)\n", time - times[idx], scores[idx], length, (cc >> 2) & 0x1, (cc >> 1) & 0x1, cc & 0x1); - scores[idx]++; - if (scores[idx] >= 30) { - printf("MATCH: %li %d\n", time - times[idx], scores[idx]); - return 0; + if (length > 2750) { + char cc = length_to_pulse(length); + printf("PULSE %d %c%d ", length, cc & 0x1 ? 'j' : 'k', (cc >> 1) & 0x3); + for (int i = 0; i < 12; ++i) { + if (data[i] != 0) + printf("%8li ", (time-data[i]) % 400000); } - times[idx] = time; + printf("\n"); + data[num++ % 12] = time; + } + + switch (disambiguator_step(&d, time, length)) { + default: + case P_UNKNOWN: + //printf("UNKN %s %2d %li %d\n", controller, sensor, time - last, length); + continue; + case P_SYNC: + { + double l = length; + char cc = round(l / 500) - 6; + printf("SYNC %s %2d %10li %c%d %10li\n", controller, sensor, time, cc & 0x1 ? 'j' : 'k', (cc >> 1) & 0x3, time-last); + last = time; + } + continue; + case P_SWEEP: + printf("SWEEP %s %2d %10li %5d\n", controller, sensor, time - last, length); + continue; } } fclose(f); -- cgit v1.2.3 From 6fbf801a0a1181861f82eab5af738a4290b21978 Mon Sep 17 00:00:00 2001 From: Julian Picht Date: Tue, 20 Dec 2016 20:01:05 +0100 Subject: looks like disambiguate is probably working pretty well(?) --- tools/disambiguate/disambiguate.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'tools') diff --git a/tools/disambiguate/disambiguate.c b/tools/disambiguate/disambiguate.c index 581e964..9a52c16 100644 --- a/tools/disambiguate/disambiguate.c +++ b/tools/disambiguate/disambiguate.c @@ -33,6 +33,7 @@ typedef struct disambiguator_ { int scores[DIS_NUM_VALUES]; dis_state state; long last; + int max_confidence; } disambiguator; typedef struct classified_pulse_ { @@ -45,15 +46,22 @@ void disambiguator_init(disambiguator * d) { memset(&(d->scores), 0x0, sizeof(d->times)); d->state = D_STATE_UNLOCKED; d->last = 0; + d->max_confidence = 0; } void disambiguator_discard(disambiguator * d, long age) { + int confidence = 0; for (unsigned int i = 0; i < DIS_NUM_VALUES; ++i) { if (d->times[i] != 0 && d->times[i] < age) { d->times[i] = 0; d->scores[i] = 0; + } else { + if (d->scores[i] > confidence) { + confidence = d->scores[i]; + } } } + d->max_confidence = confidence; } int disambiguator_find_nearest(disambiguator * d, long time, int max_diff) { @@ -101,11 +109,18 @@ pulse_type disambiguator_step(disambiguator * d, long time, int length) { if (d->scores[idx] >= 30) { d->state = D_STATE_LOCKED; // printf("MATCH: %li %d\n", time - d->times[idx], scores[idx]); - return P_SYNC; } +/* + for (unsigned int i = 0; i < DIS_NUM_VALUES; ++i) { + if (d->scores[i] > 0 && d->times[i] != 0) + printf("TS %2d %li %d\n", i, d->times[i], d->scores[i]); + } +*/ d->times[idx] = time; d->last = time; - return d->state == D_STATE_LOCKED ? P_SYNC : P_UNKNOWN; + return d->state == D_STATE_LOCKED ? ( + d->scores[idx] >= d->max_confidence ? P_SYNC : P_SWEEP + ) : P_UNKNOWN; } return d->state == D_STATE_LOCKED ? P_SWEEP : P_UNKNOWN; @@ -125,9 +140,6 @@ int main() { } long last = 0; - int num = 0; - long data[12]; - memset(&data, 0x0, sizeof(data)); disambiguator d; disambiguator_init(&d); @@ -141,16 +153,6 @@ int main() { if (fscanf(f, "%s %d %d %d %li", controller, &sensor, &unknown, &length, &time) != 5) { break; } - if (length > 2750) { - char cc = length_to_pulse(length); - printf("PULSE %d %c%d ", length, cc & 0x1 ? 'j' : 'k', (cc >> 1) & 0x3); - for (int i = 0; i < 12; ++i) { - if (data[i] != 0) - printf("%8li ", (time-data[i]) % 400000); - } - printf("\n"); - data[num++ % 12] = time; - } switch (disambiguator_step(&d, time, length)) { default: -- cgit v1.2.3 From a95737952d4fbb658b6de3bec312109b56caf6a6 Mon Sep 17 00:00:00 2001 From: Julian Picht Date: Tue, 20 Dec 2016 21:32:44 +0100 Subject: hacked in my disambiguator --- tools/disambiguate/Makefile | 2 +- tools/disambiguate/disambiguate.c | 138 +++----------------------------------- 2 files changed, 9 insertions(+), 131 deletions(-) (limited to 'tools') diff --git a/tools/disambiguate/Makefile b/tools/disambiguate/Makefile index e719469..8e8661c 100644 --- a/tools/disambiguate/Makefile +++ b/tools/disambiguate/Makefile @@ -1,4 +1,4 @@ -disambiguate: disambiguate.c +disambiguate: disambiguate.c ../../src/disambiguator.c gcc -Wall -Wextra -Werror -g -o $@ $^ -lm test: disambiguate diff --git a/tools/disambiguate/disambiguate.c b/tools/disambiguate/disambiguate.c index 9a52c16..dcaf9d8 100644 --- a/tools/disambiguate/disambiguate.c +++ b/tools/disambiguate/disambiguate.c @@ -2,134 +2,7 @@ #include #include #include - -#define DIS_NUM_VALUES 64 - -typedef enum { - D_SYNC_J0 = 0, - D_SYNC_K0 = 1, - D_SYNC_J1 = 2, - D_SYNC_K1 = 3, - D_SYNC_J2 = 4, - D_SYNC_K2 = 5, - D_SYNC_J3 = 6, - D_SYNC_K3 = 7, -} sync_pulse; - -typedef enum { - D_STATE_INVALID = 0, - D_STATE_LOCKED = 1, - D_STATE_UNLOCKED = -1, -} dis_state; - -typedef enum { - P_UNKNOWN = 0, - P_SYNC = 1, - P_SWEEP = 2, -} pulse_type; - -typedef struct disambiguator_ { - long times[DIS_NUM_VALUES]; - int scores[DIS_NUM_VALUES]; - dis_state state; - long last; - int max_confidence; -} disambiguator; - -typedef struct classified_pulse_ { - pulse_type t; - int length; -} classified_pulse; - -void disambiguator_init(disambiguator * d) { - memset(&(d->times), 0x0, sizeof(d->times)); - memset(&(d->scores), 0x0, sizeof(d->times)); - d->state = D_STATE_UNLOCKED; - d->last = 0; - d->max_confidence = 0; -} - -void disambiguator_discard(disambiguator * d, long age) { - int confidence = 0; - for (unsigned int i = 0; i < DIS_NUM_VALUES; ++i) { - if (d->times[i] != 0 && d->times[i] < age) { - d->times[i] = 0; - d->scores[i] = 0; - } else { - if (d->scores[i] > confidence) { - confidence = d->scores[i]; - } - } - } - d->max_confidence = confidence; -} - -int disambiguator_find_nearest(disambiguator * d, long time, int max_diff) { - int diff = max_diff; // max allowed diff for a match - int idx = -1; - for (unsigned int i = 0; i < DIS_NUM_VALUES; ++i) { - if (d->times[i] == 0) continue; - - int a = abs(d->times[i] - time); - if (a < diff) { - idx = i; - diff = a; - } - } - - return idx; -} - -pulse_type disambiguator_step(disambiguator * d, long time, int length) { - if (length < 2750) { - return d->state == D_STATE_LOCKED ? P_SWEEP : P_UNKNOWN; - } - - disambiguator_discard(d, time - 10000000); - int idx = disambiguator_find_nearest(d, time - 400000, 100); - - if (time - d->last > 401000) { - d->state = D_STATE_UNLOCKED; - } - - if (idx == -1) { - for (int i = 0; i < DIS_NUM_VALUES; ++i) { - if (d->times[i] == 0) { - d->times[i] = time; - break; - } - } - - return d->state == D_STATE_LOCKED ? P_SWEEP : P_UNKNOWN; - } else { - // double l = length; - // char cc = round(l / 500) - 6; - // printf("MATCH: %li %d %d (0b%d%d%d)\n", time - d->times[idx], d->scores[idx], length, (cc >> 2) & 0x1, (cc >> 1) & 0x1, cc & 0x1); - d->scores[idx]++; - if (d->scores[idx] >= 30) { - d->state = D_STATE_LOCKED; - // printf("MATCH: %li %d\n", time - d->times[idx], scores[idx]); - } -/* - for (unsigned int i = 0; i < DIS_NUM_VALUES; ++i) { - if (d->scores[i] > 0 && d->times[i] != 0) - printf("TS %2d %li %d\n", i, d->times[i], d->scores[i]); - } -*/ - d->times[idx] = time; - d->last = time; - return d->state == D_STATE_LOCKED ? ( - d->scores[idx] >= d->max_confidence ? P_SYNC : P_SWEEP - ) : P_UNKNOWN; - } - - return d->state == D_STATE_LOCKED ? P_SWEEP : P_UNKNOWN; -} - -sync_pulse length_to_pulse(int length) { - double l = length - 3000; - return round(l/500); -} +#include "../../include/disambiguator.h" int main() { @@ -139,7 +12,7 @@ int main() { return -1; } - long last = 0; + long last = 0, lastl = 0; disambiguator d; disambiguator_init(&d); @@ -153,6 +26,10 @@ int main() { if (fscanf(f, "%s %d %d %d %li", controller, &sensor, &unknown, &length, &time) != 5) { break; } + if (lastl > time) { + printf("BACKWARDS: %li %li\n", lastl, time); + } + lastl = time; switch (disambiguator_step(&d, time, length)) { default: @@ -163,7 +40,8 @@ int main() { { double l = length; char cc = round(l / 500) - 6; - printf("SYNC %s %2d %10li %c%d %10li\n", controller, sensor, time, cc & 0x1 ? 'j' : 'k', (cc >> 1) & 0x3, time-last); + int ll = (length+125)/250; + printf("SYNC %s %2d %10li %5d %c%d %10li %d %d\n", controller, sensor, time, length, (cc & 0x1) ? 'k' : 'j', (cc >> 1) & 0x3, time-last, ll & 1, (ll >> 1) - 6); last = time; } continue; -- cgit v1.2.3 From bbb1ef6a917a3e0b94c8278b3c6643b523aad5c0 Mon Sep 17 00:00:00 2001 From: Julian Picht Date: Tue, 20 Dec 2016 22:26:25 +0100 Subject: add copyright headers --- tools/disambiguate/disambiguate.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/disambiguate/disambiguate.c b/tools/disambiguate/disambiguate.c index dcaf9d8..7e46625 100644 --- a/tools/disambiguate/disambiguate.c +++ b/tools/disambiguate/disambiguate.c @@ -1,3 +1,7 @@ +// (C) 2016 Julian Picht, MIT/x11 License. +// +//All MIT/x11 Licensed Code in this file may be relicensed freely under the GPL or LGPL licenses. + #include #include #include @@ -6,7 +10,7 @@ int main() { - FILE * f = fopen( "raw_light_data_from_watchman.csv", "r" ); + FILE * f = fopen( "raw_light_data_from_watchman.sorted.csv", "r" ); if (f == NULL) { fprintf(stderr, "ERROR OPENING INPUT FILE\n"); return -1; -- cgit v1.2.3