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

make inclusive_bound public #1566

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

make inclusive_bound public #1566

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
354a9b8
somawhete make inclusive_bound publish
kali Oct 28, 2024
e62d2af
pass scenario to assertions
kali Oct 28, 2024
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 data/src/dim/sym.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ impl SymbolScopeData {
}

#[allow(clippy::mutable_key_type)]
pub fn prove_positive_or_zero(&self, t: &TDim) -> bool {
pub(crate) fn prove_positive_or_zero(&self, t: &TDim, scenario: Option<&str>) -> bool {
if let TDim::Val(v) = t {
return *v >= 0;
}
Expand All @@ -208,7 +208,7 @@ impl SymbolScopeData {
if t.to_i64().is_ok_and(|i| i >= 0) {
return true;
}
if t.inclusive_bound(self, false).is_some_and(|l| l >= 0) {
if t._inclusive_bound(self, false, scenario).is_some_and(|l| l >= 0) {
return true;
}
let syms = t.symbols();
Expand Down
53 changes: 28 additions & 25 deletions data/src/dim/tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,8 @@ impl TDim {
continue;
}
let diff = a.clone() - b;
if diff.as_i64().is_some_and(|i| i >= 0) || scope.prove_positive_or_zero(&diff)
if diff.as_i64().is_some_and(|i| i >= 0)
|| scope.prove_positive_or_zero(&diff, scenario)
{
redundant.insert(a.clone());
}
Expand Down Expand Up @@ -560,7 +561,8 @@ impl TDim {
continue;
}
let diff = a.clone() - b;
if diff.as_i64().is_some_and(|i| i >= 0) || scope.prove_positive_or_zero(&diff)
if diff.as_i64().is_some_and(|i| i >= 0)
|| scope.prove_positive_or_zero(&diff, scenario)
{
redundant.insert(b.clone());
}
Expand All @@ -585,15 +587,19 @@ impl TDim {
}
}

pub(super) fn inclusive_bound(&self, scope: &SymbolScopeData, upper: bool) -> Option<i64> {
pub(super) fn _inclusive_bound(
&self,
scope: &SymbolScopeData,
upper: bool,
scenario: Option<&str>,
) -> Option<i64> {
use self::TDim::*;
match self {
Val(n) => Some(*n),
Sym(_) => {
if upper {
scope
.all_assertions()
.iter()
.assertions(scenario)
.filter_map(|assert| match &assert {
Assertion::LT(left, right)
if left == self && right.as_i64().is_some() =>
Expand All @@ -610,8 +616,7 @@ impl TDim {
.min()
} else {
scope
.all_assertions()
.iter()
.assertions(scenario)
.filter_map(|assert| match &assert {
Assertion::GT(left, right)
if left == self && right.as_i64().is_some() =>
Expand All @@ -631,7 +636,7 @@ impl TDim {
Add(terms) => {
let mut bound = 0;
for t in terms {
if let Some(b) = t.inclusive_bound(scope, upper) {
if let Some(b) = t._inclusive_bound(scope, upper, scenario) {
bound += b;
} else {
return None;
Expand All @@ -641,46 +646,44 @@ impl TDim {
}
MulInt(p, a) => match p.cmp(&0) {
Ordering::Equal => Some(0),
Ordering::Greater => a.inclusive_bound(scope, upper).map(|x| x * p),
Ordering::Less => a.inclusive_bound(scope, !upper).map(|x| x * p),
Ordering::Greater => a._inclusive_bound(scope, upper, scenario).map(|x| x * p),
Ordering::Less => a._inclusive_bound(scope, !upper, scenario).map(|x| x * p),
},
Mul(_) => None,
Min(terms) if !upper => {
terms.iter().filter_map(|t| t.inclusive_bound(scope, false)).min()
terms.iter().filter_map(|t| t._inclusive_bound(scope, false, scenario)).min()
}
Max(terms) if upper => {
terms.iter().filter_map(|t| t.inclusive_bound(scope, true)).max()
terms.iter().filter_map(|t| t._inclusive_bound(scope, true, scenario)).max()
}
Div(a, q) => a.inclusive_bound(scope, upper).map(|x| x / (*q as i64)),
Div(a, q) => a._inclusive_bound(scope, upper, scenario).map(|x| x / (*q as i64)),
Broadcast(terms) => {
if upper {
Max(terms.clone()).inclusive_bound(scope, true)
Max(terms.clone())._inclusive_bound(scope, true, scenario)
} else {
Min(terms.clone()).inclusive_bound(scope, false)
Min(terms.clone())._inclusive_bound(scope, false, scenario)
}
}
_ => None,
}
}

pub fn low_inclusive_bound(&self) -> Option<i64> {
pub fn inclusive_bound(&self, upper: bool, scenario: Option<&str>) -> Option<i64> {
if let TDim::Val(v) = self {
return Some(*v);
}
let scope = self.find_scope()?;
let data = scope.0.lock();
let data = data.borrow();
self.inclusive_bound(&data, false)
self._inclusive_bound(&data, upper, scenario)
}

pub fn low_inclusive_bound(&self) -> Option<i64> {
self.inclusive_bound(false, None)
}

pub fn high_inclusive_bound(&self) -> Option<i64> {
if let TDim::Val(v) = self {
return Some(*v);
}
let scope = self.find_scope()?;
let data = scope.0.lock();
let data = data.borrow();
self.inclusive_bound(&data, true)
self.inclusive_bound(true, None)
}

pub fn prove_positive_or_zero(&self) -> bool {
Expand All @@ -690,7 +693,7 @@ impl TDim {
let Some(scope) = self.find_scope() else { return false };
let data = scope.0.lock();
let data = data.borrow();
data.prove_positive_or_zero(self)
data.prove_positive_or_zero(self, None)
}

pub fn prove_strict_positive(&self) -> bool {
Expand Down
Loading