Ignore:
Timestamp:
Aug 9, 2012, 8:36:06 PM (7 years ago)
Author:
ksherdy
Message:

Modified symbol table for integration with current ICXML structure.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/symbol_table/pablo/demo_strms.py

    r2185 r2291  
    2121    lgth = len(u8data)
    2222
    23     markers = marker_strms.Markers()
    24     marker_strms.Classify_markers(basis_bits, markers)
    25     marker_strms.Generate_markers(markers)
     23    marker = marker_strms.Markers()
     24    marker_strms.Classify_marker(basis_bits, marker)
     25    marker_strms.Generate_marker(marker)
    2626
    2727    groups = div2_group_strms.Groups()
    28     div2_group_strms.Gen_lgth_groups(markers, groups)
     28    div2_group_strms.Gen_lgth_groups(marker, groups)
    2929
    3030    print_aligned_streams([('Input Data', u8data),
    31         ('markers.spans', bitstream2string(markers.spans, lgth)),
    32         ('markers.starts', bitstream2string(markers.starts, lgth)),
    33         ('markers.follows', bitstream2string(markers.follows, lgth)),
     31        ('marker.spans', bitstream2string(marker.spans, lgth)),
     32        ('marker.starts', bitstream2string(marker.starts, lgth)),
     33        ('marker.follows', bitstream2string(marker.follows, lgth)),
    3434        ('groups.starts', bitstream2string(groups.starts, lgth)),
    3535        ('groups.follows', bitstream2string(groups.follows, lgth)),
     
    4848    lgth = len(u8data)
    4949
    50     markers = marker_strms.Markers()
    51     marker_strms.Classify_markers(basis_bits, markers)
    52     marker_strms.Generate_markers(markers)
     50    marker = marker_strms.Markers()
     51    marker_strms.Classify_marker(basis_bits, marker)
     52    marker_strms.Generate_marker(marker)
    5353
    5454    groups = logbase2_group_strms.Groups()
    55     logbase2_group_strms.Gen_lgth_groups(markers, groups)
     55    logbase2_group_strms.Gen_lgth_groups(marker, groups)
    5656
    5757    print_aligned_streams([('Input Data', u8data),
    58         ('markers.spans', bitstream2string(markers.spans, lgth)),
    59         ('markers.starts', bitstream2string(markers.starts, lgth)),
    60         ('markers.follows', bitstream2string(markers.follows, lgth)),
     58        ('marker.spans', bitstream2string(marker.spans, lgth)),
     59        ('marker.starts', bitstream2string(marker.starts, lgth)),
     60        ('marker.follows', bitstream2string(marker.follows, lgth)),
    6161        ('groups.starts', bitstream2string(groups.starts, lgth)),
    6262        ('groups.follows', bitstream2string(groups.follows, lgth)),
     
    7272    lgth = len(u8data)
    7373
    74     markers = marker_strms.Markers()
    75     marker_strms.Classify_markers(basis_bits, markers)
    76     marker_strms.Generate_markers(markers)
     74    marker = marker_strms.Markers()
     75    marker_strms.Classify_marker(basis_bits, marker)
     76    marker_strms.Generate_marker(marker)
    7777
    7878    groups = div2_logbase2_group_strms.Groups()
    79     div2_logbase2_group_strms.Gen_lgth_groups(markers, groups)
     79    div2_logbase2_group_strms.Gen_lgth_groups(marker, groups)
    8080
    8181    print_aligned_streams([('Input Data', u8data),
    82         ('markers.spans', bitstream2string(markers.spans, lgth)),
    83         ('markers.starts', bitstream2string(markers.starts, lgth)),
    84         ('markers.follows', bitstream2string(markers.follows, lgth)),
     82        ('marker.spans', bitstream2string(marker.spans, lgth)),
     83        ('marker.starts', bitstream2string(marker.starts, lgth)),
     84        ('marker.follows', bitstream2string(marker.follows, lgth)),
    8585        ('groups.starts', bitstream2string(groups.starts, lgth)),
    8686        ('groups.follows', bitstream2string(groups.follows, lgth)),
     
    9696    lgth = len(u8data)
    9797
    98     markers = marker_strms.Markers()
    99     marker_strms.Classify_markers(basis_bits, markers)
    100     marker_strms.Generate_markers(markers)
     98    marker = marker_strms.Markers()
     99    marker_strms.Classify_marker(basis_bits, marker)
     100    marker_strms.Generate_marker(marker)
    101101
    102102    groups = bit_byte_group_strms.Groups()
    103     bit_byte_group_strms.Gen_lgth_groups(markers, groups)
     103    bit_byte_group_strms.Gen_lgth_groups(marker, groups)
    104104
    105105    print_aligned_streams([('Input Data', u8data),
    106         ('markers.spans', bitstream2string(markers.spans, lgth)),
    107         ('markers.starts', bitstream2string(markers.starts, lgth)),
    108         ('markers.follows', bitstream2string(markers.follows, lgth)),
     106        ('marker.spans', bitstream2string(marker.spans, lgth)),
     107        ('marker.starts', bitstream2string(marker.starts, lgth)),
     108        ('marker.follows', bitstream2string(marker.follows, lgth)),
    109109        ('groups.starts', bitstream2string(groups.starts, lgth)),
    110110        ('groups.follows', bitstream2string(groups.follows, lgth)),
Note: See TracChangeset for help on using the changeset viewer.