Skip to content

Commit c9b7758

Browse files
svigerskesvigerske
committed
Merge branch 'v9-minor'
2 parents dadaf6a + c734b39 commit c9b7758

20 files changed

+95
-121
lines changed

‎CHANGELOG

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -505,13 +505,13 @@ Miscellaneous
505505

506506
- The TPI has been changed to become mostly independent from the actual parallel interface during compile time.
507507
For this, the locks and conditions are now pointers to abstract structs.
508-
- fixed that scip/def.h, the header for C preprocessor definition (#define's), included headers for some SCIP type and function definitions
508+
- fixed that scip/def.h, the header for C preprocessor definition (`#define`'s), included headers for some SCIP type and function definitions
509509
(scip/type_retcode.h, scip/type_message.h, scip/pub_message.h)
510510

511511

512-
@page RN80 Release notes for SCIP 8.1
512+
@page RN81 Release notes for SCIP 8.1
513513

514-
@section RN805 SCIP 8.1.0
514+
@section RN810 SCIP 8.1.0
515515
*************************
516516

517517
Fixed bugs

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ option(AMPL "should ampl interface be compiled" ON)
7878
option(IPOPT "should ipopt be linked" ON)
7979
option(LAPACK "should lapack be linked" OFF)
8080
option(WORHP "should worhp be linked" OFF)
81-
# for backward compability
81+
# for backward compatibility
8282
option(PARASCIP "should scip be compiled thread safe (deprecated, use THREADSAFE)" OFF)
8383
option(THREADSAFE "should scip be compiled thread safe" ON)
8484
option(LPSCHECK "double check SoPlex results with CPLEX" OFF)

‎doc/scip.dxy

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,8 +1121,7 @@ EXAMPLE_RECURSIVE = NO
11211121

11221122
IMAGE_PATH = pictures/ \
11231123
../examples/Binpacking/doc/pics \
1124-
../applications/Ringpacking/doc/pics \
1125-
../applications/STP/doc/pics
1124+
../applications/Ringpacking/doc/pics
11261125

11271126
# The INPUT_FILTER tag can be used to specify a program that doxygen should
11281127
# invoke to filter for each input file. Doxygen will invoke the filter program

‎doc/xternal.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,7 @@
405405
* New features, peformance improvements, and interface changes between different versions of SCIP are documented in the
406406
* release notes:
407407
*
408+
* - \subpage RN81 "SCIP 8.1"
408409
* - \subpage RN80 "SCIP 8.0"
409410
* - \subpage RN70 "SCIP 7.0"
410411
* - \subpage RN60 "SCIP 6.0"
@@ -985,14 +986,6 @@
985986
* </tr>
986987
* <tr>
987988
* <td>
988-
* @subpage POLYSCIP_MAIN
989-
* </td>
990-
* <td>
991-
* A solver for multi-objective optimization problems.
992-
* </td>
993-
* </tr>
994-
* <tr>
995-
* <td>
996989
* @subpage RINGPACKING_MAIN "Ringpacking"
997990
* </td>
998991
* <td>
@@ -8496,7 +8489,7 @@
84968489
* symmetries.
84978490
* -# Orbital reduction is a generalization of orbital fixing that also works for non-binary variable domains.
84988491
* Orbital reduction respects the 2-bit of the bitset <code>misc/usesymmetry</code>.
8499-
* See \ref SYMMETHODSELECT <method selection>. Since there is no static counterpart, this method ignores
8492+
* See \ref SYMMETHODSELECT "method selection". Since there is no static counterpart, this method ignores
85008493
* <code>propagating/symmetry/usedynamicprop</code>.
85018494
*
85028495
* In all cases, the dynamic variable ordering is derived from the branching decisions.

‎examples/maketestallexamples.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ set -e
1414
EXAMPLES=$(for f in *;do if [[ -d $f ]]; then echo $f;fi; done)
1515
# Sudoku doesn't have a test
1616
EXAMPLES=$(echo "$EXAMPLES" |grep -v Sudoku)
17+
# Binpacking tests are known to fail, #3712
18+
EXAMPLES=$(echo "$EXAMPLES" |grep -v Binpacking)
1719

1820
LPSOLVERS=(spx2)
1921
OPTS=(dbg)

‎src/scip/cons_sos1.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2412,13 +2412,13 @@ SCIP_RETCODE updateImplicationGraphSOS1(
24122412
SCIP_CONSHDLRDATA* conshdlrdata, /**< constraint handler data */
24132413
SCIP_DIGRAPH* conflictgraph, /**< conflict graph */
24142414
SCIP_Bool** adjacencymatrix, /**< adjacency matrix of conflict graph (lower half) */
2415-
SCIP_DIGRAPH* implgraph, /**< implication graph (@p j is successor of @p i if and only if \f$ x_i\not = 0 \Rightarrow x_j\not = 0\f$) */
2415+
SCIP_DIGRAPH* implgraph, /**< implication graph (\f$j\f$ is successor of \f$i\f$ if and only if \f$ x_i\not = 0 \Rightarrow x_j\not = 0\f$) */
24162416
SCIP_HASHMAP* implhash, /**< hash map from variable to node in implication graph */
24172417
SCIP_Bool* implnodes, /**< implnodes[i] = TRUE if the SOS1 variable corresponding to node i in the implication graph is implied to be nonzero */
24182418
SCIP_VAR** totalvars, /**< problem and SOS1 variables */
24192419
int** cliquecovers, /**< clique covers of linear constraint */
24202420
int* cliquecoversizes, /**< size of clique covers */
2421-
int* varincover, /**< array with varincover[i] = cover of SOS1 index @p i */
2421+
int* varincover, /**< array with varincover[i] = cover of SOS1 index \f$i\f$ */
24222422
SCIP_VAR** vars, /**< variables to be checked */
24232423
SCIP_Real* coefs, /**< coefficients of variables in linear constraint */
24242424
int nvars, /**< number of variables to be checked */
@@ -2564,19 +2564,19 @@ SCIP_RETCODE updateImplicationGraphSOS1(
25642564

25652565
/** search new disjoint clique that covers given node
25662566
*
2567-
* For a given vertex @p v search for a clique of the conflict graph induced by the variables of a linear constraint that
2568-
* - covers @p v and
2567+
* For a given vertex v search for a clique of the conflict graph induced by the variables of a linear constraint that
2568+
* - covers v and
25692569
* - has an an empty intersection with already computed clique cover.
25702570
*/
25712571
static
25722572
SCIP_RETCODE computeVarsCoverSOS1(
25732573
SCIP* scip, /**< SCIP pointer */
2574-
SCIP_DIGRAPH* conflictgraphroot, /**< conflict graph of the root node (nodes: 1, ..., @p nsos1vars) */
2575-
SCIP_DIGRAPH* conflictgraphlin, /**< conflict graph of linear constraint (nodes: 1, ..., @p nlinvars) */
2574+
SCIP_DIGRAPH* conflictgraphroot, /**< conflict graph of the root node (nodes: 1, ..., nsos1vars) */
2575+
SCIP_DIGRAPH* conflictgraphlin, /**< conflict graph of linear constraint (nodes: 1, ..., nlinvars) */
25762576
SCIP_VAR** linvars, /**< variables in linear constraint */
25772577
SCIP_Bool* coveredvars, /**< states which variables of the linear constraint are currently covered by a clique */
25782578
int* clique, /**< array to store new clique in cover */
2579-
int* cliquesize, /**< pointer to store the size of @p clique */
2579+
int* cliquesize, /**< pointer to store the size of clique */
25802580
int v, /**< position of variable in linear constraint that should be covered */
25812581
SCIP_Bool considersolvals /**< TRUE if largest auxiliary bigM values of variables should be prefered */
25822582
)

‎src/scip/nlhdlr_signomial.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
* negative exponents and \f$ t \f$ form negative variables \f$ v \f$, and the associated exponents form negative
6969
* exponents \f$ g \f$. Let \f$ s = \max(|f|,|g|) \f$ be a normalization constant, where \f$ |\cdot| \f$ denotes the L1 norm. Apply a scaling step:
7070
* Dividing the entries of \f$ f \f$ by \f$ s \f$, and dividing the entries of \f$ g \f$ by \f$ s \f$ as well. Then \f$ x^a = t \f$ has
71-
* a reformulation \f$ u^f = v^g \f$, where \f$ u^f, v^g \$ are two concave power functions.
71+
* a reformulation \f$ u^f = v^g \f$, where \f$ u^f, v^g \f$ are two concave power functions.
7272
*/
7373
struct SCIP_NlhdlrExprData
7474
{

‎src/scip/presol_qpkktref.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1550,10 +1550,10 @@ SCIP_RETCODE checkConsQuadraticProblem(
15501550
SCIP_EXPR* quadexpr, /**< quadratic expression */
15511551
SCIP_Bool allowbinary, /**< if TRUE then allow binary variables in the problem, if FALSE then all
15521552
* variables have to be continuous */
1553-
SCIP_VAR** objvar, /**< pointer to store the objective variable @p z */
1553+
SCIP_VAR** objvar, /**< pointer to store the objective variable z */
15541554
SCIP_Real* scale, /**< pointer to store the value by which we have to scale the quadratic
1555-
* constraint such that the objective variable @p z has coefficient -1 */
1556-
SCIP_Real* objrhs, /**< pointer to store the right hand side @p -d of the objective constraint */
1555+
* constraint such that the objective variable z has coefficient -1 */
1556+
SCIP_Real* objrhs, /**< pointer to store the right hand side -d of the objective constraint */
15571557
SCIP_Bool* isqp /**< pointer to store whether the problem is a (mixed-binary) QP */
15581558
)
15591559
{

‎src/scip/scip_copy.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1362,14 +1362,14 @@ void SCIPmergeNLPIStatistics(
13621362
*
13631363
* Given a subscip solution, fills an array with solution values, matching the variables given by SCIPgetVars().
13641364
* Variables that are relaxation-only in the master SCIP are set to 0 or the bound closest to 0. Such variables
1365-
* are represented as NULL entry in the \p subvars array.
1365+
* are represented as NULL entry in the subvars array.
13661366
*/
13671367
static
13681368
SCIP_RETCODE translateSubSol(
13691369
SCIP* scip, /**< SCIP data structure of the original problem */
13701370
SCIP* subscip, /**< SCIP data structure of the subproblem */
13711371
SCIP_SOL* subsol, /**< solution of the subproblem */
1372-
SCIP_VAR** subvars, /**< the variables from the subproblem in the same order as the main \p scip */
1372+
SCIP_VAR** subvars, /**< the variables from the subproblem in the same order as the main scip */
13731373
SCIP_Real* solvals /**< array where to set values taken from subsol, must have length at least SCIPgetNVars(scip) */
13741374
)
13751375
{
@@ -1401,16 +1401,16 @@ SCIP_RETCODE translateSubSol(
14011401
/** translates a solution from a subscip to the main scip
14021402
*
14031403
* Variables that are relaxation-only in the master SCIP are set to 0 or the bound closest to 0. Such variables
1404-
* are represented as NULL entry in the \p subvars array.
1404+
* are represented as NULL entry in the subvars array.
14051405
*
1406-
* @note This method allocates a new solution of the main \p scip that needs to be freed by the user.
1406+
* @note This method allocates a new solution of the main scip that needs to be freed by the user.
14071407
*/
14081408
SCIP_RETCODE SCIPtranslateSubSol(
14091409
SCIP* scip, /**< SCIP data structure of the original problem */
14101410
SCIP* subscip, /**< SCIP data structure of the subproblem */
14111411
SCIP_SOL* subsol, /**< solution of the subproblem */
14121412
SCIP_HEUR* heur, /**< heuristic that found the solution */
1413-
SCIP_VAR** subvars, /**< the variables from the subproblem in the same order as the main \p scip */
1413+
SCIP_VAR** subvars, /**< the variables from the subproblem in the same order as the main scip */
14141414
SCIP_SOL** newsol /**< buffer to store pointer to created solution in main SCIP */
14151415
)
14161416
{
@@ -1443,13 +1443,13 @@ SCIP_RETCODE SCIPtranslateSubSol(
14431443
/** checks the solutions from the subscip and adds the first one that is found feasible to the master SCIP
14441444
*
14451445
* Variables that are relaxation-only in the master SCIP are set to 0 or the bound closest to 0. Such variables
1446-
* are represented as NULL entry in the \p subvars array.
1446+
* are represented as NULL entry in the subvars array.
14471447
*/
14481448
SCIP_RETCODE SCIPtranslateSubSols(
14491449
SCIP* scip, /**< the SCIP data structure */
14501450
SCIP* subscip, /**< SCIP data structure of the subproblem */
14511451
SCIP_HEUR* heur, /**< heuristic that found the solution */
1452-
SCIP_VAR** subvars, /**< the variables from the subproblem in the same order as the main \p scip */
1452+
SCIP_VAR** subvars, /**< the variables from the subproblem in the same order as the main scip */
14531453
SCIP_Bool* success, /**< pointer to store, whether new solution was found */
14541454
int* solindex /**< pointer to store solution index of stored solution, or NULL if not of interest */
14551455
)
@@ -3338,7 +3338,7 @@ SCIP_RETCODE SCIPcopyLimits(
33383338
*/
33393339
SCIP_RETCODE SCIPsetCommonSubscipParams(
33403340
SCIP* sourcescip, /**< source SCIP data structure */
3341-
SCIP* subscip, /**< target SCIP data structure, often a copy of \p sourcescip */
3341+
SCIP* subscip, /**< target SCIP data structure, often a copy of sourcescip */
33423342
SCIP_Longint nsubnodes, /**< nodelimit for subscip, or -1 for no limit */
33433343
SCIP_Longint nstallnodes, /**< stall node limit for subscip, or -1 for no limit */
33443344
int bestsollimit /**< the limit on the number of best solutions found, or -1 for no limit */

‎src/scip/scip_copy.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -483,31 +483,31 @@ void SCIPmergeNLPIStatistics(
483483
/** translates a solution from a subscip to the main scip
484484
*
485485
* Variables that are relaxation-only in the master SCIP are set to 0 or the bound closest to 0. Such variables
486-
* are represented as NULL entry in the \p subvars array.
486+
* are represented as NULL entry in the subvars array.
487487
*
488-
* @note This method allocates a new solution of the main \p scip that needs to be freed by the user.
488+
* @note This method allocates a new solution of the main scip that needs to be freed by the user.
489489
*/
490490
SCIP_EXPORT
491491
SCIP_RETCODE SCIPtranslateSubSol(
492492
SCIP* scip, /**< SCIP data structure of the original problem */
493493
SCIP* subscip, /**< SCIP data structure of the subproblem */
494494
SCIP_SOL* subsol, /**< solution of the subproblem */
495495
SCIP_HEUR* heur, /**< heuristic that found the solution */
496-
SCIP_VAR** subvars, /**< the variables from the subproblem in the same order as the main \p scip */
496+
SCIP_VAR** subvars, /**< the variables from the subproblem in the same order as the main scip */
497497
SCIP_SOL** newsol /**< buffer to store pointer to created solution in main SCIP */
498498
);
499499

500500
/** checks the solutions from the subscip and adds the first one that is found feasible to the master SCIP
501501
*
502502
* Variables that are relaxation-only in the master SCIP are set to 0 or the bound closest to 0. Such variables
503-
* are represented as NULL entry in the \p subvars array.
503+
* are represented as NULL entry in the subvars array.
504504
*/
505505
SCIP_EXPORT
506506
SCIP_RETCODE SCIPtranslateSubSols(
507507
SCIP* scip, /**< the SCIP data structure */
508508
SCIP* subscip, /**< SCIP data structure of the subproblem */
509509
SCIP_HEUR* heur, /**< heuristic that found the solution */
510-
SCIP_VAR** subvars, /**< the variables from the subproblem in the same order as the main \p scip */
510+
SCIP_VAR** subvars, /**< the variables from the subproblem in the same order as the main scip */
511511
SCIP_Bool* success, /**< pointer to store, whether new solution was found */
512512
int* solindex /**< pointer to store solution index of stored solution, or NULL if not of interest */
513513
);
@@ -1276,7 +1276,7 @@ SCIP_RETCODE SCIPcopyLimits(
12761276
SCIP_EXPORT
12771277
SCIP_RETCODE SCIPsetCommonSubscipParams(
12781278
SCIP* sourcescip, /**< source SCIP data structure */
1279-
SCIP* subscip, /**< target SCIP data structure, often a copy of \p sourcescip */
1279+
SCIP* subscip, /**< target SCIP data structure, often a copy of sourcescip */
12801280
SCIP_Longint nsubnodes, /**< nodelimit for subscip, or -1 for no limit */
12811281
SCIP_Longint nstallnodes, /**< stall node limit for subscip, or -1 for no limit */
12821282
int bestsollimit /**< the limit on the number of best solutions found, or -1 for no limit */

‎src/scip/scip_solvingstats.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,6 @@ int SCIPgetNReoptRuns(
164164
}
165165

166166
/** add given number to the number of processed nodes in current run and in all runs, including the focus node
167-
*
168-
* @return the number of processed nodes in current run, including the focus node
169167
*
170168
* @pre This method can be called if SCIP is in one of the following stages:
171169
* - \ref SCIP_STAGE_PROBLEM
@@ -2275,9 +2273,7 @@ SCIP_Real SCIPgetAvgCutoffScoreCurrentRun(
22752273
return SCIPbranchGetScore(scip->set, NULL, cutoffsdown, cutoffsup);
22762274
}
22772275

2278-
/** returns the average normalized efficacy of a GMI cut over all variables
2279-
*
2280-
* @return increases the average normalized efficacy of a GMI cut over all variables
2276+
/** increases the average normalized efficacy of a GMI cut over all variables
22812277
*
22822278
* @pre This method can be called if SCIP is in one of the following stages:
22832279
* - \ref SCIP_STAGE_SOLVING

‎src/scip/scip_solvingstats.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ int SCIPgetNReoptRuns(
103103
);
104104

105105
/** add given number to the number of processed nodes in current run and in all runs, including the focus node
106-
*
107-
* @return the number of processed nodes in current run, including the focus node
108106
*
109107
* @pre This method can be called if SCIP is in one of the following stages:
110108
* - \ref SCIP_STAGE_PROBLEM
@@ -1650,9 +1648,7 @@ SCIP_Real SCIPgetAvgGMIeff(
16501648
SCIP* scip /**< SCIP data structure */
16511649
);
16521650

1653-
/** returns the average normalized efficacy of a GMI cut over all variables
1654-
*
1655-
* @return increases the average normalized efficacy of a GMI cut over all variables
1651+
/** increases the average normalized efficacy of a GMI cut over all variables
16561652
*
16571653
* @pre This method can be called if SCIP is in one of the following stages:
16581654
* - \ref SCIP_STAGE_SOLVING

‎src/scip/scip_var.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,9 +1144,6 @@ SCIP_RETCODE SCIPparseVarsPolynomial(
11441144
}
11451145

11461146
/** frees memory allocated when parsing a signomial from a string
1147-
*
1148-
* @return \ref SCIP_OKAY is returned if everything worked. Otherwise a suitable error code is passed. See \ref
1149-
* SCIP_Retcode "SCIP_RETCODE" for a complete list of error codes.
11501147
*
11511148
* @pre This method can be called if @p scip is in one of the following stages:
11521149
* - \ref SCIP_STAGE_PROBLEM

‎src/scip/scip_var.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -448,9 +448,6 @@ SCIP_RETCODE SCIPparseVarsPolynomial(
448448
);
449449

450450
/** frees memory allocated when parsing a signomial from a string
451-
*
452-
* @return \ref SCIP_OKAY is returned if everything worked. Otherwise a suitable error code is passed. See \ref
453-
* SCIP_Retcode "SCIP_RETCODE" for a complete list of error codes.
454451
*
455452
* @pre This method can be called if @p scip is in one of the following stages:
456453
* - \ref SCIP_STAGE_PROBLEM

0 commit comments

Comments
 (0)