From 995a070d4e777e69b1840392b265e105adc31360 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Sun, 8 Jan 2012 16:30:01 +0100 Subject: [PATCH] Probability pattern ditionary: Expect patterns ordered from least used to most used --- patternprob.c | 9 ++------- tools/pattern_bayes_gen.sh | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/patternprob.c b/patternprob.c index 0270a60..48212d6 100644 --- a/patternprob.c +++ b/patternprob.c @@ -53,13 +53,8 @@ pattern_pdict_init(char *filename, struct pattern_config *pc) str2pattern(buf, &pb->p); uint32_t spi = pattern2spatial(dict, &pb->p); - if (!dict->table[spi]) { - dict->table[spi] = pb; - } else { - struct pattern_prob *ppb = dict->table[spi]; - while (ppb->next) ppb = ppb->next; - ppb->next = pb; - } + pb->next = dict->table[spi]; + dict->table[spi] = pb; i++; } diff --git a/tools/pattern_bayes_gen.sh b/tools/pattern_bayes_gen.sh index 9872b3b..dfff880 100755 --- a/tools/pattern_bayes_gen.sh +++ b/tools/pattern_bayes_gen.sh @@ -21,7 +21,7 @@ for (keys %counts) { $p{$_} = $choices{$_} / $counts{$_}; } - for (sort { $counts{$b} <=> $counts{$a} } keys %p) { + for (sort { $counts{$a} <=> $counts{$b} } keys %p) { printf("%.3f %d %d %s\n", $p{$_}, $choices{$_}, $counts{$_}, $_); } }' -- 2.11.4.GIT