Ignore:
Timestamp:
May 16, 2012, 3:02:58 PM (7 years ago)
Author:
ksherdy
Message:

Added bit / byte strategy. Added length test to hash table.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/symbol_table/src/Makefile

    r2103 r2106  
    3030        $(CC) -o div2_logbase2 main.cpp $(AFLAGS) -DDIV2_LOGBASE2_STRATEGY -DBUFFER_PROFILING #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG  #-DHASH_TABLE_HPP_DEBUG
    3131
    32 single: basis_bits.hpp buffer.hpp byte_pool.hpp hash_strms.hpp  hash_table.hpp ../lib/hash.hpp  group_strms.hpp  symbol_table.hpp  main.cpp  marker_strms.hpp symbol_table.hpp transpose.hpp
    33         $(CC) -o single main.cpp $(AFLAGS) -DSINGLE_STRATEGY -DBUFFER_PROFILING -DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG  #-DHASH_TABLE_HPP_DEBUG
     32bit_byte: basis_bits.hpp buffer.hpp byte_pool.hpp hash_strms.hpp  hash_table.hpp ../lib/hash.hpp  group_strms.hpp  symbol_table.hpp  main.cpp  marker_strms.hpp symbol_table.hpp transpose.hpp
     33        $(CC) -o bit_byte main.cpp $(AFLAGS) -DBIT_BYTE_STRATEGY -DBUFFER_PROFILING #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG  #-DHASH_TABLE_HPP_DEBUG
    3434
    3535
     
    5555        diff -rq --exclude=".svn" $(TEST_SRC_DIR) $(TEST_DST_DIR) || exit 0
    5656
    57 single_diff_test: single
    58         $(CC) -o single main.cpp $(AFLAGS) -DSINGLE_STRATEGY -DIDENTITY_TEST
    59         python $(TEST_SCRIPT) single -d
     57bit_byte_diff_test: bit_byte
     58        $(CC) -o bit_byte main.cpp $(AFLAGS) -DBIT_BYTE_STRATEGY -DIDENTITY_TEST
     59        python $(TEST_SCRIPT) bit_byte -d
    6060        diff -rq --exclude=".svn" $(TEST_SRC_DIR) $(TEST_DST_DIR) || exit 0
    6161
     
    7777        python $(TEST_SCRIPT) div2_logbase2 -g
    7878
    79 single_gid_test:
    80         $(CC) -o single main.cpp $(AFLAGS) -DSINGLE_STRATEGY -DGID_TEST
    81         python $(TEST_SCRIPT) single -g
     79bit_byte_gid_test:
     80        $(CC) -o bit_byte main.cpp $(AFLAGS) -DBIT_BYTE_STRATEGY -DGID_TEST
     81        python $(TEST_SCRIPT) bit_byte -g
    8282
    8383clean:
    84         rm -Rf id div2 logbase2 div2_logbase2 single $(TEST_DST_DIR)
     84        rm -Rf id div2 logbase2 div2_logbase2 bit_byte $(TEST_DST_DIR)
    8585
    8686# valgrind --tool=callgrind --callgrind-out-file=./callgrind.out ./logbase2 ../test/in/\(1_1000_10\)_\(2_1000_10\)_\(3_1000_10\)_\(4_1000_10\)_\(5_1000_10\)_\(6_1000_10\)_\(7_1000_10\)_\(8_1000_10\)_\(9_1000_10\)_\(10_1000_10\)_\(11_1000_10\)_\(12_1000_10\)_\(13_1000_10\)_\(14_1000_10\)_\(15_1000_10\)_\(16_1000_10\)_\(17_1000_10\)_\(18_1000_10\)_\(19_1000_10\)_1_1.test
Note: See TracChangeset for help on using the changeset viewer.