Skip to content

Commit

Permalink
Remove log_size from expression evaluator.
Browse files Browse the repository at this point in the history
  • Loading branch information
Alon-Ti committed Feb 10, 2025
1 parent 9f7fe0f commit 7507a82
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
16 changes: 10 additions & 6 deletions crates/prover/src/constraint_framework/expr/evaluator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@ pub struct FormalLogupAtRow {
pub is_finalized: bool,
pub is_first: BaseExpr,
pub cumsum_shift: ExtExpr,
pub log_size: u32,
}

impl FormalLogupAtRow {
pub fn new(interaction: usize, log_size: u32) -> Self {
pub fn new(interaction: usize) -> Self {
let claimed_sum_name = "claimed_sum".to_string();
let column_size_name = "column_size".to_string();

Expand All @@ -30,7 +29,6 @@ impl FormalLogupAtRow {
is_first: BaseExpr::zero(),
cumsum_shift: ExtExpr::Param(claimed_sum_name)
* BaseExpr::Inv(Box::new(BaseExpr::Param(column_size_name))),
log_size,
}
}
}
Expand Down Expand Up @@ -62,12 +60,18 @@ pub struct ExprEvaluator {
pub ext_intermediates: Vec<(String, ExtExpr)>,
}

impl Default for ExprEvaluator {
fn default() -> Self {
Self::new()
}
}

impl ExprEvaluator {
pub fn new(log_size: u32) -> Self {
pub fn new() -> Self {
Self {
cur_var_index: Default::default(),
constraints: Default::default(),
logup: FormalLogupAtRow::new(INTERACTION_TRACE_IDX, log_size),
logup: FormalLogupAtRow::new(INTERACTION_TRACE_IDX),
intermediates: vec![],
ext_intermediates: vec![],
}
Expand Down Expand Up @@ -188,7 +192,7 @@ mod tests {
#[test]
fn test_expr_evaluator() {
let test_struct = TestStruct {};
let eval = test_struct.evaluate(ExprEvaluator::new(16));
let eval = test_struct.evaluate(ExprEvaluator::new());
let expected = "let intermediate0 = (trace_1_column_1_offset_0) * (trace_1_column_2_offset_0);
\
Expand Down
2 changes: 1 addition & 1 deletion crates/prover/src/examples/state_machine/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ mod tests {
claimed_sum,
);

let eval = component.evaluate(ExprEvaluator::new(log_n_rows));
let eval = component.evaluate(ExprEvaluator::new());
let expected = "let intermediate0 = (StateMachineElements_alpha0) * (trace_1_column_0_offset_0) \
+ (StateMachineElements_alpha1) * (trace_1_column_1_offset_0) \
- (StateMachineElements_z);
Expand Down

0 comments on commit 7507a82

Please sign in to comment.