Skip to content
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.

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

soheil changes #11

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions front/src/components/sandbox/Sandbox.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
}

.exampleItem {
background-color: yellow;
background-color: #1e1e1e;
display: inline;
margin: 1rem;
padding: .5rem;
border-radius: .5rem;
white-space: nowrap;
}
}
49 changes: 48 additions & 1 deletion hakim-engine/src/interactive/tactic/auto_list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,48 @@ fn convert(term: TermRef, _: LogicArena<'_, ListStatement>) -> LogicValue<'_, Li
LogicValue::Exp(LogicTree::Unknown)
}

fn check_contradiction(_: &[ListStatement]) -> bool {
fn check_contradiction(statements: &[ListStatement]) -> bool {
let mut equality_statements = Vec::new();

for statement in statements {
if let ListStatement::IsEq(x, y) = statement {
if x.0.len() == y.0.len() {
for i in 0..x.0.len() {
if let ListPart::Element(x_term) = &x.0[i] {
if let ListPart::Element(y_term) = &y.0[i] {
equality_statements.push((x_term, y_term));
equality_statements.push((y_term, x_term));
}
}
}
}
}
}

for statement in statements {
if let ListStatement::IsNeq(x, y) = statement {
if x.0.len() == y.0.len() {
let mut is_eq: bool = true;

for i in 0..x.0.len() {
if let ListPart::Atom(x_term) = &x.0[i] {
if let ListPart::Atom(y_term) = &y.0[i] {
is_eq &= equality_statements.contains(&(x_term, y_term));
} else {
is_eq = false;
}
} else {
is_eq = false;
}
}

if is_eq {
return true;
}
}
}
}

false
}

Expand Down Expand Up @@ -127,4 +168,10 @@ mod tests {
fn string_concat() {
success(r#""hello" ++ " " ++ "world" = "hello world""#);
}

#[test]
fn list_equality_implies_member_equality() {
success(r#"∀ a b c : ℤ , [1, 2, 3] = [a, b, c] -> a = 1"#);
fail(r#"∀ a b c : ℤ , [1, 2, 3] = [a, b, c] -> a = 2"#);
}
}
13 changes: 13 additions & 0 deletions hakim-engine/src/interactive/tactic/rewrite.rs
Original file line number Diff line number Diff line change
Expand Up @@ -248,4 +248,17 @@ mod tests {
EngineLevel::Empty,
);
}

#[test]
#[ignore]
fn replace_bug1() {
run_interactive(
r#"-1 * multi { x: ℤ | prime x } + 1 * (multi { x: ℤ | prime x } + 1) = 1"#,
r#"
replace #1 (- 1 * multi { x: ℤ | prime x } + 1 * (multi { x: ℤ | prime x } + 1)) with (1)
apply eq_refl
"#,
EngineLevel::Full,
);
}
}