Skip to content

Commit 702a615

Browse files
Joao-Dionisiosvigerske
authored andcommitted
Resorted to re-sorted
1 parent 21f0fe3 commit 702a615

17 files changed

+46
-46
lines changed

doc/xternal.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -3451,7 +3451,7 @@
34513451
* \n
34523452
* Note that this property only defines the default value of the priority. The user may change this value arbitrarily by
34533453
* adjusting the corresponding parameter setting. Whenever, even during solving, the priority of a cut selector is
3454-
* changed, the cut selectors are resorted by the new priorities.
3454+
* changed, the cut selectors are re-sorted by the new priorities.
34553455
*
34563456
*
34573457
* @section CUTSEL_DATA Cut Selector Data
@@ -3507,7 +3507,7 @@
35073507
* @subsection CUTSELSELECT
35083508
*
35093509
* The CUTSELSELECT callback should decide which cuts should be added to the relaxation.
3510-
* The callback receives the arrays of cuts to select from. This array must be resorted and the first nselectedcuts from
3510+
* The callback receives the arrays of cuts to select from. This array must be re-sorted and the first nselectedcuts from
35113511
* the sorted array are going to be selected.
35123512
* In addition to the aforementioned cuts, the list of forced cuts is also given as an argument. This array can be used
35133513
* to help with the selection algorithm. Note, however, that this array should not be tampered with.

src/scip/cons_cardinality.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3799,7 +3799,7 @@ SCIP_RETCODE SCIPcreateConsCardinality(
37993799
/** creates and captures a cardinality constraint with all constraint flags set to their default values.
38003800
*
38013801
* @warning Do NOT set the constraint to be modifiable manually, because this might lead
3802-
* to wrong results as the variable array will not be resorted
3802+
* to wrong results as the variable array will not be re-sorted
38033803
*
38043804
* @note the constraint gets captured, hence at one point you have to release it using the method \ref SCIPreleaseCons()
38053805
*/

src/scip/cons_cardinality.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ SCIP_RETCODE SCIPcreateConsCardinality(
122122
* @see SCIPcreateConsCardinality() for the default constraint flag configuration
123123
*
124124
* @warning Do NOT set the constraint to be modifiable manually, because this might lead
125-
* to wrong results as the variable array will not be resorted
125+
* to wrong results as the variable array will not be re-sorted
126126
*
127127
* @note the constraint gets captured, hence at one point you have to release it using the method SCIPreleaseCons()
128128
*/

src/scip/cons_knapsack.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13064,7 +13064,7 @@ SCIP_DECL_CONSRESPROP(consRespropKnapsack)
1306413064
else
1306513065
{
1306613066
/* locate the inference variable and calculate the capacity that has to be used up to conclude infervar == 0;
13067-
* inferinfo stores the position of the inference variable (but maybe the variables were resorted)
13067+
* inferinfo stores the position of the inference variable (but maybe the variables were re-sorted)
1306813068
*/
1306913069
if( inferinfo < consdata->nvars && consdata->vars[inferinfo] == infervar )
1307013070
capsum = consdata->weights[inferinfo];

src/scip/cons_sos1.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10702,7 +10702,7 @@ SCIP_RETCODE SCIPcreateConsSOS1(
1070210702
/** creates and captures a SOS1 constraint with all constraint flags set to their default values.
1070310703
*
1070410704
* @warning Do NOT set the constraint to be modifiable manually, because this might lead
10705-
* to wrong results as the variable array will not be resorted
10705+
* to wrong results as the variable array will not be re-sorted
1070610706
*
1070710707
* @note the constraint gets captured, hence at one point you have to release it using the method SCIPreleaseCons()
1070810708
*/

src/scip/cons_sos1.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ SCIP_RETCODE SCIPcreateConsSOS1(
116116
* @see SCIPcreateConsSOS1() for the default constraint flag configuration
117117
*
118118
* @warning Do NOT set the constraint to be modifiable manually, because this might lead
119-
* to wrong results as the variable array will not be resorted
119+
* to wrong results as the variable array will not be re-sorted
120120
*
121121
* @note the constraint gets captured, hence at one point you have to release it using the method SCIPreleaseCons()
122122
*/

src/scip/cons_sos2.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2664,7 +2664,7 @@ SCIP_RETCODE SCIPcreateConsSOS2(
26642664
/** creates and captures a SOS2 constraint with all constraint flags set to their default values.
26652665
*
26662666
* @warning Do NOT set the constraint to be modifiable manually, because this might lead
2667-
* to wrong results as the variable array will not be resorted
2667+
* to wrong results as the variable array will not be re-sorted
26682668
*
26692669
* @note the constraint gets captured, hence at one point you have to release it using the method SCIPreleaseCons()
26702670
*/

src/scip/cons_sos2.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ SCIP_RETCODE SCIPcreateConsSOS2(
109109
/** creates and captures a SOS2 constraint with all constraint flags set to their default values.
110110
*
111111
* @warning Do NOT set the constraint to be modifiable manually, because this might lead
112-
* to wrong results as the variable array will not be resorted
112+
* to wrong results as the variable array will not be re-sorted
113113
*
114114
* @note the constraint gets captured, hence at one point you have to release it using the method SCIPreleaseCons()
115115
*/

src/scip/cutsel_dynamic.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ SCIP_RETCODE SCIPincludeCutselDynamic(
533533
*
534534
* This is the selection method of the dynamic cut selector which implements
535535
* the dynamic orthognality filtering based on the ratio of efficacies.
536-
* The input cuts array gets resorted s.t the selected cuts come first and the remaining
536+
* The input cuts array gets re-sorted s.t the selected cuts come first and the remaining
537537
* ones are the end.
538538
*/
539539
SCIP_RETCODE SCIPselectCutsDynamic(

src/scip/cutsel_dynamic.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*
3838
* The selector allows the user to specify a filtering strategy during cut selection ('d'ynamic- and 'f'ull dynamic),
3939
* which determines how the orthogonality filtering is applied.
40-
* In both cases, after a cut is selected, the remaining cuts are resorted by computing their relative efficacy to the
40+
* In both cases, after a cut is selected, the remaining cuts are re-sorted by computing their relative efficacy to the
4141
* selected cut. The efficacy ratio is then used to filter the cuts based on the filtering strategy:
4242
* - 'd'ynamic-parallelism: The dynamic parallelism strategy filters cuts based on the efficacy ratio between cut
4343
* pairs. It only filters cuts that are not theoretically improving the efficacy of the pair given the first cut, i.e.,
@@ -80,7 +80,7 @@ SCIP_RETCODE SCIPincludeCutselDynamic(
8080
* This is an extension of the hybrid cutselector to employ a dynamic range
8181
* when applying orthogonality filtering, dependent on the efficacy ratio between cuts.
8282
*
83-
* The input cuts array should be resorted such that the selected cuts come first.
83+
* The input cuts array should be re-sorted such that the selected cuts come first.
8484
*/
8585
SCIP_EXPORT
8686
SCIP_RETCODE SCIPselectCutsDynamic(

src/scip/cutsel_hybrid.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ SCIP_RETCODE SCIPincludeCutselHybrid(
432432
*
433433
* This is the selection method of the hybrid cut selector which uses a weighted sum of the
434434
* efficacy, parallelism, directed cutoff distance, and the integral support.
435-
* The input cuts array gets resorted s.t the selected cuts come first and the remaining
435+
* The input cuts array gets re-sorted s.t the selected cuts come first and the remaining
436436
* ones are the end.
437437
*/
438438
SCIP_RETCODE SCIPselectCutsHybrid(

src/scip/cutsel_hybrid.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ SCIP_RETCODE SCIPincludeCutselHybrid(
9797
*
9898
* This is the selection method of the hybrid cut selector which uses a weighted sum of the
9999
* efficacy, parallelism, directed cutoff distance, and the integral support.
100-
* The input cuts array gets resorted s.t the selected cuts come first and the remaining
100+
* The input cuts array gets re-sorted s.t the selected cuts come first and the remaining
101101
* ones are the end.
102102
*/
103103
SCIP_EXPORT

src/scip/cutsel_xyz.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ SCIP_RETCODE SCIPincludeCutselXyz(
5656

5757
/** perform a cut selection algorithm for the given array of cuts
5858
*
59-
* The input cuts array should be resorted such that the selected cuts come first.
59+
* The input cuts array should be re-sorted such that the selected cuts come first.
6060
*/
6161
SCIP_EXPORT
6262
SCIP_RETCODE SCIPselectCutsXyz(

src/scip/prop_genvbounds.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -2295,7 +2295,7 @@ SCIP_RETCODE SCIPgenVBoundAdd(
22952295
SCIP_CALL( addNewGenVBound(scip, propdata, genvbound) );
22962296
}
22972297

2298-
/* mark genvbounds array to be resorted */
2298+
/* mark genvbounds array to be re-sorted */
22992299
propdata->issorted = FALSE;
23002300

23012301
/* debug message */
@@ -2540,7 +2540,7 @@ SCIP_DECL_PROPEXITPRE(propExitpreGenvbounds)
25402540
propdata->genvboundstore[i] = propdata->genvboundstore[propdata->ngenvbounds];
25412541
propdata->genvboundstore[i]->index = i;
25422542

2543-
/* mark genvbounds array to be resorted */
2543+
/* mark genvbounds array to be re-sorted */
25442544
propdata->issorted = FALSE;
25452545
}
25462546
}

src/scip/scip_var.c

+14-14
Original file line numberDiff line numberDiff line change
@@ -5685,7 +5685,7 @@ SCIP_Real SCIPadjustedVarUbExactFloat(
56855685
* that in conflict analysis, this change is treated like a branching decision
56865686
*
56875687
* @warning If SCIP is in presolving stage, it can happen that the internal variable array (which can be accessed via
5688-
* SCIPgetVars()) gets resorted.
5688+
* SCIPgetVars()) gets re-sorted.
56895689
*
56905690
* @return \ref SCIP_OKAY is returned if everything worked. Otherwise a suitable error code is passed. See \ref
56915691
* SCIP_Retcode "SCIP_RETCODE" for a complete list of error codes.
@@ -5863,7 +5863,7 @@ SCIP_RETCODE SCIPchgVarLbExact(
58635863
* that in conflict analysis, this change is treated like a branching decision
58645864
*
58655865
* @warning If SCIP is in presolving stage, it can happen that the internal variable array (which can be accessed via
5866-
* SCIPgetVars()) gets resorted.
5866+
* SCIPgetVars()) gets re-sorted.
58675867
*
58685868
* @return \ref SCIP_OKAY is returned if everything worked. Otherwise a suitable error code is passed. See \ref
58695869
* SCIP_Retcode "SCIP_RETCODE" for a complete list of error codes.
@@ -6128,7 +6128,7 @@ SCIP_RETCODE SCIPchgVarUbNode(
61286128
* if the global bound is better than the local bound
61296129
*
61306130
* @warning If SCIP is in presolving stage, it can happen that the internal variable array (which can be accessed via
6131-
* SCIPgetVars()) gets resorted.
6131+
* SCIPgetVars()) gets re-sorted.
61326132
*
61336133
* @return \ref SCIP_OKAY is returned if everything worked. Otherwise a suitable error code is passed. See \ref
61346134
* SCIP_Retcode "SCIP_RETCODE" for a complete list of error codes.
@@ -6217,7 +6217,7 @@ SCIP_RETCODE SCIPchgVarLbGlobal(
62176217
* if the global bound is better than the local bound
62186218
*
62196219
* @warning If SCIP is in presolving stage, it can happen that the internal variable array (which can be accessed via
6220-
* SCIPgetVars()) gets resorted.
6220+
* SCIPgetVars()) gets re-sorted.
62216221
*
62226222
* @return \ref SCIP_OKAY is returned if everything worked. Otherwise a suitable error code is passed. See \ref
62236223
* SCIP_Retcode "SCIP_RETCODE" for a complete list of error codes.
@@ -6390,7 +6390,7 @@ SCIP_RETCODE SCIPchgVarUbLazy(
63906390
* is treated like a branching decision
63916391
*
63926392
* @warning If SCIP is in presolving stage, it can happen that the internal variable array (which can be accessed via
6393-
* SCIPgetVars()) gets resorted.
6393+
* SCIPgetVars()) gets re-sorted.
63946394
*
63956395
* @return \ref SCIP_OKAY is returned if everything worked. Otherwise a suitable error code is passed. See \ref
63966396
* SCIP_Retcode "SCIP_RETCODE" for a complete list of error codes.
@@ -6640,7 +6640,7 @@ SCIP_RETCODE SCIPtightenVarLbExact(
66406640
* is treated like a branching decision
66416641
*
66426642
* @warning If SCIP is in presolving stage, it can happen that the internal variable array (which can be accessed via
6643-
* SCIPgetVars()) gets resorted.
6643+
* SCIPgetVars()) gets re-sorted.
66446644
*
66456645
* @return \ref SCIP_OKAY is returned if everything worked. Otherwise a suitable error code is passed. See \ref
66466646
* SCIP_Retcode "SCIP_RETCODE" for a complete list of error codes.
@@ -6892,7 +6892,7 @@ SCIP_RETCODE SCIPtightenVarUbExact(
68926892
* SCIPinferVarUbCons
68936893
*
68946894
* @note If SCIP is in presolving stage, it can happen that the internal variable array (which get be accessed via
6895-
* SCIPgetVars()) gets resorted.
6895+
* SCIPgetVars()) gets re-sorted.
68966896
*
68976897
* @note During presolving, an integer variable which bound changes to {0,1} is upgraded to a binary variable.
68986898
*/
@@ -6953,7 +6953,7 @@ SCIP_RETCODE SCIPinferVarFixCons(
69536953
* for the deduction of the bound change
69546954
*
69556955
* @warning If SCIP is in presolving stage, it can happen that the internal variable array (which can be accessed via
6956-
* SCIPgetVars()) gets resorted.
6956+
* SCIPgetVars()) gets re-sorted.
69576957
*
69586958
* @return \ref SCIP_OKAY is returned if everything worked. Otherwise a suitable error code is passed. See \ref
69596959
* SCIP_Retcode "SCIP_RETCODE" for a complete list of error codes.
@@ -7067,7 +7067,7 @@ SCIP_RETCODE SCIPinferVarLbCons(
70677067
* for the deduction of the bound change
70687068
*
70697069
* @warning If SCIP is in presolving stage, it can happen that the internal variable array (which can be accessed via
7070-
* SCIPgetVars()) gets resorted.
7070+
* SCIPgetVars()) gets re-sorted.
70717071
*
70727072
* @return \ref SCIP_OKAY is returned if everything worked. Otherwise a suitable error code is passed. See \ref
70737073
* SCIP_Retcode "SCIP_RETCODE" for a complete list of error codes.
@@ -7530,7 +7530,7 @@ SCIP_RETCODE SCIPinferBinvarCons(
75307530
* SCIPinferVarUbProp
75317531
*
75327532
* @note If SCIP is in presolving stage, it can happen that the internal variable array (which get be accessed via
7533-
* SCIPgetVars()) gets resorted.
7533+
* SCIPgetVars()) gets re-sorted.
75347534
*
75357535
* @note During presolving, an integer variable which bound changes to {0,1} is upgraded to a binary variable.
75367536
*/
@@ -7591,7 +7591,7 @@ SCIP_RETCODE SCIPinferVarFixProp(
75917591
* for the deduction of the bound change
75927592
*
75937593
* @warning If SCIP is in presolving stage, it can happen that the internal variable array (which can be accessed via
7594-
* SCIPgetVars()) gets resorted.
7594+
* SCIPgetVars()) gets re-sorted.
75957595
*
75967596
* @return \ref SCIP_OKAY is returned if everything worked. Otherwise a suitable error code is passed. See \ref
75977597
* SCIP_Retcode "SCIP_RETCODE" for a complete list of error codes.
@@ -7706,7 +7706,7 @@ SCIP_RETCODE SCIPinferVarLbProp(
77067706
* for the deduction of the bound change
77077707
*
77087708
* @warning If SCIP is in presolving stage, it can happen that the internal variable array (which can be accessed via
7709-
* SCIPgetVars()) gets resorted.
7709+
* SCIPgetVars()) gets re-sorted.
77107710
*
77117711
* @return \ref SCIP_OKAY is returned if everything worked. Otherwise a suitable error code is passed. See \ref
77127712
* SCIP_Retcode "SCIP_RETCODE" for a complete list of error codes.
@@ -8032,7 +8032,7 @@ SCIP_RETCODE tightenVarLbGlobalSafe(
80328032
* also tightens the local bound, if the global bound is better than the local bound
80338033
*
80348034
* @warning If SCIP is in presolving stage, it can happen that the internal variable array (which can be accessed via
8035-
* SCIPgetVars()) gets resorted.
8035+
* SCIPgetVars()) gets re-sorted.
80368036
*
80378037
* @return \ref SCIP_OKAY is returned if everything worked. Otherwise a suitable error code is passed. See \ref
80388038
* SCIP_Retcode "SCIP_RETCODE" for a complete list of error codes.
@@ -8263,7 +8263,7 @@ SCIP_RETCODE tightenVarUbGlobalSafe(
82638263
* also tightens the local bound, if the global bound is better than the local bound
82648264
*
82658265
* @warning If SCIP is in presolving stage, it can happen that the internal variable array (which can be accessed via
8266-
* SCIPgetVars()) gets resorted.
8266+
* SCIPgetVars()) gets re-sorted.
82678267
*
82688268
* @return \ref SCIP_OKAY is returned if everything worked. Otherwise a suitable error code is passed. See \ref
82698269
* SCIP_Retcode "SCIP_RETCODE" for a complete list of error codes.

0 commit comments

Comments
 (0)