Skip to content
Merged
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
48f1f92
rewrite check
kavigupta Aug 18, 2025
2ef9f55
add fix for tdfa issue
kavigupta Aug 18, 2025
9030c88
update follow so it uses inventions directly
kavigupta Aug 18, 2025
311c080
clippy
kavigupta Aug 18, 2025
398ec8b
Merge branch 'update-follow' into rewrite-check
kavigupta Aug 18, 2025
7c23dda
propagate variable types
kavigupta Aug 19, 2025
c804960
more fixes
kavigupta Aug 19, 2025
9d1879b
clippy
kavigupta Aug 19, 2025
601d192
remove unused
kavigupta Aug 19, 2025
a058860
yet another clippy fix
kavigupta Aug 19, 2025
252b9b0
Merge branch 'clippy-fix-again' into rewrite-check
kavigupta Aug 19, 2025
3b831c2
Merge remote-tracking branch 'origin/main' into rewrite-check
kavigupta Aug 19, 2025
ed0808b
undo extra
kavigupta Aug 19, 2025
2cea350
clean up
kavigupta Aug 19, 2025
7f25ba9
update
kavigupta Aug 19, 2025
b340aed
fix unwrap
kavigupta Aug 19, 2025
6be3f76
add variable types
kavigupta Aug 19, 2025
10979ac
clippy
kavigupta Aug 19, 2025
aef0065
Merge remote-tracking branch 'origin/main' into rewrite-check
kavigupta Aug 19, 2025
cbef072
export variable type
kavigupta Aug 19, 2025
d0ffdce
add variable types to invention
kavigupta Aug 19, 2025
635129d
update
kavigupta Aug 19, 2025
d6d4c10
add from_compression_output
kavigupta Aug 19, 2025
f474a3f
use types here too
kavigupta Aug 19, 2025
5b49838
add field
kavigupta Aug 19, 2025
25d0354
add type constraints to variabletype
kavigupta Aug 19, 2025
eaa317c
imports
kavigupta Aug 19, 2025
f9b528b
add type of ivar to tracking
kavigupta Aug 19, 2025
f6da2fa
don't include in tracking
kavigupta Aug 19, 2025
0a1c1de
extract function to load an invention from json
kavigupta Aug 19, 2025
41c0122
Merge branch 'extract-loading-invention' into export-variable-type
kavigupta Aug 19, 2025
2afdb4b
clean
kavigupta Aug 19, 2025
8bfa0cd
add variable type outputs
kavigupta Aug 19, 2025
2d55f62
Merge remote-tracking branch 'origin/main' into export-variable-type
kavigupta Aug 19, 2025
31b7057
render variable types
kavigupta Aug 19, 2025
a1dba26
Merge branch 'export-variable-type' into rewrite-check
kavigupta Aug 19, 2025
3de4e09
delete duplicate
kavigupta Aug 19, 2025
8651a8a
Merge remote-tracking branch 'origin/main' into export-variable-type
kavigupta Aug 19, 2025
577b035
Merge branch 'export-variable-type' into rewrite-check
kavigupta Aug 19, 2025
9fc7de2
delete unused field
kavigupta Aug 19, 2025
e623070
update
kavigupta Aug 19, 2025
5abf8d9
actually use follow types
kavigupta Aug 19, 2025
693d0fc
add test for symbol following
kavigupta Aug 19, 2025
7b00d60
Merge remote-tracking branch 'origin/main' into export-variable-type
kavigupta Aug 19, 2025
cc44770
Merge branch 'export-variable-type' into actually-use-follow-types
kavigupta Aug 19, 2025
6a5425f
add expected outputs
kavigupta Aug 19, 2025
c949f3c
actually use follow types (#261)
kavigupta Aug 19, 2025
8f99a58
Revert "actually use follow types (#261)"
kavigupta Aug 19, 2025
4ec2016
Merge branch 'export-variable-type' into actually-use-follow-types
kavigupta Aug 19, 2025
f09cb1f
Merge branch 'actually-use-follow-types' into rewrite-check
kavigupta Aug 19, 2025
85c080c
bump
kavigupta Aug 19, 2025
e158157
bump
kavigupta Aug 19, 2025
20c835c
check the variable type outputs in addition to other stuff
kavigupta Aug 19, 2025
5ecb8f1
Merge branch 'export-variable-type' into actually-use-follow-types
kavigupta Aug 19, 2025
6064078
Merge branch 'actually-use-follow-types' into rewrite-check
kavigupta Aug 19, 2025
dc6176f
make compression resumable
kavigupta Aug 29, 2025
3647567
Merge branch 'resumable-compression' into rewrite-check
kavigupta Aug 29, 2025
d72f534
add rewrite check to some experimentns
kavigupta Aug 29, 2025
a7ec637
Merge branch 'add-rewrite-check-to-some-experiments' into actually-us…
kavigupta Aug 29, 2025
a5742ab
update
kavigupta Aug 29, 2025
d2465d7
add relevant rewrite checks
kavigupta Aug 29, 2025
1d85128
Merge branch 'actually-use-follow-types' into resumable-compression
kavigupta Aug 29, 2025
3a64898
Merge branch 'resumable-compression' into rewrite-check
kavigupta Aug 29, 2025
cf3e78c
add rewrite checks
kavigupta Sep 3, 2025
e4f99d5
Merge branch 'resumable-compression' into rewrite-check
kavigupta Sep 3, 2025
a3d666b
fix everything
kavigupta Sep 3, 2025
61043ee
fix
kavigupta Sep 3, 2025
0861eb5
Merge branch 'resumable-compression' into rewrite-check
kavigupta Sep 3, 2025
40f6454
Merge remote-tracking branch 'origin/main' into rewrite-check
kavigupta Sep 4, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/test_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use serde_json::Value;
use clap::Parser;
use std::path::Path;

use crate::{multistep_compression, Input, MultistepCompressionConfig, InputFormat};
use crate::{multistep_compression, rewrite_with_inventions, Input, InputFormat, Invention, MultistepCompressionConfig};
use crate::util::timestamp;

pub const CLOBBER: bool = false;
Expand Down Expand Up @@ -45,6 +45,20 @@ pub fn compare_out_jsons_testing(file: &str, expected_out_file: &str, args: &str

let output = run_compression_testing(&input, &cfg);

let invs: Vec<Invention> = output["abstractions"].as_array().unwrap().iter().map(
|item| {
Invention::from_compression_output(item)
}
).collect::<Vec<_>>();

let (rewritten, _, _) = rewrite_with_inventions(&input.train_programs, &invs, &cfg);
if let Some(expected_rewritten) = output.get("rewritten") {
assert_eq!(rewritten, expected_rewritten.as_array().unwrap().iter().map(|v| v.as_str().unwrap()).collect::<Vec<_>>(),
"Rewritten programs do not match expected output");
} else {
panic!("Expected output does not contain 'rewritten' field");
}

println!("{}", serde_json::to_string(&output).unwrap());

let expected_out_file_path = std::path::Path::new(expected_out_file);
Expand Down