Skip to content

Refactor tricky indexing with common function #55

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
blegat merged 3 commits into from
Jan 21, 2025
Merged

Refactor tricky indexing with common function #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5e6d98
Refactor tricky indexing with common function
blegat Jan 21, 2025
e9412a9
Make it internal
blegat Jan 21, 2025
da3b442
Fix
blegat Jan 21, 2025
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
2 changes: 1 addition & 1 deletion src/lp.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ function print_lpoutput(m::HMatrix, print_solution::Bool=false)
for i in 0:P.d-1
C_i = unsafe_load(P.C, i+1)
Col_i = unsafe_load(P.Col, i+1)
idx = unsafe_load(Q.inequality, C_i-Q.lastdv+1)
idx = _unsafe_load_inequality(m, C_i)
print(" y_$(idx)=")
temp1 = extractbigint(unsafe_load(Q.Lcm, Col_i+1)) * (-1)
temp1 *= extractbigint(unsafe_load(unsafe_load(P.A, 1), Col_i+1))
Expand Down
6 changes: 5 additions & 1 deletion src/matrix.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ function initmatrix(M::Matrix{Rational{BigInt}}, linset, Hrep::Bool)
(P, Q)
end


function fillmatrix(inequality::Bool, P::Ptr{Clrs_dic}, Q::Ptr{Clrs_dat}, itr::Polyhedra.ElemIt, offset::Int)
for (i, item) in enumerate(itr)
a = convert(Vector{Rational{BigInt}}, vec(coord(lift(item))))
Expand Down Expand Up @@ -176,6 +175,11 @@ Polyhedra.islin(vrep::VMatrix, idx::Polyhedra.VIndex{Rational{BigInt}}) = !(vrep
Polyhedra.done(idxs::Polyhedra.Indices{Rational{BigInt}, ElemT, <:RepMatrix}, idx::Polyhedra.Index{Rational{BigInt}, ElemT}) where {ElemT} = idx.value > length(idxs.rep)
Base.get(rep::RepMatrix, idx::Polyhedra.Index{Rational{BigInt}}) = Polyhedra.valuetype(idx)(extractrow(rep, idx.value)...)

function _unsafe_load_inequality(m::RepMatrix, idx)
Q = unsafe_load(m.Q)
return unsafe_load(Q.inequality, idx - Q.lastdv + 1)
end

# H-representation

#HMatrix{T}(rep::Rep{T}) = HMatrix{polytypefor(T), mytypefor(T)}(rep) # TODO finish this line
Expand Down
6 changes: 3 additions & 3 deletions src/nash.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,9 @@ function nash2_main(hr1::HMatrix, hr2::HMatrix, linindex::Vector{Clong})
for i in (unsafe_load(Q1).lastdv+1):(unsafe_load(P1).m)
Row_i = unsafe_load(unsafe_load(P1).Row, i+1)
if !iszero(extractbigintat(unsafe_load(A1, Row_i+1), 1))
j = unsafe_load(
unsafe_load(Q1).inequality,
unsafe_load(unsafe_load(P1).B, i+1)-unsafe_load(Q1).lastdv+1
j = _unsafe_load_inequality(
hr1,
unsafe_load(unsafe_load(P1).B, i+1),
)
if ((unsafe_load(Q1).nlinearity == 0) ||
(j < unsafe_load(unsafe_load(Q1).linearity, 1)))
Expand Down
4 changes: 2 additions & 2 deletions src/redund.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function redund(m::RepMatrix)

redset = BitSet()
for index in (lastdv + 1):(m_A + d)
ineq = unsafe_load(unsafe_load(m.Q).inequality, index - lastdv + 1) # the input inequality number corr. to this index
ineq = _unsafe_load_inequality(m, index) # the input inequality number corr. to this index

status = checkindex(m, index)
if :redundant == checkindex(m, index)
Expand All @@ -46,7 +46,7 @@ function redundi(m::RepMatrix, ineq::Int)
d = unsafe_load(m.P).d
lastdv = unsafe_load(m.Q).lastdv

index = lastdv + findfirst(i -> ineq == unsafe_load(unsafe_load(m.Q).inequality, i - lastdv + 1), (lastdv + 1):(m_A + d))
index = lastdv + findfirst(i -> ineq == _unsafe_load_inequality(m, i), (lastdv + 1):(m_A + d))

:redundant == checkindex(m, index)
end
Loading