Ignore:
Timestamp:
Jun 5, 2010 3:42:36 PM (8 years ago)
Author:
stefan
Message:

merge split branch into trunk

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools    https://projects.coin-or.org/svn/BuildTools/stable/0.6
        2 ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        3 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
        4 Data/Netlib   https://projects.coin-or.org/svn/Data/stable/1.0/Netlib
        5 Data/Sample   https://projects.coin-or.org/svn/Data/stable/1.0/Sample
        6 CoinUtils     https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
        7 
         1BuildTools    https://projects.coin-or.org/svn/BuildTools/trunk
         2ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
         3ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
         4#Data/Netlib   https://projects.coin-or.org/svn/Data/trunk/Netlib
         5Data/Sample   https://projects.coin-or.org/svn/Data/trunk/Sample
         6CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
    • Property svn:mergeinfo changed
      /branches/split (added)merged: 1522,​1527-1531,​1542-1550,​1558
  • trunk/Clp/examples/addColumns.cpp

    r1552 r1559  
    1313#include <cassert>
    1414
    15 int main (int argc, const char *argv[])
     15int main(int argc, const char *argv[])
    1616{
    1717     {
     
    6161          double time1 = CoinCpuTime();
    6262          int k;
    63           for ( k = 0; k < 10000; k++) {
     63          for (k = 0; k < 10000; k++) {
    6464               int column2Index[] = {0, 1};
    6565               double column2Value[] = {1.0, -5.0};
     
    7373          CoinBuild buildObject;
    7474          time1 = CoinCpuTime();
    75           for ( k = 0; k < 100000; k++) {
     75          for (k = 0; k < 100000; k++) {
    7676               int column2Index[] = {0, 1};
    7777               double column2Value[] = {1.0, -5.0};
     
    8888          CoinBuild buildObject2;
    8989          time1 = CoinCpuTime();
    90           for ( k = 0; k < 10000; k++) {
     90          for (k = 0; k < 10000; k++) {
    9191               int column2Index[] = {0, 1};
    9292               double column2Value[] = {1.0, 1.0, -1.0};
     
    103103          CoinModel modelObject2;
    104104          time1 = CoinCpuTime();
    105           for ( k = 0; k < 10000; k++) {
     105          for (k = 0; k < 10000; k++) {
    106106               int column2Index[] = {0, 1};
    107107               double column2Value[] = {1.0, 1.0, -1.0};
     
    118118          CoinModel modelObject;
    119119          time1 = CoinCpuTime();
    120           for ( k = 0; k < 100000; k++) {
     120          for (k = 0; k < 100000; k++) {
    121121               int column2Index[] = {0, 1};
    122122               double column2Value[] = {1.0, -5.0};
     
    183183          ClpSimplex  model;
    184184          int status;
    185           if (argc < 2)
    186                status = model.readMps("../../Data/Sample/p0033.mps");
    187           else
     185          if (argc < 2) {
     186#if defined(COIN_HAS_SAMPLE) && defined(SAMPLEDIR)
     187               status = model.readMps(SAMPLEDIR "/p0033.mps", true);
     188#else
     189               fprintf(stderr, "Do not know where to find sample MPS files.\n");
     190               exit(1);
     191#endif
     192          } else
    188193               status = model.readMps(argv[1]);
    189194          if (status) {
     
    227232          ClpSimplex  model;
    228233          int status;
    229           if (argc < 2)
    230                status = model.readMps("../../Data/Sample/p0033.mps");
    231           else
     234          if (argc < 2) {
     235#if defined(COIN_HAS_SAMPLE) && defined(SAMPLEDIR)
     236               status = model.readMps(SAMPLEDIR "/p0033.mps", true);
     237#else
     238               fprintf(stderr, "Do not know where to find sample MPS files.\n");
     239               exit(1);
     240#endif
     241          } else
    232242               status = model.readMps(argv[1]);
    233243          if (status) {
Note: See TracChangeset for help on using the changeset viewer.