Changeset 1072


Ignore:
Timestamp:
Sep 17, 2008 7:57:13 AM (10 years ago)
Author:
forrest
Message:

add std::

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcHeuristicRandRound.cpp

    r1064 r1072  
    99#include <cmath>
    1010#include <cfloat>
    11 #include <vector.h>
     11#include <vector>
    1212
    1313#include "OsiSolverInterface.hpp"
     
    202202        break;
    203203      randNum = rand()%10 + 1;
    204       randNum = fmod(randNum, 2);
     204      randNum = (int) fmod(randNum, 2);
    205205      for(int j=0; j<numCols; j++)
    206206        {
     
    242242  // Look at solutions
    243243  int numberSolutions = solutions.numberSolutions;
    244   const char * integerInfo = simplex->integerInformation();
    245   const double * columnLower = simplex->columnLower();
    246   const double * columnUpper = simplex->columnUpper();
     244  //const char * integerInfo = simplex->integerInformation();
     245  //const double * columnLower = simplex->columnLower();
     246  //const double * columnUpper = simplex->columnUpper();
    247247  printf("there are %d solutions\n",numberSolutions);
    248248
     
    256256  bool feasibility = 1;
    257257  double bestObj = 1e30;
    258   vector< vector <double> > feasibles;
     258  std::vector< std::vector <double> > feasibles;
    259259  int numFeasibles = 0;
    260260 
     
    317317            {           
    318318              numFeasibles++;
    319                 feasibles.push_back(vector <double> (numCols));
     319                feasibles.push_back(std::vector <double> (numCols));
    320320                for(int k=0; k<numCols; k++)
    321321                  feasibles[numFeasibles-1][k] = cornerPoints[i][k];
     
    378378              else
    379379                {
    380                   if(abs(fmod(rp[i],1)) > 0.5)
     380                  if(fabs(fmod(rp[i],1)) > 0.5)
    381381                    roundRp[i] = floor(rp[i]);
    382382                  else
     
    434434              printf("%.2f\n", CoinCpuTime()-start);
    435435              numFeasibles++;
    436               feasibles.push_back(vector <double> (numCols));
     436              feasibles.push_back(std::vector <double> (numCols));
    437437              for(int i=0; i<numCols; i++)
    438438                feasibles[numFeasibles-1][i] = roundRp[i];
Note: See TracChangeset for help on using the changeset viewer.