From feb32e2028fef5fa167333da274e1dc436e9a378 Mon Sep 17 00:00:00 2001 From: Stefan Vigerske Date: Tue, 4 Jul 2023 10:48:45 +0200 Subject: [PATCH] remove or disable more unused-but-set variables - from clang 14.0.3 warnings --- Cgl/src/CglDuplicateRow/CglDuplicateRow.cpp | 8 +-- Cgl/src/CglFlowCover/CglFlowCover.cpp | 4 +- Cgl/src/CglGomory/CglGomory.cpp | 3 -- Cgl/src/CglLandP/CglLandP.cpp | 4 +- Cgl/src/CglLandP/CglLandPSimplex.cpp | 12 ++--- .../CglMixedIntegerRounding.cpp | 28 +++++++--- .../CglMixedIntegerRounding2.cpp | 26 ++++++--- Cgl/src/CglPreProcess/CglPreProcess.cpp | 54 +++++++++++++------ Cgl/src/CglProbing/CglProbing.cpp | 50 +++++++++-------- Cgl/src/CglRedSplit2/CglRedSplit2.cpp | 3 +- .../CglResidualCapacity.cpp | 4 +- Cgl/src/CglTreeInfo.cpp | 4 +- Cgl/src/CglZeroHalf/Cgl012cut.cpp | 8 +-- 13 files changed, 127 insertions(+), 81 deletions(-) diff --git a/Cgl/src/CglDuplicateRow/CglDuplicateRow.cpp b/Cgl/src/CglDuplicateRow/CglDuplicateRow.cpp index 91a75f7a..e187bf12 100644 --- a/Cgl/src/CglDuplicateRow/CglDuplicateRow.cpp +++ b/Cgl/src/CglDuplicateRow/CglDuplicateRow.cpp @@ -2967,7 +2967,7 @@ void CglDuplicateRow::generateCuts8(const OsiSolverInterface & si, OsiCuts & cs, for (iRow=0;iRowgetNumCols()+1); for (iRow=0;iRow (CoinMax(0.0,ceil(rowLower[iRow]))); if (iRhs>=lower_[iRow]) { rhs_[iRow]=iRhs; - numberGood++; + //numberGood++; } else { // infeasible ? lower_[iRow]=markBad; diff --git a/Cgl/src/CglFlowCover/CglFlowCover.cpp b/Cgl/src/CglFlowCover/CglFlowCover.cpp index 97704feb..5782ceb8 100644 --- a/Cgl/src/CglFlowCover/CglFlowCover.cpp +++ b/Cgl/src/CglFlowCover/CglFlowCover.cpp @@ -798,7 +798,7 @@ CglFlowCover::generateOneFlowCut( const OsiSolverInterface & si, //------------------------------------------------------------------------- // Generate a violated SGFC - int numCMinus = 0; + //int numCMinus = 0; int numPlusPlus = 0; double* rho = new double [rowLen]; double* xCoef = new double [rowLen]; @@ -820,7 +820,7 @@ CglFlowCover::generateOneFlowCut( const OsiSolverInterface & si, for (i = 0; i < rowLen; ++i) { if ( label[i] == CGLFLOW_COL_INCUT && sign[i] < 0 ) { cutRHS += up[i]; - ++numCMinus; + //++numCMinus; } } diff --git a/Cgl/src/CglGomory/CglGomory.cpp b/Cgl/src/CglGomory/CglGomory.cpp index 2832c17d..cb9757c6 100644 --- a/Cgl/src/CglGomory/CglGomory.cpp +++ b/Cgl/src/CglGomory/CglGomory.cpp @@ -633,11 +633,9 @@ CglGomory::generateCuts( int * rowIsBasic = new int[numberRows]; int * columnIsBasic = new int[numberColumns]; int i; - int numberBasic=0; for (i=0;igetArtifStatus(i) == CoinWarmStartBasis::basic) { rowIsBasic[i]=1; - numberBasic++; } else { rowIsBasic[i]=-1; } @@ -645,7 +643,6 @@ CglGomory::generateCuts( for (i=0;igetStructStatus(i) == CoinWarmStartBasis::basic) { columnIsBasic[i]=1; - numberBasic++; } else { columnIsBasic[i]=-1; } diff --git a/Cgl/src/CglLandP/CglLandP.cpp b/Cgl/src/CglLandP/CglLandP.cpp index c3686ed4..880dbe93 100644 --- a/Cgl/src/CglLandP/CglLandP.cpp +++ b/Cgl/src/CglLandP/CglLandP.cpp @@ -504,14 +504,14 @@ struct cutsCos void CglLandP::scanExtraCuts(OsiCuts& cs, const double * colsol) const { - int numAdded = 0; + //int numAdded = 0; for (int i = extraCuts_.sizeRowCuts() - 1; i > -1 ; i--) { double violation = extraCuts_.rowCut(i).violated(colsol); if (violation > 0.) { cs.insert(extraCuts_.rowCut(i)); - numAdded++; + //numAdded++; // std::cout<<"A cut computed in a previous iteration is violated by "< 1e-08 || getColsolToCut(ii) - lo_bounds_[ii] < 1e-08) { col_in_subspace[ii]=false; - n_removed++; } } } @@ -2143,7 +2141,7 @@ int CglLandPSimplex::findBestPivot(int &leaving, int & direction, reducedCost * rc = new reducedCost[nNegativeRcRows_]; int k = 0; rc[k].direction = 0;//initialize first rc - int k2 = 0; + //int k2 = 0; for (int i = 0 ; i < nrows_ ; i++) { if (ul_i[i] < -params.pivotTol) @@ -2153,7 +2151,7 @@ int CglLandPSimplex::findBestPivot(int &leaving, int & direction, rc[k].gammaSign = -1; rc[k].value = ul_i[i]; rc[k].row = i; - k2++; + //k2++; } if (vl_i[i] < -params.pivotTol) @@ -2163,7 +2161,7 @@ int CglLandPSimplex::findBestPivot(int &leaving, int & direction, rc[k].gammaSign = 1; rc[k].value = vl_i[i]; rc[k].row = i; - k2++; + //k2++; } @@ -2194,7 +2192,7 @@ int CglLandPSimplex::findBestPivot(int &leaving, int & direction, rc[k].value2 = uu_i[i]; } } - k2++; + //k2++; } if (vu_i[i] < -params.pivotTol) //&& rowFlags_[i]) //row has not been flaged @@ -2223,7 +2221,7 @@ int CglLandPSimplex::findBestPivot(int &leaving, int & direction, rc[k].value2 = vu_i[i]; } } - k2++; + //k2++; } if (rc[k].direction!=0) //We have added a row with < 0 rc during //last iteration diff --git a/Cgl/src/CglMixedIntegerRounding/CglMixedIntegerRounding.cpp b/Cgl/src/CglMixedIntegerRounding/CglMixedIntegerRounding.cpp index c01a8738..ccf77e94 100644 --- a/Cgl/src/CglMixedIntegerRounding/CglMixedIntegerRounding.cpp +++ b/Cgl/src/CglMixedIntegerRounding/CglMixedIntegerRounding.cpp @@ -332,15 +332,19 @@ mixIntRoundPreprocess(const OsiSolverInterface& si) } rowTypes_ = new RowType [numRows_]; // Destructor will free memory - // Summarize the row type infomation. + // Summarize the row type information. +#if CGL_DEBUG int numUNDEFINED = 0; int numVARUB = 0; int numVARLB = 0; int numVAREQ = 0; +#endif int numMIX = 0; int numCONT = 0; int numINT = 0; +#if CGL_DEBUG int numOTHER = 0; +#endif int iRow; const double* rowActivity = si.getRowActivity(); @@ -370,28 +374,38 @@ mixIntRoundPreprocess(const OsiSolverInterface& si) // Summarize information about row types switch(rowType) { case ROW_UNDEFINED: +#if CGL_DEBUG ++numUNDEFINED; +#endif break; case ROW_VARUB: - ++numVARUB; +#if CGL_DEBUG + ++numVARUB; +#endif break; case ROW_VARLB: - ++numVARLB; +#if CGL_DEBUG + ++numVARLB; +#endif break; case ROW_VAREQ: - ++numVAREQ; +#if CGL_DEBUG + ++numVAREQ; +#endif break; case ROW_MIX: - ++numMIX; + ++numMIX; break; case ROW_CONT: - ++numCONT; + ++numCONT; break; case ROW_INT: ++numINT; break; case ROW_OTHER: - ++numOTHER; +#if CGL_DEBUG + ++numOTHER; +#endif break; default: throw CoinError("Unknown row type", "MixIntRoundPreprocess", diff --git a/Cgl/src/CglMixedIntegerRounding2/CglMixedIntegerRounding2.cpp b/Cgl/src/CglMixedIntegerRounding2/CglMixedIntegerRounding2.cpp index fe400e3c..b15089a0 100644 --- a/Cgl/src/CglMixedIntegerRounding2/CglMixedIntegerRounding2.cpp +++ b/Cgl/src/CglMixedIntegerRounding2/CglMixedIntegerRounding2.cpp @@ -358,15 +358,19 @@ mixIntRoundPreprocess(const OsiSolverInterface& si) } rowTypes_ = new RowType [numRows_]; // Destructor will free memory - // Summarize the row type infomation. + // Summarize the row type information. +#if CGL_DEBUG int numUNDEFINED = 0; int numVARUB = 0; int numVARLB = 0; int numVAREQ = 0; +#endif int numMIX = 0; int numCONT = 0; int numINT = 0; +#if CGL_DEBUG int numOTHER = 0; +#endif int iRow; const double* rowActivity = si.getRowActivity(); @@ -396,16 +400,24 @@ mixIntRoundPreprocess(const OsiSolverInterface& si) // Summarize information about row types switch(rowType) { case ROW_UNDEFINED: - ++numUNDEFINED; +#if CGL_DEBUG + ++numUNDEFINED; +#endif break; case ROW_VARUB: - ++numVARUB; +#if CGL_DEBUG + ++numVARUB; +#endif break; case ROW_VARLB: - ++numVARLB; +#if CGL_DEBUG + ++numVARLB; +#endif break; case ROW_VAREQ: - ++numVAREQ; +#if CGL_DEBUG + ++numVAREQ; +#endif break; case ROW_MIX: ++numMIX; @@ -417,7 +429,9 @@ mixIntRoundPreprocess(const OsiSolverInterface& si) ++numINT; break; case ROW_OTHER: - ++numOTHER; +#if CGL_DEBUG + ++numOTHER; +#endif break; default: throw CoinError("Unknown row type", "MixIntRoundPreprocess", diff --git a/Cgl/src/CglPreProcess/CglPreProcess.cpp b/Cgl/src/CglPreProcess/CglPreProcess.cpp index e455c0bd..3e50a2c7 100644 --- a/Cgl/src/CglPreProcess/CglPreProcess.cpp +++ b/Cgl/src/CglPreProcess/CglPreProcess.cpp @@ -265,8 +265,10 @@ static int makeIntegers2(OsiSolverInterface *model, int mode) bool allGood = true; double direction = model->getObjSense(); int numberObj = 0; +#if CBC_USEFUL_PRINTING > 1 int numberEq = 0; int numberEqI = 0; +#endif int numberZero = 0; int numberNonZero = 0; if (false) { @@ -321,9 +323,9 @@ static int makeIntegers2(OsiSolverInterface *model, int mode) } bool singletonRow = true; bool equality = false; - int nC = 0; int xxxx = 0; #if CBC_USEFUL_PRINTING + int nC = 0; bool badCount = false; #endif for (CoinBigIndex j = start; j < end; j++) { @@ -346,7 +348,9 @@ static int makeIntegers2(OsiSolverInterface *model, int mode) else xxxx = 15; } +#if CBC_USEFUL_PRINTING nC++; +#endif } else if (rowLower[iRow] == rowUpper[iRow]) { equality = true; } @@ -395,7 +399,9 @@ static int makeIntegers2(OsiSolverInterface *model, int mode) thisGood = false; // Can we make equality if (end == start + 1 && !equality && false) { +#if CBC_USEFUL_PRINTING > 1 numberEq++; +#endif int iRow = row[start]; if (element[start] > 0.0) model->setRowUpper(iRow, rowLower[iRow]); @@ -459,7 +465,9 @@ static int makeIntegers2(OsiSolverInterface *model, int mode) } // Can we make equality if (end == start + 1 && !equality && false) { +#if CBC_USEFUL_PRINTING > 1 numberEq++; +#endif int iRow = row[start]; if (element[start] < 0.0) model->setRowUpper(iRow, rowLower[iRow]); @@ -477,7 +485,9 @@ static int makeIntegers2(OsiSolverInterface *model, int mode) || fabs(element[start]) != 1.0) { // no good } else if (false) { +#if CBC_USEFUL_PRINTING > 1 numberEqI++; +#endif if (element[start] * objValue > 0.0) model->setRowUpper(iRow, rowLower[iRow]); else @@ -1705,7 +1715,7 @@ CglPreProcess::preProcessNonDefault(OsiSolverInterface &model, // See if all + 1 bool allPlusOnes = true; int nPossible = 0; - int numberMadeEquality = 0; + //int numberMadeEquality = 0; for (iRow = 0; iRow < numberRows; iRow++) { int numberP1 = 0, numberM1 = 0; int numberTotal = 0; @@ -1825,7 +1835,7 @@ CglPreProcess::preProcessNonDefault(OsiSolverInterface &model, if (possibleSlack && makeEquality == -2 && (!good || state <= 0)) { if (numberTotal < minimumLength) continue; - numberMadeEquality++; + //numberMadeEquality++; element[numberSlacks] = (upperValue < 1.0e10) ? 1.0 : -1.0; rows[numberSlacks++] = iRow + numberRows; } @@ -1956,7 +1966,9 @@ CglPreProcess::preProcessNonDefault(OsiSolverInterface &model, //const double * columnElements = matrixByColumn->getElements(); double *obj = CoinCopyOfArray(startModel_->getObjCoefficients(), numberColumns); double offset; +#if CBC_USEFUL_PRINTING > 1 int numberMoved = 0; +#endif startModel_->getDblParam(OsiObjOffset, offset); // This is not a vital loop so be careful #ifndef SKIP_MOVE_COSTS_TO_INTEGERS @@ -2062,8 +2074,8 @@ CglPreProcess::preProcessNonDefault(OsiSolverInterface &model, move = smallestNeg; if (move) { // can move objective - numberMoved++; #if CBC_USEFUL_PRINTING > 1 + numberMoved++; if (rhs) printf("ZZZ on col %d move %g offset %g\n", jColumn, move, move * rhs); @@ -3432,7 +3444,7 @@ int CglPreProcess::tightenPrimalBounds(OsiSolverInterface &model, double factor) CoinBigIndex rStart = rowStart[iRow]; CoinBigIndex rEnd = rowStart[iRow] + rowLength[iRow]; CoinBigIndex j; - int numberInteger = 0; + //int numberInteger = 0; //int whichInteger=-1; // Compute possible lower and upper ranges for (j = rStart; j < rEnd; ++j) { @@ -3440,7 +3452,7 @@ int CglPreProcess::tightenPrimalBounds(OsiSolverInterface &model, double factor) iColumn = column[j]; if (newUpper[iColumn] > newLower[iColumn]) { if (model.isInteger(iColumn)) { - numberInteger++; + //numberInteger++; //whichInteger=iColumn; } largest = CoinMax(largest, fabs(value)); @@ -4001,7 +4013,9 @@ void CglPreProcess::postProcess(OsiSolverInterface &modelIn, int deleteStuff) //const double * columnUpper = model->getColUpper(); const double *objective = model->getObjCoefficients(); double direction = model->getObjSense(); +#ifndef NDEBUG int numberCheck = 0; +#endif double tolerance; model->getDblParam(OsiPrimalTolerance, tolerance); tolerance *= 10.0; @@ -4011,7 +4025,9 @@ void CglPreProcess::postProcess(OsiSolverInterface &modelIn, int deleteStuff) double value2 = floor(value); // See if empty integer if (value != value2) { +#ifndef NDEBUG numberCheck++; +#endif int allowed = 0; // can we go up double movement = value2 + 1.0 - value; @@ -4217,12 +4233,12 @@ CglPreProcess::modified(OsiSolverInterface *model, int numberRows = newModel->getNumRows(); CglUniqueRowCuts twoCuts(numberRows); int numberColumns = newModel->getNumCols(); - int number01Integers = 0; - int iColumn; - for (iColumn = 0; iColumn < numberColumns; iColumn++) { - if (newModel->isBinary(iColumn)) - number01Integers++; - } + //int number01Integers = 0; + //int iColumn; + //for (iColumn = 0; iColumn < numberColumns; iColumn++) { + // if (newModel->isBinary(iColumn)) + // number01Integers++; + //} #if CBC_USEFUL_PRINTING > 0 printf("At beginning of modified %d rows and %d columns (pass %d - doing %d minor passes)\n", numberRows, numberColumns, iBigPass, numberPasses); @@ -6677,19 +6693,23 @@ void CglPreProcess::update(const OsiPresolve *pinfo, const int *original = pinfo->originalColumns(); int numberColumns = solver->getNumCols(); // number prohibited must stay constant - int n = 0; int i; +#ifndef NDEBUG + int n = 0; for (i = 0; i < numberProhibited_; i++) { if (prohibited_[i]) n++; } int n2 = 0; +#endif for (i = 0; i < numberColumns; i++) { int iColumn = original[i]; assert(i == 0 || iColumn > original[i - 1]); char p = prohibited_[iColumn]; +#ifndef NDEBUG if (p) n2++; +#endif prohibited_[i] = p; } assert(n == n2); @@ -6870,7 +6890,7 @@ void CglPreProcess::passInRowTypes(const char *rowTypes, int numberRows) void CglPreProcess::makeInteger() { // First check if we need to - int numberInteger = 0; + //int numberInteger = 0; { const double *lower = startModel_->getColLower(); const double *upper = startModel_->getColUpper(); @@ -6880,7 +6900,7 @@ void CglPreProcess::makeInteger() for (iColumn = 0; iColumn < numberColumns; iColumn++) { if (upper[iColumn] > lower[iColumn] + 1.0e-8) { if (startModel_->isInteger(iColumn)) - numberInteger++; + ;//numberInteger++; else numberContinuous++; } @@ -7389,7 +7409,7 @@ CglBK::CglBK(const OsiSolverInterface &model, const char *rowType, } CoinSort_2(sort, sort + nSort, which); double value = sort[0]; - int nDominated = 0; + //int nDominated = 0; for (int i = 1; i < nSort; i++) { if (sort[i] == value) { int i1 = which[i - 1]; @@ -7413,7 +7433,7 @@ CglBK::CglBK(const OsiSolverInterface &model, const char *rowType, int iColumn22 = column[last2]; if (iColumn11 == iColumn21 && iColumn12 == iColumn22 && elementByRow[first1] == elementByRow[first2] && elementByRow[last1] == elementByRow[last2]) { dominated_[i2] = 1; - nDominated++; + //nDominated++; } } } diff --git a/Cgl/src/CglProbing/CglProbing.cpp b/Cgl/src/CglProbing/CglProbing.cpp index 12b44339..717df730 100644 --- a/Cgl/src/CglProbing/CglProbing.cpp +++ b/Cgl/src/CglProbing/CglProbing.cpp @@ -1667,14 +1667,18 @@ int CglProbing::gutsOfGenerateCuts(const OsiSolverInterface & si, const char * intVarOriginal = si.getColType(true); char * intVar = CoinCopyOfArray(intVarOriginal,nCols); int i; +#ifndef NDEBUG int numberIntegers=0; +#endif CoinMemcpyN(si.getColLower(),nCols,colLower); CoinMemcpyN(si.getColUpper(),nCols,colUpper); const double * colsol =si.getColSolution(); // and put reasonable bounds on integer variables for (i=0;i1.0e12) @@ -3392,7 +3396,7 @@ int CglProbing::probe( const OsiSolverInterface & si, int feasible=0; int notFeasible; for (iway=0;iway<3;iway ++) { - int fixThis=0; + //int fixThis=0; double objVal=current; int goingToTrueBound=0; stackC[0]=j; @@ -3772,7 +3776,7 @@ int CglProbing::probe( const OsiSolverInterface & si, markC[kcol] = markIt; } if (moveUp&&nstackC<2*maxStack) { - fixThis++; + //fixThis++; if (!onList) { stackC[nstackC]=kcol; saveL[nstackC]=colLower[kcol]; @@ -3841,7 +3845,7 @@ int CglProbing::probe( const OsiSolverInterface & si, } } if (moveDown&&nstackC<2*maxStack) { - fixThis++; + //fixThis++; if (!onList) { stackC[nstackC]=kcol; saveL[nstackC]=colLower[kcol]; @@ -3957,7 +3961,7 @@ int CglProbing::probe( const OsiSolverInterface & si, markC[kcol] = markIt; } if (moveUp&&nstackC<2*maxStack) { - fixThis++; + //fixThis++; if (!onList) { stackC[nstackC]=kcol; saveL[nstackC]=colLower[kcol]; @@ -4073,7 +4077,7 @@ int CglProbing::probe( const OsiSolverInterface & si, markC[kcol] = markIt; } if (moveDown&&nstackC<2*maxStack) { - fixThis++; + //fixThis++; if (!onList) { stackC[nstackC]=kcol; saveL[nstackC]=colLower[kcol]; @@ -4218,7 +4222,7 @@ int CglProbing::probe( const OsiSolverInterface & si, markC[kcol] = markIt; } if (moveUp&&nstackC<2*maxStack) { - fixThis++; + //fixThis++; if (!onList) { stackC[nstackC]=kcol; saveL[nstackC]=colLower[kcol]; @@ -4289,7 +4293,7 @@ int CglProbing::probe( const OsiSolverInterface & si, } } if (moveDown&&nstackC<2*maxStack) { - fixThis++; + //fixThis++; if (!onList) { stackC[nstackC]=kcol; saveL[nstackC]=colLower[kcol]; @@ -4405,7 +4409,7 @@ int CglProbing::probe( const OsiSolverInterface & si, markC[kcol] = markIt; } if (nstackC<2*maxStack) { - fixThis++; + //fixThis++; if (!onList) { stackC[nstackC]=kcol; saveL[nstackC]=colLower[kcol]; @@ -4521,7 +4525,7 @@ int CglProbing::probe( const OsiSolverInterface & si, markC[kcol] = markIt; } if (nstackC<2*maxStack) { - fixThis++; + //fixThis++; if (!onList) { stackC[nstackC]=kcol; saveL[nstackC]=colLower[kcol]; @@ -5672,8 +5676,8 @@ int CglProbing::probe( const OsiSolverInterface & si, CoinBigIndex kre = rowStart[i+1]; int kInt = -1; double rhsAdjustment=0.0; - int nPosInt=0; - int nNegInt=0; + //int nPosInt=0; + //int nNegInt=0; double valueInteger=0.0; // Find largest integer coefficient CoinBigIndex k; @@ -5699,14 +5703,14 @@ int CglProbing::probe( const OsiSolverInterface & si, rhsAdjustment += colUpper[j]*value; continue; } - if (intVar[j]) { - if (value>0.0) - nPosInt++; - else - nNegInt++; - } else { - nPosInt = -nCols; - } +// if (intVar[j]) { +// if (value>0.0) +// nPosInt++; +// else +// nNegInt++; +// } else { +// nPosInt = -nCols; +// } if (j!=kInt) { // treat as continuous if (value > 0.0) { @@ -6118,7 +6122,7 @@ int CglProbing::probeCliques( const OsiSolverInterface & si, int feasible=0; int notFeasible; for (iway=0;iway<3;iway ++) { - int fixThis=0; + //int fixThis=0; double objVal=current; int goingToTrueBound=0; stackC[0]=j; @@ -6272,7 +6276,7 @@ int CglProbing::probeCliques( const OsiSolverInterface & si, // not on list yet if (nstackC<2*maxStack) { markC[kcol] = 3; // say fixed - fixThis++; + //fixThis++; stackC[nstackC]=kcol; saveL[nstackC]=colLower[kcol]; saveU[nstackC]=colUpper[kcol]; @@ -6526,7 +6530,7 @@ int CglProbing::probeCliques( const OsiSolverInterface & si, markC[kcol] = markIt; } if (moveUp&&nstackC<2*maxStack) { - fixThis++; + //fixThis++; #ifdef PRINT_DEBUG printf("lower bound on %d increased from %g to %g by row %d %g %g\n",kcol,colLower[kcol],newLower,irow,rowLower[irow],rowUpper[irow]); value=0.0; @@ -6608,7 +6612,7 @@ int CglProbing::probeCliques( const OsiSolverInterface & si, } } if (moveDown&&nstackC<2*maxStack) { - fixThis++; + //fixThis++; #ifdef PRINT_DEBUG printf("upper bound on %d decreased from %g to %g by row %d %g %g\n",kcol,colUpper[kcol],newUpper,irow,rowLower[irow],rowUpper[irow]); value=0.0; diff --git a/Cgl/src/CglRedSplit2/CglRedSplit2.cpp b/Cgl/src/CglRedSplit2/CglRedSplit2.cpp index 36a3da55..113b1e7f 100644 --- a/Cgl/src/CglRedSplit2/CglRedSplit2.cpp +++ b/Cgl/src/CglRedSplit2/CglRedSplit2.cpp @@ -1476,7 +1476,7 @@ void CglRedSplit2::unflip(double *row, double *tabrowrhs) { /************************************************************************/ int CglRedSplit2::check_dynamism(double *row) { - int i, nelem = 0; + int i; double val, max_val = 0, min_val = param.getINFINIT(); for(i=0; i param.getEPS_COEFF()) { min_val = CoinMin(min_val, val); - nelem++; } } diff --git a/Cgl/src/CglResidualCapacity/CglResidualCapacity.cpp b/Cgl/src/CglResidualCapacity/CglResidualCapacity.cpp index 5a475868..50af7908 100644 --- a/Cgl/src/CglResidualCapacity/CglResidualCapacity.cpp +++ b/Cgl/src/CglResidualCapacity/CglResidualCapacity.cpp @@ -259,7 +259,7 @@ resCapPreprocess(const OsiSolverInterface& si) rowTypes_ = new RowType [numRows_]; // Destructor will free memory // Summarize the row type infomation. - int numOTHER = 0; + //int numOTHER = 0; int numL = 0; int numG = 0; int numB = 0; @@ -293,7 +293,7 @@ resCapPreprocess(const OsiSolverInterface& si) // Summarize information about row types switch(rowType) { case ROW_OTHER: - ++numOTHER; + //++numOTHER; break; case ROW_L: ++numL; diff --git a/Cgl/src/CglTreeInfo.cpp b/Cgl/src/CglTreeInfo.cpp index 642c3345..3923b967 100644 --- a/Cgl/src/CglTreeInfo.cpp +++ b/Cgl/src/CglTreeInfo.cpp @@ -566,7 +566,7 @@ CglTreeProbingInfo::analyze(const OsiSolverInterface &si, int createSolver, #if 1 for (iRow = 0; iRow < numberRows; iRow++) { int numberP1 = 0, numberM1 = 0; - int numberTotal = 0; + //int numberTotal = 0; CoinBigIndex j; double upperValue = rowUpper[iRow]; double lowerValue = rowLower[iRow]; @@ -584,7 +584,7 @@ CglTreeProbingInfo::analyze(const OsiSolverInterface &si, int createSolver, break; } else { iColumn = backward_[iColumn]; - numberTotal++; + //numberTotal++; } if (fabs(value) != 1.0) { good = false; diff --git a/Cgl/src/CglZeroHalf/Cgl012cut.cpp b/Cgl/src/CglZeroHalf/Cgl012cut.cpp index 7680aa1c..03648556 100644 --- a/Cgl/src/CglZeroHalf/Cgl012cut.cpp +++ b/Cgl/src/CglZeroHalf/Cgl012cut.cpp @@ -776,7 +776,7 @@ void free_sep_graph(separation_graph *s_graph) static auxiliary_graph *define_aux_graph(separation_graph *s_graph /* input separation graph */) { - int j, k, indjk, auxj1, auxj2, auxk1, auxk2, noutj, totoutj, narcs; + int j, k, indjk, auxj1, auxj2, auxk1, auxk2, /*noutj,*/ totoutj, narcs; edge *s_edge; auxiliary_graph *a_graph; @@ -820,7 +820,7 @@ auxiliary_graph *define_aux_graph(separation_graph *s_graph /* input separation a_graph->nodes[auxj2].firstArc = &(a_graph->arcs[narcs+totoutj]); #endif /* add the edges as arcs outgoing from j to the auxiliary graph */ - noutj = 0; + //noutj = 0; for ( k = 0; k < s_graph->nnodes; k++ ) { if ( k != j ) { auxk1 = AG_TWIN1(k); auxk2 = AG_TWIN2(k); @@ -839,7 +839,7 @@ auxiliary_graph *define_aux_graph(separation_graph *s_graph /* input separation a_graph->arcs[narcs].to = auxk1; a_graph->arcs[narcs+totoutj].to = auxk2; #endif - narcs++; noutj++; + narcs++; //noutj++; } s_edge = s_graph->odd_adj_list[indjk]; if ( s_edge != NULL ) { @@ -861,7 +861,7 @@ auxiliary_graph *define_aux_graph(separation_graph *s_graph /* input separation a_graph->nodes[auxj2].first = &(a_graph->arcs[narcs+totoutj]); } ... */ - narcs++; noutj++; + narcs++; //noutj++; } } }