Skip to content

Commit db91862

Browse files
use correct underscore signature for private funcs
1 parent 095a5d9 commit db91862

File tree

3 files changed

+88
-83
lines changed

3 files changed

+88
-83
lines changed

src/NonLinearProgram/NonLinearProgram.jl

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -356,32 +356,32 @@ end
356356

357357
include("nlp_utilities.jl")
358358

359-
all_variables(form::Form) = MOI.VariableIndex.(1:form.num_variables)
360-
all_variables(model::Model) = all_variables(model.model)
361-
all_params(form::Form) = collect(keys(form.var2param))
362-
all_params(model::Model) = all_params(model.model)
363-
all_primal_vars(form::Form) = setdiff(all_variables(form), all_params(form))
364-
all_primal_vars(model::Model) = all_primal_vars(model.model)
365-
366-
get_num_constraints(form::Form) = length(form.constraints_2_nlp_index)
367-
get_num_constraints(model::Model) = get_num_constraints(model.model)
368-
get_num_primal_vars(form::Form) = length(all_primal_vars(form))
369-
get_num_primal_vars(model::Model) = get_num_primal_vars(model.model)
370-
get_num_params(form::Form) = length(all_params(form))
371-
get_num_params(model::Model) = get_num_params(model.model)
359+
_all_variables(form::Form) = MOI.VariableIndex.(1:form.num_variables)
360+
_all_variables(model::Model) = _all_variables(model.model)
361+
_all_params(form::Form) = collect(keys(form.var2param))
362+
_all_params(model::Model) = _all_params(model.model)
363+
_all_primal_vars(form::Form) = setdiff(_all_variables(form), _all_params(form))
364+
_all_primal_vars(model::Model) = _all_primal_vars(model.model)
365+
366+
_get_num_constraints(form::Form) = length(form.constraints_2_nlp_index)
367+
_get_num_constraints(model::Model) = _get_num_constraints(model.model)
368+
_get_num_primal_vars(form::Form) = length(_all_primal_vars(form))
369+
_get_num_primal_vars(model::Model) = _get_num_primal_vars(model.model)
370+
_get_num_params(form::Form) = length(_all_params(form))
371+
_get_num_params(model::Model) = _get_num_params(model.model)
372372

373373
function _cache_evaluator!(model::Model)
374374
form = model.model
375375
# Retrieve and sort primal variables by NLP index
376-
params = sort(all_params(form); by = x -> x.value)
377-
primal_vars = sort(all_primal_vars(form); by = x -> x.value)
376+
params = sort(_all_params(form); by = x -> x.value)
377+
primal_vars = sort(_all_primal_vars(form); by = x -> x.value)
378378
num_primal = length(primal_vars)
379379

380380
# Create evaluator and constraints
381-
evaluator = create_evaluator(form)
382-
num_constraints = get_num_constraints(form)
381+
evaluator = _create_evaluator(form)
382+
num_constraints = _get_num_constraints(form)
383383
# Analyze constraints and bounds
384-
leq_locations, geq_locations = find_inequalities(form)
384+
leq_locations, geq_locations = _find_inequalities(form)
385385
num_leq = length(leq_locations)
386386
num_geq = length(geq_locations)
387387
has_up = findall(i -> haskey(form.upper_bounds, i.value), primal_vars)
@@ -451,7 +451,7 @@ function DiffOpt.forward_differentiate!(
451451
end
452452

453453
# Compute Jacobian
454-
Δs = compute_sensitivity(
454+
Δs = _compute_sensitivity(
455455
model;
456456
tol = tol,
457457
)
@@ -477,7 +477,7 @@ function DiffOpt.reverse_differentiate!(
477477
form = model.model
478478

479479
# Compute Jacobian
480-
Δs = compute_sensitivity(
480+
Δs = _compute_sensitivity(
481481
model;
482482
tol = tol,
483483
)

0 commit comments

Comments
 (0)