Skip to content

Commit

Permalink
fixed eval/proof iterations
Browse files Browse the repository at this point in the history
  • Loading branch information
gabriel-barrett committed Jan 6, 2024
1 parent e2e1e28 commit 271be4a
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 68 deletions.
2 changes: 1 addition & 1 deletion benches/common/fib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pub(crate) fn fib_expr<F: LurkField>(store: &Store<F>) -> Ptr {
}

const LIN_COEF: usize = 7;
const ANG_COEF: usize = 10;
const ANG_COEF: usize = 7;

// The env output in the `fib_frame`th frame of the above, infinite Fibonacci computation contains a binding of the
// nth Fibonacci number to `a`.
Expand Down
62 changes: 31 additions & 31 deletions src/lem/tests/eval_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ fn evaluate_lambda2() {
None,
Some(terminal),
None,
&expect!["8"],
&expect!["7"],
&None,
);
}
Expand Down Expand Up @@ -342,7 +342,7 @@ fn evaluate_lambda5() {
None,
Some(terminal),
None,
&expect!["11"],
&expect!["10"],
&None,
);
}
Expand Down Expand Up @@ -484,7 +484,7 @@ fn evaluate_adder1() {
None,
Some(terminal),
None,
&expect!["10"],
&expect!["9"],
&None,
);
}
Expand All @@ -505,7 +505,7 @@ fn evaluate_adder2() {
None,
Some(terminal),
None,
&expect!["12"],
&expect!["11"],
&None,
);
}
Expand Down Expand Up @@ -564,7 +564,7 @@ fn evaluate_let() {
None,
Some(terminal),
None,
&expect!["8"],
&expect!["7"],
&None,
);
}
Expand Down Expand Up @@ -661,7 +661,7 @@ fn evaluate_arithmetic_let() {
Some(new_env),
Some(terminal),
None,
&expect!["15"],
&expect!["12"],
&None,
);
}
Expand Down Expand Up @@ -692,7 +692,7 @@ fn evaluate_fundamental_conditional() {
None,
Some(terminal),
None,
&expect!["28"],
&expect!["22"],
&None,
);
}
Expand All @@ -719,7 +719,7 @@ fn evaluate_fundamental_conditional() {
None,
Some(terminal),
None,
&expect!["26"],
&expect!["22"],
&None,
);
}
Expand Down Expand Up @@ -803,7 +803,7 @@ fn evaluate_recursion1() {
None,
Some(terminal),
None,
&expect!["76"],
&expect!["64"],
&None,
);
}
Expand All @@ -828,7 +828,7 @@ fn evaluate_recursion2() {
None,
Some(terminal),
None,
&expect!["163"],
&expect!["122"],
&None,
);
}
Expand All @@ -851,7 +851,7 @@ fn evaluate_recursion_multiarg() {
None,
Some(terminal),
None,
&expect!["68"],
&expect!["56"],
&None,
);
}
Expand All @@ -877,7 +877,7 @@ fn evaluate_recursion_optimized() {
None,
Some(terminal),
None,
&expect!["66"],
&expect!["57"],
&None,
);
}
Expand All @@ -902,7 +902,7 @@ fn evaluate_tail_recursion() {
None,
Some(terminal),
None,
&expect!["105"],
&expect!["80"],
&None,
);
}
Expand Down Expand Up @@ -930,7 +930,7 @@ fn evaluate_tail_recursion_somewhat_optimized() {
None,
Some(terminal),
None,
&expect!["92"],
&expect!["73"],
&None,
);
}
Expand All @@ -951,7 +951,7 @@ fn evaluate_multiple_letrec_bindings() {
None,
Some(terminal),
None,
&expect!["20"],
&expect!["19"],
&None,
);
}
Expand All @@ -972,7 +972,7 @@ fn evaluate_multiple_letrec_bindings_referencing() {
None,
Some(terminal),
None,
&expect!["28"],
&expect!["25"],
&None,
);
}
Expand Down Expand Up @@ -1004,7 +1004,7 @@ fn evaluate_multiple_letrec_bindings_recursive() {
None,
Some(terminal),
None,
&expect!["175"],
&expect!["144"],
&None,
);
}
Expand All @@ -1028,7 +1028,7 @@ fn nested_let_closure_regression() {
None,
Some(terminal),
None,
&expect!["11"],
&expect!["9"],
&None,
);
}
Expand All @@ -1045,7 +1045,7 @@ fn nested_let_closure_regression() {
None,
Some(terminal),
None,
&expect!["11"],
&expect!["9"],
&None,
);
}
Expand Down Expand Up @@ -1175,7 +1175,7 @@ fn evaluate_zero_arg_lambda() {
None,
Some(terminal),
None,
&expect!["10"],
&expect!["9"],
&None,
);
}
Expand Down Expand Up @@ -1238,7 +1238,7 @@ fn evaluate_make_tree() {
None,
Some(terminal),
None,
&expect!["445"],
&expect!["397"],
&None,
);
}
Expand Down Expand Up @@ -1284,7 +1284,7 @@ fn evaluate_map_tree_bug() {
None,
Some(terminal),
None,
&expect!["125"],
&expect!["103"],
&None,
);
}
Expand All @@ -1311,7 +1311,7 @@ fn evaluate_map_tree_numequal_bug() {
None,
Some(error),
None,
&expect!["125"],
&expect!["103"],
&None,
);
}
Expand Down Expand Up @@ -1346,7 +1346,7 @@ fn env_lost_bug() {
None,
Some(terminal),
None,
&expect!["22"],
&expect!["18"],
&None,
);
}
Expand All @@ -1371,7 +1371,7 @@ fn dont_discard_rest_env() {
None,
Some(terminal),
None,
&expect!["20"],
&expect!["15"],
&None,
);
}
Expand Down Expand Up @@ -1677,7 +1677,7 @@ fn go_translate() {
None,
None,
None,
&expect!["840"],
&expect!["509"],
&None,
);
}
Expand Down Expand Up @@ -2391,7 +2391,7 @@ fn test_relational_edge_case_identity() {
None,
Some(terminal),
None,
&expect!["17"],
&expect!["16"],
&None,
);
}
Expand All @@ -2410,7 +2410,7 @@ fn test_relational_edge_case_identity() {
None,
Some(terminal),
None,
&expect!["22"],
&expect!["21"],
&None,
);
}
Expand All @@ -2434,7 +2434,7 @@ fn test_num_syntax_implications() {
None,
Some(terminal),
None,
&expect!["8"],
&expect!["7"],
&None,
);
}
Expand Down Expand Up @@ -2567,7 +2567,7 @@ fn test_quoted_symbols() {
None,
Some(terminal),
None,
&expect!["11"],
&expect!["10"],
&None,
);
}
Expand Down Expand Up @@ -3340,7 +3340,7 @@ fn test_fold_cons_regression() {
None,
Some(terminal),
None,
&expect!["92"],
&expect!["67"],
&None,
);
}
Expand Down
Loading

0 comments on commit 271be4a

Please sign in to comment.