Skip to content

Commit 1ae3793

Browse files
committed
Cleanup renames
1 parent be30333 commit 1ae3793

File tree

2 files changed

+1
-17
lines changed

2 files changed

+1
-17
lines changed

src/constrained_variables.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function _select_constrained_variables(
4646
# and not a parameter
4747
vi ->
4848
!haskey(m.primal_convar_to_primal_convarcon_and_index, vi) &&
49-
!(vi in params),
49+
!(vi in params),
5050
f.variables,
5151
)
5252
for (i, vi) in enumerate(f.variables)

src/structures.jl

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ Main maps:
4545
their internal index from 1 to dimension(set) (if vector constraints:
4646
VectorOfVariables-in-Set), 1 otherwise (scalar: VariableIndex-in-Set).
4747
48-
note: this set is important to dualization can keep track of what it
49-
decided to define as a constrained variable.
50-
- consider index 0 to highlight scalars
51-
5248
* `primal_convarcon_to_dual_con::Dict{MOI.ConstraintIndex,MOI.ConstraintIndex}`: maps
5349
the primal constraint index of constrained variables to the dual
5450
model's constraint index of the associated dual constraint. This dual
@@ -57,31 +53,19 @@ Main maps:
5753
are not in this map, as they are not dualized (See
5854
primal_convarcon_to_dual_function).
5955
60-
note: from the above two maps, we can get primal_convar_to_dual_con_and_index
61-
6256
* `primal_var_to_dual_con::Dict{MOI.VariableIndex,MOI.ConstraintIndex}`: maps
6357
"free" primal variables to their associated dual (equality) constraints.
6458
Free variables as opposed to constrained variables. Note that Dualization
6559
will select automatically which variables are free and which are
6660
constrained.
6761
68-
note: from the above three maps, we can get primal_var_to_dual_con_and_index
69-
70-
# TODO: idea, for simmetry, keep only
71-
- primal_convarcon_to_dual_con (as is), analogous to primal_con_to_dual_convarcon
72-
- primal_var_to_dual_con_and_index, analogous to primal_con_to_dual_var_vec
73-
-- the second implicitly tracks which vars were decided to be convar's
74-
7562
* `primal_con_to_dual_var_vec::Dict{MOI.ConstraintIndex,Vector{MOI.VariableIndex}}`:
7663
maps primal constraint indices to vectors of dual variable indices. For
7764
scalar constraints those vectors will be single element vectors.
7865
Primal constrained variables constraints (the main ones) are not in this
7966
map. However, `VariableIndex`-in-set and `VectorOfVariables`-in-set might
8067
appear in this map if they were not chosen as the main ones.
8168
82-
note: possibly change this to:
83-
primal_con_to_dual_var_vec_and_convarcon
84-
8569
* `primal_con_to_dual_convarcon::Dict{MOI.ConstraintIndex,MOI.ConstraintIndex}`:
8670
maps regular primal constraints to dual constrained variable. If the primal
8771
constraint's set is EqualTo or Zeros, no constraint is added in the dual

0 commit comments

Comments
 (0)