github/powdr
1
1
Fork 0
mirror of https://github.com/powdr-labs/powdr.git synced 2026-05-13 03:00:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename the actual evalutor.

Browse Source
This commit is contained in:
chriseth
2023-03-28 16:59:32 +02:00
parent d61d0a09bb
commit a73672b94f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/witness_generator/generator.rs
View File

@@ -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,

8
src/witness_generator/mod.rs
View File

@@ -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 = generator::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;
}