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

Topic/inverse evaluate proposer #8

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Topic/inverse evaluate proposer #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3369455
adding old versions of functions
na2021 Mar 27, 2019
2e787dd
adding random selection of rhs when inverse evaluating and adding rep…
na2021 Apr 10, 2019
677d68c
formatting fixes
na2021 Apr 10, 2019
64cd2c8
Rewrite: Moving tests for private methods from doctests to normal tests
na2021 May 7, 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
20 changes: 9 additions & 11 deletions src/trs/lexicon.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,8 +488,8 @@ impl Lex {
for arg_tp in arg_types {
let subtype = arg_tp.apply(ctx);
let arg_schema = TypeSchema::Monotype(arg_tp);
let result = self
.sample_term_internal(
let result =
self.sample_term_internal(
&arg_schema,
ctx,
atom_weights,
Expand All @@ -498,13 +498,12 @@ impl Lex {
max_size,
size,
vars,
)
.map_err(|_| SampleError::Subterm)
.and_then(|subterm| {
let tp = self.infer_term(&subterm, ctx)?.instantiate_owned(ctx);
ctx.unify_fast(subtype, tp)?;
Ok(subterm)
});
).map_err(|_| SampleError::Subterm)
.and_then(|subterm| {
let tp = self.infer_term(&subterm, ctx)?.instantiate_owned(ctx);
ctx.unify_fast(subtype, tp)?;
Ok(subterm)
});
match result {
Ok(subterm) => {
size += subterm.size();
Expand Down Expand Up @@ -1077,8 +1076,7 @@ impl GP for Lexicon {
.read()
.expect("poisoned lexicon")
.background
.contains(&r)
|| rng.gen_bool(params.p_keep)
.contains(&r) || rng.gen_bool(params.p_keep)
})
})
.collect()
Expand Down
28 changes: 11 additions & 17 deletions src/trs/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,7 @@ mod tests {
&mut sig,
&mut vars,
&mut ops,
)
.unwrap();
).unwrap();
assert_eq!(a.display(), "SUCC");
assert_eq!(s.to_string(), "int → int");
}
Expand Down Expand Up @@ -389,9 +388,8 @@ mod tests {
vec![],
false,
TypeContext::default(),
)
.unwrap()
.1;
).unwrap()
.1;
let mut ctx = lex.0.read().expect("poisoned lexicon").ctx.clone();
let res = typed_rule("SUCC(x_) = ZERO", &mut lex, &mut ctx);

Expand All @@ -409,9 +407,8 @@ mod tests {
vec![],
false,
TypeContext::default(),
)
.unwrap()
.1;
).unwrap()
.1;
let mut ctx = lex.0.read().expect("poisoned lexicon").ctx.clone();
let res = trs(
CompleteStr("PLUS(ZERO x_) = ZERO; PLUS(SUCC(x_) y_) = SUCC(PLUS(x_ y_));"),
Expand All @@ -436,9 +433,8 @@ mod tests {
vec![],
false,
TypeContext::default(),
)
.unwrap()
.1;
).unwrap()
.1;
let mut ctx = lex.0.read().expect("poisoned lexicon").ctx.clone();
let res = typed_context(CompleteStr("PLUS(x_ [!])"), &mut lex, &mut ctx);

Expand All @@ -456,9 +452,8 @@ mod tests {
vec![],
false,
TypeContext::default(),
)
.unwrap()
.1;
).unwrap()
.1;
let mut ctx = lex.0.read().expect("poisoned lexicon").ctx.clone();
let res = typed_rulecontext(CompleteStr("PLUS(x_ [!]) = ZERO"), &mut lex, &mut ctx);

Expand All @@ -476,9 +471,8 @@ mod tests {
vec![],
false,
TypeContext::default(),
)
.unwrap()
.1;
).unwrap()
.1;
let mut ctx = lex.0.read().expect("poisoned lexicon").ctx.clone();
let res = templates(
CompleteStr("PLUS(x_ [!]) = ZERO; [!] = SUCC(ZERO);"),
Expand Down
182 changes: 172 additions & 10 deletions src/trs/rewrite.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use rand::Rng;
use std::f64::NEG_INFINITY;
use std::fmt;
use term_rewriting::trace::Trace;
use term_rewriting::{Rule, RuleContext, Strategy as RewriteStrategy, TRS as UntypedTRS};
use term_rewriting::{Rule, RuleContext, Strategy as RewriteStrategy, Term, TRS as UntypedTRS};

use super::{Lexicon, ModelParams, SampleError, TypeError};

Expand Down Expand Up @@ -279,13 +279,9 @@ impl TRS {
) -> Result<TRS, SampleError> {
let mut trs = self.clone();
let context = sample_iter(rng, contexts, 1)?[0].clone();
let rule = trs.lex.sample_rule_from_context(
context,
&mut trs.ctx,
atom_weights,
true,
max_size,
)?;
let rule =
trs.lex
.sample_rule_from_context(context, &mut trs.ctx, atom_weights, true, max_size)?;
trs.lex
.0
.write()
Expand All @@ -304,11 +300,112 @@ impl TRS {
Err(SampleError::OptionsExhausted)
} else {
let mut trs = self.clone();
trs.utrs
.remove_clauses(sample_iter(rng, deletable, 1)?[0])?;
trs.utrs.remove_clauses(sample_iter(rng, deletable, 1)?[0])?;
Ok(trs)
}
}
/// Replaces one subterm with another subterm in a main Term.
fn replace_term_helper(term: &Term, replace: &Term, new: Term) -> Term {
if Term::alpha(replace, term) != None {
let unwrapped_sub = Term::alpha(replace, term).unwrap();
return new.substitute(&unwrapped_sub);
} else if term.args() != vec![] {
match *term {
Term::Variable(ref _var) => {
return term.clone();
}
Term::Application { ref op, args: _ } => {
let mut args = term.args().clone();
for idx in 0..args.len() {
args[idx] = TRS::replace_term_helper(&args[idx], replace, new.clone());
}
let op = op.clone();
return Term::Application { op, args };
}
}
}
return term.clone();
}
/// Replaces one subterm with another subterm in a given Rule.
fn replace_term_in_rule_helper(rule: &Rule, t: &Term, v: Term) -> Option<Rule> {
let r = rule.clone();
let lhs = TRS::replace_term_helper(&r.lhs, t, v.clone());
let mut rhs: Vec<Term> = vec![];
for idx in 0..r.rhs.len() {
rhs.push(TRS::replace_term_helper(&r.rhs[idx].clone(), t, v.clone()));
}
Rule::new(lhs, rhs)
}
// helper for routinization
// TODO fix rule lhs before inserting
fn inverse_evaluation_helper<R: Rng>(rule: &Rule, t: &Term, rng: &mut R) -> Term {
let rhs_idx = rng.gen_range(0, rule.rhs.len());
TRS::replace_term_helper(t, &rule.rhs[rhs_idx], rule.lhs.clone())
}
/// Given two rules, attempts to apply one rule inversely to the other.
fn inverse_evaluate_rule_helper<R: Rng>(rule: &Rule, r: &Rule, rng: &mut R) -> Option<Rule> {
let lhs = TRS::inverse_evaluation_helper(rule, &r.lhs, rng);
let mut rhs: Vec<Term> = vec![];
for idx in 0..r.rhs.len() {
rhs.push(TRS::inverse_evaluation_helper(rule, &r.rhs[idx], rng));
}
Rule::new(lhs, rhs)
}

/// Extracts a sngle rule from the TRS selecting only 1 rhs
fn sample_rule<R: Rng>(&self, rng: &mut R) -> Result<Rule, SampleError> {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Funny - I forgot that I'd put this in the last review and just wrote a similar function, TRS::choose_clause, a couple days ago. I suppose we have a strong use case for it! I'm not sure why this one is quite so long, though. Here's my implementation:

    fn choose_clause<R: Rng>(&self, rng: &mut R) -> Result<Rule, SampleError> {
        let rules = {
            let num_rules = self.len();
            let background = &self.lex.0.read().expect("poisoned lexicon").background;
            let num_background = background.len();
            &self.utrs.rules[0..(num_rules - num_background)]
        };
        let mut clauses = rules.iter().flat_map(Rule::clauses).collect_vec();
        let idx = (0..clauses.len())
            .choose(rng)
            .ok_or(SampleError::OptionsExhausted)?;
        Ok(clauses.swap_remove(idx))
    }

Am I missing something?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I was reading some of the lines you'd deleted as part of the current function. They're pretty similar in length.

let mut trs = self.clone();
let num_rules = self.len();
let num_background = self
.lex
.0
.read()
.expect("poisoned lexicon")
.background
.len();
let ref_idx: usize = rng.gen_range(0, num_rules);
let mut ref_rule = trs.utrs.rules[ref_idx].clone();
let rhs_idx = rng.gen_range(0, ref_rule.rhs.len());
let temp_rule = Rule::new(ref_rule.lhs, vec![ref_rule.rhs[rhs_idx].clone()]);
if temp_rule == None {
return Err(SampleError::OptionsExhausted);
}
ref_rule = temp_rule.unwrap();
joshrule marked this conversation as resolved.
Show resolved Hide resolved
if ref_rule.lhs.variables().len() < ref_rule.rhs[0].variables().len() {
return Err(SampleError::OptionsExhausted);
}
Ok(ref_rule)
}
/// Selects two Rules from the TRS at random and atempts to inverse evaluate one rule on the other, if it
/// succeeds it takes that new rule and inserts it imediately after the background.
pub fn inverse_evaluate<R: Rng>(&self, rng: &mut R) -> Result<TRS, SampleError> {
let mut trs = self.clone();
let num_rules = self.len();
let num_background = self
.lex
.0
.read()
.expect("poisoned lexicon")
.background
.len();
if num_background >= num_rules - 1 {
return Err(SampleError::OptionsExhausted);
}
let mut target_idx: usize = rng.gen_range(num_background, num_rules);
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of sampling a rule by index, would it work just to sample another clause? Also, we write so much boilerplate to figure out how many rules we've learned. Perhaps that could also be extracted into a helper function, say, pub fn learned_rules<'a>(&'a self) -> &'a [Rule] or something similar.

let ref_rule = trs.sample_rule(rng)?;
let new_rule =
TRS::inverse_evaluate_rule_helper(&ref_rule, &trs.utrs.rules[target_idx], rng);
if new_rule == None {
return Err(SampleError::OptionsExhausted);
}
trs.utrs
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you can use ? here instead of expect. That way, you return the error rather than panic. Something like this:

trs.utrs.remove_clauses(&ref_rule)?;

.remove_clauses(&ref_rule)
.expect("removing old rule");
trs.utrs
.insert_clauses(&new_rule.unwrap())
.expect("inserting new rule");
Ok(trs)
}
}
impl fmt::Display for TRS {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
Expand All @@ -331,3 +428,68 @@ impl fmt::Display for TRS {
write!(f, "{}", trs_str)
}
}
#[cfg(test)]
mod tests {
use super::*;
extern crate polytype;
extern crate rand;
extern crate term_rewriting;
use rand::thread_rng;
use term_rewriting::{parse_rule, parse_term, Context, RuleContext, Signature};

#[test]
fn replace_term_helper_test() {
let mut sig = Signature::default();
let term = parse_term(&mut sig, "A(y_ B(C) D)").expect("parse of A(y_ B(C) D)");
let t = parse_term(&mut sig, "B(C)").expect("parse of B(C)");
let v = parse_term(&mut sig, "x_").expect("parse of x_");

let new_term = TRS::replace_term_helper(&term, &t, v);
assert_eq!(new_term.display(), "A(y_ x_ D)");
}

#[test]
fn replace_term_in_rule_helper_test() {
let mut sig = Signature::default();
let rule =
parse_rule(&mut sig, "A(y_ B(C) D) = B(C)").expect("parse of A(y_ B(C) D) = B(C)");
let t = parse_term(&mut sig, "B(C)").expect("parse of B(C)");
let v = parse_term(&mut sig, "x_").expect("parse of x_");

let new_rule = TRS::replace_term_in_rule_helper(&rule, &t, v);
if new_rule == None {
assert!(false);
} else {
let rule = new_rule.unwrap();
assert_eq!(rule.display(), "A(y_ x_ D) = x_");
}
}

#[test]
fn inverse_evaluation_helper_test() {
let mut sig = Signature::default();

let t = parse_term(&mut sig, "A(B(x_ x_))").expect("parse of A(B(x_ x_))");
let r = parse_rule(&mut sig, "C(y_) = B(y_ y_)").expect("parse of C(y_) = B(y_ y_)");
let mut rng = thread_rng();

let result = TRS::inverse_evaluation_helper(&r, &t, &mut rng);

assert_eq!(result.display(), "A(C(x_))");
}

#[test]
fn inverse_evluate_rule_helper_test() {
let mut sig = Signature::default();

let r = parse_rule(&mut sig, "A(B(x_ x_)) = D B(x_ x_)")
.expect("parse of A(B(x_ x_)) = D B(x_ x_)");
let rule = parse_rule(&mut sig, "C(y_) = B(y_ y_)").expect("parse of C(y_) = B(y_ y_)");
let mut rng = thread_rng();

let result = TRS::inverse_evaluate_rule_helper(&rule, &r, &mut rng);

assert_eq!(result.unwrap().pretty(), "A(C(x_)) = D C(x_)");
}

}