Expand products raised to negative powers

- Rename `representations` to `atom`
benruijl · Apr 15, 2024 · 30fcc97 · 30fcc97
1 parent d06075c
commit 30fcc97
Show file tree

Hide file tree

Showing 51 changed files with 103 additions and 88 deletions.
diff --git a/examples/builder.rs b/examples/builder.rs
@@ -1,6 +1,6 @@
 use symbolica::{
+    atom::{Atom, FunctionBuilder},
     fun,
-    representations::{Atom, FunctionBuilder},
     state::State,
 };
 

diff --git a/examples/coefficient_ring.rs b/examples/coefficient_ring.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use symbolica::{representations::Atom, state::State};
+use symbolica::{atom::Atom, state::State};
 
 fn main() {
     let expr = Atom::parse("x*z+x*(y+2)^-1*(y+z+1)").unwrap();

diff --git a/examples/collect.rs b/examples/collect.rs
@@ -1,6 +1,6 @@
 use symbolica::{
+    atom::{Atom, FunctionBuilder},
     fun,
-    representations::{Atom, FunctionBuilder},
     state::State,
 };
 

diff --git a/examples/derivative.rs b/examples/derivative.rs
@@ -1,4 +1,4 @@
-use symbolica::{representations::Atom, state::State};
+use symbolica::{atom::Atom, state::State};
 
 fn main() {
     let x = State::get_symbol("x");

diff --git a/examples/evaluate.rs b/examples/evaluate.rs
@@ -1,6 +1,6 @@
 use ahash::HashMap;
 use symbolica::evaluate::EvaluationFn;
-use symbolica::{representations::Atom, state::State};
+use symbolica::{atom::Atom, state::State};
 
 fn main() {
     let x = State::get_symbol("x");

diff --git a/examples/expansion.rs b/examples/expansion.rs
@@ -1,4 +1,4 @@
-use symbolica::representations::Atom;
+use symbolica::atom::Atom;
 
 fn main() {
     let input = Atom::parse("(1+x)^3").unwrap();

diff --git a/examples/factorization.rs b/examples/factorization.rs
@@ -1,9 +1,9 @@
 use std::sync::Arc;
 
 use symbolica::{
+    atom::Atom,
     domains::{finite_field::Zp, integer::Z},
     poly::{factor::Factorize, polynomial::MultivariatePolynomial, Variable},
-    representations::Atom,
     state::State,
 };
 

diff --git a/examples/fibonacci.rs b/examples/fibonacci.rs
@@ -1,6 +1,6 @@
 use symbolica::{
+    atom::{Atom, AtomView},
     id::{Match, Pattern, PatternRestriction},
-    representations::{Atom, AtomView},
     state::{RecycledAtom, State},
 };
 

diff --git a/examples/groebner_basis.rs b/examples/groebner_basis.rs
@@ -1,7 +1,7 @@
 use symbolica::{
+    atom::Atom,
     domains::finite_field::Zp,
     poly::{groebner::GroebnerBasis, polynomial::MultivariatePolynomial, GrevLexOrder},
-    representations::Atom,
     state::State,
 };
 

diff --git a/examples/optimize.rs b/examples/optimize.rs
@@ -1,7 +1,7 @@
 use symbolica::{
+    atom::Atom,
     domains::rational::Q,
     poly::evaluate::{BorrowedHornerScheme, InstructionSetPrinter},
-    representations::Atom,
 };
 
 use symbolica::poly::polynomial::MultivariatePolynomial;

diff --git a/examples/optimize_multiple.rs b/examples/optimize_multiple.rs
@@ -1,7 +1,7 @@
 use symbolica::{
+    atom::Atom,
     domains::rational::{Rational, Q},
     poly::evaluate::{HornerScheme, InstructionSetPrinter},
-    representations::Atom,
 };
 
 use symbolica::poly::polynomial::MultivariatePolynomial;

diff --git a/examples/partition.rs b/examples/partition.rs
@@ -1,4 +1,4 @@
-use symbolica::{id::Pattern, representations::Atom, state::State, transformer::Transformer};
+use symbolica::{atom::Atom, id::Pattern, state::State, transformer::Transformer};
 
 fn main() {
     let input = Atom::parse("f(1,3,2,3,1)").unwrap();

diff --git a/examples/pattern_match.rs b/examples/pattern_match.rs
@@ -1,6 +1,6 @@
 use symbolica::{
+    atom::Atom,
     id::{Condition, Match, MatchSettings},
-    representations::Atom,
     state::State,
 };
 

diff --git a/examples/pattern_restrictions.rs b/examples/pattern_restrictions.rs
@@ -1,8 +1,8 @@
 use symbolica::{
+    atom::{Atom, AtomView},
     coefficient::CoefficientView,
     domains::finite_field,
     id::{Condition, Match, MatchSettings, PatternRestriction},
-    representations::{Atom, AtomView},
     state::State,
 };
 fn main() {

diff --git a/examples/polynomial_gcd.rs b/examples/polynomial_gcd.rs
@@ -1,6 +1,6 @@
 use symbolica::{
+    atom::Atom,
     domains::{integer::Z, rational::Q},
-    representations::Atom,
 };
 use tracing_subscriber::{fmt, prelude::*, util::SubscriberInitExt, EnvFilter};
 

diff --git a/examples/rational_polynomial.rs b/examples/rational_polynomial.rs
@@ -1,6 +1,6 @@
 use symbolica::{
+    atom::Atom,
     domains::{integer::Z, rational_polynomial::RationalPolynomial},
-    representations::Atom,
 };
 
 fn main() {

diff --git a/examples/replace_all.rs b/examples/replace_all.rs
@@ -1,4 +1,4 @@
-use symbolica::{id::Pattern, representations::Atom};
+use symbolica::{atom::Atom, id::Pattern};
 
 fn main() {
     let expr = Atom::parse(" f(1,2,x) + f(1,2,3)").unwrap();

diff --git a/examples/replace_once.rs b/examples/replace_once.rs
@@ -1,6 +1,6 @@
 use symbolica::{
+    atom::Atom,
     id::{Condition, MatchSettings},
-    representations::Atom,
 };
 
 fn main() {

diff --git a/examples/solve_linear_system.rs b/examples/solve_linear_system.rs
@@ -1,13 +1,13 @@
 use std::sync::Arc;
 
 use symbolica::{
+    atom::{Atom, AtomView},
     domains::{
         integer::Z,
         rational::Q,
         rational_polynomial::{RationalPolynomial, RationalPolynomialField},
     },
     poly::Variable,
-    representations::{Atom, AtomView},
     state::State,
     tensors::matrix::Matrix,
 };

diff --git a/examples/streaming.rs b/examples/streaming.rs
@@ -1,4 +1,4 @@
-use symbolica::{id::Pattern, representations::Atom, streaming::TermStreamer};
+use symbolica::{atom::Atom, id::Pattern, streaming::TermStreamer};
 
 fn main() {
     let input = Atom::parse("x+ f(x) + 2*f(y) + 7*f(z)").unwrap();

diff --git a/examples/taylor_series.rs b/examples/taylor_series.rs
@@ -1,4 +1,4 @@
-use symbolica::{representations::Atom, state::State};
+use symbolica::{atom::Atom, state::State};
 
 fn main() {
     let x = State::get_symbol("x");

diff --git a/examples/tree_replace.rs b/examples/tree_replace.rs
@@ -1,6 +1,6 @@
 use symbolica::{
+    atom::Atom,
     id::{Condition, Match, MatchSettings, PatternAtomTreeIterator},
-    representations::Atom,
     state::State,
 };
 

diff --git a/examples/tree_walk.rs b/examples/tree_walk.rs
@@ -1,4 +1,7 @@
-use symbolica::{id::{AtomTreeIterator, MatchSettings}, representations::Atom};
+use symbolica::{
+    atom::Atom,
+    id::{AtomTreeIterator, MatchSettings},
+};
 
 fn main() {
     let expr: Atom = Atom::parse("f(z)*f(f(x),z)*f(y)").unwrap();

diff --git a/src/api/python.rs b/src/api/python.rs
@@ -20,6 +20,7 @@ use smallvec::SmallVec;
 use smartstring::{LazyCompact, SmartString};
 
 use crate::{
+    atom::{Atom, AtomView, ListIterator, Symbol},
     domains::{
         finite_field::{ToFiniteField, Zp},
         float::Complex,
@@ -50,7 +51,6 @@ use crate::{
     printer::{
         AtomPrinter, MatrixPrinter, PolynomialPrinter, PrintOptions, RationalPolynomialPrinter,
     },
-    representations::{Atom, AtomView, ListIterator, Symbol},
     state::{FunctionAttribute, RecycledAtom, State, Workspace},
     streaming::TermStreamer,
     tensors::matrix::Matrix,

diff --git a/src/representations.rs → src/atom.rs b/src/representations.rs → src/atom.rs
@@ -1,5 +1,5 @@
 mod coefficient;
-pub mod default;
+pub mod representation;
 
 use crate::{
     coefficient::Coefficient,
@@ -9,11 +9,11 @@ use crate::{
 };
 use std::{cmp::Ordering, hash::Hash, ops::DerefMut};
 
-pub use self::default::{
+pub use self::representation::{
     Add, AddView, Fun, ListIterator, ListSlice, Mul, MulView, Num, NumView, Pow, PowView, Var,
     VarView,
 };
-use self::default::{FunView, RawAtom};
+use self::representation::{FunView, RawAtom};
 
 /// A symbol, for example the name of a variable or the name of a function,
 /// together with its properties.
@@ -564,7 +564,7 @@ impl Atom {
 /// For example:
 /// ```
 /// # use symbolica::{
-/// #     representations::{Atom, AsAtomView, FunctionBuilder},
+/// #     atom::{Atom, AsAtomView, FunctionBuilder},
 /// #     state::{FunctionAttribute, State},
 /// # };
 /// # fn main() {
@@ -1040,8 +1040,8 @@ impl<T: Into<Coefficient>> std::ops::Div<T> for Atom {
 #[cfg(test)]
 mod test {
     use crate::{
+        atom::{Atom, FunctionBuilder},
         fun,
-        representations::{Atom, FunctionBuilder},
         state::State,
     };
 

diff --git a/src/representations/coefficient.rs → src/atom/coefficient.rs b/src/representations/coefficient.rs → src/atom/coefficient.rs
diff --git a/src/representations/default.rs → src/atom/representation.rs b/src/representations/default.rs → src/atom/representation.rs
diff --git a/src/coefficient.rs b/src/coefficient.rs
@@ -13,6 +13,7 @@ use rug::{
 use smallvec::{smallvec, SmallVec};
 
 use crate::{
+    atom::{Atom, AtomView},
     domains::{
         finite_field::{
             FiniteField, FiniteFieldCore, FiniteFieldElement, FiniteFieldWorkspace, ToFiniteField,
@@ -23,7 +24,6 @@ use crate::{
         EuclideanDomain, Field, Ring,
     },
     poly::{polynomial::MultivariatePolynomial, Variable, INLINED_EXPONENTS},
-    representations::{Atom, AtomView},
     state::{FiniteFieldIndex, State, Workspace},
 };
 
@@ -892,7 +892,7 @@ impl<'a> AtomView<'a> {
 mod test {
     use std::sync::Arc;
 
-    use crate::{domains::rational::Rational, representations::Atom, state::State};
+    use crate::{atom::Atom, domains::rational::Rational, state::State};
 
     #[test]
     fn coefficient_ring() {

diff --git a/src/collect.rs b/src/collect.rs
@@ -1,8 +1,8 @@
 use ahash::HashMap;
 
 use crate::{
+    atom::{Add, AsAtomView, Atom, AtomView, Symbol},
     domains::{integer::Z, rational::Q},
-    representations::{Add, AsAtomView, Atom, AtomView, Symbol},
     state::Workspace,
 };
 
@@ -400,8 +400,8 @@ impl<'a> AtomView<'a> {
 #[cfg(test)]
 mod test {
     use crate::{
+        atom::{Atom, FunctionBuilder},
         fun,
-        representations::{Atom, FunctionBuilder},
         state::State,
     };
 

diff --git a/src/derivative.rs b/src/derivative.rs
@@ -1,9 +1,9 @@
 use std::ops::DerefMut;
 
 use crate::{
+    atom::{Atom, AtomView, Symbol},
     coefficient::Coefficient,
     domains::integer::Integer,
-    representations::{Atom, AtomView, Symbol},
     state::{State, Workspace},
 };
 
@@ -453,7 +453,7 @@ impl<'a> AtomView<'a> {
 
 #[cfg(test)]
 mod test {
-    use crate::{representations::Atom, state::State};
+    use crate::{atom::Atom, state::State};
 
     #[test]
     fn derivative() {

diff --git a/src/domains/algebraic_number.rs b/src/domains/algebraic_number.rs
@@ -278,9 +278,9 @@ impl<R: Field + PolynomialGCD<u8>> Field for AlgebraicNumberRing<R> {
 
 #[cfg(test)]
 mod tests {
+    use crate::atom::Atom;
     use crate::domains::algebraic_number::AlgebraicNumberRing;
     use crate::domains::rational::Q;
-    use crate::representations::Atom;
 
     #[test]
     fn gcd_number_field() -> Result<(), String> {

diff --git a/src/domains/rational_polynomial.rs b/src/domains/rational_polynomial.rs
@@ -1112,7 +1112,7 @@ mod test {
 
     #[test]
     fn hermite_reduction() {
-        use crate::representations::Atom;
+        use crate::atom::Atom;
         let p: RationalPolynomial<_, _> = Atom::parse("1/(v1 + 1)^5")
             .unwrap()
             .to_rational_polynomial::<_, _, u8>(&Q, &Z, None);
@@ -1130,7 +1130,7 @@ mod test {
 
     #[test]
     fn constant() {
-        use crate::representations::Atom;
+        use crate::atom::Atom;
         let p: RationalPolynomial<_, _> = Atom::parse("(v1^4+v2+v1*v2+2*v1)/(v2 + 1)")
             .unwrap()
             .to_rational_polynomial::<_, _, u8>(
@@ -1160,7 +1160,7 @@ mod test {
 
     #[test]
     fn mixed_denominator() {
-        use crate::representations::Atom;
+        use crate::atom::Atom;
         let p: RationalPolynomial<_, _> = Atom::parse("(v1^4+v2+v1*v2+2*v1)/(v1)/(v2 + 1)")
             .unwrap()
             .to_rational_polynomial::<_, _, u8>(
@@ -1197,7 +1197,7 @@ mod test {
 
     #[test]
     fn three_factors() {
-        use crate::representations::Atom;
+        use crate::atom::Atom;
         let p: RationalPolynomial<_, _> =
             Atom::parse("(36v1^2+1167v1+3549/2)/(v1^3+23/30v1^2-2/15v1-2/15)")
                 .unwrap()
@@ -1241,7 +1241,7 @@ mod test {
 
     #[test]
     fn multiple_residues() {
-        use crate::representations::Atom;
+        use crate::atom::Atom;
         let p: RationalPolynomial<_, _> = Atom::parse(
             "(7v1^13+10v1^8+4v1^7-7v1^6-4v1^3-4v1^2+3v1+3)/(v1^14-2v1^8-2v1^7-2v1^4-4v1^3-v1^2+2v1+1)",
         )
@@ -1278,7 +1278,7 @@ mod test {
 
     #[test]
     fn multi_factor() {
-        use crate::representations::Atom;
+        use crate::atom::Atom;
         let p: RationalPolynomial<_, _> = Atom::parse("1/(v1^3+v1)")
             .unwrap()
             .to_rational_polynomial::<_, _, u8>(&Q, &Z, None);
@@ -1313,7 +1313,7 @@ mod test {
 
     #[test]
     fn multiple_variables() {
-        use crate::representations::Atom;
+        use crate::atom::Atom;
         let p: RationalPolynomial<_, _> = Atom::parse("(v1^4+v2+v1*v2+2*v1)/((v1-v2)(v1-2)(v1-4))")
             .unwrap()
             .to_rational_polynomial::<_, _, u8>(&Q, &Z, None);