8000 Improve the proof format and proof checker by jix · Pull Request #42 · jix/varisat · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Improve the proof format and proof checker #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 13, 2019
Merged

Improve the proof format and proof checker #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f994dc6
checker: Use a simple bump allocator for clause literals
jix May 12, 2019
c888cd6
Use variable length encoding for varisat proofs
jix May 13, 2019
6e7e13c
Dynamically adjust the hash size for varisat proofs
jix May 13, 2019
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
18 changes: 3 additions & 15 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion varisat/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ edition = "2018"


[dependencies]
bincode = "1.1.3"
failure = "0.1.5"
itoa = "0.4.4"
log = "0.4.6"
Expand Down
4 changes: 2 additions & 2 deletions 8000 varisat/src/binary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pub fn simplify_binary<'a>(
// This check avoids deleting binary clauses twice if both literals are assigned.
if (!lit) < other_lit {
let lits = [!lit, other_lit];
proof::add_step(ctx.borrow(), &ProofStep::DeleteClause(lits[..].into()));
proof::add_step(ctx.borrow(), &ProofStep::DeleteClause(&lits[..]));
}
}
}
Expand All @@ -69,7 +69,7 @@ pub fn simplify_binary<'a>(
// This check avoids deleting binary clauses twice if both literals are assigned.
if ctx.part(ProofP).is_active() && !retain && (!lit) < other_lit {
let lits = [!lit, other_lit];
proof::add_step(ctx.borrow(), &ProofStep::DeleteClause(lits[..].into()));
proof::add_step(ctx.borrow(), &ProofStep::DeleteClause(&lits[..]));
}

retain
Expand Down
2 changes: 1 addition & 1 deletion varisat/src/cdcl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ pub fn conflict_step<'a>(
ctx.borrow(),
&ProofStep::AtClause {
clause: clause.into(),
propagation_hashes: analyze.clause_hashes().into(),
propagation_hashes: analyze.clause_hashes(),
},
);

Expand Down
Loading
0