patrick/anthem-rs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Determine variable IDs correctly

Browse Source
This commit is contained in:
Patrick Lühne 2020-05-22 02:42:38 +02:00
parent 81ddfd450a
commit 3b3f9017ba
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/problem.rs
View File

@ -289,7 +289,7 @@ impl Problem
fn prove_unproven_statements(&self) -> Result<ProofResult, crate::Error> fn prove_unproven_statements(&self) -> Result<ProofResult, crate::Error>
{ {
let display_statement = |statement: &Statement| -> Result<(), crate::Error> let display_statement = |statement: &mut Statement| -> Result<(), crate::Error>
{ {
let step_title = match statement.proof_status let step_title = match statement.proof_status
{ {
@ -319,6 +319,14 @@ impl Problem
self.shell.borrow_mut().print(&format!("{}: ", statement.kind), self.shell.borrow_mut().print(&format!("{}: ", statement.kind),
&termcolor::ColorSpec::new())?; &termcolor::ColorSpec::new())?;
match statement.kind
{
StatementKind::CompletedDefinition(_)
| StatementKind::IntegrityConstraint =>
crate::autoname_variables(&mut statement.formula),
_ => (),
}
print!("{}", statement.formula); print!("{}", statement.formula);
Ok(()) Ok(())
@ -508,7 +516,7 @@ impl<'p> std::fmt::Display for ProblemTPTPDisplay<'p>
last_symbolic_constant = Some(std::rc::Rc::clone(symbolic_constant)); last_symbolic_constant = Some(std::rc::Rc::clone(symbolic_constant));
} }
for (section_kind, statements) in self.0.statements.borrow().iter() for (section_kind, statements) in self.0.statements.borrow_mut().iter_mut()
{ {
if statements.is_empty() if statements.is_empty()
{ {
@ -530,7 +538,7 @@ impl<'p> std::fmt::Display for ProblemTPTPDisplay<'p>
let mut i = 0; let mut i = 0;
for statement in statements.iter() for statement in statements.iter_mut()
{ {
if let StatementKind::CompletedDefinition(_) = statement.kind if let StatementKind::CompletedDefinition(_) = statement.kind
{ {
@ -561,6 +569,15 @@ impl<'p> std::fmt::Display for ProblemTPTPDisplay<'p>
ProofStatus::Ignored => continue, ProofStatus::Ignored => continue,
}; };
// TODO: avoid doing this twice
match statement.kind
{
StatementKind::CompletedDefinition(_)
| StatementKind::IntegrityConstraint =>
crate::autoname_variables(&mut statement.formula),
_ => (),
}
// TODO: add proper statement type // TODO: add proper statement type
writeln!(formatter, "tff({}, {}, {}).", name, statement_type, writeln!(formatter, "tff({}, {}, {}).", name, statement_type,
crate::output::tptp::display_formula(&statement.formula))?; crate::output::tptp::display_formula(&statement.formula))?;

2
src/translate/verify_properties.rs
View File

@ -149,8 +149,6 @@ impl<'p> Translator<'p>
let mut completed_definition = completed_definition(predicate_declaration, let mut completed_definition = completed_definition(predicate_declaration,
&mut self.definitions); &mut self.definitions);
crate::autoname_variables(&mut completed_definition);
//crate::simplify(&mut completed_definition); //crate::simplify(&mut completed_definition);
let statement_name = let statement_name =