Ignore:
Timestamp:
Jun 5, 2010 3:42:36 PM (9 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/rowColumn.cpp

    r1552 r1559  
    1515#include <cassert>
    1616
    17 int main (int argc, const char *argv[])
     17int main(int argc, const char *argv[])
    1818{
    1919     ClpSimplex  modelByRow, modelByColumn;
     
    6161     modelByColumn.dual();
    6262     // check value of objective
    63      assert (fabs(modelByColumn.objectiveValue() - 76000.0) < 1.0e-7);
     63     assert(fabs(modelByColumn.objectiveValue() - 76000.0) < 1.0e-7);
    6464     // b) As two steps - first creating a CoinPackedMatrix
    6565     // NULL for column lengths indicate they are stored without gaps
     
    7575     modelByColumn.dual();
    7676     // check value of objective
    77      assert (fabs(modelByColumn.objectiveValue() - 76000.0) < 1.0e-7);
     77     assert(fabs(modelByColumn.objectiveValue() - 76000.0) < 1.0e-7);
    7878     // Now do by row
    7979     // The false says row ordered so numberRows and numberColumns swapped - see CoinPackedMatrix.hpp
    80      assert(numberElements == rowStart[numberRows]); // check same number of elements in each copy
     80     assert(numberElements == rowStart[numberRows]);    // check same number of elements in each copy
    8181     CoinPackedMatrix byRow(false, numberColumns, numberRows, numberElements,
    8282                            elementByRow, column, rowStart, NULL);
     
    8888     modelByRow.dual();
    8989     // check value of objective
    90      assert (fabs(modelByRow.objectiveValue() - 76000.0) < 1.0e-7);
     90     assert(fabs(modelByRow.objectiveValue() - 76000.0) < 1.0e-7);
    9191     // write solution
    9292     const double * solution = modelByRow.primalColumnSolution();
Note: See TracChangeset for help on using the changeset viewer.