diff --git a/deps/SZ/sz/include/Huffman.h b/deps/SZ/sz/include/Huffman.h index 650d6dd7e9956e0f53b51dee41154ff5bda2229e..cd817bd5f3499d02c14c05ddc9938a808e291eb8 100644 --- a/deps/SZ/sz/include/Huffman.h +++ b/deps/SZ/sz/include/Huffman.h @@ -51,7 +51,6 @@ void init_static(HuffmanTree *huffmanTree, int *s, size_t length); void encode(HuffmanTree *huffmanTree, int *s, size_t length, unsigned char *out, size_t *outSize); void decode(unsigned char *s, size_t targetLength, node t, int *out); -void decode_MSST19(unsigned char *s, size_t targetLength, node t, int *out, int maxBits); void pad_tree_uchar(HuffmanTree* huffmanTree, unsigned char* L, unsigned char* R, unsigned int* C, unsigned char* t, unsigned int i, node root); void pad_tree_ushort(HuffmanTree* huffmanTree, unsigned short* L, unsigned short* R, unsigned int* C, unsigned char* t, unsigned int i, node root); @@ -61,11 +60,8 @@ void unpad_tree_uchar(HuffmanTree* huffmanTree, unsigned char* L, unsigned char* void unpad_tree_ushort(HuffmanTree* huffmanTree, unsigned short* L, unsigned short* R, unsigned int* C, unsigned char* t, unsigned int i, node root); void unpad_tree_uint(HuffmanTree* huffmanTree, unsigned int* L, unsigned int* R, unsigned int* C, unsigned char* t, unsigned int i, node root); node reconstruct_HuffTree_from_bytes_anyStates(HuffmanTree *huffmanTree, unsigned char* bytes, int nodeCount); - void encode_withTree(HuffmanTree* huffmanTree, int *s, size_t length, unsigned char **out, size_t *outSize); -int encode_withTree_MSST19(HuffmanTree* huffmanTree, int *s, size_t length, unsigned char **out, size_t *outSize); void decode_withTree(HuffmanTree* huffmanTree, unsigned char *s, size_t targetLength, int *out); -void decode_withTree_MSST19(HuffmanTree* huffmanTree, unsigned char *s, size_t targetLength, int *out, int maxBits); void SZ_ReleaseHuffman(HuffmanTree* huffmanTree); #ifdef __cplusplus diff --git a/deps/SZ/sz/src/TightDataPointStorageF.c b/deps/SZ/sz/src/TightDataPointStorageF.c index 6abf345370a07c4984df660aae63cdd7b1f11d08..47afc4f9dfc4abc869dc2e952385d2cb1f7079d4 100644 --- a/deps/SZ/sz/src/TightDataPointStorageF.c +++ b/deps/SZ/sz/src/TightDataPointStorageF.c @@ -178,10 +178,7 @@ void new_TightDataPointStorageF(TightDataPointStorageF **this, // encode type with huffMan int stateNum = 2*intervals; HuffmanTree* huffmanTree = createHuffmanTree(stateNum); - if(confparams_cpr->errorBoundMode == PW_REL && confparams_cpr->accelerate_pw_rel_compression) - (*this)->max_bits = encode_withTree_MSST19(huffmanTree, type, dataSeriesLength, &(*this)->typeArray, &(*this)->typeArray_size); - else - encode_withTree(huffmanTree, type, dataSeriesLength, &(*this)->typeArray, &(*this)->typeArray_size); + encode_withTree(huffmanTree, type, dataSeriesLength, &(*this)->typeArray, &(*this)->typeArray_size); SZ_ReleaseHuffman(huffmanTree); (*this)->exactMidBytes = exactMidBytes;