Skip to content

Commit

Permalink
Merge branch 'whitespaces-in-some-files' into 'master'
Browse files Browse the repository at this point in the history 
Whitespaces in some files

See merge request integer/scip!3121
  • Loading branch information
@GioniMexi
GioniMexi committed Jul 18, 2023
2 parents 97e5e5c + 70b1f15 commit e1ce3e2
Show file tree
Hide file tree
Showing 10 changed files with 68 additions and 68 deletions.
14 changes: 7 additions & 7 deletions src/scip/conflict_dualproofanalysis.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1290,8 +1290,8 @@ SCIP_RETCODE separateAlternativeProofs(
SCIP_Real* cutcoefs;
SCIP_Real cutefficacy;
SCIP_Real cutrhs;
SCIP_Real proofefficiacy;
SCIP_Real efficiacynorm;
SCIP_Real proofefficacy;
SCIP_Real efficacynorm;
SCIP_Bool islocal;
SCIP_Bool cutsuccess;
SCIP_Bool success;
Expand All @@ -1309,15 +1309,15 @@ SCIP_RETCODE separateAlternativeProofs(
inds = SCIPaggrRowGetInds(proofrow);
nnz = SCIPaggrRowGetNNz(proofrow);

proofefficiacy = SCIPaggrRowGetMinActivity(set, transprob, proofrow, curvarlbs, curvarubs, &infdelta);
proofefficacy = SCIPaggrRowGetMinActivity(set, transprob, proofrow, curvarlbs, curvarubs, &infdelta);

if( infdelta )
return SCIP_OKAY;

proofefficiacy -= SCIPaggrRowGetRhs(proofrow);
proofefficacy -= SCIPaggrRowGetRhs(proofrow);

efficiacynorm = SCIPaggrRowCalcEfficacyNorm(set->scip, proofrow);
proofefficiacy /= MAX(1e-6, efficiacynorm);
efficacynorm = SCIPaggrRowCalcEfficacyNorm(set->scip, proofrow);
proofefficacy /= MAX(1e-6, efficacynorm);

/* create reference solution */
SCIP_CALL( SCIPcreateSol(set->scip, &refsol, NULL) );
Expand Down Expand Up @@ -1361,7 +1361,7 @@ SCIP_RETCODE separateAlternativeProofs(
success = (success || cutsuccess);

/* replace the current proof */
if( success && !islocal && SCIPsetIsPositive(set, cutefficacy) && cutefficacy * nnz > proofefficiacy * cutnnz )
if( success && !islocal && SCIPsetIsPositive(set, cutefficacy) && cutefficacy * nnz > proofefficacy * cutnnz )
{
SCIP_PROOFSET* alternativeproofset;
SCIP_Bool redundant;
Expand Down
2 changes: 1 addition & 1 deletion src/scip/conflict_general.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1434,7 +1434,7 @@ SCIP_RETCODE SCIPgetDualProof(
*/

/* add the objective function to the aggregation row with respect to the current cutoff bound
*
*
* for an integral objective the right-hand side is reduced by the cutoff bound delta to cut off up to the next
* possible objective value below the cutoff bound
*/
Expand Down
38 changes: 19 additions & 19 deletions src/scip/cons.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1009,7 +1009,7 @@ SCIP_RETCODE conshdlrAddEnfocons(
{
/* we have to make sure that even this obsolete constraint is enforced in the next enforcement call;
* if the same LP or pseudo solution is enforced again, only the newly added useful constraints are
* enforced; thus, we have to reset the enforcement counters and force all constraints to be
* enforced; thus, we have to reset the enforcement counters and force all constraints to be
* enforced again; this is not needed for separation and propagation, because they are not vital for correctness
*/
conshdlr->lastenfolplpcount = -1;
Expand Down Expand Up @@ -1720,10 +1720,10 @@ SCIP_RETCODE conshdlrProcessUpdates(
|| cons->updatemarkpropagate || cons->updateunmarkpropagate);

SCIPsetDebugMsg(set, " -> constraint <%s>: insert=%u, activate=%u, deactivate=%u, enable=%u, disable=%u, sepaenable=%u, sepadisable=%u, propenable=%u, propdisable=%u, obsolete=%u, free=%u (consdata=%p)\n",
cons->name, cons->updateinsert, cons->updateactivate, cons->updatedeactivate,
cons->name, cons->updateinsert, cons->updateactivate, cons->updatedeactivate,
cons->updateenable, cons->updatedisable,
cons->updatesepaenable, cons->updatesepadisable,
cons->updatepropenable, cons->updatepropdisable,
cons->updatesepaenable, cons->updatesepadisable,
cons->updatepropenable, cons->updatepropdisable,
cons->updateobsolete, cons->updatefree, (void*)cons->consdata);

if( cons->updateinsert )
Expand Down Expand Up @@ -1789,7 +1789,7 @@ SCIP_RETCODE conshdlrProcessUpdates(
else if( cons->updatesepadisable )
{
if( cons->sepaenabled )
{
{
SCIP_CALL( conshdlrDisableConsSeparation(conshdlr, cons) );
assert(!cons->sepaenabled);
}
Expand All @@ -1809,7 +1809,7 @@ SCIP_RETCODE conshdlrProcessUpdates(
else if( cons->updatepropdisable )
{
if( cons->propenabled )
{
{
SCIP_CALL( conshdlrDisableConsPropagation(conshdlr, cons) );
assert(!cons->propenabled);
}
Expand Down Expand Up @@ -2994,7 +2994,7 @@ SCIP_RETCODE SCIPconshdlrSeparateLP(
&& *result != SCIP_DIDNOTRUN
&& *result != SCIP_DELAYED )
{
SCIPerrorMessage("LP separation method of constraint handler <%s> returned invalid result <%d>\n",
SCIPerrorMessage("LP separation method of constraint handler <%s> returned invalid result <%d>\n",
conshdlr->name, *result);
return SCIP_INVALIDRESULT;
}
Expand Down Expand Up @@ -3121,7 +3121,7 @@ SCIP_RETCODE SCIPconshdlrSeparateSol(
&& *result != SCIP_DIDNOTRUN
&& *result != SCIP_DELAYED )
{
SCIPerrorMessage("SOL separation method of constraint handler <%s> returned invalid result <%d>\n",
SCIPerrorMessage("SOL separation method of constraint handler <%s> returned invalid result <%d>\n",
conshdlr->name, *result);
return SCIP_INVALIDRESULT;
}
Expand Down Expand Up @@ -3491,7 +3491,7 @@ SCIP_RETCODE SCIPconshdlrEnforceLPSol(
&& *result != SCIP_INFEASIBLE
&& *result != SCIP_FEASIBLE )
{
SCIPerrorMessage("enforcing method of constraint handler <%s> for LP solutions returned invalid result <%d>\n",
SCIPerrorMessage("enforcing method of constraint handler <%s> for LP solutions returned invalid result <%d>\n",
conshdlr->name, *result);
return SCIP_INVALIDRESULT;
}
Expand Down Expand Up @@ -3563,8 +3563,8 @@ SCIP_RETCODE SCIPconshdlrEnforcePseudoSol(
assert(tree->nchildren == 0);
assert(result != NULL);

/* no enforcing of pseudo solution */
if( set->cons_disableenfops && SCIPbranchcandGetNPseudoCands(branchcand) > 0 )
/* no enforcing of pseudo solution */
if( set->cons_disableenfops && SCIPbranchcandGetNPseudoCands(branchcand) > 0 )
{
*result = SCIP_INFEASIBLE;
return SCIP_OKAY;
Expand Down Expand Up @@ -3625,7 +3625,7 @@ SCIP_RETCODE SCIPconshdlrEnforcePseudoSol(
assert(nusefulconss <= nconss);

/* constraint handlers without constraints should only be called once */
if( nconss > 0 || (!conshdlr->needscons && pschanged) )
if( nconss > 0 || (!conshdlr->needscons && pschanged) )
{
SCIP_CONS** conss;
SCIP_Longint oldndomchgs;
Expand Down Expand Up @@ -3674,7 +3674,7 @@ SCIP_RETCODE SCIPconshdlrEnforcePseudoSol(
conshdlr->nenfopscalls++;
else if( !objinfeasible )
{
SCIPerrorMessage("enforcing method of constraint handler <%s> for pseudo solutions was skipped, even though the solution was not objective-infeasible\n",
SCIPerrorMessage("enforcing method of constraint handler <%s> for pseudo solutions was skipped, even though the solution was not objective-infeasible\n",
conshdlr->name);
conshdlr->lastenfopsresult = *result;

Expand Down Expand Up @@ -3714,7 +3714,7 @@ SCIP_RETCODE SCIPconshdlrEnforcePseudoSol(
&& *result != SCIP_FEASIBLE
&& *result != SCIP_DIDNOTRUN )
{
SCIPerrorMessage("enforcing method of constraint handler <%s> for pseudo solutions returned invalid result <%d>\n",
SCIPerrorMessage("enforcing method of constraint handler <%s> for pseudo solutions returned invalid result <%d>\n",
conshdlr->name, *result);
return SCIP_INVALIDRESULT;
}
Expand Down Expand Up @@ -4099,7 +4099,7 @@ SCIP_RETCODE SCIPconshdlrPresolve(
&& *result != SCIP_DIDNOTRUN
&& *result != SCIP_DELAYED )
{
SCIPerrorMessage("presolving method of constraint handler <%s> returned invalid result <%d>\n",
SCIPerrorMessage("presolving method of constraint handler <%s> returned invalid result <%d>\n",
conshdlr->name, *result);
return SCIP_INVALIDRESULT;
}
Expand Down Expand Up @@ -6442,7 +6442,7 @@ SCIP_RETCODE SCIPconsTransform(
{
/* create new constraint with a pointer copy of the constraint data */
SCIP_CALL( SCIPconsCreate(transcons, blkmem, set, origcons->name, origcons->conshdlr, origcons->consdata, origcons->initial,
origcons->separate, origcons->enforce, origcons->check, origcons->propagate,
origcons->separate, origcons->enforce, origcons->check, origcons->propagate,
origcons->local, origcons->modifiable, origcons->dynamic, origcons->removable, origcons->stickingatnode,
FALSE, FALSE) );
}
Expand Down Expand Up @@ -7233,14 +7233,14 @@ SCIP_RETCODE SCIPconsResolvePropagation(
/* check result code */
if( *result != SCIP_SUCCESS && *result != SCIP_DIDNOTFIND )
{
SCIPerrorMessage("propagation conflict resolving method of constraint handler <%s> returned invalid result <%d>\n",
SCIPerrorMessage("propagation conflict resolving method of constraint handler <%s> returned invalid result <%d>\n",
conshdlr->name, *result);
return SCIP_INVALIDRESULT;
}
}
else
{
SCIPerrorMessage("propagation conflict resolving method of constraint handler <%s> is not implemented\n",
SCIPerrorMessage("propagation conflict resolving method of constraint handler <%s> is not implemented\n",
conshdlr->name);
return SCIP_PLUGINNOTFOUND;
}
Expand Down Expand Up @@ -8081,7 +8081,7 @@ void SCIPprintLinConsStats(
#undef SCIPconsIsAdded
#undef SCIPconsGetNUpgradeLocks

/** returns the name of the constraint
/** returns the name of the constraint
*
* @note to change the name of a constraint, use SCIPchgConsName() from scip.h
*/
Expand Down
4 changes: 2 additions & 2 deletions src/scip/cons.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ SCIP_RETCODE SCIPconsCreate(
* Usually set to FALSE. In column generation applications, set to TRUE if pricing
* adds coefficients to this constraint. */
SCIP_Bool dynamic, /**< is constraint subject to aging?
* Usually set to FALSE. Set to TRUE for own cuts which
* Usually set to FALSE. Set to TRUE for own cuts which
* are separated as constraints. */
SCIP_Bool removable, /**< should the relaxation be removed from the LP due to aging or cleanup?
* Usually set to FALSE. Set to TRUE for 'lazy constraints' and 'user cuts'. */
Expand Down Expand Up @@ -680,7 +680,7 @@ SCIP_RETCODE SCIPconsParse(
* Usually set to FALSE. In column generation applications, set to TRUE if pricing
* adds coefficients to this constraint. */
SCIP_Bool dynamic, /**< is constraint subject to aging?
* Usually set to FALSE. Set to TRUE for own cuts which
* Usually set to FALSE. Set to TRUE for own cuts which
* are separated as constraints. */
SCIP_Bool removable, /**< should the relaxation be removed from the LP due to aging or cleanup?
* Usually set to FALSE. Set to TRUE for 'lazy constraints' and 'user cuts'. */
Expand Down
50 changes: 25 additions & 25 deletions src/scip/cons_setppc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1658,9 +1658,9 @@ SCIP_RETCODE mergeMultiples(

assert(consdata->vars != NULL || consdata->nvars == 0);

/* sorting array after indices of variables, that's only for faster merging */
/* sorting array after indices of variables, that's only for faster merging */
SCIPsortPtr((void**)consdata->vars, SCIPvarCompActiveAndNegated, consdata->nvars);
/* setppc sorting now lost */
/* setppc sorting now lost */
consdata->sorted = FALSE;

/* loop backwards through the items: deletion only affects rear items */
Expand Down Expand Up @@ -6995,7 +6995,7 @@ SCIP_RETCODE enforceConstraint(
{
SCIP_CALL( separateCons(scip, conss[c], sol, TRUE, &cutoff, &separated, &reduceddom) );
}

#ifdef VARUSES
#ifdef BRANCHLP
/* @todo also branch on relaxation solution */
Expand Down Expand Up @@ -7034,28 +7034,28 @@ SCIP_RETCODE createConsSetppc(
int nvars, /**< number of variables in the constraint */
SCIP_VAR** vars, /**< array with variables of constraint entries */
SCIP_SETPPCTYPE setppctype, /**< type of constraint: set partitioning, packing, or covering constraint */
SCIP_Bool initial, /**< should the LP relaxation of constraint be in the initial LP?
SCIP_Bool initial, /**< should the LP relaxation of constraint be in the initial LP?
* Usually set to TRUE. Set to FALSE for 'lazy constraints'. */
SCIP_Bool separate, /**< should the constraint be separated during LP processing?
SCIP_Bool separate, /**< should the constraint be separated during LP processing?
* Usually set to TRUE. */
SCIP_Bool enforce, /**< should the constraint be enforced during node processing?
SCIP_Bool enforce, /**< should the constraint be enforced during node processing?
* TRUE for model constraints, FALSE for additional, redundant constraints. */
SCIP_Bool check, /**< should the constraint be checked for feasibility?
SCIP_Bool check, /**< should the constraint be checked for feasibility?
* TRUE for model constraints, FALSE for additional, redundant constraints. */
SCIP_Bool propagate, /**< should the constraint be propagated during node processing?
SCIP_Bool propagate, /**< should the constraint be propagated during node processing?
* Usually set to TRUE. */
SCIP_Bool local, /**< is constraint only valid locally?
SCIP_Bool local, /**< is constraint only valid locally?
* Usually set to FALSE. Has to be set to TRUE, e.g., for branching constraints. */
SCIP_Bool modifiable, /**< is constraint modifiable (subject to column generation)?
SCIP_Bool modifiable, /**< is constraint modifiable (subject to column generation)?
* Usually set to FALSE. In column generation applications, set to TRUE if pricing
* adds coefficients to this constraint. */
SCIP_Bool dynamic, /**< is constraint subject to aging?
* Usually set to FALSE. Set to TRUE for own cuts which
SCIP_Bool dynamic, /**< is constraint subject to aging?
* Usually set to FALSE. Set to TRUE for own cuts which
* are separated as constraints. */
SCIP_Bool removable, /**< should the relaxation be removed from the LP due to aging or cleanup?
SCIP_Bool removable, /**< should the relaxation be removed from the LP due to aging or cleanup?
* Usually set to FALSE. Set to TRUE for 'lazy constraints' and 'user cuts'. */
SCIP_Bool stickingatnode /**< should the constraint always be kept at the node where it was added, even
* if it may be moved to a more global node?
* if it may be moved to a more global node?
* Usually set to FALSE. Set to TRUE to for constraints that represent node data. */
)
{
Expand Down Expand Up @@ -7121,28 +7121,28 @@ SCIP_RETCODE createNormalizedSetppc(
SCIP_Real* vals, /**< array with coefficients (+1.0 or -1.0) */
int mult, /**< multiplier on the coefficients(+1 or -1) */
SCIP_SETPPCTYPE setppctype, /**< type of constraint: set partitioning, packing, or covering constraint */
SCIP_Bool initial, /**< should the LP relaxation of constraint be in the initial LP?
SCIP_Bool initial, /**< should the LP relaxation of constraint be in the initial LP?
* Usually set to TRUE. Set to FALSE for 'lazy constraints'. */
SCIP_Bool separate, /**< should the constraint be separated during LP processing?
SCIP_Bool separate, /**< should the constraint be separated during LP processing?
* Usually set to TRUE. */
SCIP_Bool enforce, /**< should the constraint be enforced during node processing?
SCIP_Bool enforce, /**< should the constraint be enforced during node processing?
* TRUE for model constraints, FALSE for additional, redundant constraints. */
SCIP_Bool check, /**< should the constraint be checked for feasibility?
SCIP_Bool check, /**< should the constraint be checked for feasibility?
* TRUE for model constraints, FALSE for additional, redundant constraints. */
SCIP_Bool propagate, /**< should the constraint be propagated during node processing?
SCIP_Bool propagate, /**< should the constraint be propagated during node processing?
* Usually set to TRUE. */
SCIP_Bool local, /**< is constraint only valid locally?
SCIP_Bool local, /**< is constraint only valid locally?
* Usually set to FALSE. Has to be set to TRUE, e.g., for branching constraints. */
SCIP_Bool modifiable, /**< is constraint modifiable (subject to column generation)?
SCIP_Bool modifiable, /**< is constraint modifiable (subject to column generation)?
* Usually set to FALSE. In column generation applications, set to TRUE if pricing
* adds coefficients to this constraint. */
SCIP_Bool dynamic, /**< is constraint subject to aging?
* Usually set to FALSE. Set to TRUE for own cuts which
SCIP_Bool dynamic, /**< is constraint subject to aging?
* Usually set to FALSE. Set to TRUE for own cuts which
* are separated as constraints. */
SCIP_Bool removable, /**< should the relaxation be removed from the LP due to aging or cleanup?
SCIP_Bool removable, /**< should the relaxation be removed from the LP due to aging or cleanup?
* Usually set to FALSE. Set to TRUE for 'lazy constraints' and 'user cuts'. */
SCIP_Bool stickingatnode /**< should the constraint always be kept at the node where it was added, even
* if it may be moved to a more global node?
* if it may be moved to a more global node?
* Usually set to FALSE. Set to TRUE to for constraints that represent node data. */
)
{
Expand Down
Loading

0 comments on commit e1ce3e2

Please sign in to comment.