Skip to content

Commit 17ab4ef

Browse files
GioniMexiGioniMexi
committed
Merge branch '3952-rename-scipaddupgrade' into 'v100-bugfix'
Resolve "rename SCIPaddUpgrade()" See merge request integer/scip!4046
2 parents b6a2995 + 70eae89 commit 17ab4ef

File tree

14 files changed

+22
-22
lines changed

14 files changed

+22
-22
lines changed

‎CHANGELOG‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ Interface changes
202202
- SCIPconshdlrSetNeedsCons() to set whether constraint handler callbacks should also be called if there are no constraints
203203
- SCIPpropSetTimingmask() to set timing mask of a propagator
204204
- added C++ interface for expression handlers: src/objscip/objexprhdlr.h
205-
- SCIPaddUpgrade() to add constraint upgrades while especially informing the conflict store
205+
- SCIPaddConsUpgrade() to add constraint upgrades while especially informing the conflict store
206206
- SCIPincludeNlpSolverConopt(), SCIPsetLicenseConopt(), SCIPgetSolverNameConopt(), SCIPgetSolverDescConopt(), and SCIPisConoptAvailableConopt() to interact with the CONOPT interface
207207
- SCIPnlpiOracleGetConstraintLinearCoef() to get a linear coefficient of a variable in a given constraint in the NLP oracle
208208
- SCIPnlpiOracleGetJacobianColSparsity() to get the columnwise sparsity pattern of the Jacobian from the NLP oracle

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_DEBUG} ${CMAKE_CXX_FLAGS_R
2626
set(SCIP_VERSION_MAJOR 10)
2727
set(SCIP_VERSION_MINOR 0)
2828
set(SCIP_VERSION_PATCH 0)
29-
set(SCIP_VERSION_API 155)
29+
set(SCIP_VERSION_API 156)
3030

3131
project(SCIP
3232
VERSION ${SCIP_VERSION_MAJOR}.${SCIP_VERSION_MINOR}.${SCIP_VERSION_PATCH}

‎make/make.project‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ SPLINT ?= splint
172172
SCIP_VERSION_MAJOR = 10
173173
SCIP_VERSION_MINOR = 0
174174
SCIP_VERSION_PATCH = 0
175-
SCIP_VERSION_API = 155
175+
SCIP_VERSION_API = 156
176176
SCIP_VERSION = $(SCIP_VERSION_MAJOR).$(SCIP_VERSION_MINOR).$(SCIP_VERSION_PATCH)
177177

178178
#-----------------------------------------------------------------------------

‎src/scip/cons_and.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1483,7 +1483,7 @@ SCIP_RETCODE consdataLinearize(
14831483
{
14841484
/* add and release new constraint */
14851485
SCIPdebugPrintCons(scip, lincons, NULL); /*lint !e644*/
1486-
SCIP_CALL( SCIPaddUpgrade(scip, cons, &lincons) );
1486+
SCIP_CALL( SCIPaddConsUpgrade(scip, cons, &lincons) );
14871487
++(*nupgdconss);
14881488
}
14891489

@@ -2885,7 +2885,7 @@ SCIP_RETCODE cliquePresolve(
28852885
SCIPconsIsStickingAtNode(cons)) );
28862886
SCIPdebugMsg(scip, " -> adding clique constraint: ");
28872887
SCIPdebugPrintCons(scip, cliquecons, NULL);
2888-
SCIP_CALL( SCIPaddUpgrade(scip, cons, &cliquecons) );
2888+
SCIP_CALL( SCIPaddConsUpgrade(scip, cons, &cliquecons) );
28892889
++(*naddconss);
28902890

28912891
SCIP_CALL( SCIPdelCons(scip, cons) );
@@ -3294,7 +3294,7 @@ SCIP_RETCODE cliquePresolve(
32943294
SCIPconsIsStickingAtNode(cons)) );
32953295
SCIPdebugMsg(scip, " -> upgrading AND-constraint <%s> with use of clique information to a set-partitioning constraint: \n", SCIPconsGetName(cons));
32963296
SCIPdebugPrintCons(scip, cliquecons, NULL);
3297-
SCIP_CALL( SCIPaddUpgrade(scip, cons, &cliquecons) );
3297+
SCIP_CALL( SCIPaddConsUpgrade(scip, cons, &cliquecons) );
32983298
++(*naddconss);
32993299

33003300
/* delete old constraint */

‎src/scip/cons_bounddisjunction.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,7 +1253,7 @@ SCIP_RETCODE upgradeCons(
12531253
/* add the upgraded constraint to the problem */
12541254
SCIPdebugMsg(scip, "upgrading constraint <%s> to the following %s constraint\n", SCIPconsGetName(cons), (nvars == 2 ? "setppc" : "logicor"));
12551255
SCIPdebugPrintCons(scip, newcons, NULL);
1256-
SCIP_CALL( SCIPaddUpgrade(scip, cons, &newcons) );
1256+
SCIP_CALL( SCIPaddConsUpgrade(scip, cons, &newcons) );
12571257
++(*naddconss);
12581258

12591259
/* remove the underlying constraint from the problem */
@@ -2591,7 +2591,7 @@ SCIP_DECL_CONSPRESOL(consPresolBounddisjunction)
25912591
}
25922592

25932593
/* add the upgraded constraint to the problem */
2594-
SCIP_CALL( SCIPaddUpgrade(scip, cons, &lincons) );
2594+
SCIP_CALL( SCIPaddConsUpgrade(scip, cons, &lincons) );
25952595
++(*nupgdconss);
25962596
}
25972597

‎src/scip/cons_knapsack.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7888,7 +7888,7 @@ SCIP_RETCODE upgradeCons(
78887888
}
78897889

78907890
/* add the upgraded constraint to the problem */
7891-
SCIP_CALL( SCIPaddUpgrade(scip, cons, &newcons) );
7891+
SCIP_CALL( SCIPaddConsUpgrade(scip, cons, &newcons) );
78927892
++(*naddconss);
78937893

78947894
/* remove the underlying constraint from the problem */
@@ -8497,7 +8497,7 @@ SCIP_RETCODE dualWeightsTightening(
84978497
SCIPconsIsStickingAtNode(cons)) );
84988498

84998499
/* add the upgraded constraint to the problem */
8500-
SCIP_CALL( SCIPaddUpgrade(scip, cons, &newcons) );
8500+
SCIP_CALL( SCIPaddConsUpgrade(scip, cons, &newcons) );
85018501
++(*naddconss);
85028502

85038503
/* remove the underlying constraint from the problem */
@@ -13009,7 +13009,7 @@ SCIP_DECL_CONSPRESOL(consPresolKnapsack)
1300913009
SCIPinfoMessage(scip, NULL, "\n");
1301013010
#endif
1301113011
/* add the upgraded constraint to the problem */
13012-
SCIP_CALL( SCIPaddUpgrade(scip, cons, &cardcons) );
13012+
SCIP_CALL( SCIPaddConsUpgrade(scip, cons, &cardcons) );
1301313013
++(*nupgdconss);
1301413014

1301513015
/* delete oknapsack constraint */

‎src/scip/cons_linear.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12867,7 +12867,7 @@ SCIP_RETCODE aggregateConstraints(
1286712867
*aggregated = TRUE;
1286812868

1286912869
/* add the new linear constraint to the problem and delete the old constraint */
12870-
SCIP_CALL( SCIPaddUpgrade(scip, cons0, &newcons) );
12870+
SCIP_CALL( SCIPaddConsUpgrade(scip, cons0, &newcons) );
1287112871
SCIP_CALL( SCIPdelCons(scip, cons0) );
1287212872
}
1287312873
else
@@ -16673,7 +16673,7 @@ SCIP_DECL_CONSPRESOL(consPresolLinear)
1667316673
if( upgdcons != NULL )
1667416674
{
1667516675
/* add the upgraded constraint to the problem */
16676-
SCIP_CALL( SCIPaddUpgrade(scip, cons, &upgdcons) );
16676+
SCIP_CALL( SCIPaddConsUpgrade(scip, cons, &upgdcons) );
1667716677
++(*nupgdconss);
1667816678

1667916679
/* mark the linear constraint being upgraded and to be removed after presolving;

‎src/scip/cons_logicor.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3663,7 +3663,7 @@ SCIP_RETCODE removeConstraintsDueToNegCliques(
36633663
SCIPconsIsDynamic(cons), SCIPconsIsRemovable(cons), SCIPconsIsStickingAtNode(cons)) );
36643664

36653665
SCIPdebugPrintCons(scip, newcons, NULL);
3666-
SCIP_CALL( SCIPaddUpgrade(scip, cons, &newcons) );
3666+
SCIP_CALL( SCIPaddConsUpgrade(scip, cons, &newcons) );
36673667

36683668
SCIPdebugMsg(scip, "logicor constraint <%s> is redundant due to negated clique information and will be replaced by a setppc constraint \n",
36693669
SCIPconsGetName(cons));
@@ -3802,7 +3802,7 @@ SCIP_RETCODE fixDeleteOrUpgradeCons(
38023802
SCIPconsIsDynamic(cons), SCIPconsIsRemovable(cons), SCIPconsIsStickingAtNode(cons)) );
38033803

38043804
SCIPdebugPrintCons(scip, newcons, NULL);
3805-
SCIP_CALL( SCIPaddUpgrade(scip, cons, &newcons) );
3805+
SCIP_CALL( SCIPaddConsUpgrade(scip, cons, &newcons) );
38063806

38073807
SCIPdebugMsg(scip, "logicor constraint <%s> was upgraded to a set-packing constraint\n", SCIPconsGetName(cons));
38083808

‎src/scip/cons_or.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1382,7 +1382,7 @@ SCIP_RETCODE upgradeCons(
13821382
SCIPconsIsChecked(cons), SCIPconsIsPropagated(cons), SCIPconsIsLocal(cons),
13831383
SCIPconsIsModifiable(cons), SCIPconsIsDynamic(cons), SCIPconsIsRemovable(cons),
13841384
SCIPconsIsStickingAtNode(cons)) );
1385-
SCIP_CALL( SCIPaddUpgrade(scip, cons, &andcons) );
1385+
SCIP_CALL( SCIPaddConsUpgrade(scip, cons, &andcons) );
13861386

13871387
/* delete the or constraint */
13881388
SCIP_CALL( SCIPdelCons(scip, cons) );

‎src/scip/cons_sos1.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1784,7 +1784,7 @@ SCIP_RETCODE presolRoundConsSOS1(
17841784
SCIPconsIsInitial(cons), SCIPconsIsSeparated(cons), SCIPconsIsEnforced(cons), SCIPconsIsChecked(cons),
17851785
SCIPconsIsPropagated(cons), SCIPconsIsLocal(cons), SCIPconsIsModifiable(cons), SCIPconsIsDynamic(cons),
17861786
SCIPconsIsRemovable(cons), SCIPconsIsStickingAtNode(cons)) );
1787-
SCIP_CALL( SCIPaddUpgrade(scip, cons, &setpackcons) );
1787+
SCIP_CALL( SCIPaddConsUpgrade(scip, cons, &setpackcons) );
17881788

17891789
SCIPdebugMsg(scip, "Upgrading SOS1 constraint <%s> to set packing constraint.\n", SCIPconsGetName(cons));
17901790

0 commit comments

Comments
 (0)