Apc stacking #2917
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -130,6 +130,13 @@ impl<T, R> AlgebraicExpression<T, R> { | |
| } | ||
| } | ||
|
|
||
| impl<T: Clone + Ord, R: Clone + Ord> AlgebraicExpression<T, R> { | ||
|
There was a problem hiding this comment. I think the changes to this file could be nice individual PR :) |
||
| /// Get a canonical form by expanding the expression and reordering operands. | ||
| pub fn normalize(self) -> Self { | ||
| normalize(expand(self)) | ||
| } | ||
| } | ||
|
Comment on lines
+133
to
+138
There was a problem hiding this comment. Could this be done by going through quadratic expression? cc @georgwiese There was a problem hiding this comment. Not quite. We could do this by introducing a If self.to_expression(
&|number| CanonicalExpression { coefficients:
[(BTreeSet::new(), *number)].into_iter().collect()
}, |reference| CanonicalExpression { coefficients:
([*reference].into_iter().collect(), T::one())].into_iter().collect()
}).into()Not sure if it's worth it, but seems a bit cleaner. |
||
|
|
||
| impl<T, R> ops::Add for AlgebraicExpression<T, R> { | ||
| type Output = Self; | ||
|
|
||
|
|
@@ -168,6 +175,192 @@ impl<T, R> From<T> for AlgebraicExpression<T, R> { | |
| } | ||
| } | ||
|
|
||
| // Helper to flatten Add trees | ||
| fn flatten_add<T: Ord + Clone, R: Ord + Clone>( | ||
| expr: AlgebraicExpression<T, R>, | ||
| acc: &mut Vec<AlgebraicExpression<T, R>>, | ||
| ) { | ||
| match expr { | ||
| AlgebraicExpression::BinaryOperation(AlgebraicBinaryOperation { | ||
| left, | ||
| op: AlgebraicBinaryOperator::Add, | ||
| right, | ||
| }) => { | ||
| flatten_add(*left, acc); | ||
| flatten_add(*right, acc); | ||
| } | ||
| _ => acc.push(normalize(expr)), | ||
| } | ||
| } | ||
|
|
||
| // Helper to flatten Mul trees | ||
| fn flatten_mul<T: Ord + Clone, R: Ord + Clone>( | ||
| expr: AlgebraicExpression<T, R>, | ||
| acc: &mut Vec<AlgebraicExpression<T, R>>, | ||
| ) { | ||
| match expr { | ||
| AlgebraicExpression::BinaryOperation(AlgebraicBinaryOperation { | ||
| left, | ||
| op: AlgebraicBinaryOperator::Mul, | ||
| right, | ||
| }) => { | ||
| flatten_mul(*left, acc); | ||
| flatten_mul(*right, acc); | ||
| } | ||
| _ => acc.push(normalize(expr)), | ||
| } | ||
| } | ||
|
|
||
| fn normalize<T: Ord + Clone, R: Ord + Clone>( | ||
| expr: AlgebraicExpression<T, R>, | ||
| ) -> AlgebraicExpression<T, R> { | ||
| match expr { | ||
| AlgebraicExpression::BinaryOperation(AlgebraicBinaryOperation { | ||
| left, | ||
| op: AlgebraicBinaryOperator::Add, | ||
| right, | ||
| }) => { | ||
| let mut terms = Vec::new(); | ||
| flatten_add(*left, &mut terms); | ||
| flatten_add(*right, &mut terms); | ||
| terms.sort(); | ||
| terms.into_iter().reduce(|a, b| a + b).unwrap() | ||
| } | ||
| AlgebraicExpression::BinaryOperation(AlgebraicBinaryOperation { | ||
| left, | ||
| op: AlgebraicBinaryOperator::Mul, | ||
| right, | ||
| }) => { | ||
| let mut factors = Vec::new(); | ||
| flatten_mul(*left, &mut factors); | ||
| flatten_mul(*right, &mut factors); | ||
| factors.sort(); | ||
| factors.into_iter().reduce(|a, b| a * b).unwrap() | ||
| } | ||
| AlgebraicExpression::BinaryOperation(AlgebraicBinaryOperation { | ||
| left, | ||
| op: AlgebraicBinaryOperator::Sub, | ||
| right, | ||
| }) => normalize(*left) - normalize(*right), | ||
|
There was a problem hiding this comment. This seems sus, why would it be simpler than addition? There was a problem hiding this comment. its simpler because there's no need to handle commutativity (no need to flatten and reorder) |
||
| _ => expr, | ||
| } | ||
| } | ||
|
|
||
| fn expand<T: Ord + Clone, R: Ord + Clone>( | ||
| expr: AlgebraicExpression<T, R>, | ||
| ) -> AlgebraicExpression<T, R> { | ||
| match expr { | ||
| AlgebraicExpression::BinaryOperation(AlgebraicBinaryOperation { | ||
| left, | ||
| op: AlgebraicBinaryOperator::Mul, | ||
| right, | ||
| }) => { | ||
| let left = expand(*left); | ||
| let right = expand(*right); | ||
| match (left, right) { | ||
| // (a + b)*c ==> a*c + b*c | ||
| ( | ||
| AlgebraicExpression::BinaryOperation(AlgebraicBinaryOperation { | ||
| left: a, | ||
| op: AlgebraicBinaryOperator::Add, | ||
| right: b, | ||
| }), | ||
| c, | ||
| ) => expand(*a * c.clone()) + expand(*b * c), | ||
| // a*(b + c) ==> a*b + a*c | ||
| ( | ||
| a, | ||
| AlgebraicExpression::BinaryOperation(AlgebraicBinaryOperation { | ||
| left: b, | ||
| op: AlgebraicBinaryOperator::Add, | ||
| right: c, | ||
| }), | ||
| ) => expand(a.clone() * *b) + expand(a.clone() * *c), | ||
| (left, right) => left * right, | ||
| } | ||
| } | ||
| AlgebraicExpression::BinaryOperation(AlgebraicBinaryOperation { | ||
| left, | ||
| op: AlgebraicBinaryOperator::Add, | ||
| right, | ||
| }) => expand(*left) + expand(*right), | ||
| AlgebraicExpression::BinaryOperation(AlgebraicBinaryOperation { | ||
| left, | ||
| op: AlgebraicBinaryOperator::Sub, | ||
| right, | ||
| }) => expand(*left) - expand(*right), | ||
| _ => expr, | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use super::*; | ||
| type Expr = AlgebraicExpression<u32, String>; | ||
|
|
||
| fn v(name: &str) -> Expr { | ||
| Expr::Reference(name.to_string()) | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_normalize() { | ||
| let expr1 = normalize(v("c") + v("b") + v("a")); | ||
| let expr2 = normalize(v("a") + v("b") + v("c")); | ||
| assert_eq!(expr1, expr2); | ||
|
|
||
| let expr1 = normalize(v("c") * v("b") * v("a")); | ||
| let expr2 = normalize(v("a") * v("b") * v("c")); | ||
| assert_eq!(expr1, expr2); | ||
|
|
||
| let expr1 = normalize(v("a") + v("b") * v("c")); | ||
| let expr2 = normalize(v("c") * v("b") + v("a")); | ||
| assert_eq!(expr1, expr2); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_expand() { | ||
| let e1 = expand(v("a") * (v("b") + v("c"))); | ||
| let e2 = v("a") * v("b") + v("a") * v("c"); | ||
| assert_eq!(e1, e2); | ||
|
|
||
| let e1 = expand((v("a") + v("b")) * v("c")); | ||
| let e2 = v("a") * v("c") + v("b") * v("c"); | ||
| assert_eq!(e1, e2); | ||
|
|
||
| // (a + b) * (c + d) | ||
| let e1 = expand((v("a") + v("b")) * (v("c") + v("d"))); | ||
| let e2 = v("a") * v("c") + v("a") * v("d") + v("b") * v("c") + v("b") * v("d"); | ||
| assert_eq!(normalize(e1), normalize(e2)); | ||
|
|
||
| // (a + b) * (c + d) * (e + f) | ||
| let e1 = expand((v("a") + v("b")) * (v("c") + v("d")) * (v("e") + v("f"))); | ||
| let e2 = v("a") * v("c") * v("e") | ||
| + v("a") * v("c") * v("f") | ||
| + v("a") * v("d") * v("e") | ||
| + v("a") * v("d") * v("f") | ||
| + v("b") * v("c") * v("e") | ||
| + v("b") * v("c") * v("f") | ||
| + v("b") * v("d") * v("e") | ||
| + v("b") * v("d") * v("f"); | ||
| assert_eq!(normalize(e1), normalize(e2)); | ||
|
|
||
| // a*(b + c) + d + b*(a + b) | ||
| let expr1 = normalize(expand( | ||
| v("a") * (v("b") + v("c")) + v("d") + v("b") * (v("a") + v("b")), | ||
| )); | ||
| // a*b + a*c + (d + b*a + b*b) | ||
| let expr2 = normalize(expand( | ||
| v("a") * v("b") + v("a") * v("c") + (v("d") + v("b") * v("a") + v("b") * v("b")), | ||
| )); | ||
| // (d + b*a) + b*b + (a*b + a*c) | ||
| let expr3 = normalize(expand( | ||
| (v("d") + v("b") * v("a")) + v("b") * v("b") + (v("a") * v("b") + v("a") * v("c")), | ||
| )); | ||
| assert_eq!(expr1, expr2); | ||
| assert_eq!(expr1, expr3); | ||
| } | ||
| } | ||
|
|
||
| impl<T, R> ExpressionConvertible<T, R> for AlgebraicExpression<T, R> { | ||
| fn to_expression< | ||
| E: Add<E, Output = E> + Sub<E, Output = E> + Mul<E, Output = E> + Neg<Output = E>, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add some documentation on this parameter?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about this?