Changeset 2096 for trunk/symbol_table

Timestamp:

May 10, 2012, 12:00:09 PM (7 years ago)

Author:

ksherdy

Message:

Renamed log2 logbase2

Location:

trunk/symbol_table

Files:

• Makefile (modified) (2 diffs)
• demo_strms.py (modified) (5 diffs)
• logbase2_group_strms.py (moved) (moved from trunk/symbol_table/log2_group_strms.py)
• symbol_table.pro (modified) (1 diff)

trunk/symbol_table/Makefile

@@ -28 +28 @@
 ID_GROUP_STRMS = id_group_strms.py
 DIV2_GROUP_STRMS = div2_group_strms.py
-LOG2_GROUP_STRMS = log2_group_strms.py
+LOGBASE2_GROUP_STRMS = logbase2_group_strms.py
 
 GROUP_PREFIX=@group_strms_
@@ -60 +60 @@
         python $(PABLO_COMPILER) $(DIV2_GROUP_STRMS) -t $(MAIN_TEMPLATE) -l $(GROUP_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
 
-logbase2_group: log2_group_strms.py group_strms_template.hpp main_template.cpp
-        python $(PABLO_COMPILER) $(LOG2_GROUP_STRMS) -t $(GROUP_TEMPLATE) -l $(GROUP_PREFIX) -o $(GROUP_OUTFILE) $(PABLO_ADD_DEBUG)
-        python $(PABLO_COMPILER) $(LOG2_GROUP_STRMS) -t $(MAIN_TEMPLATE) -l $(GROUP_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
+logbase2_group: logbase2_group_strms.py group_strms_template.hpp main_template.cpp
+        python $(PABLO_COMPILER) $(LOGBASE2_GROUP_STRMS) -t $(GROUP_TEMPLATE) -l $(GROUP_PREFIX) -o $(GROUP_OUTFILE) $(PABLO_ADD_DEBUG)
+        python $(PABLO_COMPILER) $(LOGBASE2_GROUP_STRMS) -t $(MAIN_TEMPLATE) -l $(GROUP_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG)
 
 clean:

trunk/symbol_table/demo_strms.py

@@ -2 +2 @@
 import marker_strms
 import div2_group_strms
-import log2_group_strms
+import logbase2_group_strms
 import sys
 
@@ -44 +44 @@
         ('groups.ends_gte_17', bitstream2string(groups.ends_gte_17, lgth))])
 
-def Demo_log2(u8data, basis_bits):
+def Demo_logbase2(u8data, basis_bits):
 
     lgth = len(u8data)
@@ -52 +52 @@
     marker_strms.Generate_markers(markers)
 
-    groups = log2_group_strms.Groups()
+    groups = logbase2_group_strms.Groups()
     groups.starts = markers.starts
     groups.ends = markers.ends
-    log2_group_strms.Gen_lgth_groups(groups)
+    logbase2_group_strms.Gen_lgth_groups(groups)
 
     print_aligned_streams([('Input Data', u8data),
@@ -66 +66 @@
         ('groups.ends_2', bitstream2string(groups.ends_2, lgth)),
         ('groups.ends_4', bitstream2string(groups.ends_4, lgth)),
+        ('groups.ends_8', bitstream2string(groups.ends_8, lgth)),
+        ('groups.ends_16', bitstream2string(groups.ends_16, lgth)),
+        ('groups.ends_gte_17', bitstream2string(groups.ends_gte_17, lgth))])
+
+def Demo_div2_logbase2(u8data, basis_bits):
+
+    lgth = len(u8data)
+
+    markers = marker_strms.Markers()
+    marker_strms.Classify_markers(basis_bits, markers)
+    marker_strms.Generate_markers(markers)
+
+    groups = div2_logbase2_group_strms.Groups()
+    groups.starts = markers.starts
+    groups.ends = markers.ends
+    div2_logbase2_group_strms.Gen_lgth_groups(groups)
+
+    print_aligned_streams([('Input Data', u8data),
+        ('markers.spans', bitstream2string(markers.spans, lgth)),
+        ('markers.starts', bitstream2string(markers.starts, lgth)),
+        ('markers.ends', bitstream2string(markers.ends, lgth)),
+        ('groups.starts', bitstream2string(groups.starts, lgth)),
+        ('groups.ends', bitstream2string(groups.ends, lgth)),
+        ('groups.ends_2', bitstream2string(groups.ends_2, lgth)),
+        ('groups.ends_4', bitstream2string(groups.ends_4, lgth)),
+        ('groups.ends_6', bitstream2string(groups.ends_6, lgth)),
         ('groups.ends_8', bitstream2string(groups.ends_8, lgth)),
         ('groups.ends_16', bitstream2string(groups.ends_16, lgth)),
@@ -91 +117 @@
 
     # Demo_div2(u8data, basis_bits)
-    Demo_log2(u8data, basis_bits)
+    Demo_logbase2(u8data, basis_bits)
 

trunk/symbol_table/symbol_table.pro

@@ -50 +50 @@
     bitutil.py \
     pablo.py \
-    log2_group_strms.py \
     test/uniform/st_test_UNIFORM_(5_1_1)_(6_1_1)_(7_1_1)_(8_1_1)_(9_1_1)_(10_1_1)_1_1 \
     test/run_tests.py \
     test/uniform/[1_100_10][2_100_10][3_100_10][4_100_10][5_100_10][6_100_10][7_100_10][8_100_10][9_100_10][10_100_10][11_100_10][12_100_10][13_100_10][14_100_10][15_100_10][16_100_10][17_100_10][18_100_10][19_100_10]_1_1.test \
-    test/gen_test_file.py
+    test/gen_test_file.py \
+    logbase2_group_strms.py
 HEADERS += marker_strms_template.hpp \
     marker_strms.hpp \