From 33467add60a9ef1c3c0e0e937b03e78159c25f1c Mon Sep 17 00:00:00 2001 From: Paul Cruz Date: Mon, 19 Jun 2017 11:27:50 -0700 Subject: [PATCH] made changes so that HUF_writeCTable no longer fails --- tests/decodecorpus.c | 50 +++++++++++++------------------------------- 1 file changed, 15 insertions(+), 35 deletions(-) diff --git a/tests/decodecorpus.c b/tests/decodecorpus.c index 4f8e89a2..00eaa9da 100644 --- a/tests/decodecorpus.c +++ b/tests/decodecorpus.c @@ -1342,42 +1342,22 @@ static int generateCorpusWithDict(U32 seed, unsigned numFiles, const char* const RAND_buffer(&seed, (void*)dictContent, dictContentSize); { size_t dictWriteSize = 0; - /* create random samples */ - unsigned numSamples = 0; - BYTE* samples; - unsigned i = 0; - size_t* sampleSizes = malloc(255*sizeof(size_t)); + + /* create samples */ + unsigned numSamples = 4; + BYTE* samples = malloc(5000*sizeof(BYTE)); + size_t* sampleSizes = malloc(numSamples*sizeof(size_t)); { - size_t* curr = sampleSizes; - size_t totalSize = 0; - unsigned numReps = 1; - while (numSamples < 200) { - size_t randSize = RAND(&seed) % dictContentSize; - unsigned counter = numReps; - numSamples += numReps; - while(counter-- > 0){ - *curr = randSize; - totalSize += *curr; - curr++; - } - DISPLAY("random size: %zu\n", randSize); - numReps *= 2; - } - samples = malloc(totalSize); - DISPLAY("%zu\n", totalSize); - /* reset pointer and counter */ - curr = sampleSizes; - i = 0; - { - /* take substring from dictionary content */ - size_t pos = 0; - BYTE* endDict = dictContent + dictContentSize; - while (i++ < numSamples) { - size_t currSize = *(curr++); - BYTE* startSubstring = endDict - currSize; - memcpy(samples + pos, (void*)startSubstring, currSize); - pos += currSize; + unsigned i = 1; + size_t currSize = 1; + BYTE* curr = samples; + while (i <= 4) { + *(sampleSizes + i - 1) = currSize; + for (int j = 0; j < currSize; j++) { + *(curr++) = (BYTE)i; } + i++; + currSize *= 16; } } DISPLAY("==================done with generation====================\n"); @@ -1386,7 +1366,7 @@ static int generateCorpusWithDict(U32 seed, unsigned numFiles, const char* const ZDICT_params_t zdictParams; memset(&zdictParams, 0, sizeof(zdictParams)); zdictParams.dictID = dictID; - zdictParams.notificationLevel = 1; + zdictParams.notificationLevel = 5; DISPLAY("===================zdict params================\n"); /* finalize dictionary with random samples */ dictWriteSize = ZDICT_finalizeDictionary(fullDict, dictSize,