Ignore:
Timestamp:
Mar 15, 2019 11:56:51 AM (7 months ago)
Author:
stefan
Message:

sync with trunk

Location:
stable/1.17
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/1.17

    • Property svn:externals
      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.8.8/
        2 ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.4.1/
        3 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.4.7/
        4 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.6.0/
        5 ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/releases/1.3.7/
        6 ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.6.1/
        7 ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/releases/1.10.6/
        8 Data/Netlib  https://projects.coin-or.org/svn/Data/Netlib/releases/1.2.7/
        9 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/releases/1.2.11/
        10 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.11.0/CoinUtils
        11 Osi  https://projects.coin-or.org/svn/Osi/releases/0.108.0/Osi
        12 
         1BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.8
         2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.4
         3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.4
         4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.6
         5ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.3
         6ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.6
         7ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.10
         8Data/Netlib       https://projects.coin-or.org/svn/Data/Netlib/stable/1.2
         9Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
         10CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.11/CoinUtils
         11Osi               https://projects.coin-or.org/svn/Osi/stable/0.108/Osi
    • Property svn:mergeinfo changed
      /trunk (added)merged: 2396,​2405-2409,​2422-2430
  • stable/1.17/Clp

  • stable/1.17/Clp/examples/addRows.cpp

    r2278 r2431  
    232232               value = columnPrimal[iColumn];
    233233               if (fabs(value) < 1.0e5)
    234                     std::cout << setiosflags(std::ios::fixed | std::ios::showpoint) << std::setw(14) << value;
    235                else
    236                     std::cout << setiosflags(std::ios::scientific) << std::setw(14) << value;
     234                    std::cout << std::setiosflags(std::ios::fixed | std::ios::showpoint) << std::setw(14) << value;
     235               else
     236                    std::cout << std::setiosflags(std::ios::scientific) << std::setw(14) << value;
    237237               value = columnDual[iColumn];
    238238               if (fabs(value) < 1.0e5)
    239                     std::cout << setiosflags(std::ios::fixed | std::ios::showpoint) << std::setw(14) << value;
    240                else
    241                     std::cout << setiosflags(std::ios::scientific) << std::setw(14) << value;
     239                    std::cout << std::setiosflags(std::ios::fixed | std::ios::showpoint) << std::setw(14) << value;
     240               else
     241                    std::cout << std::setiosflags(std::ios::scientific) << std::setw(14) << value;
    242242               value = columnLower[iColumn];
    243243               if (fabs(value) < 1.0e5)
    244                     std::cout << setiosflags(std::ios::fixed | std::ios::showpoint) << std::setw(14) << value;
    245                else
    246                     std::cout << setiosflags(std::ios::scientific) << std::setw(14) << value;
     244                    std::cout << std::setiosflags(std::ios::fixed | std::ios::showpoint) << std::setw(14) << value;
     245               else
     246                    std::cout << std::setiosflags(std::ios::scientific) << std::setw(14) << value;
    247247               value = columnUpper[iColumn];
    248248               if (fabs(value) < 1.0e5)
    249                     std::cout << setiosflags(std::ios::fixed | std::ios::showpoint) << std::setw(14) << value;
    250                else
    251                     std::cout << setiosflags(std::ios::scientific) << std::setw(14) << value;
     249                    std::cout << std::setiosflags(std::ios::fixed | std::ios::showpoint) << std::setw(14) << value;
     250               else
     251                    std::cout << std::setiosflags(std::ios::scientific) << std::setw(14) << value;
    252252               value = columnObjective[iColumn];
    253253               if (fabs(value) < 1.0e5)
    254                     std::cout << setiosflags(std::ios::fixed | std::ios::showpoint) << std::setw(14) << value;
    255                else
    256                     std::cout << setiosflags(std::ios::scientific) << std::setw(14) << value;
     254                    std::cout << std::setiosflags(std::ios::fixed | std::ios::showpoint) << std::setw(14) << value;
     255               else
     256                    std::cout << std::setiosflags(std::ios::scientific) << std::setw(14) << value;
    257257
    258258               std::cout << std::endl;
Note: See TracChangeset for help on using the changeset viewer.