Changeset 1056


Ignore:
Timestamp:
Jul 25, 2007 3:55:53 PM (12 years ago)
Author:
forrest
Message:

out ambiguities

Location:
trunk/Clp/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpModel.cpp

    r1053 r1056  
    32863286#ifndef CLP_NO_STD
    32873287// Create row names as char **
    3288 const char * const * const
     3288const char * const *
    32893289ClpModel::rowNamesAsChar() const
    32903290{
     
    33203320}
    33213321// Create column names as char **
    3322 const char * const * const
     3322const char * const *
    33233323ClpModel::columnNamesAsChar() const
    33243324{
     
    33543354// Delete char * version of names
    33553355void
    3356 ClpModel::deleteNamesAsChar(const char * const * const names,int number) const
     3356ClpModel::deleteNamesAsChar(const char * const * names,int number) const
    33573357{
    33583358  for (int i=0;i<number;i++) {
  • trunk/Clp/src/ClpModel.hpp

    r1055 r1056  
    844844   }
    845845  /// Create row names as char **
    846   const char * const * const rowNamesAsChar() const;
     846  const char * const * rowNamesAsChar() const;
    847847  /// Create column names as char **
    848   const char * const * const columnNamesAsChar() const;
     848  const char * const * columnNamesAsChar() const;
    849849  /// Delete char * version of names
    850   void deleteNamesAsChar(const char * const * const names,int number) const;
     850  void deleteNamesAsChar(const char * const * names,int number) const;
    851851  //@}
    852852
  • trunk/Clp/src/ClpPredictorCorrector.cpp

    r894 r1056  
    314314          // not close to optimal but check if getting bad
    315315          double scaledRHSError=maximumRHSError_/solutionNorm_;
    316           if (maximumBoundInfeasibility_>1.0e-1||
     316          if ((maximumBoundInfeasibility_>1.0e-1||
    317317              scaledRHSError>1.0e-1||
    318               maximumDualError_>objectiveNorm_*1.0e-1
    319               &&numberIterations_>50
    320               &&complementarityGap_>0.9*historyInfeasibility_[0]) {
     318               maximumDualError_>objectiveNorm_*1.0e-1)
     319              &&(numberIterations_>50
     320                 &&complementarityGap_>0.9*historyInfeasibility_[0])) {
    321321            handler_->message(CLP_BARRIER_EXIT2,messages_)
    322322              <<saveIteration
  • trunk/Clp/src/ClpSimplex.cpp

    r1034 r1056  
    400400    if ((oldValue<incomingInfeasibility_||badInfeasibility>
    401401         (CoinMax(10.0*allowedInfeasibility_,100.0*oldValue)))
    402         &&badInfeasibility>CoinMax(incomingInfeasibility_,allowedInfeasibility_)||
    403         useError>1.0e-3) {
     402        &&(badInfeasibility>CoinMax(incomingInfeasibility_,allowedInfeasibility_)||
     403           useError>1.0e-3)) {
    404404      //printf("Original largest infeas %g, now %g, primalError %g\n",
    405405      //     oldValue,nonLinearCost_->largestInfeasibility(),
     
    38503850    matrix_=auxiliaryModel_->matrix_;
    38513851    auxiliaryModel_->matrix_=temp;
    3852     assert ((auxiliaryModel_->specialOptions_&16+32)==16+32);
     3852    assert ((auxiliaryModel_->specialOptions_&(16+32))==16+32);
    38533853    if (problemStatus_!=1&&problemStatus_!=10) {
    38543854      int i;
     
    53135313        return 1;
    53145314    if (ray_) {
    5315       if (problemStatus_==1)
     5315      if (problemStatus_==1) {
    53165316        if (outDoubleArray(ray_,numberRows_,fp))
    53175317          return 1;
    5318       else if (problemStatus_==2)
     5318      } else if (problemStatus_==2) {
    53195319        if (outDoubleArray(ray_,numberColumns_,fp))
    53205320          return 1;
    5321       else
     5321      } else {
    53225322        if (outDoubleArray(NULL,0,fp))
    53235323          return 1;
     5324      }
    53245325    } else {
    53255326      if (outDoubleArray(NULL,0,fp))
     
    90549055    bool primal = (secondaryStatus_==2||secondaryStatus_==4);
    90559056    bool dual = (secondaryStatus_==3||secondaryStatus_==4);
    9056     if (((check&1)!=0&&primal)||((check&2)!=0)&&dual) {
     9057    if (((check&1)!=0&&primal)||(((check&2)!=0)&&dual)) {
    90579058      // need cleanup
    90589059      int saveScalingFlag = scalingFlag_;
  • trunk/Clp/src/ClpSimplexNonlinear.cpp

    r1054 r1056  
    36433643      constraint->gradient(&newModel,solution,gradient,functionValue,offset);
    36443644      assert (!numberErrors);
    3645       double dualValue = newModel.dualRowSolution()[iRow];
     3645      // double dualValue = newModel.dualRowSolution()[iRow];
    36463646      int numberCoefficients = constraint->numberCoefficients();
    36473647      for (CoinBigIndex j=rowStart[iRow];j<rowStart[iRow]+numberCoefficients;j++) {
  • trunk/Clp/src/unitTest.cpp

    r1034 r1056  
    589589        int presolveOff=iAlg/100;
    590590        iAlg=iAlg % 100;
    591         if( !barrierAvailable&&iAlg==0)
     591        if( !barrierAvailable&&iAlg==0) {
    592592          if (nRows[m]!=2172)
    593593            iAlg = 5; // try primal
    594594          else
    595595            iAlg=3; // d2q06c
     596        }
    596597        solveOptions=setupForSolve(iAlg,nameAlgorithm,0);
    597598        if (presolveOff)
Note: See TracChangeset for help on using the changeset viewer.