Changeset 2216


Ignore:
Timestamp:
Jun 5, 2012, 9:01:54 PM (7 years ago)
Author:
cameron
Message:

Deprecate Advance32/interpose32

Location:
trunk/symbol_table/pablo
Files:
2 edited

Legend:

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

    r2185 r2216  
    4848
    4949        # Advance 32 and Interpose
    50         temp32 = pablo.Advance32 (follows_mask_1_8)
    51         groups.follows_16 = follows_gt_8 & interpose32 (follows_mask_1_8, temp32, 8)
     50        #temp32 = pablo.Advance32 (follows_mask_1_8)
     51        #groups.follows_16 = follows_gt_8 & interpose32 (follows_mask_1_8, temp32, 8)
     52
     53        temp8 = pablo.Advance (follows_mask_1_8, 8)
     54        groups.follows_16 = follows_gt_8 & temp8
     55
    5256
    5357        follows_gt_16 = follows_gt_8 &~ groups.follows_16
  • trunk/symbol_table/pablo/logbase2_group_strms.py

    r2185 r2216  
    3131                # Group symbols of length 3 to 4
    3232                temp = starts_1 | starts_2
    33                 temp32 = pablo.Advance32(temp)
    34                 #starts_3_to_4 = pablo.Advance(pablo.Advance(temp))
    35                 starts_3_to_4 = interpose32 (temp, temp32, 2)
     33                #temp32 = pablo.Advance32(temp)
     34                starts_3_to_4 = pablo.Advance(temp,2)
     35                #starts_3_to_4 = interpose32 (temp, temp32, 2)
    3636                groups.follows_4 = starts_3_to_4 & remaining_follows
    3737                remaining_follows = remaining_follows & ~groups.follows_4
     
    3939                # Group symbols of length 5 to 8
    4040                temp = temp | starts_3_to_4
    41                 temp32 = pablo.Advance32(temp)
    42                 #starts_5_to_8 = pablo.Advance(pablo.Advance(pablo.Advance(pablo.Advance(temp))))
    43                 starts_5_to_8 = interpose32 (temp, temp32, 4)
     41                #temp32 = pablo.Advance32(temp)
     42                starts_5_to_8 = pablo.Advance(temp, 4)
     43                #starts_5_to_8 = interpose32 (temp, temp32, 4)
    4444                groups.follows_8 = starts_5_to_8 & remaining_follows
    4545                remaining_follows = remaining_follows & ~groups.follows_8
     
    4747                # Group symbols of length 9 to 16
    4848                temp = temp | starts_5_to_8
    49                 temp32 = pablo.Advance32 (temp)
    50                 #starts_9_16 = pablo.Advance(pablo.Advance(pablo.Advance(pablo.Advance(pablo.Advance(pablo.Advance(pablo.Advance(pablo.Advance(temp))))))))
    51                 starts_9_16 = interpose32 (temp, temp32, 8)
     49                #temp32 = pablo.Advance32 (temp)
     50                starts_9_16 = pablo.Advance(temp,8)
     51                #starts_9_16 = interpose32 (temp, temp32, 8)
    5252                groups.follows_16 = starts_9_16 & remaining_follows
    5353                remaining_follows = remaining_follows & ~groups.follows_16
Note: See TracChangeset for help on using the changeset viewer.