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.

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

variable-assignements use only constants when tracing facts #398

Merged
merged 2 commits into from
Nov 2, 2023
Merged

variable-assignements use only constants when tracing facts #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49d5df4
variable-assignements use only constants when tracing facts
matzemathics Nov 2, 2023
13e0318
remove outdated comment
matzemathics Nov 2, 2023
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
8 changes: 3 additions & 5 deletions nemo-python/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use nemo::{
model::{
chase_model::{ChaseAtom, ChaseFact},
types::primitive_logical_value::PrimitiveLogicalValueT,
Constant, NumericLiteral, RdfLiteral, Term, Variable, XSD_STRING,
Constant, NumericLiteral, RdfLiteral, Variable, XSD_STRING,
},
};

Expand Down Expand Up @@ -242,12 +242,10 @@ impl NemoTrace {
}
}

fn assignement_to_dict(assignment: &HashMap<Variable, Term>, py: Python) -> PyResult<PyObject> {
fn assignement_to_dict(assignment: &HashMap<Variable, Constant>, py: Python) -> PyResult<PyObject> {
let dict = PyDict::new(py);
for (variable, value) in assignment {
// TODO: value should be a constant, which can be converted using the
// `constant_to_python` function
dict.set_item(variable.to_string(), value.to_string())?;
dict.set_item(variable.to_string(), constant_to_python(py, value)?)?;
}

Ok(dict.to_object(py))
Expand Down
4 changes: 2 additions & 2 deletions nemo-python/tests/test_example.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@ def test_trace(self):
trace = self.engine.trace("interesting(circle)")
expected_trace = {
"rule": "interesting(?y) :- data(?x, ?y), interesting(?x) .",
"assignment": {"?x": "3.14", "?y": "circle"},
"assignment": {"?x": Decimal('3.14'), "?y": "circle"},
"subtraces": [
{"fact": "data(3.14, circle)"},
{
"rule": "interesting(?y) :- data(?x, ?y), interesting(?x) .",
"assignment": {"?x": "py", "?y": "3.14"},
"assignment": {"?x": "py", "?y": Decimal('3.14')},
"subtraces": [
{"fact": "data(py, 3.14)"},
{"fact": "interesting(py)"},
Expand Down
12 changes: 3 additions & 9 deletions nemo/src/execution/execution_engine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ use crate::{
primitive_types::PrimitiveType,
},
Constant, Constraint, Fact, Identifier, PrimitiveTerm, Program, Term, Variable,
VariableAssignment,
},
program_analysis::analysis::ProgramAnalysis,
table_manager::{MemoryUsage, SubtableExecutionPlan, SubtableIdentifier, TableManager},
Expand Down Expand Up @@ -418,7 +417,7 @@ impl<Strategy: RuleSelectionStrategy> ExecutionEngine<Strategy> {
};

if step == 0 {
// If fact has no predecesor rule it must have been given as an EDB fact
// If fact has no predecessor rule it must have been given as an EDB fact

return Ok(Some(ExecutionTrace::Fact(ChaseFact::new(
fact_predicate,
Expand Down Expand Up @@ -639,15 +638,10 @@ impl<Strategy: RuleSelectionStrategy> ExecutionEngine<Strategy> {
})
.collect();

let rule_assignment: VariableAssignment = variable_order
let rule_assignment: HashMap<Variable, Constant> = variable_order
.as_ordered_list()
.into_iter()
.zip(
query_terms
.iter()
.cloned()
.map(|c| Term::Primitive(PrimitiveTerm::Constant(c))),
)
.zip(query_terms.iter().cloned())
.collect();

let mut fully_derived = true;
Expand Down
155 changes: 56 additions & 99 deletions nemo/src/execution/tracing/trace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
//! This module contains basic data structures for tracing the origins of derived facts.

use std::collections::HashMap;

use ascii_tree::write_tree;

use crate::model::{chase_model::ChaseFact, Rule, VariableAssignment};
use crate::model::{chase_model::ChaseFact, Constant, PrimitiveTerm, Rule, Term, Variable};

/// Identifies an atom within the head of a rule
#[derive(Debug, Clone)]
pub struct RuleApplication {
/// The rule, that was applied.
pub rule: Rule,
/// The assignement, that was found.
pub assignment: VariableAssignment,
pub assignment: HashMap<Variable, Constant>,
_position: usize,
}

impl RuleApplication {
/// Create new [`RuleApplication`].
pub fn new(rule: Rule, assignment: VariableAssignment, _position: usize) -> Self {
pub fn new(rule: Rule, assignment: HashMap<Variable, Constant>, _position: usize) -> Self {
debug_assert!(_position < rule.head().len());

Self {
Expand All @@ -30,7 +32,18 @@ impl RuleApplication {
impl std::fmt::Display for RuleApplication {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let mut rule_applied = self.rule.clone();
rule_applied.apply_assignment(&self.assignment);
rule_applied.apply_assignment(
&self
.assignment
.iter()
.map(|(variable, constant)| {
(
variable.clone(),
Term::Primitive(PrimitiveTerm::Constant(constant.clone())),
)
})
.collect(),
);

rule_applied.fmt(f)
}
Expand Down Expand Up @@ -85,119 +98,63 @@ mod test {

use super::{ExecutionTrace, RuleApplication};

macro_rules! variable_assignment {
($($k:expr => $v:expr),*) => {
[$(($k, $v)),*]
.into_iter()
.map(|(k, v)| {
(
Variable::Universal(Identifier(k.to_string())),
Constant::Abstract(Identifier(v.to_string())),
)
})
.collect()
};
}

macro_rules! atom_term {
(? $var:expr ) => {
Term::Primitive(PrimitiveTerm::Variable(Variable::Universal(Identifier(
$var.to_string(),
))))
};
}

macro_rules! atom {
( $pred:expr; $( $marker:tt $t:tt ),* ) => {
Atom::new(Identifier($pred.to_string()), vec![ $( atom_term!( $marker $t ) ),* ])
};
}

#[test]
fn print_trace() {
// P(?x, ?y) :- Q(?y, ?x) .
let rule_1 = Rule::new(
vec![Atom::new(
Identifier("P".to_string()),
vec![
Term::Primitive(PrimitiveTerm::Variable(Variable::Universal(Identifier(
"x".to_string(),
)))),
Term::Primitive(PrimitiveTerm::Variable(Variable::Universal(Identifier(
"y".to_string(),
)))),
],
)],
vec![Literal::Positive(Atom::new(
Identifier("Q".to_string()),
vec![
Term::Primitive(PrimitiveTerm::Variable(Variable::Universal(Identifier(
"y".to_string(),
)))),
Term::Primitive(PrimitiveTerm::Variable(Variable::Universal(Identifier(
"x".to_string(),
)))),
],
))],
vec![atom!("P"; ?"x", ?"y")],
vec![Literal::Positive(atom!("Q"; ?"y", ?"x"))],
vec![],
);
let mut rule_1_assignment = HashMap::default();
rule_1_assignment.insert(
Variable::Universal(Identifier("x".to_string())),
Term::Primitive(PrimitiveTerm::Constant(Constant::Abstract(Identifier(
"b".to_string(),
)))),
);
rule_1_assignment.insert(
Variable::Universal(Identifier("y".to_string())),
Term::Primitive(PrimitiveTerm::Constant(Constant::Abstract(Identifier(
"a".to_string(),
)))),
);
let rule_1_assignment = variable_assignment!("x" => "b", "y" => "a");

// S(?x) :- T(?x) .
let rule_2 = Rule::new(
vec![Atom::new(
Identifier("S".to_string()),
vec![Term::Primitive(PrimitiveTerm::Variable(
Variable::Universal(Identifier("x".to_string())),
))],
)],
vec![Literal::Positive(Atom::new(
Identifier("T".to_string()),
vec![Term::Primitive(PrimitiveTerm::Variable(
Variable::Universal(Identifier("x".to_string())),
))],
))],
vec![atom!("S"; ?"x")],
vec![Literal::Positive(atom!("T"; ?"x"))],
vec![],
);
let mut rule_2_assignment = HashMap::default();
rule_2_assignment.insert(
Variable::Universal(Identifier("x".to_string())),
Term::Primitive(PrimitiveTerm::Constant(Constant::Abstract(Identifier(
"a".to_string(),
)))),
);

let rule_2_assignment = variable_assignment!("x" => "a");

// R(?x, ?y) :- P(?x, ?y), S(?y) .
let rule_3 = Rule::new(
vec![Atom::new(
Identifier("R".to_string()),
vec![
Term::Primitive(PrimitiveTerm::Variable(Variable::Universal(Identifier(
"x".to_string(),
)))),
Term::Primitive(PrimitiveTerm::Variable(Variable::Universal(Identifier(
"y".to_string(),
)))),
],
)],
vec![atom!("R"; ?"x", ?"y")],
vec![
Literal::Positive(Atom::new(
Identifier("P".to_string()),
vec![
Term::Primitive(PrimitiveTerm::Variable(Variable::Universal(Identifier(
"x".to_string(),
)))),
Term::Primitive(PrimitiveTerm::Variable(Variable::Universal(Identifier(
"y".to_string(),
)))),
],
)),
Literal::Positive(Atom::new(
Identifier("S".to_string()),
vec![Term::Primitive(PrimitiveTerm::Variable(
Variable::Universal(Identifier("y".to_string())),
))],
)),
Literal::Positive(atom!("P"; ?"x", ?"y")),
Literal::Positive(atom!("S"; ?"y")),
],
vec![],
);
let mut rule_3_assignment = HashMap::default();
rule_3_assignment.insert(
Variable::Universal(Identifier("x".to_string())),
Term::Primitive(PrimitiveTerm::Constant(Constant::Abstract(Identifier(
"b".to_string(),
)))),
);
rule_3_assignment.insert(
Variable::Universal(Identifier("y".to_string())),
Term::Primitive(PrimitiveTerm::Constant(Constant::Abstract(Identifier(
"a".to_string(),
)))),
);
let rule_3_assignment: HashMap<_, _> = variable_assignment!("x" => "b", "y" => "a");

let q_ab = ChaseFact::new(
Identifier("Q".to_string()),
Expand Down