Skip to content
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

Jump to bottom

Allow changing coefficient type in read_from_file #3801

Merged
merged 6 commits into from
Aug 8, 2024
Merged

Allow changing coefficient type in read_from_file #3801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0e56e00
Allow changing coefficient type in read_from_file
blegat Aug 7, 2024
c9e73b9
New approach
blegat Aug 8, 2024
0bffc95
Mention MOF
blegat Aug 8, 2024
93fd1f9
Fix
blegat Aug 8, 2024
cce1fad
Add test
blegat Aug 8, 2024
c6a5688
Update test_file_formats.jl
odow Aug 8, 2024
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
15 changes: 10 additions & 5 deletions src/file_formats.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,14 @@ function Base.write(
return
end

_value_type(::MOI.Utilities.AbstractModelLike{T}) where {T} = T

# This fallback may not get the correct value type. However, since
# all models defined in `MOI.FileFormats` return a
# `MOI.Utilities.GenericModel` except `NL` and `MOF` which only supports
# `Float64`, this does the job for now.
_value_type(::MOI.ModelLike) = Float64

"""
read_from_file(
filename::String;
Expand All @@ -107,12 +115,9 @@ function read_from_file(
format::MOI.FileFormats.FileFormat = MOI.FileFormats.FORMAT_AUTOMATIC,
kwargs...,
)
src =
MOI.FileFormats.Model(; format = format, filename = filename, kwargs...)
src = MOI.FileFormats.Model(; format, filename, kwargs...)
MOI.read_from_file(src, filename)
# TODO(odow): what number type to choose? Are there any non-Float64 file
# formats?
model = GenericModel{Float64}()
model = GenericModel{_value_type(src)}()
MOI.copy_to(model, src)
return model
end
Expand Down
14 changes: 14 additions & 0 deletions test/test_file_formats.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ module TestFileFormats
using JuMP
using Test

import LinearAlgebra

function test_mof_file()
model = Model()
@variable(model, x)
Expand Down Expand Up @@ -138,4 +140,16 @@ function test_nl_round_trip()
return
end

function test_sdpa_bigfloat()
model = Model()
@variable(model, x)
@constraint(model, LinearAlgebra.Symmetric([1 x; x 1]) in PSDCone())
@objective(model, Max, 2x)
write_to_file(model, "model.dat-s")
model_2 = read_from_file("model.dat-s"; number_type = BigFloat)
@test model_2 isa GenericModel{BigFloat}
rm("model.dat-s")
return
end

end
Loading