Merge pull request #120 from chriseth/rename_commit_evaluator

Rename commit evaluator

src/compiler.rs

@@ -7,7 +7,7 @@ use num_bigint::Sign;
 
 use crate::number::{abstract_to_degree, AbstractNumberType, DegreeType};
 use crate::parser::ast::PILFile;
-use crate::{analyzer, asm_compiler, commit_evaluator, constant_evaluator, json_exporter};
+use crate::{analyzer, asm_compiler, constant_evaluator, json_exporter, witness_generator};
 
 pub fn no_callback() -> Option<fn(&str) -> Option<AbstractNumberType>> {
     None
@@ -140,7 +140,7 @@ fn compile(
         println!("Wrote constants.bin.");
         println!("Deducing witness columns...");
         let commits =
-            commit_evaluator::generate(analyzed, degree, &constants, query_callback, verbose);
+            witness_generator::generate(analyzed, degree, &constants, query_callback, verbose);
         write_polys_file(
             &mut BufWriter::new(&mut fs::File::create(output_dir.join("commits.bin")).unwrap()),
             degree,

src/lib.rs

@@ -1,6 +1,5 @@
 pub mod analyzer;
 pub mod asm_compiler;
-pub mod commit_evaluator;
 pub mod compiler;
 pub mod constant_evaluator;
 pub mod json_exporter;
@@ -8,3 +7,4 @@ pub mod number;
 pub mod parser;
 pub mod riscv;
 pub mod utils;
+pub mod witness_generator;

src/witness_generator/affine_expression.rs

@@ -349,8 +349,8 @@ mod test {
 
     use super::*;
     use crate::{
-        commit_evaluator::{bit_constraints::BitConstraint, eval_error::EvalError},
         number::AbstractNumberType,
+        witness_generator::{bit_constraints::BitConstraint, eval_error::EvalError},
     };
 
     use super::{AffineExpression, GOLDILOCKS_MOD};

src/witness_generator/bit_constraints.rs

@@ -2,8 +2,8 @@ use std::collections::{BTreeMap, BTreeSet};
 use std::fmt::{Display, Formatter};
 
 use crate::analyzer::{BinaryOperator, Expression, Identity, IdentityKind, PolynomialReference};
-use crate::commit_evaluator::util::{contains_next_ref, WitnessColumnNamer};
 use crate::number::{AbstractNumberType, GOLDILOCKS_MOD};
+use crate::witness_generator::util::{contains_next_ref, WitnessColumnNamer};
 
 use super::expression_evaluator::ExpressionEvaluator;
 use super::symbolic_evaluator::SymbolicEvaluator;
@@ -316,8 +316,8 @@ fn smallest_period_candidate(fixed: &[AbstractNumberType]) -> Option<u64> {
 mod test {
     use std::collections::BTreeMap;
 
-    use crate::commit_evaluator::bit_constraints::{propagate_constraints, BitConstraint};
-    use crate::commit_evaluator::{FixedData, WitnessColumn};
+    use crate::witness_generator::bit_constraints::{propagate_constraints, BitConstraint};
+    use crate::witness_generator::{FixedData, WitnessColumn};
 
     use super::process_fixed_column;
 

src/witness_generator/double_sorted_witness_machine.rs

@@ -5,8 +5,8 @@ use itertools::{Either, Itertools};
 
 use crate::analyzer::PolynomialReference;
 use crate::analyzer::{Expression, Identity, IdentityKind, SelectedExpressions};
-use crate::commit_evaluator::eval_error;
 use crate::number::AbstractNumberType;
+use crate::witness_generator::eval_error;
 
 use super::affine_expression::AffineExpression;
 use super::eval_error::EvalError;

src/witness_generator/fixed_lookup_machine.rs

@@ -1,10 +1,10 @@
 use std::collections::{HashMap, HashSet};
 
 use crate::analyzer::{Expression, Identity, IdentityKind, SelectedExpressions};
-use crate::commit_evaluator::eval_error;
-use crate::commit_evaluator::expression_evaluator::ExpressionEvaluator;
-use crate::commit_evaluator::util::contains_witness_ref;
 use crate::number::{AbstractNumberType, DegreeType};
+use crate::witness_generator::eval_error;
+use crate::witness_generator::expression_evaluator::ExpressionEvaluator;
+use crate::witness_generator::util::contains_witness_ref;
 
 use super::affine_expression::AffineExpression;
 use super::eval_error::EvalError;

src/witness_generator/generator.rs

@@ -13,7 +13,7 @@ use super::machine::Machine;
 use super::util::contains_next_witness_ref;
 use super::{Constraint, EvalResult, FixedData, WitnessColumn};
 
-pub struct Evaluator<'a, QueryCallback>
+pub struct Generator<'a, QueryCallback>
 where
     QueryCallback: FnMut(&'a str) -> Option<AbstractNumberType>,
 {
@@ -44,7 +44,7 @@ enum EvaluationRow {
     Next,
 }
 
-impl<'a, QueryCallback> Evaluator<'a, QueryCallback>
+impl<'a, QueryCallback> Generator<'a, QueryCallback>
 where
     QueryCallback: FnMut(&str) -> Option<AbstractNumberType>,
 {
@@ -57,7 +57,7 @@ where
     ) -> Self {
         let witness_cols = fixed_data.witness_cols;
 
-        Evaluator {
+        Generator {
             fixed_data,
             identities,
             machines,

src/witness_generator/mod.rs

@@ -11,10 +11,10 @@ mod affine_expression;
 mod bit_constraints;
 mod double_sorted_witness_machine;
 mod eval_error;
-mod evaluator;
 mod expression_evaluator;
 pub mod fixed_evaluator;
 mod fixed_lookup_machine;
+mod generator;
 mod machine;
 mod machine_extractor;
 mod sorted_witness_machine;
@@ -53,7 +53,7 @@ pub fn generate<'a>(
         machine_extractor::split_out_machines(&fixed, &analyzed.identities, &witness_cols);
     let (global_bit_constraints, identities) =
         bit_constraints::determine_global_constraints(&fixed, identities);
-    let mut evaluator = evaluator::Evaluator::new(
+    let mut generator = generator::Generator::new(
         &fixed,
         identities,
         global_bit_constraints,
@@ -64,18 +64,18 @@ pub fn generate<'a>(
     let mut values: Vec<(&str, Vec<AbstractNumberType>)> =
         witness_cols.iter().map(|p| (p.name, Vec::new())).collect();
     for row in 0..degree as DegreeType {
-        let row_values = evaluator.compute_next_row(row);
+        let row_values = generator.compute_next_row(row);
         for (col, v) in row_values.into_iter().enumerate() {
             values[col].1.push(v);
         }
     }
-    for (col, v) in evaluator.compute_next_row(0).into_iter().enumerate() {
+    for (col, v) in generator.compute_next_row(0).into_iter().enumerate() {
         if v != values[col].1[0] {
             eprintln!("Wrap-around value for column {} does not match: {} (wrap-around) vs. {} (first row).",
             witness_cols[col].name, v, values[col].1[0]);
         }
     }
-    for (name, data) in evaluator.machine_witness_col_values() {
+    for (name, data) in generator.machine_witness_col_values() {
         let (_, col) = values.iter_mut().find(|(n, _)| *n == name).unwrap();
         *col = data;
     }

src/witness_generator/sorted_witness_machine.rs

@@ -3,8 +3,8 @@ use std::collections::{BTreeMap, HashMap, HashSet};
 use itertools::{Either, Itertools};
 
 use crate::analyzer::{Expression, Identity, IdentityKind, SelectedExpressions};
-use crate::commit_evaluator::eval_error;
 use crate::number::AbstractNumberType;
+use crate::witness_generator::eval_error;
 
 use super::affine_expression::AffineExpression;
 use super::eval_error::EvalError;