Skip to content

Use the new API to access nodes and adjacency matrix #147

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

Closed
blegat wants to merge 2 commits into from
Closed

Use the new API to access nodes and adjacency matrix #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e57553e
Use the new API to access nodes and adjacency matrix
blegat May 9, 2025
06be9fd
Checkout MOI branch
blegat May 9, 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
7 changes: 7 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ jobs:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- uses: julia-actions/cache@v1
- name: MOI
shell: julia --project=@. {0}
run: |
using Pkg
Pkg.add([
PackageSpec(name="MathOptInterface", rev="bl/expression_adj"),
])
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
- uses: julia-actions/julia-processcoverage@v1
Expand Down
8 changes: 4 additions & 4 deletions src/eago_optimizer/functions/nonlinear/graph/graphs/directed_tree.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,9 @@ user_multivariate_operator(g::DAT, i) = g.user_operators.registered_multivariate

function DirectedTree(aux_info, d, op::OperatorRegistry, sub_sparsity::Dict{Int,Vector{Int}}, subexpr_linearity, parameter_values, is_sub, subexpr_indx)

nd = copy(d.nodes)
adj = copy(d.adj)
const_values = copy(d.const_values)
nd = copy(MOI.Nonlinear.expression(d).nodes)
adj = copy(MOI.Nonlinear.adjacency_matrix(d))
const_values = copy(MOI.Nonlinear.expression(d).values)

sparsity, dependent_subexpressions = _compute_sparsity(d, sub_sparsity, is_sub, subexpr_indx)
dependent_subexpression_dict = Dict{Int,Int}()
Expand All @@ -243,7 +243,7 @@ function DirectedTree(aux_info, d, op::OperatorRegistry, sub_sparsity::Dict{Int,
rev_sparsity[s] = i
end

nodes = _convert_node_list(aux_info, d.nodes, op)
nodes = _convert_node_list(aux_info, MOI.Nonlinear.expression(d).nodes, op)
lin = linearity(nd, adj, subexpr_linearity)
DirectedTree(nodes = nodes,
variables = rev_sparsity,
Expand Down
4 changes: 2 additions & 2 deletions src/eago_optimizer/functions/nonlinear/graph/utilities.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ sparsity(d::MOIRAD._FunctionStorage) = d.grad_sparsity
function _compute_sparsity(d::MOIRAD._FunctionStorage, sparse_dict::Dict{Int,Vector{Int}}, is_sub, subexpr_indx)
dep_subexpression = Int[]
variable_dict = Dict{Int,Bool}()
for n in d.nodes
for n in MOI.Nonlinear.expression(d).nodes
if n.type == MOINL.NODE_VARIABLE
if !haskey(variable_dict, n.index)
variable_dict[n.index] = true
Expand All @@ -74,7 +74,7 @@ end
function _compute_sparsity(d::MOIRAD._SubexpressionStorage, sparse_dict::Dict{Int,Vector{Int}}, is_sub, subexpr_indx)
dep_subexpression = Int[]
variable_dict = Dict{Int,Bool}()
for n in d.nodes
for n in MOI.Nonlinear.expression(d).nodes
if n.type == MOINL.NODE_VARIABLE
if !haskey(variable_dict, n.index)
variable_dict[n.index] = true
Expand Down
Loading