Changeset 1901


Ignore:
Timestamp:
Apr 8, 2013 8:49:41 AM (9 years ago)
Author:
stefan
Message:

fix compiler warnings; remove duplicate basic2 of basic

Location:
trunk/Osi
Files:
3 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Osi/MSVisualStudio/v10/Osi.sln

    r1812 r1901  
    44EndProject
    55Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCoinUtils", "..\..\..\CoinUtils\MSVisualStudio\v10\libCoinUtils\libCoinUtils.vcxproj", "{C4867F15-438D-4FF8-8388-62FBAAA9786C}"
    6 EndProject
    7 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OsiExamplesBasic2", "OsiExamplesBasic2\OsiExamplesBasic2.vcxproj", "{B349E853-2E2B-468E-8853-184ACD948678}"
    86EndProject
    97Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OsiExamplesBasic", "OsiExamplesBasic\OsiExamplesBasic.vcxproj", "{B874A948-B5F4-4501-9735-BD9586C5216D}"
  • trunk/Osi/MSVisualStudio/v9/Osi.sln

    r1615 r1901  
    77EndProject
    88Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCoinUtils", "..\..\..\CoinUtils\MSVisualStudio\v9\libCoinUtils\libCoinUtils.vcproj", "{C4867F15-438D-4FF8-8388-62FBAAA9786C}"
    9 EndProject
    10 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OsiExamplesBasic2", "OsiExamplesBasic2\OsiExamplesBasic2.vcproj", "{B349E853-2E2B-468E-8853-184ACD948678}"
    11         ProjectSection(ProjectDependencies) = postProject
    12                 {C4867F15-438D-4FF8-8388-62FBAAA9786C} = {C4867F15-438D-4FF8-8388-62FBAAA9786C}
    13                 {7D98E2CB-876E-4F75-9F71-77D3FE87E149} = {7D98E2CB-876E-4F75-9F71-77D3FE87E149}
    14         EndProjectSection
    159EndProject
    1610Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OsiExamplesBasic", "OsiExamplesBasic\OsiExamplesBasic.vcproj", "{B874A948-B5F4-4501-9735-BD9586C5216D}"
  • trunk/Osi/examples/basic.cpp

    r1881 r1901  
    3030
    3131      int n = si->getNumCols();
    32       const double *solution;
    33       solution = si->getColSolution();
    34       // We could then print the solution or examine it.
     32      const double* solution = si->getColSolution();
     33
     34      // We can then print the solution or could examine it.
     35      for( int i = 0; i < n && i < 5; ++i )
     36         std::cout << si->getColName(i) << " = " << solution[i] << std::endl;
     37      if( 5 < n )
     38         std::cout << "..." << std::endl;
    3539   } else {
    3640      std::cout << "Didn't find optimal solution." << std::endl;
  • trunk/Osi/examples/build.cpp

    r1881 r1901  
    9292
    9393      int n = si->getNumCols();
    94       const double *solution;
    95       solution = si->getColSolution();
    96       // We could then print the solution or examine it.
     94      const double* solution = si->getColSolution();
     95
     96      // We can then print the solution or could examine it.
     97      for( int i = 0; i < n; ++i )
     98         std::cout << si->getColName(i) << " = " << solution[i] << std::endl;
     99
    97100   } else {
    98101      std::cout << "Didn't find optimal solution." << std::endl;
  • trunk/Osi/examples/opbdp_solve.cpp

    r1516 r1901  
    11// Copyright (C) 2006, International Business Machines
    22// Corporation and others.  All Rights Reserved.
    3 #ifdef COIN_OPBDP
    4 #if defined(_MSC_VER)
    5 // Turn off compiler warning about long names
    6 #  pragma warning(disable:4786)
    7 #endif
    83
    94#include "OsiConfig.h"
     
    1712#include <iostream>
    1813
     14#include "CoinPragma.hpp"
    1915#include "CoinHelperFunctions.hpp"
    2016#include "CoinPackedVector.hpp"
    2117#include "CoinPackedMatrix.hpp"
    22 #include  "CoinTime.hpp"
     18#include "CoinTime.hpp"
    2319
    24 #include "odbdp_solve.hpp"
     20#include "opbdp_solve.hpp"
    2521#include "PBCS.h"
    2622// Not threadsafe
     
    485481  }
    486482}
    487 #endif
Note: See TracChangeset for help on using the changeset viewer.