Changeset 55


Ignore:
Timestamp:
Nov 21, 2002 4:08:32 PM (17 years ago)
Author:
forrest
Message:

Making it a bit more likely Visual Studio will work

Location:
trunk
Files:
21 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpModel.cpp

    r50 r55  
    11// Copyright (C) 2002, International Business Machines
    22// Corporation and others.  All Rights Reserved.
    3 #if defined(_MSC_VER)
    4 // Turn off compiler warning about long names
    5 #  pragma warning(disable:4786)
    6 #endif
    73
    84#include <cmath>
     
    1410
    1511#include <time.h>
     12#if defined(_MSC_VER)
     13// Turn off compiler warning about long names
     14#  pragma warning(disable:4786)
     15#else
    1616#include <sys/times.h>
    1717#include <sys/resource.h>
    1818#include <unistd.h>
     19#endif
    1920
    2021#include "CoinHelperFunctions.hpp"
  • trunk/PresolveDoubleton.cpp

    r50 r55  
    44#include <stdio.h>
    55#include <math.h>
    6 #include <strings.h>
    76
    87#include "CoinHelperFunctions.hpp"
  • trunk/PresolveDual.cpp

    r50 r55  
    11#include <stdio.h>
    22#include <math.h>
    3 #include <strings.h>
    43
    54#include "PresolveMatrix.hpp"
  • trunk/PresolveDupcol.cpp

    r50 r55  
    11#include <stdio.h>
    22#include <math.h>
    3 #include <strings.h>
    43
    54#include "PresolveMatrix.hpp"
  • trunk/PresolveEmpty.cpp

    r50 r55  
    44#include <stdio.h>
    55#include <math.h>
    6 #include <strings.h>
    76
    87#include "PresolveMatrix.hpp"
  • trunk/PresolveFixed.cpp

    r50 r55  
    44#include <stdio.h>
    55#include <math.h>
    6 #include <strings.h>
    76
    87#include "PresolveMatrix.hpp"
  • trunk/PresolveForcing.cpp

    r50 r55  
    11#include <stdio.h>
    22#include <math.h>
    3 #include <strings.h>
    43
    54#include "PresolveMatrix.hpp"
  • trunk/PresolveImpliedFree.cpp

    r50 r55  
    11#include <stdio.h>
    22#include <math.h>
    3 #include <strings.h>
    43
    54#include "PresolveMatrix.hpp"
  • trunk/PresolveIsolated.cpp

    r50 r55  
    11#include <stdio.h>
    22#include <math.h>
    3 #include <strings.h>
    43
    54#include "PresolveMatrix.hpp"
  • trunk/PresolveMatrix.cpp

    r50 r55  
    171171  }
    172172  abort();
     173  return -1;
    173174}
    174175
     
    776777  int nbasic = 0;
    777778
    778   for (int i=0; i<ncols_; i++)
     779  int i;
     780  for (i=0; i<ncols_; i++)
    779781    if (columnIsBasic(i))
    780782      nbasic++;
    781783
    782   for (int i=0; i<nrows_; i++)
     784  for (i=0; i<nrows_; i++)
    783785    if (rowIsBasic(i))
    784786      nbasic++;
  • trunk/PresolvePsdebug.cpp

    r50 r55  
    55#include <stdio.h>
    66#include <math.h>
    7 #include <strings.h>
    87
    98#include "PresolveMatrix.hpp"
  • trunk/PresolveSingleton.cpp

    r50 r55  
    44#include <stdio.h>
    55#include <math.h>
    6 #include <strings.h>
    76
    87#include "CoinHelperFunctions.hpp"
  • trunk/PresolveSubst.cpp

    r50 r55  
    11#include <stdio.h>
    22#include <math.h>
    3 #include <strings.h>
    43
    54#include "PresolveMatrix.hpp"
  • trunk/PresolveTighten.cpp

    r50 r55  
    11#include <stdio.h>
    22#include <math.h>
    3 #include <strings.h>
    43
    54#include "PresolveMatrix.hpp"
  • trunk/PresolveUseless.cpp

    r50 r55  
    11#include <stdio.h>
    22#include <math.h>
    3 #include <strings.h>
    43#include "PresolveMatrix.hpp"
    54#include "PresolveUseless.hpp"
  • trunk/PresolveZeros.cpp

    r50 r55  
    44#include <stdio.h>
    55#include <math.h>
    6 #include <strings.h>
    76
    87#include "CoinHelperFunctions.hpp"
  • trunk/Test/ClpMain.cpp

    r50 r55  
    1414
    1515#include <time.h>
     16
     17#if defined(_MSC_VER)
     18// Turn off compiler warning about long names
     19#  pragma warning(disable:4786)
     20#else
    1621#include <sys/times.h>
    1722#include <sys/resource.h>
    1823#include <unistd.h>
    19 
    20 #define CLPVERSION "0.92"
     24#endif
     25#define CLPVERSION "0.93"
    2126
    2227//#include "CoinPackedMatrix.hpp"
     
    561566}
    562567#ifdef READLINE     
    563 #include "/usr/include/readline/readline.h"
    564 #include "/usr/include/readline/history.h"
     568#include <readline/readline.h>
     569#include <readline/history.h>
    565570#include <signal.h>
    566571static ClpSimplex * currentModel = NULL;
  • trunk/Test/unitTest.cpp

    r52 r55  
    11// Copyright (C) 2002, International Business Machines
    22// Corporation and others.  All Rights Reserved.
    3 #if defined(_MSC_VER)
    4 // Turn off compiler warning about long names
    5 #  pragma warning(disable:4786)
    6 #endif
    73
    84#include <cassert>
     
    1410
    1511#include <time.h>
    16 #include <sys/times.h>
    17 #include <sys/resource.h>
    18 #include <unistd.h>
     12#if defined(_MSC_VER)
     13// Turn off compiler warning about long names
     14#  pragma warning(disable:4786)
     15#endif
    1916
    2017#include "CoinMpsIO.hpp"
     
    296293               solution.sumPrimalInfeasibilities(),
    297294               solution.numberPrimalInfeasibilities());
    298         {
     295        if (0) {
    299296          Presolve pinfoA;
    300297          model2 = pinfoA.presolvedModel(solution,1.0e-8);
  • trunk/include/ClpMatrixBase.hpp

    r50 r55  
    77// Turn off compiler warning about long names
    88#  pragma warning(disable:4786)
    9 #endif
     9#if !defined(min)
     10#define min(a,b)  (((a) < (b)) ? (a) : (b))
     11#endif
     12#if !defined(max)
     13#define max(a,b)  (((a) > (b)) ? (a) : (b))
     14#endif
     15double drand48(void);
     16#else
    1017using std::min;
    1118using std::max;
     19#endif
    1220
    1321#include "CoinPackedMatrix.hpp"
  • trunk/include/ClpParameters.hpp

    r50 r55  
    5757ClpDisjointCopyN( const T * array, const int size, T * newArray)
    5858{
    59   memcpy(newArray,array,size*sizeof(T));
     59  memcpy((void *) newArray,array,size*sizeof(T));
    6060}
    6161/// And set
  • trunk/include/PresolveMatrix.hpp

    r50 r55  
    88#include <cmath>
    99#include <cfloat>
     10#if defined(_MSC_VER)
     11// Turn off compiler warning about long names
     12#  pragma warning(disable:4786)
     13#if !defined(min)
     14#define min(a,b)  (((a) < (b)) ? (a) : (b))
     15#endif
     16#if !defined(max)
     17#define max(a,b)  (((a) > (b)) ? (a) : (b))
     18#endif
     19#else
    1020using std::min;
    1121using std::max;
     22#endif
    1223
    1324
Note: See TracChangeset for help on using the changeset viewer.