radix and fidelity became parameters

Cargo.toml

@@ -22,9 +22,8 @@ env_logger = "0.10.1"
 tempfile = "3.9.0"
 epserde = "0.2.1"
 mem_dbg = "0.1.3"
-lender = "0.2.9"
 dsi-progress-logger = "0.2.2"
-thiserror = "1.0"
+
 [dev-dependencies]
 criterion = "0.5.1"
 pprof = { version = "0.13.0", features = ["flamegraph", "criterion", "frame-pointer"] }

examples/bench_bvgraph.rs

@@ -1,3 +1,4 @@
+/*
 use epserde::prelude::{Deserialize, Serialize};
 
 use webgraph::prelude::{BVComp, BVGraph, EmptyDict, RandomAccessLabelling, SequentialLabelling};
@@ -7,7 +8,7 @@ use folded_streaming_rans::bvgraph::writer::{BVGraphModelBuilder, BVGraphWriter}
 use folded_streaming_rans::multi_model_ans::Prelude;
 
 use anyhow::Result;
-use folded_streaming_rans::bvgraph::mock_writers::{ANSymbolTable, EntropyMockWriter, Log2MockWriter, MockWriter};
+use folded_streaming_rans::bvgraph::mock_writers::{ANSymbolTable, EntropyMockWriter, Log2MockWriter};
 use folded_streaming_rans::multi_model_ans::encoder::ANSCompressorPhase;
 
 const NODES: usize = 325557;
@@ -120,4 +121,7 @@ fn main() -> Result<()> {
     dbg!(now.elapsed().as_nanos() / arcs as u128);
 
     Ok(())
-}
+}
+*/
+
+fn main() {}

src/ans/decoder.rs

@@ -1,8 +1,8 @@
 use crate::ans::model4decoder::VecFrame;
-use crate::ans::{Prelude, K_LOG2};
+use crate::ans::{Prelude, K_LOG2, DecoderModelEntry};
 use crate::traits::folding::FoldRead;
 use crate::traits::quasi::Quasi;
-use crate::{DecoderModelEntry, RawSymbol, State, FASTER_RADIX, LOG2_B};
+use crate::{RawSymbol, State, FASTER_RADIX, LOG2_B};
 use epserde::traits::ZeroCopy;
 use std::ops::Index;
 

src/ans/mod.rs

@@ -1,11 +1,14 @@
+use epserde::Epserde;
+use epserde::prelude::ZeroCopy;
 use crate::traits::folding::FoldRead;
 use crate::{Freq, State};
 use strength_reduce::StrengthReducedU64;
+use crate::traits::quasi::Quasi;
 
-mod decoder;
-mod encoder;
-mod model4decoder;
-mod model4encoder;
+pub mod decoder;
+pub mod encoder;
+pub mod model4decoder;
+pub mod model4encoder;
 
 pub const K: usize = 16;
 pub const K_LOG2: usize = 4;
@@ -62,3 +65,12 @@ impl From<(Freq, u64, Freq)> for EncoderModelEntry {
         }
     }
 }
+
+#[derive(Clone, Copy, Debug, Default, Epserde)]
+#[repr(C)]
+#[zero_copy]
+pub struct DecoderModelEntry<const RADIX: usize, T: Quasi<RADIX> + ZeroCopy + 'static> {
+    pub freq: Freq,
+    pub cumul_freq: Freq,
+    pub quasi_folded: T,
+}

src/ans/model4decoder.rs

@@ -1,10 +1,10 @@
 use crate::traits::quasi::Quasi;
-use crate::{DecoderModelEntry, State, Symbol};
+use crate::{State, Symbol};
 use epserde::prelude::*;
 use std::ops::Index;
 use sucds::bit_vectors::{Rank, Rank9Sel};
 use sux::prelude::*;
-use crate::ans::EncoderModelEntry;
+use crate::ans::{DecoderModelEntry, EncoderModelEntry};
 
 #[derive(Epserde)]
 pub struct EliasFanoFrame<const RADIX: usize, T>

src/bin/bvcomp.rs

@@ -1,3 +1,4 @@
+/*
 use std::path::PathBuf;
 use anyhow::Result;
 use clap::{Parser};
@@ -8,7 +9,7 @@ use folded_streaming_rans::bvgraph::mock_writers::{ANSymbolTable, EntropyMockWri
 use folded_streaming_rans::bvgraph::writer::{BVGraphModelBuilder, BVGraphWriter};
 
 const FIDELITY: usize = 2;
-const RADIX: usize = 4;
+const RADIX: usize = 6;
 
 #[derive(Parser, Debug)]
 #[command(about = "Recompress a BVGraph", long_about = None)]
@@ -46,7 +47,7 @@ pub fn main() -> Result<()> {
         FIDELITY,
         RADIX,
         Log2MockWriter<FIDELITY, RADIX>
-    >>::new(model_builder, 7, 2, 3, 0);
+    >>::new(model_builder, 16, 2, 2147483647, 0);
 
     bvcomp.extend(seq_graph.iter())?;
 
@@ -67,17 +68,17 @@ pub fn main() -> Result<()> {
         FIDELITY,
         RADIX,
         EntropyMockWriter<FIDELITY, RADIX>
-    >>::new(model_builder, 7, 2, 3, 0);
+    >>::new(model_builder, 16, 2, 2147483647, 0);
 
     bvcomp.extend(seq_graph.iter())?;
 
     let model4encoder = bvcomp.flush()?.build();
 
     let mut bvcomp = BVComp::<BVGraphWriter<FIDELITY, RADIX>>::new(
         BVGraphWriter::new(model4encoder, entropy_costs),
-        7,
+        16,
         2,
-        3,
+        2147483647,
         0
     );
 
@@ -97,4 +98,7 @@ pub fn main() -> Result<()> {
 
     Ok(())
 
-}
+}
+*/
+
+fn main() {}

src/bin/bvtest.rs

@@ -1,3 +1,4 @@
+/*
 use std::{
     hint::black_box,
     path::{PathBuf},
@@ -7,12 +8,6 @@ use anyhow::Result;
 use clap::Parser;
 use dsi_progress_logger::*;
 use epserde::prelude::*;
-use folded_streaming_rans::{
-    bvgraph::{
-        reader::ANSBVGraphReaderBuilder,
-    },
-    multi_model_ans::{encoder::ANSCompressorPhase, Prelude},
-};
 use rand::rngs::SmallRng;
 use rand::Rng;
 use rand::SeedableRng;
@@ -74,3 +69,6 @@ pub fn main() -> Result<()> {
 
     Ok(())
 }
+*/
+
+fn main() {}