Skip to content

Add high-level cone construction API #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fingolfin merged 1 commit into from
Jun 5, 2026
Merged

Add high-level cone construction API #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 28 additions & 5 deletions src/Normaliz.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,28 @@ computed_cone_properties(cone::Cone) = _string_vector(_computed_cone_properties(
is_computed(cone::Cone, property::AbstractString) = _is_computed(cone, property)
is_computed(cone::Cone, property::Symbol) = is_computed(cone, String(property))

_julia_cone_property(x) = x
_julia_cone_property(x::NmzInteger) = convert(BigInt, x)
_julia_cone_property(x::NmzRational) = convert(Rational{BigInt}, x)
_julia_cone_property(x::NmzMatrix{NmzInteger}) = Matrix{BigInt}(x)
_julia_cone_property(x::NmzMatrix{NmzRational}) = Matrix{Rational{BigInt}}(x)
_julia_cone_property(x::CxxWrap.StdLib.StdVector{NmzInteger}) =
convert.(BigInt, collect(x))
_julia_cone_property(x::CxxWrap.StdLib.StdVector{NmzRational}) =
convert.(Rational{BigInt}, collect(x))

function cone_property(cone::Cone, property::AbstractString)
output_type = _cone_property_output_type(property)
if output_type == "Matrix"
return get_matrix_cone_property(cone, property)
return _julia_cone_property(get_matrix_cone_property(cone, property))
elseif output_type == "Vector"
return get_vector_cone_property(cone, property)
return _julia_cone_property(get_vector_cone_property(cone, property))
elseif output_type == "Integer"
return get_integer_cone_property(cone, property)
return _julia_cone_property(get_integer_cone_property(cone, property))
elseif output_type == "GMPInteger"
return get_gmp_integer_cone_property(cone, property)
return _julia_cone_property(get_gmp_integer_cone_property(cone, property))
elseif output_type == "Rational"
return get_rational_cone_property(cone, property)
return _julia_cone_property(get_rational_cone_property(cone, property))
elseif output_type == "Float"
return get_float_cone_property(cone, property)
elseif output_type == "MachineInteger"
Expand Down Expand Up @@ -161,6 +171,19 @@ function LongLongCone(input::AbstractDict)
return _LongLongCone(input_keys, input_matrices)
end

function Cone(input::AbstractDict; type::Symbol = :gmp)
if type in (:gmp, :bigint, :NmzInteger)
return GMPCone(input)
elseif type in (:longlong, :long_long, :int64, :Int64)
return LongLongCone(input)
end
throw(ArgumentError("unsupported Normaliz cone type: $type"))
end

function Cone(; type::Symbol = :gmp, kwargs...)
return Cone(Dict{Symbol,Any}(kwargs); type)
end

Cone{NmzInteger}(args...) = GMPCone(args...)
Cone{BigInt}(args...) = GMPCone(args...)
Cone{Int64}(args...) = LongLongCone(args...)
Expand Down
38 changes: 28 additions & 10 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,29 @@ end
Normaliz.get_matrix_cone_property( yy, "SupportHyperplanes" )
end

@testset "high-level cone API" begin
yy = Normaliz.Cone(Dict(:cone => [1 2 ; 3 5], :grading => [1 1]))
@test yy isa Normaliz.Cone

hilbert_basis = Normaliz.cone_property(yy, :HilbertBasis)
@test hilbert_basis isa Matrix{BigInt}
@test hilbert_basis == BigInt[1 2 ; 3 5]

grading = Normaliz.cone_property(yy, :Grading)
@test grading isa Vector{BigInt}
@test grading == BigInt[1, 1]

@test Normaliz.cone_property(yy, :ExternalIndex) == big(1)
@test Normaliz.cone_property(yy, :Multiplicity) isa Rational{BigInt}
@test Normaliz.cone_property(yy, :EuclideanVolume) isa Float64
@test Normaliz.cone_property(yy, :EmbeddingDim) isa Int
@test Normaliz.cone_property(yy, :IsPointed) isa Bool

yy = Normaliz.Cone(; cone = [1 2 ; 3 5], grading = [1 1], type = :longlong)
@test yy isa Normaliz.Cone
@test Normaliz.cone_property(yy, :HilbertBasis) == BigInt[1 2 ; 3 5]
end

@testset "cone property queries" begin
known_properties = Normaliz.known_cone_properties()
@test known_properties isa Vector{String}
Expand Down Expand Up @@ -197,17 +220,12 @@ end

matrix_from_generic = Normaliz.cone_property(yy, :HilbertBasis)
matrix_from_typed = Normaliz.get_matrix_cone_property(yy, "HilbertBasis")
@test size(matrix_from_generic) == size(matrix_from_typed)
@test string(matrix_from_generic[1, 1]) == string(matrix_from_typed[1, 1])
@test matrix_from_generic == Matrix{BigInt}(matrix_from_typed)

@test typeof(Normaliz.cone_property(yy, :Grading)) ==
typeof(Normaliz.get_vector_cone_property(yy, "Grading"))
@test Normaliz.cone_property(yy, :TriangulationDetSum) ==
Normaliz.get_integer_cone_property(yy, "TriangulationDetSum")
@test string(Normaliz.cone_property(yy, :ExternalIndex)) ==
string(Normaliz.get_gmp_integer_cone_property(yy, "ExternalIndex"))
@test string(Normaliz.cone_property(yy, :Multiplicity)) ==
string(Normaliz.get_rational_cone_property(yy, "Multiplicity"))
@test eltype(Normaliz.cone_property(yy, :Grading)) <: Integer
@test Normaliz.cone_property(yy, :TriangulationDetSum) isa Integer
@test Normaliz.cone_property(yy, :ExternalIndex) isa BigInt
@test Normaliz.cone_property(yy, :Multiplicity) isa Rational{BigInt}
@test Normaliz.cone_property(yy, :EuclideanVolume) ==
Normaliz.get_float_cone_property(yy, "EuclideanVolume")
@test Normaliz.cone_property(yy, "EmbeddingDim") ==
Expand Down