From 266386321bc1ac40551e63977d58a68ff9abb8ce Mon Sep 17 00:00:00 2001
From: Peng Wu <alexepico@gmail.com>
Date: Wed, 9 Nov 2011 14:31:04 +0800
Subject: revert re-split table

---
 scripts/genspecialtable.py   | 15 +++++----------
 src/storage/pinyin_parser2.h |  5 +++--
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/scripts/genspecialtable.py b/scripts/genspecialtable.py
index 0ef9d44..0b03404 100644
--- a/scripts/genspecialtable.py
+++ b/scripts/genspecialtable.py
@@ -68,17 +68,12 @@ def gen_resplit_table():
         (orig_first_key, orig_second_key, new_first_key, new_second_key) = map\
             (get_chewing_string, (orig_first_key, orig_second_key, \
                                       new_first_key, new_second_key))
-        if new_freq > orig_freq:
-            if orig_freq == 0:
-                benefit = 0.5
-            else:
-                benefit = 0.3
-        elif orig_freq >= new_freq:
+        if orig_freq >= new_freq:
             assert orig_freq > 0, "Expected orig_freq > 0 here."
-            benefit = 0
-        entry = '{{{0}, {1}, {2}, {3}, {4}}}'.format \
-            (orig_first_key, orig_second_key, \
-                 new_first_key, new_second_key, benefit)
+
+        entry = '{{{0}, {1}, {2}, {3}, {4}, {5}}}'.format \
+            (orig_first_key, orig_second_key, orig_freq,\
+                 new_first_key, new_second_key, new_freq)
         entries.append(entry)
     return ',\n'.join(entries)
 
diff --git a/src/storage/pinyin_parser2.h b/src/storage/pinyin_parser2.h
index c2702cd..9a78e88 100644
--- a/src/storage/pinyin_parser2.h
+++ b/src/storage/pinyin_parser2.h
@@ -48,15 +48,16 @@ typedef struct {
     ChewingKey   m_orig_key;
     ChewingKey   m_first_key;
     ChewingKey   m_second_key;
-    guint32      m_freq;
+    guint32      m_new_freq;
 } divided_table_item_t;
 
 typedef struct {
     ChewingKey   m_orig_first_key;
     ChewingKey   m_orig_second_key;
+    guint32      m_orig_freq;
     ChewingKey   m_new_first_key;
     ChewingKey   m_new_second_key;
-    gfloat       m_benefit;
+    guint32      m_new_freq;
 } resplit_table_item_t;
 
 };
-- 
cgit