From 70b1f1536f64300ace76b6ee9f5eab434eb17211 Mon Sep 17 00:00:00 2001 From: Gioni Mexi Date: Tue, 18 Jul 2023 18:04:20 +0200 Subject: [PATCH] remove extra whitespaces in some files --- src/scip/conflict_dualproofanalysis.c | 14 ++++---- src/scip/conflict_general.c | 2 +- src/scip/cons.c | 38 ++++++++++---------- src/scip/cons.h | 4 +-- src/scip/cons_setppc.c | 50 +++++++++++++-------------- src/scip/cons_varbound.c | 14 ++++---- src/scip/disp_default.c | 2 +- src/scip/prop.c | 4 +-- src/scip/pub_cons.h | 6 ++-- src/scip/struct_set.h | 2 +- 10 files changed, 68 insertions(+), 68 deletions(-) diff --git a/src/scip/conflict_dualproofanalysis.c b/src/scip/conflict_dualproofanalysis.c index 0d8e018b94..6aecfdaf01 100644 --- a/src/scip/conflict_dualproofanalysis.c +++ b/src/scip/conflict_dualproofanalysis.c @@ -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; @@ -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) ); @@ -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; diff --git a/src/scip/conflict_general.c b/src/scip/conflict_general.c index 41eaa1144f..55cf62a6e7 100644 --- a/src/scip/conflict_general.c +++ b/src/scip/conflict_general.c @@ -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 */ diff --git a/src/scip/cons.c b/src/scip/cons.c index 721a4e120f..6c446cbc3e 100644 --- a/src/scip/cons.c +++ b/src/scip/cons.c @@ -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; @@ -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 ) @@ -1789,7 +1789,7 @@ SCIP_RETCODE conshdlrProcessUpdates( else if( cons->updatesepadisable ) { if( cons->sepaenabled ) - { + { SCIP_CALL( conshdlrDisableConsSeparation(conshdlr, cons) ); assert(!cons->sepaenabled); } @@ -1809,7 +1809,7 @@ SCIP_RETCODE conshdlrProcessUpdates( else if( cons->updatepropdisable ) { if( cons->propenabled ) - { + { SCIP_CALL( conshdlrDisableConsPropagation(conshdlr, cons) ); assert(!cons->propenabled); } @@ -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; } @@ -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; } @@ -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; } @@ -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; @@ -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; @@ -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; @@ -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; } @@ -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; } @@ -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) ); } @@ -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; } @@ -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 */ diff --git a/src/scip/cons.h b/src/scip/cons.h index ad700185d3..1e1fa7a3ba 100644 --- a/src/scip/cons.h +++ b/src/scip/cons.h @@ -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'. */ @@ -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'. */ diff --git a/src/scip/cons_setppc.c b/src/scip/cons_setppc.c index 0bcca1e1f1..b8cb04cfae 100644 --- a/src/scip/cons_setppc.c +++ b/src/scip/cons_setppc.c @@ -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 */ @@ -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 */ @@ -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. */ ) { @@ -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. */ ) { diff --git a/src/scip/cons_varbound.c b/src/scip/cons_varbound.c index ccc4281fa2..586b583a04 100644 --- a/src/scip/cons_varbound.c +++ b/src/scip/cons_varbound.c @@ -4255,9 +4255,9 @@ SCIP_DECL_LINCONSUPGD(linconsUpgdVarbound) /* create the bin variable bound constraint (an automatically upgraded constraint is always unmodifiable) */ assert(!SCIPconsIsModifiable(cons)); SCIP_CALL( SCIPcreateConsVarbound(scip, upgdcons, SCIPconsGetName(cons), var, vbdvar, vbdcoef, vbdlhs, vbdrhs, - SCIPconsIsInitial(cons), SCIPconsIsSeparated(cons), SCIPconsIsEnforced(cons), - SCIPconsIsChecked(cons), SCIPconsIsPropagated(cons), - SCIPconsIsLocal(cons), SCIPconsIsModifiable(cons), + SCIPconsIsInitial(cons), SCIPconsIsSeparated(cons), SCIPconsIsEnforced(cons), + SCIPconsIsChecked(cons), SCIPconsIsPropagated(cons), + SCIPconsIsLocal(cons), SCIPconsIsModifiable(cons), SCIPconsIsDynamic(cons), SCIPconsIsRemovable(cons), SCIPconsIsStickingAtNode(cons)) ); } @@ -4376,7 +4376,7 @@ SCIP_DECL_CONSDELETE(consDeleteVarbound) } -/** transforms constraint data into data belonging to the transformed problem */ +/** transforms constraint data into data belonging to the transformed problem */ static SCIP_DECL_CONSTRANS(consTransVarbound) { /*lint --e{715}*/ @@ -4400,7 +4400,7 @@ SCIP_DECL_CONSTRANS(consTransVarbound) SCIP_CALL( SCIPcreateCons(scip, targetcons, SCIPconsGetName(sourcecons), conshdlr, targetdata, SCIPconsIsInitial(sourcecons), SCIPconsIsSeparated(sourcecons), SCIPconsIsEnforced(sourcecons), SCIPconsIsChecked(sourcecons), SCIPconsIsPropagated(sourcecons), - SCIPconsIsLocal(sourcecons), SCIPconsIsModifiable(sourcecons), + SCIPconsIsLocal(sourcecons), SCIPconsIsModifiable(sourcecons), SCIPconsIsDynamic(sourcecons), SCIPconsIsRemovable(sourcecons), SCIPconsIsStickingAtNode(sourcecons)) ); /* catch events for variables */ @@ -4941,7 +4941,7 @@ SCIP_DECL_CONSPRINT(consPrintVarbound) SCIPinfoMessage(scip, file, "%.15g <= ", consdata->lhs); /* print coefficients and variables */ - SCIPinfoMessage(scip, file, "<%s>[%c] %+.15g<%s>[%c]", SCIPvarGetName(consdata->var), + SCIPinfoMessage(scip, file, "<%s>[%c] %+.15g<%s>[%c]", SCIPvarGetName(consdata->var), SCIPvarGetType(consdata->var) == SCIP_VARTYPE_BINARY ? SCIP_VARTYPE_BINARY_CHAR : SCIPvarGetType(consdata->var) == SCIP_VARTYPE_INTEGER ? SCIP_VARTYPE_INTEGER_CHAR : SCIPvarGetType(consdata->var) == SCIP_VARTYPE_IMPLINT ? SCIP_VARTYPE_IMPLINT_CHAR : SCIP_VARTYPE_CONTINUOUS_CHAR, @@ -4987,7 +4987,7 @@ SCIP_DECL_CONSCOPY(consCopyVarbound) /* copy the varbound using the linear constraint copy method */ SCIP_CALL( SCIPcopyConsLinear(scip, cons, sourcescip, consname, 2, vars, coefs, - SCIPgetLhsVarbound(sourcescip, sourcecons), SCIPgetRhsVarbound(sourcescip, sourcecons), varmap, consmap, + SCIPgetLhsVarbound(sourcescip, sourcecons), SCIPgetRhsVarbound(sourcescip, sourcecons), varmap, consmap, initial, separate, enforce, check, propagate, local, modifiable, dynamic, removable, stickingatnode, global, valid) ); SCIPfreeBufferArray(scip, &coefs); diff --git a/src/scip/disp_default.c b/src/scip/disp_default.c index 4f638ddad6..2ffdebe416 100644 --- a/src/scip/disp_default.c +++ b/src/scip/disp_default.c @@ -646,7 +646,7 @@ SCIP_DECL_DISPOUTPUT(SCIPdispOutputNLPAvgIters) if( SCIPgetNNodes(scip) < 2 ) SCIPinfoMessage(scip, file, " - "); else - SCIPinfoMessage(scip, file, "%6.1f ", + SCIPinfoMessage(scip, file, "%6.1f ", (SCIPgetNLPIterations(scip) - SCIPgetNRootLPIterations(scip)) / (SCIP_Real)(SCIPgetNTotalNodes(scip) - 1) ); return SCIP_OKAY; diff --git a/src/scip/prop.c b/src/scip/prop.c index 24c8403e4c..f043c5fa67 100644 --- a/src/scip/prop.c +++ b/src/scip/prop.c @@ -708,7 +708,7 @@ SCIP_RETCODE SCIPpropExec( && *result != SCIP_DELAYED && *result != SCIP_DELAYNODE ) { - SCIPerrorMessage("execution method of propagator <%s> returned invalid result <%d>\n", + SCIPerrorMessage("execution method of propagator <%s> returned invalid result <%d>\n", prop->name, *result); return SCIP_INVALIDRESULT; } @@ -771,7 +771,7 @@ SCIP_RETCODE SCIPpropResolvePropagation( /* check result code */ if( *result != SCIP_SUCCESS && *result != SCIP_DIDNOTFIND ) { - SCIPerrorMessage("propagation conflict resolving method of propagator <%s> returned invalid result <%d>\n", + SCIPerrorMessage("propagation conflict resolving method of propagator <%s> returned invalid result <%d>\n", prop->name, *result); return SCIP_INVALIDRESULT; } diff --git a/src/scip/pub_cons.h b/src/scip/pub_cons.h index 13c5e10bfe..b3f754f2a8 100644 --- a/src/scip/pub_cons.h +++ b/src/scip/pub_cons.h @@ -125,7 +125,7 @@ void SCIPconshdlrSetEnforelax( * * @note A constraint is active if it is global and was not removed or it was added locally (in that case the local * flag is TRUE) and the current node belongs to the corresponding sub tree. - */ + */ SCIP_EXPORT SCIP_CONS** SCIPconshdlrGetConss( SCIP_CONSHDLR* conshdlr /**< constraint handler */ @@ -174,7 +174,7 @@ int SCIPconshdlrGetNCheckConss( * * @note A constraint is active if it is global and was not removed or it was added locally (in that case the local * flag is TRUE) and the current node belongs to the corresponding sub tree. - */ + */ SCIP_EXPORT int SCIPconshdlrGetNActiveConss( SCIP_CONSHDLR* conshdlr /**< constraint handler */ @@ -548,7 +548,7 @@ void SCIPconshdlrSetPresolTiming( */ -/** 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 */ diff --git a/src/scip/struct_set.h b/src/scip/struct_set.h index c68bcfdaf4..b0d38218cd 100644 --- a/src/scip/struct_set.h +++ b/src/scip/struct_set.h @@ -342,7 +342,7 @@ struct SCIP_Set * freed at end of diving? */ int lp_colagelimit; /**< maximum age a column can reach before it is deleted from the SCIP_LP * (-1: don't delete columns due to aging) */ - int lp_rowagelimit; /**< maximum age a row can reach before it is deleted from the LP + int lp_rowagelimit; /**< maximum age a row can reach before it is deleted from the LP * (-1: don't delete rows due to aging) */ SCIP_Bool lp_cleanupcols; /**< should new non-basic columns be removed after LP solving? */ SCIP_Bool lp_cleanupcolsroot; /**< should new non-basic columns be removed after root LP solving? */