Skip to content

Commit 0a30bb6

Browse files
committed
polyhedral_fan: Adapt order of arguments, see #3054
1 parent 3a86c02 commit 0a30bb6

File tree

21 files changed

+84
-75
lines changed

21 files changed

+84
-75
lines changed

docs/src/AlgebraicGeometry/ToricVarieties/NormalToricVarieties.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ affine_normal_toric_variety(v::NormalToricVariety)
2929
### Normal Toric Varieties
3030

3131
```@docs
32-
normal_toric_variety(rays::AbstractCollection[RayVector], max_cones::Vector{Vector{Int64}}; non_redundant::Bool = false)
33-
normal_toric_variety(PF::PolyhedralFan)
34-
normal_toric_variety(P::Polyhedron)
32+
normal_toric_variety
3533
```
3634

3735
### Famous Toric Vareties

experimental/FTheoryTools/src/auxiliary.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function _auxiliary_base_space(auxiliary_base_variable_names::Vector{String}, au
2222
if dim(auxiliary_base_space) != d
2323
integral_rays = matrix(ZZ, rays(variety))
2424
new_max_cones = IncidenceMatrix(cones(variety, d))
25-
auxiliary_base_space = normal_toric_variety(integral_rays, new_max_cones; non_redundant = true)
25+
auxiliary_base_space = normal_toric_variety(new_max_cones, integral_rays; non_redundant = true)
2626
end
2727

2828
# Set attributes of this base space and return it
@@ -81,7 +81,7 @@ function _ambient_space(base::NormalToricVariety, fiber_ambient_space::NormalTor
8181
ambient_space_max_cones = IncidenceMatrix(vcat(ambient_space_max_cones...))
8282

8383
# Construct the ambient space
84-
ambient_space = normal_toric_variety(ambient_space_rays, ambient_space_max_cones; non_redundant = true)
84+
ambient_space = normal_toric_variety(ambient_space_max_cones, ambient_space_rays; non_redundant = true)
8585

8686
# Compute torusinvariant weil divisor group and the class group
8787
ambient_space_torusinvariant_weil_divisor_group = free_abelian_group(nrows(ambient_space_rays))
@@ -198,7 +198,7 @@ function sample_toric_variety()
198198
[5, 11, 12], [5, 6, 32], [5, 6, 12], [4, 31, 32], [4, 10, 11], [4, 5, 32],
199199
[4, 5, 11], [3, 30, 31], [3, 9, 10], [3, 4, 31], [3, 4, 10], [2, 29, 30],
200200
[2, 8, 9], [2, 3, 30], [2, 3, 9], [1, 8, 29], [1, 2, 29], [1, 2, 8]])
201-
return normal_toric_variety(rays, cones)
201+
return normal_toric_variety(cones, rays)
202202
end
203203

204204

src/AlgebraicGeometry/ToricVarieties/AlgebraicCycles/special_attributes.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ true
2727
julia> ngens(chow_ring(p2))
2828
3
2929
30-
julia> v = normal_toric_variety([[1, 0], [0, 1], [-1, -1]], [[1], [2], [3]])
30+
julia> v = normal_toric_variety(IncidenceMatrix([[1], [2], [3]]), [[1, 0], [0, 1], [-1, -1]])
3131
Normal toric variety
3232
3333
julia> is_complete(v)

src/AlgebraicGeometry/ToricVarieties/CohomologyClasses/methods.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ julia> m = 2;
5858
5959
julia> ray_generators = [e1, -e1, e2, e3, - e2 - e3 - m * e1];
6060
61-
julia> max_cones = [[1,3,4], [1,3,5], [1,4,5], [2,3,4], [2,3,5], [2,4,5]];
61+
julia> max_cones = IncidenceMatrix([[1,3,4], [1,3,5], [1,4,5], [2,3,4], [2,3,5], [2,4,5]]);
6262
63-
julia> X = normal_toric_variety(ray_generators, max_cones; non_redundant = true)
63+
julia> X = normal_toric_variety(max_cones, ray_generators; non_redundant = true)
6464
Normal toric variety
6565
6666
julia> cox_ring(X)

src/AlgebraicGeometry/ToricVarieties/NormalToricVarieties/constructors.jl

+12-12
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ end
6363

6464

6565
@doc raw"""
66-
normal_toric_variety(rays::AbstractCollection[RayVector], max_cones::IncidenceMatrix; non_redundant::Bool = false)
66+
normal_toric_variety(max_cones::IncidenceMatrix, rays::AbstractCollection[RayVector]; non_redundant::Bool = false)
6767
6868
Construct a normal toric variety $X$ by providing the rays and maximal cones
6969
as vector of vectors. By default, this method assumes that the input is not
@@ -82,23 +82,23 @@ julia> ray_generators = [[1,0], [0, 1], [-1, 5], [0, -1]]
8282
[-1, 5]
8383
[0, -1]
8484
85-
julia> max_cones = [[1, 2], [2, 3], [3, 4], [4, 1]]
86-
4-element Vector{Vector{Int64}}:
87-
[1, 2]
88-
[2, 3]
89-
[3, 4]
90-
[4, 1]
85+
julia> max_cones = IncidenceMatrix([[1, 2], [2, 3], [3, 4], [4, 1]])
86+
4×4 IncidenceMatrix
87+
[1, 2]
88+
[2, 3]
89+
[3, 4]
90+
[1, 4]
9191
92-
julia> normal_toric_variety(ray_generators, max_cones)
92+
julia> normal_toric_variety(max_cones, ray_generators)
9393
Normal toric variety
9494
95-
julia> normal_toric_variety(ray_generators, max_cones; non_redundant = true)
95+
julia> normal_toric_variety(max_cones, ray_generators; non_redundant = true)
9696
Normal toric variety
9797
```
9898
"""
99-
normal_toric_variety(rays::AbstractCollection[RayVector], max_cones::Vector{Vector{Int64}}; non_redundant::Bool = false) = normal_toric_variety(rays, IncidenceMatrix(max_cones); non_redundant = non_redundant)
100-
function normal_toric_variety(rays::AbstractCollection[RayVector], max_cones::IncidenceMatrix; non_redundant::Bool = false)
101-
fan = polyhedral_fan(rays, max_cones; non_redundant=non_redundant)
99+
normal_toric_variety(max_cones::Vector{Vector{Int64}}, rays::AbstractCollection[RayVector]; non_redundant::Bool = false) = normal_toric_variety(IncidenceMatrix(max_cones), rays; non_redundant)
100+
function normal_toric_variety(max_cones::IncidenceMatrix, rays::AbstractCollection[RayVector]; non_redundant::Bool = false)
101+
fan = polyhedral_fan(max_cones, rays; non_redundant)
102102
return normal_toric_variety(fan)
103103
end
104104

src/AlgebraicGeometry/ToricVarieties/NormalToricVarieties/standard_constructions.jl

+7-7
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ Normal toric variety
8080
"""
8181
function hirzebruch_surface(::Type{NormalToricVariety}, r::Int)
8282
fan_rays = [1 0; 0 1; -1 r; 0 -1]
83-
cones = [[1, 2], [2, 3], [3, 4], [4, 1]]
84-
variety = normal_toric_variety(fan_rays, cones; non_redundant = true)
83+
cones = IncidenceMatrix([[1, 2], [2, 3], [3, 4], [4, 1]])
84+
variety = normal_toric_variety(cones, fan_rays; non_redundant = true)
8585
set_attribute!(variety, :torusinvariant_weil_divisor_group, free_abelian_group(4))
8686
set_attribute!(variety, :class_group, free_abelian_group(2))
8787
weights = matrix(ZZ, [1 0; 0 1; 1 0; r 1])
@@ -126,7 +126,7 @@ function del_pezzo_surface(::Type{NormalToricVariety}, b::Int)
126126
fan_rays = [1 0; 0 1; -1 -1; 1 1; 0 -1; -1 0]
127127
cones = IncidenceMatrix([[1, 4], [2, 4], [1, 5], [5, 3], [2, 6], [6, 3]])
128128
end
129-
variety = normal_toric_variety(fan_rays, cones; non_redundant = true)
129+
variety = normal_toric_variety(cones, fan_rays; non_redundant = true)
130130
set_attribute!(variety, :torusinvariant_weil_divisor_group, free_abelian_group(b+3))
131131
set_attribute!(variety, :class_group, free_abelian_group(b+1))
132132
if b == 1
@@ -245,7 +245,7 @@ function normal_toric_variety_from_star_triangulation(P::Polyhedron)
245245
integral_rays = vcat([pts[k,:] for k in 2:nrows(pts)])
246246

247247
# construct the variety
248-
return normal_toric_variety(integral_rays, max_cones; non_redundant = true)
248+
return normal_toric_variety(max_cones, integral_rays; non_redundant = true)
249249
end
250250

251251

@@ -298,7 +298,7 @@ function normal_toric_varieties_from_star_triangulations(P::Polyhedron)
298298
max_cones = [IncidenceMatrix([[c[i]-1 for i in 2:length(c)] for c in t]) for t in trias]
299299

300300
# construct the varieties
301-
return [normal_toric_variety(integral_rays, cones; non_redundant = true) for cones in max_cones]
301+
return [normal_toric_variety(cones, integral_rays; non_redundant = true) for cones in max_cones]
302302
end
303303

304304

@@ -341,7 +341,7 @@ function normal_toric_variety_from_glsm(charges::ZZMatrix)
341341
# construct varieties
342342
triang = _find_full_star_triangulation(pts)
343343
max_cones = IncidenceMatrix([[c[i]-1 for i in 2:length(c)] for c in triang])
344-
variety = normal_toric_variety(integral_rays, max_cones; non_redundant = true)
344+
variety = normal_toric_variety(max_cones, integral_rays; non_redundant = true)
345345

346346
# set the attributes and return the variety
347347
set_attribute!(variety, :torusinvariant_weil_divisor_group, G1)
@@ -408,7 +408,7 @@ function normal_toric_varieties_from_glsm(charges::ZZMatrix)
408408
# construct varieties
409409
integral_rays = vcat([pts[k,:] for k in 2:nrows(pts)])
410410
max_cones = [IncidenceMatrix([[c[i]-1 for i in 2:length(c)] for c in t]) for t in star_triangulations(pts; full = true)]
411-
varieties = [normal_toric_variety(integral_rays, cones; non_redundant = true) for cones in max_cones]
411+
varieties = [normal_toric_variety(cones, integral_rays; non_redundant = true) for cones in max_cones]
412412

413413
# set the map from Div_T -> Cl to the desired matrix
414414
for v in varieties

src/AlgebraicGeometry/ToricVarieties/Proj/constructors.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ function _proj_and_total_space(is_proj::Bool, E::Vector{T}) where T <: Union{Tor
7676

7777
total_rays_gens = vcat([modified_ray_gens[ray] for ray in rays(v)], [vcat(ray_vector(zeros(Int64, dim(v))), l[i]) for i in eachindex(E)])
7878

79-
return normal_toric_variety(polyhedral_fan(total_rays_gens, IncidenceMatrix(new_maximal_cones)))
79+
return normal_toric_variety(polyhedral_fan(IncidenceMatrix(new_maximal_cones), total_rays_gens))
8080
end
8181

8282
function _m_sigma(sigma::Cone{QQFieldElem}, pol_sigma::Cone{QQFieldElem}, D::Union{ToricDivisor, ToricLineBundle})::RayVector{QQFieldElem}

src/AlgebraicGeometry/ToricVarieties/ToricMorphisms/standard_constructions.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Toric morphism
1616
mapping_matrix = matrix(ZZ, rays(variety))
1717
max_cones_for_cox_variety = ray_indices(maximal_cones(variety))
1818
rays_for_cox_variety = matrix(ZZ, [[if i==j 1 else 0 end for j in 1:nrays(variety)] for i in 1:nrays(variety)])
19-
cox_variety = normal_toric_variety(polyhedral_fan(rays_for_cox_variety, max_cones_for_cox_variety))
19+
cox_variety = normal_toric_variety(polyhedral_fan(max_cones_for_cox_variety, rays_for_cox_variety))
2020
return toric_morphism(cox_variety, mapping_matrix, variety)
2121
end
2222

src/PolyhedralGeometry/PolyhedralFan/constructors.jl

+11-11
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ julia> R = [1 0; 1 1; 0 1; -1 0; 0 -1];
4545
4646
julia> IM=IncidenceMatrix([[1,2],[2,3],[3,4],[4,5],[1,5]]);
4747
48-
julia> PF=polyhedral_fan(R,IM)
48+
julia> PF=polyhedral_fan(IM, R)
4949
Polyhedral fan in ambient dimension 2
5050
```
5151
@@ -57,17 +57,17 @@ julia> L = [0 1 0];
5757
5858
julia> IM = IncidenceMatrix([[1],[2]]);
5959
60-
julia> PF=polyhedral_fan(R, L, IM)
60+
julia> PF=polyhedral_fan(IM, R, L)
6161
Polyhedral fan in ambient dimension 3
6262
6363
julia> lineality_dim(PF)
6464
1
6565
```
6666
"""
6767
function polyhedral_fan(f::scalar_type_or_field,
68+
Incidence::IncidenceMatrix,
6869
Rays::AbstractCollection[RayVector],
69-
LS::Union{AbstractCollection[RayVector], Nothing},
70-
Incidence::IncidenceMatrix;
70+
LS::Union{AbstractCollection[RayVector], Nothing};
7171
non_redundant::Bool = false)
7272
parent_field, scalar_type = _determine_parent_and_scalar(f, Rays, LS)
7373
RM = unhomogenized_matrix(Rays)
@@ -90,9 +90,9 @@ function polyhedral_fan(f::scalar_type_or_field,
9090
), parent_field)
9191
end
9292
end
93-
polyhedral_fan(f::scalar_type_or_field, Rays::AbstractCollection[RayVector], Incidence::IncidenceMatrix; non_redundant::Bool = false) = polyhedral_fan(f, Rays, nothing, Incidence; non_redundant=non_redundant)
94-
polyhedral_fan(Rays::AbstractCollection[RayVector], LS::Union{AbstractCollection[RayVector], Nothing}, Incidence::IncidenceMatrix; non_redundant::Bool = false) = polyhedral_fan(QQFieldElem, Rays, LS, Incidence; non_redundant = non_redundant)
95-
polyhedral_fan(Rays::AbstractCollection[RayVector], Incidence::IncidenceMatrix; non_redundant::Bool = false) = polyhedral_fan(QQFieldElem, Rays, Incidence; non_redundant = non_redundant)
93+
polyhedral_fan(f::scalar_type_or_field, Incidence::IncidenceMatrix, Rays::AbstractCollection[RayVector]; non_redundant::Bool = false) = polyhedral_fan(f, Incidence, Rays, nothing; non_redundant)
94+
polyhedral_fan(Incidence::IncidenceMatrix, Rays::AbstractCollection[RayVector], LS::Union{AbstractCollection[RayVector], Nothing}; non_redundant::Bool = false) = polyhedral_fan(QQFieldElem, Incidence, Rays, LS; non_redundant)
95+
polyhedral_fan(Incidence::IncidenceMatrix, Rays::AbstractCollection[RayVector]; non_redundant::Bool = false) = polyhedral_fan(QQFieldElem, Incidence, Rays; non_redundant)
9696

9797
"""
9898
pm_object(PF::PolyhedralFan)
@@ -117,10 +117,10 @@ function polyhedral_fan(cones::AbstractVector{Cone{T}}; non_redundant::Bool=fals
117117
end
118118

119119
#Same construction for when the user gives Matrix{Bool} as incidence matrix
120-
polyhedral_fan(f::scalar_type_or_field, Rays::AbstractCollection[RayVector], LS::AbstractCollection[RayVector], Incidence::Matrix{Bool}) =
121-
polyhedral_fan(f, Rays, LS, IncidenceMatrix(Polymake.IncidenceMatrix(Incidence)))
122-
polyhedral_fan(f::scalar_type_or_field, Rays::AbstractCollection[RayVector], Incidence::Matrix{Bool}) =
123-
polyhedral_fan(f, Rays, IncidenceMatrix(Polymake.IncidenceMatrix(Incidence)))
120+
polyhedral_fan(f::scalar_type_or_field, Incidence::Matrix{Bool}, Rays::AbstractCollection[RayVector], LS::AbstractCollection[RayVector]) =
121+
polyhedral_fan(f, IncidenceMatrix(Polymake.IncidenceMatrix(Incidence)), Rays, LS)
122+
polyhedral_fan(f::scalar_type_or_field, Incidence::Matrix{Bool}, Rays::AbstractCollection[RayVector]) =
123+
polyhedral_fan(f, IncidenceMatrix(Polymake.IncidenceMatrix(Incidence)), Rays)
124124

125125
polyhedral_fan(C::Cone{T}) where T<:scalar_types = polyhedral_fan([C])
126126

src/PolyhedralGeometry/PolyhedralFan/properties.jl

+8-8
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ Return the dimension of `PF`.
230230
This fan in the plane contains a 2-dimensional cone and is thus 2-dimensional
231231
itself.
232232
```jldoctest
233-
julia> PF = polyhedral_fan([1 0; 0 1; -1 -1], IncidenceMatrix([[1, 2], [3]]));
233+
julia> PF = polyhedral_fan(IncidenceMatrix([[1, 2], [3]]), [1 0; 0 1; -1 -1]);
234234
235235
julia> dim(PF)
236236
2
@@ -247,7 +247,7 @@ Return the number of maximal cones of `PF`.
247247
The cones given in this construction are non-redundant. Thus there are two
248248
maximal cones.
249249
```jldoctest
250-
julia> PF = polyhedral_fan([1 0; 0 1; -1 -1], IncidenceMatrix([[1, 2], [3]]));
250+
julia> PF = polyhedral_fan(IncidenceMatrix([[1, 2], [3]]), [1 0; 0 1; -1 -1]);
251251
252252
julia> n_maximal_cones(PF)
253253
2
@@ -264,7 +264,7 @@ Return the number of cones of `PF`.
264264
The cones given in this construction are non-redundant. There are six
265265
cones in this fan.
266266
```jldoctest
267-
julia> PF = polyhedral_fan([1 0; 0 1; -1 -1], IncidenceMatrix([[1, 2], [3]]))
267+
julia> PF = polyhedral_fan(IncidenceMatrix([[1, 2], [3]]), [1 0; 0 1; -1 -1])
268268
Polyhedral fan in ambient dimension 2
269269
270270
julia> n_cones(PF)
@@ -386,7 +386,7 @@ This fan consists of two cones, one containing all the points with $y ≤ 0$ and
386386
one containing all the points with $y ≥ 0$. The fan's lineality is the common
387387
lineality of these two cones, i.e. in $x$-direction.
388388
```jldoctest
389-
julia> PF = polyhedral_fan([1 0; 0 1; -1 0; 0 -1], IncidenceMatrix([[1, 2, 3], [3, 4, 1]]))
389+
julia> PF = polyhedral_fan(IncidenceMatrix([[1, 2, 3], [3, 4, 1]]), [1 0; 0 1; -1 0; 0 -1])
390390
Polyhedral fan in ambient dimension 2
391391
392392
julia> lineality_space(PF)
@@ -441,7 +441,7 @@ Determine whether `PF` is smooth.
441441
Even though the cones of this fan cover the positive orthant together, one of
442442
these und thus the whole fan is not smooth.
443443
```jldoctest
444-
julia> PF = polyhedral_fan([0 1; 2 1; 1 0], IncidenceMatrix([[1, 2], [2, 3]]));
444+
julia> PF = polyhedral_fan(IncidenceMatrix([[1, 2], [2, 3]]), [0 1; 2 1; 1 0]);
445445
446446
julia> is_smooth(PF)
447447
false
@@ -457,7 +457,7 @@ Determine whether `PF` is regular, i.e. the normal fan of a polytope.
457457
# Examples
458458
This fan is not complete and thus not regular.
459459
```jldoctest
460-
julia> PF = polyhedral_fan([1 0; 0 1; -1 -1], IncidenceMatrix([[1, 2], [3]]));
460+
julia> PF = polyhedral_fan(IncidenceMatrix([[1, 2], [3]]), [1 0; 0 1; -1 -1]);
461461
462462
julia> is_regular(PF)
463463
false
@@ -473,7 +473,7 @@ Determine whether `PF` is pure, i.e. all maximal cones have the same dimension.
473473
474474
# Examples
475475
```jldoctest
476-
julia> PF = polyhedral_fan([1 0; 0 1; -1 -1], IncidenceMatrix([[1, 2], [3]]));
476+
julia> PF = polyhedral_fan(IncidenceMatrix([[1, 2], [3]]), [1 0; 0 1; -1 -1]);
477477
478478
julia> is_pure(PF)
479479
false
@@ -490,7 +490,7 @@ dimension.
490490
491491
# Examples
492492
```jldoctest
493-
julia> PF = polyhedral_fan([1 0; 0 1; -1 -1], IncidenceMatrix([[1, 2], [3]]));
493+
julia> PF = polyhedral_fan(IncidenceMatrix([[1, 2], [3]]), [1 0; 0 1; -1 -1]);
494494
495495
julia> is_fulldimensional(PF)
496496
true

src/PolyhedralGeometry/PolyhedralFan/standard_constructions.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ function star_subdivision(Sigma::_FanLikeType, new_ray::AbstractVector{<:Integer
127127
end
128128
end
129129

130-
return polyhedral_fan(coefficient_field(Sigma), new_rays, IncidenceMatrix([nc for nc in new_cones]); non_redundant=true)
130+
return polyhedral_fan(coefficient_field(Sigma), IncidenceMatrix([nc for nc in new_cones]), new_rays; non_redundant=true)
131131
end
132132

133133
function _get_refinable_facets(Sigma::_FanLikeType, new_ray::AbstractVector{<:IntegerUnion}, refinable_cones::Vector{Int}, facet_normals::AbstractMatrix, mc_old::IncidenceMatrix)

src/deprecations.jl

+17-6
Original file line numberDiff line numberDiff line change
@@ -265,14 +265,14 @@ function PolyhedralFan{T}(Rays::AbstractCollection[RayVector],
265265
Incidence::IncidenceMatrix;
266266
non_redundant::Bool = false) where T<:scalar_types
267267
Base.depwarn("'PolyhedralFan{$T}(x...)' is deprecated, use 'polyhedral_fan($T, x...)' instead.", :PolyhedralFan)
268-
return polyhedral_fan(T, Rays, LS, Incidence; non_redundant=non_redundant)
268+
return polyhedral_fan(T, Incidence, Rays, LS; non_redundant=non_redundant)
269269
end
270270
function PolyhedralFan{T}(Rays::AbstractCollection[RayVector], Incidence::IncidenceMatrix; non_redundant::Bool = false) where T<:scalar_types
271271
Base.depwarn("'PolyhedralFan{$T}(x...)' is deprecated, use 'polyhedral_fan($T, x...)' instead.", :PolyhedralFan)
272-
return polyhedral_fan(T, Rays, Incidence; non_redundant=non_redundant)
272+
return polyhedral_fan(T, Incidence, Rays; non_redundant=non_redundant)
273273
end
274-
@deprecate PolyhedralFan(Rays::AbstractCollection[RayVector], LS::Union{AbstractCollection[RayVector], Nothing}, Incidence::IncidenceMatrix; non_redundant::Bool = false) polyhedral_fan(QQFieldElem, Rays, LS, Incidence; non_redundant = non_redundant)
275-
@deprecate PolyhedralFan(Rays::AbstractCollection[RayVector], Incidence::IncidenceMatrix; non_redundant::Bool = false) polyhedral_fan(QQFieldElem, Rays, Incidence; non_redundant = non_redundant)
274+
@deprecate PolyhedralFan(Rays::AbstractCollection[RayVector], LS::Union{AbstractCollection[RayVector], Nothing}, Incidence::IncidenceMatrix; non_redundant::Bool = false) polyhedral_fan(QQFieldElem, Incidence, Rays, LS; non_redundant = non_redundant)
275+
@deprecate PolyhedralFan(Rays::AbstractCollection[RayVector], Incidence::IncidenceMatrix; non_redundant::Bool = false) polyhedral_fan(QQFieldElem, Incidence, Rays; non_redundant = non_redundant)
276276
function PolyhedralFan(itr::AbstractVector{Cone{T}}) where T<:scalar_types
277277
Base.depwarn("'PolyhedralFan' is deprecated, use 'polyhedral_fan' instead.", :PolyhedralFan)
278278
return polyhedral_fan(itr)
@@ -283,11 +283,11 @@ function PolyhedralFan(C::Cone{T}) where T<:scalar_types
283283
end
284284
function PolyhedralFan{T}(Rays::AbstractCollection[RayVector], LS::AbstractCollection[RayVector], Incidence::Matrix{Bool}) where T<:scalar_types
285285
Base.depwarn("'PolyhedralFan{$T}(x...)' is deprecated, use 'polyhedral_fan($T, x...)' instead.", :PolyhedralFan)
286-
return polyhedral_fan(T, Rays, LS, Incidence)
286+
return polyhedral_fan(T, Incidence, Rays, LS)
287287
end
288288
function PolyhedralFan{T}(Rays::AbstractCollection[RayVector], Incidence::Matrix{Bool}) where T<:scalar_types
289289
Base.depwarn("'PolyhedralFan{$T}(x...)' is deprecated, use 'polyhedral_fan($T, x...)' instead.", :PolyhedralFan)
290-
return polyhedral_fan(T, Rays, Incidence)
290+
return polyhedral_fan(T, Incidence, Rays)
291291
end
292292

293293
# SubdivisionOfPoints -> subdivision_of_points
@@ -494,3 +494,14 @@ end
494494
@deprecate revlex(v::AbstractVector{<:MPolyRingElem}) invlex(v::AbstractVector{<:MPolyRingElem})
495495
@deprecate negrevlex(R::MPolyRing) ngeinvlex(R::MPolyRing)
496496
@deprecate negrevlex(v::AbstractVector{<:MPolyRingElem}) neginvlex(v::AbstractVector{<:MPolyRingElem})
497+
@deprecate polyhedral_fan(f::scalar_type_or_field, Rays::AbstractCollection[RayVector], Incidence::IncidenceMatrix; non_redundant::Bool = false) polyhedral_fan(f, Incidence, Rays, nothing; non_redundant)
498+
@deprecate polyhedral_fan(Rays::AbstractCollection[RayVector], LS::Union{AbstractCollection[RayVector], Nothing}, Incidence::IncidenceMatrix; non_redundant::Bool = false) polyhedral_fan(QQFieldElem, Incidence, Rays, LS; non_redundant)
499+
@deprecate polyhedral_fan(Rays::AbstractCollection[RayVector], Incidence::IncidenceMatrix; non_redundant::Bool = false) polyhedral_fan(QQFieldElem, Incidence, Rays; non_redundant)
500+
@deprecate polyhedral_fan(f::scalar_type_or_field,
501+
Rays::AbstractCollection[RayVector],
502+
LS::Union{AbstractCollection[RayVector], Nothing},
503+
Incidence::IncidenceMatrix;
504+
non_redundant::Bool = false) polyhedral_fan(f, Incidence, Rays, LS; non_redundant)
505+
@deprecate polyhedral_fan(f::scalar_type_or_field, Rays::AbstractCollection[RayVector], LS::AbstractCollection[RayVector], Incidence::Matrix{Bool}) polyhedral_fan(f, Rays, LS, IncidenceMatrix(Polymake.IncidenceMatrix(Incidence)))
506+
@deprecate polyhedral_fan(f::scalar_type_or_field, Rays::AbstractCollection[RayVector], Incidence::Matrix{Bool}) polyhedral_fan(f, Rays, IncidenceMatrix(Polymake.IncidenceMatrix(Incidence)))
507+
@deprecate normal_toric_variety(rays::AbstractCollection[RayVector], max_cones::IncidenceMatrix; non_redundant::Bool = false) normal_toric_variety(max_cones, rays; non_redundant)

0 commit comments

Comments
 (0)