From 01f29a0b4cbb5322aa5d7c8f125238533ad6409a Mon Sep 17 00:00:00 2001 From: Sebastiano Vigna Date: Thu, 29 Feb 2024 11:47:46 +0000 Subject: [PATCH] Adapter for new BVComp::new argument order --- benches/benchmarks/model4encoder_building.rs | 4 ++-- src/bin/bvcomp.rs | 6 +++--- tests/test_bvgraph.rs | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/benches/benchmarks/model4encoder_building.rs b/benches/benchmarks/model4encoder_building.rs index 4c9fa9e..84ec39a 100644 --- a/benches/benchmarks/model4encoder_building.rs +++ b/benches/benchmarks/model4encoder_building.rs @@ -14,7 +14,7 @@ fn model4encoder_building_bench(c: &mut Criterion) { let log2_mock = Log2Estimator::default(); let model_builder = BVGraphModelBuilder::::new(log2_mock); - let mut bvcomp = BVComp::>::new(model_builder, 7, 2, 3, 0); + let mut bvcomp = BVComp::>::new(model_builder, 7, 3, 2, 0); // First iteration with Log2MockWriter bvcomp.extend(graph.iter()).unwrap(); @@ -32,7 +32,7 @@ fn model4encoder_building_bench(c: &mut Criterion) { || { let model_builder = BVGraphModelBuilder::::new(entropic_mock.clone()); - BVComp::>::new(model_builder, 7, 2, 3, 0) + BVComp::>::new(model_builder, 7, 3, 2, 0) }, |mut bvcomp| // second iteration with EntropyMockWriter diff --git a/src/bin/bvcomp.rs b/src/bin/bvcomp.rs index 3445d00..282ed79 100644 --- a/src/bin/bvcomp.rs +++ b/src/bin/bvcomp.rs @@ -60,8 +60,8 @@ pub fn main() -> Result<()> { let mut bvcomp = BVComp::>::new( model_builder, args.compressions_args.compression_window, - args.compressions_args.min_interval_length, args.compressions_args.max_ref_count, + args.compressions_args.min_interval_length, 0, ); @@ -88,8 +88,8 @@ pub fn main() -> Result<()> { let mut bvcomp = BVComp::>::new( model_builder, args.compressions_args.compression_window, - args.compressions_args.min_interval_length, args.compressions_args.max_ref_count, + args.compressions_args.min_interval_length, 0, ); @@ -111,8 +111,8 @@ pub fn main() -> Result<()> { let mut bvcomp = BVComp::::new( ANSBVGraphMeasurableEncoder::new(model4encoder, entropy_estimator), args.compressions_args.compression_window, - args.compressions_args.min_interval_length, args.compressions_args.max_ref_count, + args.compressions_args.min_interval_length, 0, ); diff --git a/tests/test_bvgraph.rs b/tests/test_bvgraph.rs index 9572deb..d167709 100644 --- a/tests/test_bvgraph.rs +++ b/tests/test_bvgraph.rs @@ -24,7 +24,7 @@ fn decoder_decodes_correctly_dummy_graph() -> Result<()> { let log_mock = Log2Estimator::default(); let model_builder = BVGraphModelBuilder::new(log_mock); - let mut bvcomp = BVComp::>::new(model_builder, 7, 2, 3, 0); + let mut bvcomp = BVComp::>::new(model_builder, 7, 3, 2, 0); // first iteration -> build the model with log2 mock writer for node_index in 0..graph.num_nodes() { @@ -40,7 +40,7 @@ fn decoder_decodes_correctly_dummy_graph() -> Result<()> { let entropic_costs_table = EntropyEstimator::new(&model4encoder, folding_params); let model_builder = BVGraphModelBuilder::::new(entropic_costs_table.clone()); let mut bvcomp = - BVComp::>::new(model_builder, 7, 2, 3, 0); + BVComp::>::new(model_builder, 7, 3, 2, 0); // second iteration -> build the model with entropic mock writer for node_index in 0..graph.num_nodes() { @@ -55,8 +55,8 @@ fn decoder_decodes_correctly_dummy_graph() -> Result<()> { let mut bvcomp = BVComp::::new( ANSBVGraphMeasurableEncoder::new(model4encoder, entropic_costs_table), 7, - 2, 3, + 2, 0, ); @@ -108,7 +108,7 @@ fn decoder_decodes_correctly_cnr_graph() -> Result<()> { let log2_mock = Log2Estimator::default(); let model_builder = BVGraphModelBuilder::::new(log2_mock); - let mut bvcomp = BVComp::>::new(model_builder, 7, 2, 3, 0); + let mut bvcomp = BVComp::>::new(model_builder, 7, 3, 2, 0); // First iteration with Log2MockWriter bvcomp.extend(graph.iter())?; @@ -118,7 +118,7 @@ fn decoder_decodes_correctly_cnr_graph() -> Result<()> { let entropic_mock = EntropyEstimator::new(&model4encoder, folding_params); let model_builder = BVGraphModelBuilder::::new(entropic_mock.clone()); let mut bvcomp = - BVComp::>::new(model_builder, 7, 2, 3, 0); + BVComp::>::new(model_builder, 7, 3, 2, 0); // second iteration with EntropyMockWriter bvcomp.extend(graph.iter())?; @@ -128,8 +128,8 @@ fn decoder_decodes_correctly_cnr_graph() -> Result<()> { let mut bvcomp = BVComp::::new( ANSBVGraphMeasurableEncoder::new(model4encoder, entropic_mock), 7, - 2, 3, + 2, 0, ); @@ -170,7 +170,7 @@ fn decoder_decodes_correctly_sequential_cnr_graph() -> Result<()> { let log2_mock = Log2Estimator::default(); let model_builder = BVGraphModelBuilder::::new(log2_mock); - let mut bvcomp = BVComp::>::new(model_builder, 7, 2, 3, 0); + let mut bvcomp = BVComp::>::new(model_builder, 7, 3, 2, 0); // First iteration with Log2MockWriter bvcomp.extend(graph.iter())?; @@ -180,7 +180,7 @@ fn decoder_decodes_correctly_sequential_cnr_graph() -> Result<()> { let entropic_mock = EntropyEstimator::new(&model4encoder, folding_params); let model_builder = BVGraphModelBuilder::::new(entropic_mock.clone()); let mut bvcomp = - BVComp::>::new(model_builder, 7, 2, 3, 0); + BVComp::>::new(model_builder, 7, 3, 2, 0); // second iteration with EntropyMockWriter bvcomp.extend(graph.iter())?; @@ -190,8 +190,8 @@ fn decoder_decodes_correctly_sequential_cnr_graph() -> Result<()> { let mut bvcomp = BVComp::::new( ANSBVGraphMeasurableEncoder::new(model4encoder, entropic_mock), 7, - 2, 3, + 2, 0, );