Changeset 1686 for proto


Ignore:
Timestamp:
Nov 16, 2011, 12:37:01 PM (8 years ago)
Author:
vla24
Message:

SymbolTable?: use alphabets as words for dictionary, not alphanumerics

Location:
proto/SymbolTable
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • proto/SymbolTable/Makefile

    r1671 r1686  
    1 DICTIONARY_OUTFILE=src/dictionary.cpp
     1WCD_OUTFILE=src/wcd.cpp
    22
    3 PABLO_DICTIONARY=dictionary.py
    4 PABLO_DICTIONARY_ID=dictionary_id.py
    5 PABLO_DICTIONARY_PBGS_ID=dictionary_pbgs_id.py
    6 PABLO_DICTIONARY_PBGS_ID_ADV=dictionary_pbgs_id_adv.py
    7 PABLO_DICTIONARY_PBGS_LOG=dictionary_pbgs_log.py
    8 PABLO_DICTIONARY_PBGS_DIV=dictionary_pbgs_div.py
     3PABLO_WCD=dictionary.py
     4PABLO_WCD_ID=dictionary_id.py
     5PABLO_WCD_PBGS_ID=dictionary_pbgs_id.py
     6PABLO_WCD_PBGS_ID_ADV=dictionary_pbgs_id_adv.py
     7PABLO_WCD_PBGS_LOG=dictionary_pbgs_log.py
     8PABLO_WCD_PBGS_DIV=dictionary_pbgs_div.py
    99
    10 DICTIONARY_STL_TEMPLATE=dictionary_stl_template.cpp
    11 DICTIONARY_LS_TEMPLATE=dictionary_ls_template.cpp
    12 DICTIONARY_HASH_TEMPLATE=dictionary_hash_template.cpp
    13 DICTIONARY_IDENTITY_TEMPLATE=dictionary_identity_template.cpp
    14 DICTIONARY_PBGS_ID_TEMPLATE=dictionary_pbgs_identity_template.cpp
    15 DICTIONARY_PBGS_LOG_TEMPLATE=dictionary_pbgs_log_template.cpp
    16 DICTIONARY_PBGS_DIV_TEMPLATE=dictionary_pbgs_div_template.cpp
     10WCD_STL_TEMPLATE=dictionary_stl_template.cpp
     11WCD_LS_TEMPLATE=dictionary_ls_template.cpp
     12WCD_HASH_TEMPLATE=dictionary_hash_template.cpp
     13WCD_IDENTITY_TEMPLATE=dictionary_identity_template.cpp
     14WCD_PBGS_ID_TEMPLATE=dictionary_pbgs_identity_template.cpp
     15WCD_PBGS_LOG_TEMPLATE=dictionary_pbgs_log_template.cpp
     16WCD_PBGS_DIV_TEMPLATE=dictionary_pbgs_div_template.cpp
    1717
    1818XMLWF_OUTFILE=src/xmlwf.cpp
     
    3737PABLO_FLAGS=#-a
    3838
    39 dict_stl:       $(PABLO_DICTIONARY)
    40         python $(PABLO_COMPILER) $(PABLO_DICTIONARY) -t $(DICTIONARY_STL_TEMPLATE) -o $(DICTIONARY_OUTFILE)
     39wcd_stl:        $(PABLO_WCD)
     40        python $(PABLO_COMPILER) $(PABLO_WCD) -t $(WCD_STL_TEMPLATE) -o $(WCD_OUTFILE)
    4141
    42 dict_ls:        $(PABLO_DICTIONARY)
    43         python $(PABLO_COMPILER) $(PABLO_DICTIONARY) -t $(DICTIONARY_LS_TEMPLATE) -o $(DICTIONARY_OUTFILE)
     42wcd_ls: $(PABLO_WCD)
     43        python $(PABLO_COMPILER) $(PABLO_WCD) -t $(WCD_LS_TEMPLATE) -o $(WCD_OUTFILE)
    4444
    45 dict_hash:      $(PABLO_DICTIONARY)
    46         python $(PABLO_COMPILER) $(PABLO_DICTIONARY) -t $(DICTIONARY_HASH_TEMPLATE) -o $(DICTIONARY_OUTFILE)
     45wcd_hash:       $(PABLO_WCD)
     46        python $(PABLO_COMPILER) $(PABLO_WCD) -t $(WCD_HASH_TEMPLATE) -o $(WCD_OUTFILE)
    4747
    48 dict_id:        $(PABLO_DICTIONARY_ID)
    49         python $(PABLO_COMPILER) $(PABLO_DICTIONARY_ID) -t $(DICTIONARY_IDENTITY_TEMPLATE) -o $(DICTIONARY_OUTFILE)
     48wcd_id: $(PABLO_WCD_ID)
     49        python $(PABLO_COMPILER) $(PABLO_WCD_ID) -t $(WCD_IDENTITY_TEMPLATE) -o $(WCD_OUTFILE)
    5050
    51 dict_pbgs_id:   $(PABLO_DICTIONARY_PBGS_ID) # Paralel bitstream based group sorting
    52         python $(PABLO_COMPILER) $(PABLO_DICTIONARY_PBGS_ID) -t $(DICTIONARY_PBGS_ID_TEMPLATE) -o $(DICTIONARY_OUTFILE)
     51wcd_pbgs_id:    $(PABLO_WCD_PBGS_ID) # Paralel bitstream based group sorting
     52        python $(PABLO_COMPILER) $(PABLO_WCD_PBGS_ID) -t $(WCD_PBGS_ID_TEMPLATE) -o $(WCD_OUTFILE)
    5353
    54 dict_pbgs_id_adv:       $(PABLO_DICTIONARY_PBGS_ID_ADV) # Paralel bitstream based group sorting
    55         python $(PABLO_COMPILER) $(PABLO_DICTIONARY_PBGS_ID_ADV) -t $(DICTIONARY_PBGS_ID_TEMPLATE) -o $(DICTIONARY_OUTFILE)
     54wcd_pbgs_id_adv:        $(PABLO_WCD_PBGS_ID_ADV) # Paralel bitstream based group sorting
     55        python $(PABLO_COMPILER) $(PABLO_WCD_PBGS_ID_ADV) -t $(WCD_PBGS_ID_TEMPLATE) -o $(WCD_OUTFILE)
    5656
    57 dict_pbgs_log:  $(PABLO_DICTIONARY_PBGS_LOG) # Paralel bitstream based group sorting
    58         python $(PABLO_COMPILER) $(PABLO_DICTIONARY_PBGS_LOG) -t $(DICTIONARY_PBGS_LOG_TEMPLATE) -o $(DICTIONARY_OUTFILE)
     57wcd_pbgs_log:   $(PABLO_WCD_PBGS_LOG) # Paralel bitstream based group sorting
     58        python $(PABLO_COMPILER) $(PABLO_WCD_PBGS_LOG) -t $(WCD_PBGS_LOG_TEMPLATE) -o $(WCD_OUTFILE)
    5959
    60 dict_pbgs_div:  $(PABLO_DICTIONARY_PBGS_DIV) # Paralel bitstream based group sorting
    61         python $(PABLO_COMPILER) $(PABLO_DICTIONARY_PBGS_DIV) -t $(DICTIONARY_PBGS_DIV_TEMPLATE) -o $(DICTIONARY_OUTFILE)
     60wcd_pbgs_div:   $(PABLO_WCD_PBGS_DIV) # Paralel bitstream based group sorting
     61        python $(PABLO_COMPILER) $(PABLO_WCD_PBGS_DIV) -t $(WCD_PBGS_DIV_TEMPLATE) -o $(WCD_OUTFILE)
    6262
    6363symtab_stl:     $(PABLO_SRCFILE)
     
    9191        rm -f $(XMLWF_OUTFILE)
    9292
    93 dict_clean:
    94         rm -f $(DICTIONARY_OUTFILE)
     93wcd_clean:
     94        rm -f $(WCD_OUTFILE)
  • proto/SymbolTable/build_dict.sh

    r1666 r1686  
    1 make dict_pbgs_div && cd src && make dict && cd .. && ./src/dictionary test/test_files/dict_bezier.txt
     1make wcd_pbgs_div && cd src && make dict && cd .. && ./src/dictionary test/test_files/dict_bezier.txt
  • proto/SymbolTable/dictionary.py

    r1666 r1686  
    4040    temp8 = ((basis_bits.bit_3 & temp4)|(~(basis_bits.bit_3) & temp7))
    4141    temp9 = (basis_bits.bit_1 &~ basis_bits.bit_0)
    42     temp10 = (temp8 & temp9)
    43     temp11 = (basis_bits.bit_0 | basis_bits.bit_1)
    44     temp12 = (basis_bits.bit_2 & basis_bits.bit_3)
    45     temp13 = (temp12 &~ temp11)
    46     temp14 = (basis_bits.bit_5 | basis_bits.bit_6)
    47     temp15 = (basis_bits.bit_4 & temp14)
    48     temp16 = (temp13 &~ temp15)
    49     dictionary.Words = (temp10 | temp16)
     42    dictionary.Words = (temp8 & temp9)
    5043
    5144    temp = pablo.Advance(dictionary.Words) ^ dictionary.Words
  • proto/SymbolTable/dictionary_id.py

    r1666 r1686  
    4343    temp8 = ((basis_bits.bit_3 & temp4)|(~(basis_bits.bit_3) & temp7))
    4444    temp9 = (basis_bits.bit_1 &~ basis_bits.bit_0)
    45     temp10 = (temp8 & temp9)
    46     temp11 = (basis_bits.bit_0 | basis_bits.bit_1)
    47     temp12 = (basis_bits.bit_2 & basis_bits.bit_3)
    48     temp13 = (temp12 &~ temp11)
    49     temp14 = (basis_bits.bit_5 | basis_bits.bit_6)
    50     temp15 = (basis_bits.bit_4 & temp14)
    51     temp16 = (temp13 &~ temp15)
    52     dictionary.Words = (temp10 | temp16)
     45    dictionary.Words = (temp8 & temp9)
    5346
    5447    temp = pablo.Advance(dictionary.Words) ^ dictionary.Words
  • proto/SymbolTable/dictionary_pbgs_div.py

    r1666 r1686  
    5252    temp8 = ((basis_bits.bit_3 & temp4)|(~(basis_bits.bit_3) & temp7))
    5353    temp9 = (basis_bits.bit_1 &~ basis_bits.bit_0)
    54     temp10 = (temp8 & temp9)
    55     temp11 = (basis_bits.bit_0 | basis_bits.bit_1)
    56     temp12 = (basis_bits.bit_2 & basis_bits.bit_3)
    57     temp13 = (temp12 &~ temp11)
    58     temp14 = (basis_bits.bit_5 | basis_bits.bit_6)
    59     temp15 = (basis_bits.bit_4 & temp14)
    60     temp16 = (temp13 &~ temp15)
    61     dictionary.Words = (temp10 | temp16)
     54    dictionary.Words = (temp8 & temp9)
    6255
    6356    temp = pablo.Advance(dictionary.Words) ^ dictionary.Words
  • proto/SymbolTable/dictionary_pbgs_id.py

    r1666 r1686  
    6060    temp8 = ((basis_bits.bit_3 & temp4)|(~(basis_bits.bit_3) & temp7))
    6161    temp9 = (basis_bits.bit_1 &~ basis_bits.bit_0)
    62     temp10 = (temp8 & temp9)
    63     temp11 = (basis_bits.bit_0 | basis_bits.bit_1)
    64     temp12 = (basis_bits.bit_2 & basis_bits.bit_3)
    65     temp13 = (temp12 &~ temp11)
    66     temp14 = (basis_bits.bit_5 | basis_bits.bit_6)
    67     temp15 = (basis_bits.bit_4 & temp14)
    68     temp16 = (temp13 &~ temp15)
    69     dictionary.Words = (temp10 | temp16)
     62    dictionary.Words = (temp8 & temp9)
    7063
    7164    temp = pablo.Advance(dictionary.Words) ^ dictionary.Words
  • proto/SymbolTable/dictionary_pbgs_id_adv.py

    r1666 r1686  
    6060    temp8 = ((basis_bits.bit_3 & temp4)|(~(basis_bits.bit_3) & temp7))
    6161    temp9 = (basis_bits.bit_1 &~ basis_bits.bit_0)
    62     temp10 = (temp8 & temp9)
    63     temp11 = (basis_bits.bit_0 | basis_bits.bit_1)
    64     temp12 = (basis_bits.bit_2 & basis_bits.bit_3)
    65     temp13 = (temp12 &~ temp11)
    66     temp14 = (basis_bits.bit_5 | basis_bits.bit_6)
    67     temp15 = (basis_bits.bit_4 & temp14)
    68     temp16 = (temp13 &~ temp15)
    69     dictionary.Words = (temp10 | temp16)
     62    dictionary.Words = (temp8 & temp9)
    7063
    7164    temp = pablo.Advance(dictionary.Words) ^ dictionary.Words
  • proto/SymbolTable/dictionary_pbgs_log.py

    r1666 r1686  
    4949    temp8 = ((basis_bits.bit_3 & temp4)|(~(basis_bits.bit_3) & temp7))
    5050    temp9 = (basis_bits.bit_1 &~ basis_bits.bit_0)
    51     temp10 = (temp8 & temp9)
    52     temp11 = (basis_bits.bit_0 | basis_bits.bit_1)
    53     temp12 = (basis_bits.bit_2 & basis_bits.bit_3)
    54     temp13 = (temp12 &~ temp11)
    55     temp14 = (basis_bits.bit_5 | basis_bits.bit_6)
    56     temp15 = (basis_bits.bit_4 & temp14)
    57     temp16 = (temp13 &~ temp15)
    58     dictionary.Words = (temp10 | temp16)
     51    dictionary.Words = (temp8 & temp9)
    5952
    6053    temp = pablo.Advance(dictionary.Words) ^ dictionary.Words
Note: See TracChangeset for help on using the changeset viewer.