Skip to content

Commit

Permalink
Eliminate more spelling differences between American and British Engl…
Browse files Browse the repository at this point in the history
…ish (#3392)

* `behaviour` -> `behavior`

* `labelled` -> `labeled`

* `modelled` -> `modeled`

* `cancelled` -> `canceled`

* `cancellation` -> `cancelation`

* `regocnise` -> `recognize`

* More `-ise-` -> `-ize-`

* `-re` -> `-er`

(cherry picked from commit 898f41a)
  • Loading branch information
lgoettgens authored and benlorenz committed Feb 23, 2024
1 parent 6a53af1 commit 1498d35
Show file tree
Hide file tree
Showing 38 changed files with 144 additions and 141 deletions.
2 changes: 1 addition & 1 deletion docs/src/AlgebraicGeometry/Schemes/CoveredSchemes.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ An `AbsCoveredScheme` may have different properties such as
fiber_product(f::AbsCoveredSchemeMorphism, g::AbsCoveredSchemeMorphism)
```

## The modeling of covered schemes and their expected behaviour
## The modeling of covered schemes and their expected behavior

Any `AbsCoveredScheme` may possess several `Covering`s. This is necessary for
several reasons; for instance, a morphism $f : X \to Y$ between `AbsCoveredScheme`s
Expand Down
4 changes: 2 additions & 2 deletions docs/src/CommutativeAlgebra/FrameWorks/ring_localizations.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ end
# A Framework for Localizing Rings

For the convenience of the developer, we outline a general framework for creating concrete instances of localized rings in OSCAR,
addressing relevant abstract types as well as a standardized set of functions whose concrete behaviour must be implemented.
addressing relevant abstract types as well as a standardized set of functions whose concrete behavior must be implemented.

We roughly follow the outline of the previous subsection on localizing multivariate rings which provides illustrating examples.
With regard to notation, the name `Rloc` will refer to the localization of a commutative ring `R` with 1.
Expand Down Expand Up @@ -45,7 +45,7 @@ to set `check = false`.

For any concrete instance of type `AbsLocalizedRingElem`, methods for the functions
`parent`, `numerator`, and `denominator` must be provided. Moreover,
if a cancellation function for the type of fractions under consideration is
if a cancelation function for the type of fractions under consideration is
not yet available, such a function should be implemented and named
`reduce_fraction`.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ and homomorphisms between free modules by matrices.
All OSCAR types for the modules considered here belong to the
abstract type `ModuleFP{T}`, where `T` is the element type of the underlying ring.
Graded or not, the free modules belong to the abstract subtype `AbstractFreeMod{T} <: ModuleFP{T}`,
they are modelled as objects of the concrete type `FreeMod{T} <: AbstractFreeMod{T}`.
they are modeled as objects of the concrete type `FreeMod{T} <: AbstractFreeMod{T}`.

!!! note
Canonical maps such us the canonical projection onto a quotient module arise in many
Expand Down Expand Up @@ -98,7 +98,7 @@ degrees_of_generators(F::FreeMod)
All OSCAR types for elements of the modules considered here belong
to the abstract type `ModuleElemFP{T}`, where `T` is the element type of the underlying ring.
The free modules belong to the abstract subtype `AbstractFreeModElem{T} <: ModuleFPElem{T}`.
They are modelled as objects of the concrete type `FreeModElem{T} <: AbstractFreeModElem{T}`
They are modeled as objects of the concrete type `FreeModElem{T} <: AbstractFreeModElem{T}`
which implements an element $f$ of a free module $F$ as a sparse row, that is, as an object of
type `SRow{T}`. This object specifies the coordinates of $f$ with respect to the basis of standard
unit vectors of $F$. To create an element, enter its coordinates as a sparse row or a vector:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ and regard $M$ as a submodule of that ambient module, embedded in the natural wa
All OSCAR types for the finitely presented modules considered here belong to the
abstract type `ModuleFP{T}`, where `T` is the element type of the underlying ring.
Graded or not, the subquotients belong to the abstract subtype `AbstractSubQuo{T} <: ModuleFP{T}`,
they are modelled as objects of the concrete type `SubquoModule{T} <: AbstractSubQuo{T}`.
they are modeled as objects of the concrete type `SubquoModule{T} <: AbstractSubQuo{T}`.

!!! note
Canonical maps such us the canonical projection onto a quotient module arise in many
Expand Down
2 changes: 1 addition & 1 deletion docs/src/CommutativeAlgebra/localizations.md
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ internally represented by a pair `(r, u)` of elements of `R`, then
- `parent(f)` refers to `RQL`,
- `numerator(f)` to the image of `r` in `RQ`, and
- `denominator(f)` to the image of `u` in `RQ`.
That is, the behaviour of the functions `numerator` and `denominator` reflects the mathematical viewpoint
That is, the behavior of the functions `numerator` and `denominator` reflects the mathematical viewpoint
of representing `f` by pairs of elements of `RQ` and not the internal representation of `f` as pairs of elements of `R`.

##### Examples
Expand Down
2 changes: 1 addition & 1 deletion docs/src/CommutativeAlgebra/rings.md
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ we follow the former book.

### Types

Multivariate rings with gradings are modelled by objects of type
Multivariate rings with gradings are modeled by objects of type
`MPolyDecRing{T, S} :< MPolyRing{T}`, with elements of type
`MPolyRingElem_dec{T, S} :< MPolyRingElem{T}`. Here, `S` is the element type of the
multivariate ring, and `T` is the element type of its coefficient ring as above.
Expand Down
6 changes: 3 additions & 3 deletions docs/src/DeveloperDocumentation/debugging.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Pitfalls: Mutable objects in OSCAR code

Suppose you are having the following difficulties. Your code is exhibiting
inexplicable behaviour and values that should not be changing are changing in
inexplicable behavior and values that should not be changing are changing in
seemingly random locations. To get to the bottom of these kind of issues
it is necessary to be familiar with mutable objects in Julia and some of the
relevant conventions in place in OSCAR. This section discusses these
Expand Down Expand Up @@ -92,7 +92,7 @@ julia> evaluate(x) # x is now unchanged

It is of course not true that all Julia functions take ownership of their
arguments, but the GOP derives from the fact that this decision is an
implementation detail with performance consequences. The behaviour of a
implementation detail with performance consequences. The behavior of a
function may be inconsistent across different types and versions of OSCAR.
In the following two snippets, the GOP says both modifications of `a` are
illegal since they have since been passed to a function. If `K = QQ`, the two
Expand Down Expand Up @@ -161,7 +161,7 @@ julia> a
3
```

The preceding behaviour of the function `modular_proj` is an artifact of
The preceding behavior of the function `modular_proj` is an artifact of
internal efficiency and may be desirable in certain circumstances. In other
circumstances, the following `deepcopy`s may be necessary for your code to
function correctly.
Expand Down
2 changes: 1 addition & 1 deletion docs/src/DeveloperDocumentation/serialization.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Serialization

This document summarises the serialization efforts of OSCAR, how it is supposed
This document summarizes the serialization efforts of OSCAR, how it is supposed
to work, how it works and the overall goal.
[Serialization](https://en.wikipedia.org/wiki/Serialization) broadly speaking
is the process of reading and writing data. There are many reasons for this
Expand Down
2 changes: 1 addition & 1 deletion docs/src/Experimental/Singularities/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ The singularities part of OSCAR provides functionality for handling
- space germs
- map germs

For readers' convenience, the documentation is organised by typical settings,
For readers' convenience, the documentation is organized by typical settings,
This, on the other hand, implies that certain keywords may appear in several
settings. In particular, there are overlaps between hypersurface
singularities and curve singularities and between hypersurface singularities
Expand Down
2 changes: 1 addition & 1 deletion docs/src/NoncommutativeAlgebra/PBWAlgebras/creation.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ end

## Types

PBW-algebras are modelled by objects of type `PBWAlgRing{T, S} <: NCRing`, their elements are objects of type
PBW-algebras are modeled by objects of type `PBWAlgRing{T, S} <: NCRing`, their elements are objects of type
`PBWAlgElem{T, S} <: NCRingElem`. Here, `T` is the element type of the field over which the PBW-algebra
is defined (the type `S` is added for internal use).

Expand Down
2 changes: 1 addition & 1 deletion docs/src/NoncommutativeAlgebra/PBWAlgebras/quotients.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ functionality for dealing with quotients of PBW-algebras modulo two-sided ideals

## Types

GR-algebras are modelled by objects of type `PBWAlgQuo{T, S} <: NCRing`, their elements are objects of type
GR-algebras are modeled by objects of type `PBWAlgQuo{T, S} <: NCRing`, their elements are objects of type
`PBWAlgQuoElem{T, S} <: NCRingElem`. Here, `T` is the element type of the field over which the GR-algebra
is defined (the type `S` is added for internal use).

Expand Down
6 changes: 3 additions & 3 deletions docs/src/Rings/integer.md
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ julia> ZZ(1)^(-2)

!!! note
In Julia `2^-2` is called a literal power. The value returned is a
floating point value. To get behaviour that agrees with OSCAR, one can
floating point value. To get behavior that agrees with OSCAR, one can
write `2^Int(-2)`.

The following is allowed for convenience.
Expand Down Expand Up @@ -643,7 +643,7 @@ ERROR: 7 is not a factor of -1 * 5 * 2^2 * 3
!!! note
The functions in this section that take `Int` arguments will return an
`Int`, which may overflow or throw an error. Use the `ZZRingElem` versions if
this is not the desired behaviour.
this is not the desired behavior.

### Factorial

Expand Down Expand Up @@ -753,7 +753,7 @@ julia> fibonacci(-2)
!!! note
The functions in this section that take `Int` arguments will return a
`Int`, which may overflow or throw an error. Use the `ZZRingElem` versions if
this is not the desired behaviour.
this is not the desired behavior.

### Moebius mu function

Expand Down
10 changes: 5 additions & 5 deletions examples/MatrixDisplay.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#############################################################################
##
## functionality for displaying labelled matrices,
## functionality for displaying labeled matrices,
## that is, 2-dimensional arrays of strings
## together with row labels, columns labels, header, and footer
##
Expand Down Expand Up @@ -47,7 +47,7 @@ function replace_TeX(str::String)
end

"""
labelled_matrix_formatted(io::IO, mat::Matrix{String})
labeled_matrix_formatted(io::IO, mat::Matrix{String})
Output a formatted version of `mat` to `io`.
The following attributes of `io` are supported.
Expand Down Expand Up @@ -89,18 +89,18 @@ The following attributes of `io` are supported.
(enter `0` for a line above the first row),
- `:column_portions`:
array of column numbers after which a new labelled table shall be started;
array of column numbers after which a new labeled table shall be started;
the default is to have just one portion in the `:TeX` case,
and to create portions according to the screen width otherwise,
- `:row_portions`:
array of row numbers after which a new labelled table shall be started;
array of row numbers after which a new labeled table shall be started;
the default is to have just one portion.
## Examples:
...
"""
function labelled_matrix_formatted(io::IO, mat::Matrix{String})
function labeled_matrix_formatted(io::IO, mat::Matrix{String})
TeX = get(io, :TeX, false)

subset_row = get(io, :subset_row, 1:size(mat, 1))
Expand Down
4 changes: 2 additions & 2 deletions examples/Timo.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ function timo(f::QQPolyRingElem, p_all::Vector{Int})

all_g = [x for x = G]
@show :aut
@time au = Oscar.SolveRadical.recognise(S, K, [K.pe^g for g = all_g])
@time au = Oscar.SolveRadical.recognize(S, K, [K.pe^g for g = all_g])
# au = Hecke.closure([hom(k.fld, k.fld, x) for x = au])
#recognise seems to be faster than closure - and keeps the link
#recognize seems to be faster than closure - and keeps the link
#between the Galois group and the automorphisms
@time au = [hom(K.fld, K.fld, x, check = false) for x = au]

Expand Down
4 changes: 2 additions & 2 deletions experimental/DoubleAndHyperComplexes/test/DoubleComplex.jl
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
@test matrix(map(tot_xyz, 2)) == R[-y z 0; -x 0 z; 0 -x y]
@test matrix(map(tot_xyz, 3)) == R[x -y z]

# Test behaviour w.r.t zero entries
# Test behavior w.r.t zero entries
Z = FreeMod(R, 0)
Kx = ComplexOfMorphisms([hom(Z, R1, elem_type(R1)[]), hom(R1, R1, [x*R1[1]]), hom(R1, Z, [zero(Z)])], seed = -1)
Ky = ComplexOfMorphisms([hom(Z, R1, elem_type(R1)[]), hom(R1, R1, [y*R1[1]]), hom(R1, Z, [zero(Z)])], seed = -1)
Expand Down Expand Up @@ -206,7 +206,7 @@ end
@test matrix(map(tot_xyz, 2)) == R[-y z 0; -x 0 z; 0 -x y]
@test matrix(map(tot_xyz, 3)) == R[x -y z]

# Test behaviour w.r.t zero entries
# Test behavior w.r.t zero entries
Z = FreeMod(R, 0)
Kx = ComplexOfMorphisms([hom(Z, R1, elem_type(R1)[]), hom(R1, R1, [x*R1[1]]), hom(R1, Z, [zero(Z)])], seed = -1)
Ky = ComplexOfMorphisms([hom(Z, R1, elem_type(R1)[]), hom(R1, R1, [y*R1[1]]), hom(R1, Z, [zero(Z)])], seed = -1)
Expand Down
15 changes: 8 additions & 7 deletions experimental/GaloisGrp/src/Solve.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ function __init__()
Hecke.add_assertion_scope(:SolveRadical)
end

@deprecate recognise recognize

mutable struct SubField
coeff_field::Union{Nothing, SubField}
Expand Down Expand Up @@ -376,13 +377,13 @@ function conjugates(C::GaloisCtx, S::SubField, a::QQFieldElem, pr::Int = 10)
return [parent(rt[1])(a)]
end

function recognise(C::GaloisCtx, S::SubField, I::SLPoly)
r = recognise(C, S, [I])
function recognize(C::GaloisCtx, S::SubField, I::SLPoly)
r = recognize(C, S, [I])
r === nothing && return r
return r[1]
end

function recognise(C::GaloisCtx, S::SubField, J::Vector{<:SLPoly}, d=false)
function recognize(C::GaloisCtx, S::SubField, J::Vector{<:SLPoly}, d=false)
if d != false
B = d
elseif isdefined(S, :ts)
Expand Down Expand Up @@ -541,20 +542,20 @@ function Oscar.solve(f::ZZPolyRingElem; max_prec::Int=typemax(Int), show_radical

cyclo = fld_arr[length(pp)+1]
@vprint :SolveRadical 1 "finding roots-of-1...\n"
@vtime :SolveRadical 1 zeta = [recognise(C, cyclo, gens(parent(cyclo.pe))[i])//scale for i=pp]
@vtime :SolveRadical 1 zeta = [recognize(C, cyclo, gens(parent(cyclo.pe))[i])//scale for i=pp]
@hassert :SolveRadical 1 all(i->isone(zeta[i]^lp[i]), 1:length(pp))
aut = []
@vprint :SolveRadical 1 "finding automorphisms...\n"
for i=length(pp)+2:length(fld_arr)
@vprint :SolveRadical 1 "..on level $(i-length(pp)-1)...\n"
K = fld_arr[i]
@vtime :SolveRadical 1 push!(aut, hom(K.fld, K.fld, recognise(C, K, K.pe^K.conj[2])))
@vtime :SolveRadical 1 push!(aut, hom(K.fld, K.fld, recognize(C, K, K.pe^K.conj[2])))
end
for i=1:length(pp)
fld_arr[i+1].fld.S = Symbol("z_$(lp[i])")
end
@vprint :SolveRadical 1 "find roots...\n"
@vtime :SolveRadical 1 R = recognise(C, All, gens(S)[rt])
@vtime :SolveRadical 1 R = recognize(C, All, gens(S)[rt])
R = R .// scale
#now, rewrite as radicals..
#the cyclos are fine:
Expand Down Expand Up @@ -761,7 +762,7 @@ function galois_factor(C::GaloisCtx)
end
end
z = _fixed_field(C, Gi, invar = I)
return recognise(C, z, x)
return recognize(C, z, x)
end

end # SolveRadical
Expand Down
2 changes: 1 addition & 1 deletion experimental/IntersectionTheory/src/Bott.jl
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ end
# TnBundle, TnVariety - varieties with a torus action and equivariant bundles
#
# A Tⁿ-abstract_variety X is represented as the set of fixed points X.points, each
# labelled using some value of type P (e.g. an array), and has a multiplicity e
# labeled using some value of type P (e.g. an array), and has a multiplicity e
# (orbifold multiplicity);
#
# A Tⁿ-equivariant bundle on X is represented by its localization/restriction
Expand Down
2 changes: 1 addition & 1 deletion experimental/LieAlgebras/test/WeylGroup-test.jl
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ include(
@test word(s[1] * s[2] * s[1]) == UInt8[1, 2, 1]
@test word(s[3] * s[2] * s[3]) == UInt8[2, 3, 2]

# test general multiplication behaviour
# test general multiplication behavior
W = weyl_group(:B, 4)
@test W(b4_w0) == W(b4_w0; normalize=false)

Expand Down
2 changes: 1 addition & 1 deletion experimental/OrthogonalDiscriminants/gap/fix.g
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

###############################################################################
##
## Improve the behaviour of 'Indicator' in characteristic 2.
## Improve the behavior of 'Indicator' in characteristic 2.
##
InstallMethod( IndicatorOp,
"for a Brauer character table and <n> = 2",
Expand Down
2 changes: 1 addition & 1 deletion experimental/OrthogonalDiscriminants/src/utils.jl
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ function show_OD_info(tbl::Oscar.GAPGroupCharacterTable, io::IO = stdout)
:separators_col => 0:(length(result[1])-1),
)

labelled_matrix_formatted(ioc, permutedims(reduce(hcat, result)))
labeled_matrix_formatted(ioc, permutedims(reduce(hcat, result)))
println(io, "")
end

Expand Down
2 changes: 1 addition & 1 deletion experimental/Schemes/CoherentSheaves.jl
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ identifications given by the gluings in the `default_covering`.
### Lookup and production pattern for sheaves of modules
#
# When asked to produce a module on an open affine U, the functions
# below lead to the following behaviour.
# below lead to the following behavior.
#
# U₁ an `affine_chart` of `X`
# _________/|\______________ (`patches` of `default_covering(X)`)
Expand Down
4 changes: 2 additions & 2 deletions experimental/Schemes/elliptic_surface.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1704,7 +1704,7 @@ function _elliptic_parameter_conversion(X::EllipticSurface, u::VarietyFunctionFi
eqn1 = numerator(f_trans)
# According to
# A. Kumar: "Elliptic Fibrations on a generic Jacobian Kummer surface"
# p. 45, l. 1 we expect the following cancellation to be possible:
# p. 45, l. 1 we expect the following cancelation to be possible:
divisor_num = evaluate(numerator(x0), x2)
divisor_den = evaluate(denominator(x0), x2)
divisor = divisor_den * y2 - divisor_num
Expand Down Expand Up @@ -1733,7 +1733,7 @@ function _elliptic_parameter_conversion(X::EllipticSurface, u::VarietyFunctionFi
eqn1 = numerator(f_trans)
# According to
# A. Kumar: "Elliptic Fibrations on a generic Jacobian Kummer surface"
# p. 45, l. 15 we expect the following cancellation to be possible:
# p. 45, l. 15 we expect the following cancelation to be possible:
success, eqn1 = divides(eqn1, y2)
@assert success "equation did not come out in the anticipated form"
return eqn1, phi
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###########################################################
# (1) The fibre product of two morphisms of affine schemes
# (1) The fiber product of two morphisms of affine schemes
###########################################################

@doc raw"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ If `X = Spec(R)` and `R` is...
- a localized polynomial ring `R[U⁻¹]`, then this returns the zero ideal in that ring;
- a quotient of a localized polynomial ring `(R[U⁻¹])/J`, then this returns the ideal `J` in the ring `R[U⁻¹]`.
This behaviour is streamlined with the return values of `modulus` on the algebraic side.
This behavior is streamlined with the return values of `modulus` on the algebraic side.
If you are looking for an ideal `I` in the polynomial `ambient_ring` of `X` defining
the closure of `X` in its `ambient_space`, use for instance `saturated_ideal(defining_ideal(X))`.
```jldoctest
Expand Down
2 changes: 1 addition & 1 deletion src/Groups/GAPGroups.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1480,7 +1480,7 @@ false
is_quasisimple(G::GAPGroup)
Return whether `G` is a quasisimple group,
i.e., `G` is perfect such that the factor group modulo its centre is
i.e., `G` is perfect such that the factor group modulo its center is
a non-abelian simple group.
# Examples
Expand Down
Loading

0 comments on commit 1498d35

Please sign in to comment.