ANL-CEEESA/MIPLearn.jl
1
0
Fork 0
mirror of https://github.com/ANL-CEEESA/MIPLearn.jl.git synced 2025-12-06 08:28:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

FisSal2011: Improve estimated tableau density

Browse Source
This commit is contained in:
Alinson S. Xavier
2025-08-08 15:06:15 -05:00
parent 37f3abee42
commit 5e2b0c2958
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Cuts/tableau/gmi_dual.jl
View File

@@ -327,6 +327,7 @@ function collect_gmi_FisSal2011(
pool_cut_age = nothing pool_cut_age = nothing
pool_cut_hashes = Set{UInt64}() pool_cut_hashes = Set{UInt64}()
pool_size_mb = 0 pool_size_mb = 0
tableau_density::Float32 = 0.05
λ, Δ = 0, 0 λ, Δ = 0, 0
μ = 10 μ = 10
end end
@@ -470,7 +471,8 @@ function collect_gmi_FisSal2011(
end end
@timeit "Compute tableau rows" begin @timeit "Compute tableau rows" begin
tableau = compute_tableau(data_s, basis, x = sol_frac, rows = selected_rows) tableau = compute_tableau(data_s, basis, x = sol_frac, rows = selected_rows, estimated_density=tableau_density * 1.05)
tableau_density = nnz(tableau.lhs) / length(tableau.lhs)
assert_eq(tableau.lhs * sol_frac, tableau.rhs, atol=1e-3) assert_eq(tableau.lhs * sol_frac, tableau.rhs, atol=1e-3)
assert_eq(tableau.lhs * sol_opt_s, tableau.rhs, atol=1e-3) assert_eq(tableau.lhs * sol_opt_s, tableau.rhs, atol=1e-3)
end end

3
src/Cuts/tableau/tableau.jl
View File

@@ -58,6 +58,7 @@ function compute_tableau(
x::Union{Nothing,Vector{Float64}} = nothing, x::Union{Nothing,Vector{Float64}} = nothing,
rows::Union{Vector{Int},Nothing} = nothing, rows::Union{Vector{Int},Nothing} = nothing,
tol = 1e-8, tol = 1e-8,
estimated_density = 0.10,
)::Tableau )::Tableau
@timeit "Split data" begin @timeit "Split data" begin
nrows, ncols = size(data.constr_lhs) nrows, ncols = size(data.constr_lhs)
@@ -78,7 +79,7 @@ function compute_tableau(
tableau_lhs_I::Array{Int} = Int[] tableau_lhs_I::Array{Int} = Int[]
tableau_lhs_J::Array{Int} = Int[] tableau_lhs_J::Array{Int} = Int[]
tableau_lhs_V::Array{Float64} = Float64[] tableau_lhs_V::Array{Float64} = Float64[]
estimated_nnz::Int = length(rows) * ncols ÷ 20 estimated_nnz::Int = round(length(rows) * ncols * estimated_density)
sizehint!(tableau_lhs_I, estimated_nnz) sizehint!(tableau_lhs_I, estimated_nnz)
sizehint!(tableau_lhs_J, estimated_nnz) sizehint!(tableau_lhs_J, estimated_nnz)
sizehint!(tableau_lhs_V, estimated_nnz) sizehint!(tableau_lhs_V, estimated_nnz)