update stateNum in preprocess_encode

include/SZ3/compressor/SZGeneralCompressor.hpp

@@ -31,7 +31,7 @@ namespace SZ {
 
             std::vector<int> quant_inds = frontend.compress(data);
 
-            encoder.preprocess_encode(quant_inds, 0);
+            encoder.preprocess_encode(quant_inds, frontend.get_radius() * 2);
             size_t bufferSize = 1.2 * (frontend.size_est() + encoder.size_est() + sizeof(T) * quant_inds.size());
 
             uchar *buffer = new uchar[bufferSize];

include/SZ3/compressor/SZInterpolationCompressor.hpp

@@ -147,7 +147,7 @@ namespace SZ {
 
 //            writefile("pred.dat", preds.data(), num_elements);
 //            writefile("quant.dat", quant_inds.data(), num_elements);
-            encoder.preprocess_encode(quant_inds, 0);
+            encoder.preprocess_encode(quant_inds, quantizer.get_radius() * 2);
             size_t bufferSize = 1.2 * (quantizer.size_est() + encoder.size_est() + sizeof(T) * quant_inds.size());
 
             uchar *buffer = new uchar[bufferSize];

include/SZ3/compressor/deprecated/SZBlockInterpolationCompressor.hpp

@@ -146,7 +146,7 @@ namespace SZ {
             quantizer.postcompress_data();
 //            predictor.print();
 
-            encoder.preprocess_encode(quant_inds, 0);
+            encoder.preprocess_encode(quant_inds, quantizer.get_radius() * 2);
             size_t bufferSize = 1.2 * (quantizer.size_est() + encoder.size_est() + sizeof(T) * quant_inds.size());
 
             uchar *buffer = new uchar[bufferSize];

include/SZ3/encoder/Encoder.hpp

@@ -11,6 +11,12 @@ namespace SZ {
 
             virtual ~EncoderInterface() = default;
 
+            /**
+             * init the encoder
+             * E.g., Huffman will build tree in this step
+             * @param bins to-be-encoded integers
+             * @param stateNum stateNum > 0 indicates the bins has a range of [0, stateNum). stateNum == 0 means no such guarantee
+             */
             virtual void preprocess_encode(const std::vector<T> &bins, int stateNum) = 0;
 
             /**

include/SZ3/encoder/HuffmanEncoder.hpp

@@ -87,7 +87,7 @@ namespace SZ {
         /**
          * build huffman tree using bins
          * @param bins
-         * @param stateNum is no longer needed
+         * @param stateNum
          */
         void preprocess_encode(const std::vector<T> &bins, int stateNum) {
             preprocess_encode(bins.data(), bins.size(), stateNum);
@@ -97,7 +97,7 @@ namespace SZ {
          * build huffman tree using bins
          * @param bins
          * @param num_bin
-         * @param stateNum is no longer needed
+         * @param stateNum
          */
         void preprocess_encode(const T *bins, size_t num_bin, int stateNum) {
             nodeCount = 0;

include/SZ3/frontend/SZFastFrontend.hpp

@@ -374,7 +374,7 @@ namespace SZ {
 
             if (reg_count) {
                 reg_huffman = HuffmanEncoder<int>();
-                reg_huffman.preprocess_encode(reg_params_type, RegCoeffNum3d * reg_count, 0);
+                reg_huffman.preprocess_encode(reg_params_type, RegCoeffNum3d * reg_count, RegCoeffRadius * 2);
             }
             indicator_huffman = HuffmanEncoder<int>();
             indicator_huffman.preprocess_encode(indicator, SELECTOR_RADIUS);

include/SZ3/predictor/ComposedPredictor.hpp

@@ -77,7 +77,7 @@ namespace SZ {
             c += sizeof(size_t);
             if (selection.size()) {
                 HuffmanEncoder<int> selection_encoder;
-                selection_encoder.preprocess_encode(selection, 0);
+                selection_encoder.preprocess_encode(selection, predict_error.size());
                 selection_encoder.save(c);
                 selection_encoder.encode(selection, c);
                 selection_encoder.postprocess_encode();

include/SZ3/predictor/PolyRegressionPredictor.hpp

@@ -130,7 +130,10 @@ namespace SZ {
                 quantizer_liner.save(c);
                 quantizer_poly.save(c);
                 HuffmanEncoder<int> encoder = HuffmanEncoder<int>();
-                encoder.preprocess_encode(regression_coeff_quant_inds, 0);
+
+                encoder.preprocess_encode(regression_coeff_quant_inds,
+                                          2 * std::max(std::max(quantizer_independent.get_radius(), quantizer_liner.get_radius()),
+                                                       quantizer_poly.get_radius()));
                 encoder.save(c);
                 encoder.encode(regression_coeff_quant_inds, c);
                 encoder.postprocess_encode();

include/SZ3/predictor/RegressionPredictor.hpp

@@ -109,7 +109,8 @@ namespace SZ {
                 quantizer_independent.save(c);
                 quantizer_liner.save(c);
                 HuffmanEncoder<int> encoder = HuffmanEncoder<int>();
-                encoder.preprocess_encode(regression_coeff_quant_inds,0);
+                encoder.preprocess_encode(regression_coeff_quant_inds,
+                                          2 * std::max(quantizer_independent.get_radius(), quantizer_liner.get_radius()));
                 encoder.save(c);
                 encoder.encode(regression_coeff_quant_inds, c);
                 encoder.postprocess_encode();

tools/mdz/include/ExaaltCompressor.hpp

@@ -116,7 +116,7 @@ namespace SZ {
             quantizer.save(compressed_data_pos);
 //            quantizer.print();
 
-            encoder.preprocess_encode(quant_inds, 4 * quantizer.get_radius());
+            encoder.preprocess_encode(quant_inds, 2 * quantizer.get_radius());
             encoder.save(compressed_data_pos);
             encoder.encode(quant_inds, compressed_data_pos);
             encoder.postprocess_encode();

tools/sz3/deprecated/test_huffman_coding.cpp

@@ -15,7 +15,7 @@ int main() {
     unsigned char *compressed = (unsigned char *) malloc(N * sizeof(int));
     {
         SZ::HuffmanEncoder<int> encoder;
-        encoder.preprocess_encode(type, 0);
+        encoder.preprocess_encode(type, capacity);
         unsigned char *compressed_pos = compressed;
         cout << "save encoder" << endl;
         encoder.save(compressed_pos);