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
gabriel-barrett committed Dec 21, 2023
1 parent 253a8ea commit e14b268
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 69 deletions.
2 changes: 1 addition & 1 deletion benches/fibonacci.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ fn fib<F: LurkField>(store: &Store<F>, state: Rc<RefCell<State>>, _a: u64) -> Pt
// nth Fibonacci number to `a`.
// means of computing it.]
fn fib_frame(n: usize) -> usize {
11 + 10 * n
7 + 7 * n
}

// Set the limit so the last step will be filled exactly, since Lurk currently only pads terminal/error continuations.
Expand Down
2 changes: 1 addition & 1 deletion examples/fibonacci.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fn fib_expr<F: LurkField>(store: &Store<F>) -> Ptr {
// 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`.
fn fib_frame(n: usize) -> usize {
11 + 10 * n
7 + 7 * n
}

// Set the limit so the last step will be filled exactly, since Lurk currently only pads terminal/error continuations.
Expand Down
62 changes: 31 additions & 31 deletions src/lem/tests/eval_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ fn evaluate_lambda2() {
None,
Some(terminal),
None,
&expect!["8"],
&expect!["7"],
&None,
);
}
Expand Down Expand Up @@ -339,7 +339,7 @@ fn evaluate_lambda5() {
None,
Some(terminal),
None,
&expect!["11"],
&expect!["10"],
&None,
);
}
Expand Down Expand Up @@ -481,7 +481,7 @@ fn evaluate_adder1() {
None,
Some(terminal),
None,
&expect!["10"],
&expect!["9"],
&None,
);
}
Expand All @@ -502,7 +502,7 @@ fn evaluate_adder2() {
None,
Some(terminal),
None,
&expect!["12"],
&expect!["11"],
&None,
);
}
Expand Down Expand Up @@ -561,7 +561,7 @@ fn evaluate_let() {
None,
Some(terminal),
None,
&expect!["8"],
&expect!["7"],
&None,
);
}
Expand Down Expand Up @@ -658,7 +658,7 @@ fn evaluate_arithmetic_let() {
Some(new_env),
Some(terminal),
None,
&expect!["15"],
&expect!["12"],
&None,
);
}
Expand Down Expand Up @@ -689,7 +689,7 @@ fn evaluate_fundamental_conditional() {
None,
Some(terminal),
None,
&expect!["28"],
&expect!["22"],
&None,
);
}
Expand All @@ -716,7 +716,7 @@ fn evaluate_fundamental_conditional() {
None,
Some(terminal),
None,
&expect!["26"],
&expect!["22"],
&None,
);
}
Expand Down Expand Up @@ -800,7 +800,7 @@ fn evaluate_recursion1() {
None,
Some(terminal),
None,
&expect!["76"],
&expect!["64"],
&None,
);
}
Expand All @@ -825,7 +825,7 @@ fn evaluate_recursion2() {
None,
Some(terminal),
None,
&expect!["163"],
&expect!["122"],
&None,
);
}
Expand All @@ -848,7 +848,7 @@ fn evaluate_recursion_multiarg() {
None,
Some(terminal),
None,
&expect!["68"],
&expect!["56"],
&None,
);
}
Expand All @@ -874,7 +874,7 @@ fn evaluate_recursion_optimized() {
None,
Some(terminal),
None,
&expect!["66"],
&expect!["57"],
&None,
);
}
Expand All @@ -899,7 +899,7 @@ fn evaluate_tail_recursion() {
None,
Some(terminal),
None,
&expect!["105"],
&expect!["80"],
&None,
);
}
Expand Down Expand Up @@ -927,7 +927,7 @@ fn evaluate_tail_recursion_somewhat_optimized() {
None,
Some(terminal),
None,
&expect!["92"],
&expect!["73"],
&None,
);
}
Expand All @@ -948,7 +948,7 @@ fn evaluate_multiple_letrec_bindings() {
None,
Some(terminal),
None,
&expect!["20"],
&expect!["19"],
&None,
);
}
Expand All @@ -969,7 +969,7 @@ fn evaluate_multiple_letrec_bindings_referencing() {
None,
Some(terminal),
None,
&expect!["28"],
&expect!["25"],
&None,
);
}
Expand Down Expand Up @@ -1001,7 +1001,7 @@ fn evaluate_multiple_letrec_bindings_recursive() {
None,
Some(terminal),
None,
&expect!["175"],
&expect!["144"],
&None,
);
}
Expand All @@ -1025,7 +1025,7 @@ fn nested_let_closure_regression() {
None,
Some(terminal),
None,
&expect!["11"],
&expect!["9"],
&None,
);
}
Expand All @@ -1042,7 +1042,7 @@ fn nested_let_closure_regression() {
None,
Some(terminal),
None,
&expect!["11"],
&expect!["9"],
&None,
);
}
Expand Down Expand Up @@ -1172,7 +1172,7 @@ fn evaluate_zero_arg_lambda() {
None,
Some(terminal),
None,
&expect!["10"],
&expect!["9"],
&None,
);
}
Expand Down Expand Up @@ -1235,7 +1235,7 @@ fn evaluate_make_tree() {
None,
Some(terminal),
None,
&expect!["445"],
&expect!["397"],
&None,
);
}
Expand Down Expand Up @@ -1281,7 +1281,7 @@ fn evaluate_map_tree_bug() {
None,
Some(terminal),
None,
&expect!["125"],
&expect!["103"],
&None,
);
}
Expand All @@ -1308,7 +1308,7 @@ fn evaluate_map_tree_numequal_bug() {
None,
Some(error),
None,
&expect!["125"],
&expect!["103"],
&None,
);
}
Expand Down Expand Up @@ -1343,7 +1343,7 @@ fn env_lost_bug() {
None,
Some(terminal),
None,
&expect!["22"],
&expect!["18"],
&None,
);
}
Expand All @@ -1368,7 +1368,7 @@ fn dont_discard_rest_env() {
None,
Some(terminal),
None,
&expect!["20"],
&expect!["15"],
&None,
);
}
Expand Down Expand Up @@ -1674,7 +1674,7 @@ fn go_translate() {
None,
None,
None,
&expect!["840"],
&expect!["509"],
&None,
);
}
Expand Down Expand Up @@ -2388,7 +2388,7 @@ fn test_relational_edge_case_identity() {
None,
Some(terminal),
None,
&expect!["17"],
&expect!["16"],
&None,
);
}
Expand All @@ -2407,7 +2407,7 @@ fn test_relational_edge_case_identity() {
None,
Some(terminal),
None,
&expect!["22"],
&expect!["21"],
&None,
);
}
Expand All @@ -2431,7 +2431,7 @@ fn test_num_syntax_implications() {
None,
Some(terminal),
None,
&expect!["8"],
&expect!["7"],
&None,
);
}
Expand Down Expand Up @@ -2564,7 +2564,7 @@ fn test_quoted_symbols() {
None,
Some(terminal),
None,
&expect!["11"],
&expect!["10"],
&None,
);
}
Expand Down Expand Up @@ -3337,7 +3337,7 @@ fn test_fold_cons_regression() {
None,
Some(terminal),
None,
&expect!["92"],
&expect!["67"],
&None,
);
}
Expand Down
Loading

0 comments on commit e14b268

Please sign in to comment.