Commit 40b3a7c4 authored by dagal's avatar dagal
Browse files

Ready for Nieves experiments

parent de6718f7
......@@ -6,8 +6,8 @@ CC = g++
## Uncomment for using a dictionary represented as a bitmap-RRR
#export CXXFLAGS = -std=c++11 -O9 -m64 -DNDEBUG -DDICTIONARY_RRR -I libcds/includes/
#export CXXFLAGS = -std=c++11 -O9 -m64 -DNDEBUG -DEXPERIMENTS -fPIC -DDICTIONARY_RRR -I libcds/includes/
export CXXFLAGS = -std=c++11 -g -O0 -m64 -Wall -DEXPERIMENTS -fPIC -DDICTIONARY_RRR -I libcds/includes/
export CXXFLAGS = -std=c++11 -O9 -m64 -DNDEBUG -DEXPERIMENTS -fPIC -DDICTIONARY_RRR -I libcds/includes/
#export CXXFLAGS = -std=c++11 -g -O0 -m64 -Wall -DEXPERIMENTS -fPIC -DDICTIONARY_RRR -I libcds/includes/
#######################################################################
......
/home/alberto/software/lib/libcds.a
/home/alberto/software/includes/libcds/includes/bitsequence/BitSequence.h
/home/alberto/software/includes/libcds/includes/bitsequence/BitSequenceBG.h
/home/alberto/software/includes/libcds/includes/bitsequence/BitSequenceBRW32.h
/home/alberto/software/includes/libcds/includes/bitsequence/BitSequenceBuilder.h
/home/alberto/software/includes/libcds/includes/bitsequence/BitSequenceBuilderBG.h
/home/alberto/software/includes/libcds/includes/bitsequence/BitSequenceBuilderDArray.h
/home/alberto/software/includes/libcds/includes/bitsequence/BitSequenceBuilderDelta.h
/home/alberto/software/includes/libcds/includes/bitsequence/BitSequenceBuilderPlain.h
/home/alberto/software/includes/libcds/includes/bitsequence/BitSequenceBuilderRG.h
/home/alberto/software/includes/libcds/includes/bitsequence/BitSequenceBuilderRPSC.h
/home/alberto/software/includes/libcds/includes/bitsequence/BitSequenceBuilderRPSN.h
/home/alberto/software/includes/libcds/includes/bitsequence/BitSequenceBuilderRRR.h
/home/alberto/software/includes/libcds/includes/bitsequence/BitSequenceBuilderSDArray.h
/home/alberto/software/includes/libcds/includes/bitsequence/BitSequenceDArray.h
/home/alberto/software/includes/libcds/includes/bitsequence/BitSequenceDelta.h
/home/alberto/software/includes/libcds/includes/bitsequence/BitSequencePlain.h
/home/alberto/software/includes/libcds/includes/bitsequence/BitSequenceRG.h
/home/alberto/software/includes/libcds/includes/bitsequence/BitSequenceRPSC.h
/home/alberto/software/includes/libcds/includes/bitsequence/BitSequenceRPSN.h
/home/alberto/software/includes/libcds/includes/bitsequence/BitSequenceRRR.h
/home/alberto/software/includes/libcds/includes/bitsequence/BitSequenceSDArray.h
/home/alberto/software/includes/libcds/includes/bitsequence/Makefile
/home/alberto/software/includes/libcds/includes/bitsequence/TableOffsetRRR.h
/home/alberto/software/includes/libcds/includes/bitsequence/sdarraySadakane.h
/home/alberto/software/includes/libcds/includes/coders/Coder.h
/home/alberto/software/includes/libcds/includes/coders/HuffmanCoder.h
/home/alberto/software/includes/libcds/includes/coders/Makefile
/home/alberto/software/includes/libcds/includes/coders/MultiAryHuffman.h
/home/alberto/software/includes/libcds/includes/coders/MultiAryHuffmanHelper.h
/home/alberto/software/includes/libcds/includes/coders/huff.h
/home/alberto/software/includes/libcds/includes/direct_access/ArrayDA.h
/home/alberto/software/includes/libcds/includes/direct_access/DAC.h
/home/alberto/software/includes/libcds/includes/direct_access/DACInc.h
/home/alberto/software/includes/libcds/includes/direct_access/DACe.h
/home/alberto/software/includes/libcds/includes/direct_access/DirectAccess.h
/home/alberto/software/includes/libcds/includes/direct_access/Makefile
/home/alberto/software/includes/libcds/includes/grammar/DictionaryRP.h
/home/alberto/software/includes/libcds/includes/grammar/DictionaryRPBuilder.h
/home/alberto/software/includes/libcds/includes/grammar/DictionaryRPBuilderPlain.h
/home/alberto/software/includes/libcds/includes/grammar/DictionaryRPBuilderTabei.h
/home/alberto/software/includes/libcds/includes/grammar/DictionaryRPPlain.h
/home/alberto/software/includes/libcds/includes/grammar/DictionaryRPTabei.h
/home/alberto/software/includes/libcds/includes/grammar/Repair.h
/home/alberto/software/includes/libcds/includes/grammar/RepairDN.h
/home/alberto/software/includes/libcds/includes/grammar/array.h
/home/alberto/software/includes/libcds/includes/grammar/basicsRepair.h
/home/alberto/software/includes/libcds/includes/grammar/hash.h
/home/alberto/software/includes/libcds/includes/grammar/heap.h
/home/alberto/software/includes/libcds/includes/grammar/irepair.h
/home/alberto/software/includes/libcds/includes/grammar/makefile
/home/alberto/software/includes/libcds/includes/grammar/makefile.old
/home/alberto/software/includes/libcds/includes/grammar/records.h
/home/alberto/software/includes/libcds/includes/mapper/GenericMapper.h
/home/alberto/software/includes/libcds/includes/mapper/Makefile
/home/alberto/software/includes/libcds/includes/mapper/Mapper.h
/home/alberto/software/includes/libcds/includes/mapper/MapperCont.h
/home/alberto/software/includes/libcds/includes/mapper/MapperNone.h
/home/alberto/software/includes/libcds/includes/mapper/MapperRev.h
/home/alberto/software/includes/libcds/includes/permutation/Makefile
/home/alberto/software/includes/libcds/includes/permutation/Permutation.h
/home/alberto/software/includes/libcds/includes/permutation/PermutationBuilder.h
/home/alberto/software/includes/libcds/includes/permutation/PermutationBuilderMRRR.h
/home/alberto/software/includes/libcds/includes/permutation/PermutationBuilderWT.h
/home/alberto/software/includes/libcds/includes/permutation/PermutationMRRR.h
/home/alberto/software/includes/libcds/includes/permutation/PermutationWT.h
/home/alberto/software/includes/libcds/includes/permutation/perm.h
/home/alberto/software/includes/libcds/includes/rmq/Makefile
/home/alberto/software/includes/libcds/includes/rmq/RMQ.h
/home/alberto/software/includes/libcds/includes/rmq/RMQ_succinct.h
/home/alberto/software/includes/libcds/includes/sequence/BitmapsSequence.h
/home/alberto/software/includes/libcds/includes/sequence/BlockGraph.h
/home/alberto/software/includes/libcds/includes/sequence/BlockGraphBuilder.h
/home/alberto/software/includes/libcds/includes/sequence/BlockGraphUtils.h
/home/alberto/software/includes/libcds/includes/sequence/CanonicalWTNoptrs.h
/home/alberto/software/includes/libcds/includes/sequence/LZBaseCopyOptimal.h
/home/alberto/software/includes/libcds/includes/sequence/LZBaseLength.h
/home/alberto/software/includes/libcds/includes/sequence/LZBaseLimitHops.h
/home/alberto/software/includes/libcds/includes/sequence/LZBaseSampleOnN.h
/home/alberto/software/includes/libcds/includes/sequence/LZBaseStrategy.h
/home/alberto/software/includes/libcds/includes/sequence/Makefile
/home/alberto/software/includes/libcds/includes/sequence/MappingAcelerators.h
/home/alberto/software/includes/libcds/includes/sequence/MappingBuilder.h
/home/alberto/software/includes/libcds/includes/sequence/MappingHelper.h
/home/alberto/software/includes/libcds/includes/sequence/MappingPermutations.h
/home/alberto/software/includes/libcds/includes/sequence/MappingPermutationsBuilder.h
/home/alberto/software/includes/libcds/includes/sequence/MappingSymbols.h
/home/alberto/software/includes/libcds/includes/sequence/MappingTable.h
/home/alberto/software/includes/libcds/includes/sequence/MappingTableAcelerators.h
/home/alberto/software/includes/libcds/includes/sequence/MappingTableBuilder.h
/home/alberto/software/includes/libcds/includes/sequence/MappingWM.h
/home/alberto/software/includes/libcds/includes/sequence/MappingWMBMP.h
/home/alberto/software/includes/libcds/includes/sequence/MappingWMBS.h
/home/alberto/software/includes/libcds/includes/sequence/MappingWMBSBuilder.h
/home/alberto/software/includes/libcds/includes/sequence/MappingWMBSC.h
/home/alberto/software/includes/libcds/includes/sequence/MappingWMBSCBuilder.h
/home/alberto/software/includes/libcds/includes/sequence/MappingWMBlocks.h
/home/alberto/software/includes/libcds/includes/sequence/MappingWMBlocksBuilder.h
/home/alberto/software/includes/libcds/includes/sequence/MappingWMBuilder.h
/home/alberto/software/includes/libcds/includes/sequence/MultiArity/MultiArityCanonicalHuffman.h
/home/alberto/software/includes/libcds/includes/sequence/MultiArity/MultiArityCoder.h
/home/alberto/software/includes/libcds/includes/sequence/MultiArity/MultiArityCoderFixed.h
/home/alberto/software/includes/libcds/includes/sequence/MultiArity/MultiArityInternalNode.h
/home/alberto/software/includes/libcds/includes/sequence/MultiArity/MultiArityLeafNode.h
/home/alberto/software/includes/libcds/includes/sequence/MultiArity/MultiArityNode.h
/home/alberto/software/includes/libcds/includes/sequence/MultiArity/MultiArityWT.h
/home/alberto/software/includes/libcds/includes/sequence/MultiArity/MultiArityWTHelper.h
/home/alberto/software/includes/libcds/includes/sequence/MultiArity/SequenceBuilderMultiArityWT.h
/home/alberto/software/includes/libcds/includes/sequence/Sequence.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceAlphPart.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceAlphPartRep.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceAlphPartRepReg.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceBinary.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceBuilder.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceBuilderAlphPart.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceBuilderAlphPartRep.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceBuilderBinary.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceBuilderCanonicalWTNoptrs.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceBuilderGMR.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceBuilderGMRChunk.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceBuilderNaive.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceBuilderSequenceMatrix.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceBuilderSequenceRepairSC.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceBuilderSequenceRepairSN.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceBuilderSequenceWTRP.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceBuilderStr.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceBuilderWTNoptrsHybrid.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceBuilderWTRPHeur.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceBuilderWaveletMatrix.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceBuilderWaveletMatrixHuff.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceBuilderWaveletTree.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceBuilderWaveletTreeNoptrs.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceBuilderWaveletTreeNoptrsS.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceGMR.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceGMRChunk.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceLZBLockHelper.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceLZEnd.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceLZEndBase.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceMatrix.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceNaive.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceRepair.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceRepairSC.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceRepairSN.h
/home/alberto/software/includes/libcds/includes/sequence/SequenceWTRP.h
/home/alberto/software/includes/libcds/includes/sequence/Tuple.h
/home/alberto/software/includes/libcds/includes/sequence/WaveletMatrix.h
/home/alberto/software/includes/libcds/includes/sequence/WaveletMatrixHuff.h
/home/alberto/software/includes/libcds/includes/sequence/WaveletTree.h
/home/alberto/software/includes/libcds/includes/sequence/WaveletTreeNoptrs.h
/home/alberto/software/includes/libcds/includes/sequence/WaveletTreeNoptrsHybrid.h
/home/alberto/software/includes/libcds/includes/sequence/WaveletTreeNoptrsS.h
/home/alberto/software/includes/libcds/includes/sequence/bintopk.h
/home/alberto/software/includes/libcds/includes/sequence/htwt/HuTuckerPermPtrs.cpp
/home/alberto/software/includes/libcds/includes/sequence/htwt/HuTuckerPermPtrs.h
/home/alberto/software/includes/libcds/includes/sequence/htwt/Makefile
/home/alberto/software/includes/libcds/includes/sequence/htwt/PermWT.cpp
/home/alberto/software/includes/libcds/includes/sequence/htwt/PermWT.h
/home/alberto/software/includes/libcds/includes/sequence/htwt/htwt.h
/home/alberto/software/includes/libcds/includes/sequence/htwt/htwt2.c
/home/alberto/software/includes/libcds/includes/sequence/htwt/hu-tucker/Makefile
/home/alberto/software/includes/libcds/includes/sequence/htwt/hu-tucker/README.txt
/home/alberto/software/includes/libcds/includes/sequence/htwt/hu-tucker/basicsHT.cpp
/home/alberto/software/includes/libcds/includes/sequence/htwt/hu-tucker/basicsHT.h
/home/alberto/software/includes/libcds/includes/sequence/htwt/hu-tucker/binarynode.cpp
/home/alberto/software/includes/libcds/includes/sequence/htwt/hu-tucker/binarynode.h
/home/alberto/software/includes/libcds/includes/sequence/htwt/hu-tucker/bitStringHT.cpp
/home/alberto/software/includes/libcds/includes/sequence/htwt/hu-tucker/bitStringHT.h
/home/alberto/software/includes/libcds/includes/sequence/htwt/hu-tucker/hutucker.cpp
/home/alberto/software/includes/libcds/includes/sequence/htwt/hu-tucker/hutucker.h
/home/alberto/software/includes/libcds/includes/sequence/htwt/hu-tucker/proba.c.proba
/home/alberto/software/includes/libcds/includes/sequence/htwt/huTuckerInternalNode.h
/home/alberto/software/includes/libcds/includes/sequence/htwt/huTuckerLeafNode.h
/home/alberto/software/includes/libcds/includes/sequence/htwt/huTuckerNode.cpp
/home/alberto/software/includes/libcds/includes/sequence/htwt/huTuckerNode.h
/home/alberto/software/includes/libcds/includes/sequence/htwt/huTuckerPerm.cpp
/home/alberto/software/includes/libcds/includes/sequence/htwt/huTuckerPerm.h
/home/alberto/software/includes/libcds/includes/sequence/htwt/testPerm.cpp
/home/alberto/software/includes/libcds/includes/sequence/type_Tuple.h
/home/alberto/software/includes/libcds/includes/sequence/wt_coder.h
/home/alberto/software/includes/libcds/includes/sequence/wt_coder_Balanced.h
/home/alberto/software/includes/libcds/includes/sequence/wt_coder_Pmin.h
/home/alberto/software/includes/libcds/includes/sequence/wt_coder_SubOptimalAdd.h
/home/alberto/software/includes/libcds/includes/sequence/wt_coder_SubOptimalMult.h
/home/alberto/software/includes/libcds/includes/sequence/wt_coder_Suboptimal.h
/home/alberto/software/includes/libcds/includes/sequence/wt_coder_binary.h
/home/alberto/software/includes/libcds/includes/sequence/wt_coder_huff.h
/home/alberto/software/includes/libcds/includes/sequence/wt_coder_huff_can.h
/home/alberto/software/includes/libcds/includes/sequence/wt_coder_hutucker.h
/home/alberto/software/includes/libcds/includes/sequence/wt_node.h
/home/alberto/software/includes/libcds/includes/sequence/wt_node_internal.h
/home/alberto/software/includes/libcds/includes/sequence/wt_node_leaf.h
/home/alberto/software/includes/libcds/includes/text_indexes/BWTBuilder.h
/home/alberto/software/includes/libcds/includes/text_indexes/IntSuffixSort.h
/home/alberto/software/includes/libcds/includes/text_indexes/Makefile
/home/alberto/software/includes/libcds/includes/text_indexes/SuffixSort.h
/home/alberto/software/includes/libcds/includes/text_indexes/fmi.h
/home/alberto/software/includes/libcds/includes/text_indexes/sa_sort.h
/home/alberto/software/includes/libcds/includes/trees/BP.h
/home/alberto/software/includes/libcds/includes/trees/BPNaive.h
/home/alberto/software/includes/libcds/includes/trees/CartesianTree.h
/home/alberto/software/includes/libcds/includes/trees/GCT.h
/home/alberto/software/includes/libcds/includes/trees/Makefile
/home/alberto/software/includes/libcds/includes/trees/Parentheses.h
/home/alberto/software/includes/libcds/includes/trees/bp-darray.h
/home/alberto/software/includes/libcds/includes/trees/bp-utils.h
/home/alberto/software/includes/libcds/includes/trees/bp.h
/home/alberto/software/includes/libcds/includes/utils/Array.h
/home/alberto/software/includes/libcds/includes/utils/BinarySearchTree.h
/home/alberto/software/includes/libcds/includes/utils/BinaryTree.h
/home/alberto/software/includes/libcds/includes/utils/BitStreamIterator.h
/home/alberto/software/includes/libcds/includes/utils/BitString.h
/home/alberto/software/includes/libcds/includes/utils/DisjointSet.h
/home/alberto/software/includes/libcds/includes/utils/DisjointSet2.h
/home/alberto/software/includes/libcds/includes/utils/GenericArray.h
/home/alberto/software/includes/libcds/includes/utils/HashMap.h
/home/alberto/software/includes/libcds/includes/utils/HashTable.h
/home/alberto/software/includes/libcds/includes/utils/HashTableBG.h
/home/alberto/software/includes/libcds/includes/utils/Heap.h
/home/alberto/software/includes/libcds/includes/utils/IfstreamBuffer.h
/home/alberto/software/includes/libcds/includes/utils/InBufferIterator.h
/home/alberto/software/includes/libcds/includes/utils/Logger.h
/home/alberto/software/includes/libcds/includes/utils/OutBuffer.h
/home/alberto/software/includes/libcds/includes/utils/SparseSuffixSort.h
/home/alberto/software/includes/libcds/includes/utils/StringUtils.h
/home/alberto/software/includes/libcds/includes/utils/TemporaryFile.h
/home/alberto/software/includes/libcds/includes/utils/TreePointers.h
/home/alberto/software/includes/libcds/includes/utils/Tuples.h
/home/alberto/software/includes/libcds/includes/utils/cppUtils.h
/home/alberto/software/includes/libcds/includes/utils/libcdsBasics.h
/home/alberto/software/includes/libcds/includes/utils/libcdsBasicsGeneric.h
/home/alberto/software/includes/libcds/includes/utils/libcdsSDArray.h
/home/alberto/software/includes/libcds/includes/utils/libcdsTrees.h
/home/alberto/software/includes/libcds/includes/utils/timeMeasure.h
/home/alberto/software/includes/libcds/includes/utils/timing.h
\ No newline at end of file
......@@ -142,10 +142,11 @@
#../benchmark indexes/madrid_lines indexes/madrid_lines ./queries/madrid/top-100.txt 0 1000
#echo 'TTCTR (psi='$2' lines='$3' times='$4')'
echo 'TTCTR (psi='$2' lines='$3' times='$4')'
#../benchmark indexes/$1$2 indexes/$1_$3 indexes/$1_$4 ./queries/madrid/10k-starts-with-x-ends-with-y.txt 0 10000
#../benchmark indexes/$1$2 indexes/$1_$3 ./queries/madrid/10k-starts-with-x.txt 0 1000
../benchmark indexes/$1$2 indexes/$1_$3 indexes/$1_$4 ./queries/madrid/10k-starts-with-x.txt 0 10000
../benchmark indexes/$1$2 indexes/$1_$3 indexes/$1_$4 ./queries/madrid/10k-ends-with-x.txt 0 10000
../benchmark indexes/madrid_lines indexes/madrid_lines_RG32 indexes/madrid_lines_RG32 ./queries/madrid/10k-starts-with-x-ends-with-y.txt 0 10000
#../benchmark indexes/madrid_lines indexes/madrid_lines indexes/madrid_lines ./queries/madrid/10k-starts-with-x-ends-with-y.txt 0 10000
#../benchmark indexes/madrid_lines indexes/madrid_lines indexes/madrid_lines ./queries/madrid/10k-starts-with-x.txt 0 10000
#../benchmark indexes/madrid_lines indexes/madrid_lines indexes/madrid_lines ./queries/madrid/10k-ends-with-x.txt 0 10000
......@@ -1350,9 +1350,7 @@ int get_ends_with_x(void *index, TimeQuery *query) {
for (const auto &line : lines) {
n = getRange(linesWM->at(u), lu-stop_offset, ru-stop_offset, line, line, &res);
printf("%lu %lu\n", lu-stop_offset, ru-stop_offset);
printf("%lu %lu %lu\n", res.first, res.second, n);
assert(n == res.second-res.first+1);
assert(n == 0 || n == res.second-res.first+1);
assert(stop_offset+res.second < g->n);
if (n && query->subtype & XY_TIME_END) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment