Merge branch 'master' into js/padicsbreaking

Nemocas · Jul 19, 2024 · ebb12bf · ebb12bf
2 parents 30523d9 + 9a662cd
commit ebb12bf
Show file tree

Hide file tree

Showing 43 changed files with 1,449 additions and 1,359 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "Nemo"
 uuid = "2edaba10-b0f1-5616-af89-8c11ac63239a"
-version = "0.45.6"
+version = "0.46.0"
 
 [deps]
 AbstractAlgebra = "c3fe647b-3220-5bb0-a1ea-a7954cac585d"
@@ -13,7 +13,7 @@ RandomExtensions = "fb686558-2515-59ef-acaa-46db3789a887"
 SHA = "ea8e919c-243c-51af-8825-aaa63cd721ce"
 
 [compat]
-AbstractAlgebra = "0.41.9"
+AbstractAlgebra = "0.42.0"
 FLINT_jll = "^300.100.100"
 Libdl = "1.6"
 LinearAlgebra = "1.6"

diff --git a/docs/src/matrix.md b/docs/src/matrix.md
@@ -26,11 +26,11 @@ $\mathbb{Z}/n\mathbb{Z}$ (large $n$)  | Flint               | `ZZModMatrix`
 $\mathbb{Q}$                          | Flint               | `QQMatrix`          | `QQMatrixSpace`
 $\mathbb{Z}/p\mathbb{Z}$ (small $p$)  | Flint               | `fpMatrix`          | `fpMatrixSpace`
 $\mathbb{F}_{p^n}$ (small $p$)        | Flint               | `fqPolyRepMatrix`   | `fqPolyRepMatrixSpace`
-$\mathbb{F}_{p^n}$ (large $p$)        | Flint               | `FqPolyRepMatrix`   | `FqPolyRepMatrixSpace
-$\mathbb{R}$ (arbitrary precision)    | Arb                 | `RealMat`           | `RealMatSpace`
-$\mathbb{C}$ (arbitrary precision)    | Arb                 | `ComplexMat`        | `ComplexMatSpace`
-$\mathbb{R}$ (fixed precision)        | Arb                 | `ArbMatrix`         | `ArbMatSpace`
-$\mathbb{C}$ (fixed precision)        | Arb                 | `AcbMatrix`         | `AcbMatSpace`
+$\mathbb{F}_{p^n}$ (large $p$)        | Flint               | `FqPolyRepMatrix`   | `FqPolyRepMatrixSpace`
+$\mathbb{R}$ (arbitrary precision)    | Arb                 | `RealMatrix`        | `RealMatrixSpace`
+$\mathbb{C}$ (arbitrary precision)    | Arb                 | `ComplexMatrix`     | `ComplexMatrixSpace`
+$\mathbb{R}$ (fixed precision)        | Arb                 | `ArbMatrix`         | `ArbMatrixSpace`
+$\mathbb{C}$ (fixed precision)        | Arb                 | `AcbMatrix`         | `AcbMatrixSpace`
 
 The dimensions and base ring $R$ of a generic matrix are stored in its parent
 object.
@@ -59,19 +59,19 @@ matrix functionality, for specific rings in Nemo.
 ### Comparison operators
 
 ```@docs
-overlaps(::RealMat, ::RealMat)
+overlaps(::RealMatrix, ::RealMatrix)
 ```
 
 ```@docs
-overlaps(::ComplexMat, ::ComplexMat)
+overlaps(::ComplexMatrix, ::ComplexMatrix)
 ```
 
 ```@docs
-contains(::RealMat, ::RealMat)
+contains(::RealMatrix, ::RealMatrix)
 ```
 
 ```@docs
-contains(::ComplexMat, ::ComplexMat)
+contains(::ComplexMatrix, ::ComplexMatrix)
 ```
 
 In addition we have the following ad hoc comparison operators.
@@ -488,11 +488,11 @@ julia> B = exp(A)
 ### Norm
 
 ```@docs
-bound_inf_norm(::RealMat)
+bound_inf_norm(::RealMatrix)
 ```
 
 ```@docs
-bound_inf_norm(::ComplexMat)
+bound_inf_norm(::ComplexMatrix)
 ```
 
 **Examples**
@@ -559,9 +559,9 @@ In case the matrix cannot be converted without loss, an `InexactError` is thrown
 ### Eigenvalues and Eigenvectors (experimental)
 
 ```@docs
-eigenvalues(::ComplexMat)
-eigenvalues_with_multiplicities(::ComplexMat)
-eigenvalues_simple(a::ComplexMat)
+eigenvalues(::ComplexMatrix)
+eigenvalues_with_multiplicities(::ComplexMatrix)
+eigenvalues_simple(a::ComplexMatrix)
 ```
 
 ```jldoctest; setup = :(CC = ComplexField())

diff --git a/docs/src/polynomial.md b/docs/src/polynomial.md
@@ -30,8 +30,8 @@ $\mathbb{Z}/p\mathbb{Z}$ (small prime $p$)  | Flint               | `fpPolyRingE
 $\mathbb{Z}/p\mathbb{Z}$ (large prime $p$)  | Flint               | `FpPolyRingElem`        | `FpPolyRing`
 $\mathbb{F}_{p^n}$ (small $p$)              | Flint               | `fqPolyRepPolyRingElem` | `fqPolyRepPolyRing`
 $\mathbb{F}_{p^n}$ (large $p$)              | Flint               | `FqPolyRepPolyRingElem` | `FqPolyRepPolyRing`
-$\mathbb{R}$ (arbitrary precision)          | Arb                 | `RealPoly`              | `RealPolyRing`
-$\mathbb{C}$ (arbitrary precision)          | Arb                 | `ComplexPoly`           | `ComplexPolyRing`
+$\mathbb{R}$ (arbitrary precision)          | Arb                 | `RealPolyRingElem`      | `RealPolyRing`
+$\mathbb{C}$ (arbitrary precision)          | Arb                 | `ComplexPolyRingElem`   | `ComplexPolyRing`
 $\mathbb{R}$ (fixed precision)              | Arb                 | `ArbPolyRingElem`       | `ArbPolyRing`
 $\mathbb{C}$ (fixed precision)              | Arb                 | `AcbPolyRingElem`       | `AcbPolyRing`
 
@@ -57,11 +57,11 @@ AbstractAlgebra.jl, for specific coefficient rings.
 ### Remove and valuation
 
 ```@docs
-evaluate2(::RealPoly, ::RealFieldElem)
+evaluate2(::RealPolyRingElem, ::RealFieldElem)
 ```
 
 ```@docs
-evaluate2(::ComplexPoly, ::ComplexFieldElem)
+evaluate2(::ComplexPolyRingElem, ::ComplexFieldElem)
 ```
 
 **Examples**
@@ -90,7 +90,7 @@ signature(::QQPolyRingElem)
 ### Root finding
 
 ```@docs
-roots(::ComplexPoly)
+roots(::ComplexPolyRingElem)
 ```
 
 **Examples**
@@ -160,8 +160,8 @@ true
 ### Bounding absolute values of roots
 
 ```@docs
-roots_upper_bound(::RealPoly)
-roots_upper_bound(::ComplexPoly)
+roots_upper_bound(::RealPolyRingElem)
+roots_upper_bound(::ComplexPolyRingElem)
 ```
 
 ### Lifting
@@ -202,28 +202,28 @@ or contain other exact or inexact polynomials. The following functions are
 provided for this purpose.
 
 ```@docs
-overlaps(::RealPoly, ::RealPoly)
-overlaps(::ComplexPoly, ::ComplexPoly)
+overlaps(::RealPolyRingElem, ::RealPolyRingElem)
+overlaps(::ComplexPolyRingElem, ::ComplexPolyRingElem)
 ```
 
 ```@docs
-contains(::RealPoly, ::RealPoly)
-contains(::ComplexPoly, ::ComplexPoly)
+contains(::RealPolyRingElem, ::RealPolyRingElem)
+contains(::ComplexPolyRingElem, ::ComplexPolyRingElem)
 ```
 
 ```@docs
-contains(::RealPoly, ::ZZPolyRingElem)
-contains(::RealPoly, ::QQPolyRingElem)
-contains(::ComplexPoly, ::ZZPolyRingElem)
-contains(::ComplexPoly, ::QQPolyRingElem)
+contains(::RealPolyRingElem, ::ZZPolyRingElem)
+contains(::RealPolyRingElem, ::QQPolyRingElem)
+contains(::ComplexPolyRingElem, ::ZZPolyRingElem)
+contains(::ComplexPolyRingElem, ::QQPolyRingElem)
 ```
 
 It is sometimes also useful to be able to determine if there is a unique
 integer contained in the coefficient of an inexact constant polynomial.
 
 ```@docs
-unique_integer(::RealPoly)
-unique_integer(::ComplexPoly)
+unique_integer(::RealPolyRingElem)
+unique_integer(::ComplexPolyRingElem)
 ```
 
 **Examples**

diff --git a/docs/src/types.md b/docs/src/types.md
@@ -65,8 +65,8 @@ parent objects of the given rings and structures.
      - `AcbFieldElem` (`AcbField`)
      - `ArbPolyRingElem` (`ArbPolyRing`)
      - `AcbPolyRingElem` (`AcbPolyRing`)
-     - `ArbMatrix` (`ArbMatSpace`)
-     - `AcbMatrix` (`AcbMatSpace`)
+     - `ArbMatrix` (`ArbMatrixSpace`)
+     - `AcbMatrix` (`AcbMatrixSpace`)
 
   - Calcium
 

diff --git a/src/Deprecations.jl b/src/Deprecations.jl
@@ -7,7 +7,7 @@
 # ALL aliases here are only a temporary measure to allow for a smooth transition downstream.
 # they will be replaced by deprecations eventually
 
-#= currently none =#
+
 
 ###############################################################################
 #
@@ -46,6 +46,18 @@ macro include_deprecated_bindings()
                Base.@deprecate_binding AnticNumberField AbsSimpleNumField
                Base.@deprecate_binding nf_elem AbsSimpleNumFieldElem
 
+               # depreacted in 0.46
+               Base.@deprecate_binding QQBar QQBarField()
+               Base.@deprecate_binding CalciumQQBar QQBarField()
+
+               Base.@deprecate_binding ComplexPoly ComplexPolyRingElem
+               Base.@deprecate_binding RealPoly RealPolyRingElem
+               Base.@deprecate_binding ComplexMat ComplexMatrix
+               Base.@deprecate_binding RealMat RealMatrix
+               Base.@deprecate_binding AcbMatSpace AcbMatrixSpace
+               Base.@deprecate_binding ComplexMatSpace ComplexMatrixSpace
+               Base.@deprecate_binding ArbMatSpace ArbMatrixSpace
+               Base.@deprecate_binding RealMatSpace RealMatrixSpace
              end)
 end
 
@@ -64,25 +76,21 @@ end
 
 # Deprecated in 0.45.*
 @deprecate defining_polynomial(Q::fqPolyRepField, P::Ring) defining_polynomial(P, Q)
-lift(a::PadicFieldElem) = lift(ZZ, a)
-prime_field(k::PadicField) = base_field(k)
+
+# Deprecated in 0.46
+@deprecate lift(a::PadicFieldElem) lift(ZZ, a)
+@deprecate prime_field(k::PadicField) base_field(k)
 
 function (R::QadicField)(n::ZZPolyRingElem, pr::Int)
-  #Base.depwarn("`(::QadicField)(::ZZPolyRingElem, ::Int)` is deprecated, use `(::QadicField)(::ZZPolyRingElem; precision::Int)` instead.", :QadicField)
+  Base.depwarn("`(::QadicField)(::ZZPolyRingElem, ::Int)` is deprecated, use `(::QadicField)(::ZZPolyRingElem; precision::Int)` instead.", :QadicField)
   return (R::QadicField)(n::ZZPolyRingElem; precision=pr)
 end
 
-is_power(x::IntegerUnion) = is_perfect_power_with_data(x)
-is_power(x::QQFieldElem) = is_perfect_power_with_data(x)
-is_power(x::Rational) = is_perfect_power_with_data(x)
-
-@doc qqbar_field_doc
-const QQBar = QQBarField()
-export QQBar
-
-@doc qqbar_field_doc
-const CalciumQQBar = QQBarField()
-export CalciumQQBar
+@deprecate is_power(x::IntegerUnion) is_perfect_power_with_data(x)
+@deprecate is_power(x::QQFieldElem) is_perfect_power_with_data(x)
+@deprecate is_power(x::Rational) is_perfect_power_with_data(x)
 
+# Deprecated in 0.47
 @deprecate coefficient_ring(k::PadicField) base_field(k)
 @deprecate coefficient_ring(k::QadicField) base_field(k)
+
diff --git a/src/Exports.jl b/src/Exports.jl
@@ -11,7 +11,7 @@ export AbsSimpleNumFieldElem
 export AcbField
 export AcbFieldElem
 export AcbMatrix
-export AcbMatSpace
+export AcbMatrixSpace
 export AcbPolyRing
 export AcbPolyRingElem
 export accuracy_bits
@@ -34,7 +34,7 @@ export angle
 export ArbField
 export ArbFieldElem
 export ArbMatrix
-export ArbMatSpace
+export ArbMatrixSpace
 export ArbPolyRing
 export ArbPolyRingElem
 export Array
@@ -87,10 +87,10 @@ export compare_index
 export complex_normal_form
 export ComplexField
 export ComplexFieldElem
-export ComplexMat
-export ComplexMatSpace
-export ComplexPoly
+export ComplexMatrix
+export ComplexMatrixSpace
 export ComplexPolyRing
+export ComplexPolyRingElem
 export compose
 export conj
 export conjugates
@@ -525,10 +525,10 @@ export rational_field
 export real
 export RealField
 export RealFieldElem
-export RealMat
-export RealMatSpace
-export RealPoly
+export RealMatrix
+export RealMatrixSpace
 export RealPolyRing
+export RealPolyRingElem
 export reconstruct
 export reduce_mod
 export reduce_mod!

diff --git a/src/Nemo.jl b/src/Nemo.jl
@@ -178,6 +178,7 @@ import AbstractAlgebra: force_op
 import AbstractAlgebra: get_attribute
 import AbstractAlgebra: get_cached!
 import AbstractAlgebra: Group
+import AbstractAlgebra: howell_form!
 import AbstractAlgebra: Indent
 import AbstractAlgebra: is_terse
 import AbstractAlgebra: Lowercase