Changeset 530


Ignore:
Timestamp:
Mar 12, 2011 11:52:06 AM (9 years ago)
Author:
pbelotti
Message:

removed unnecessary #includes of CouenneConfig?.h. fixed a few warnings.

Location:
trunk/Couenne
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/inc/config_couenne.h.in

    r487 r530  
    3636/* Version number of project */
    3737#undef COUENNE_VERSION
     38
     39/* Major Version number of project */
     40#undef COUENNE_VERSION_MAJOR
     41
     42/* Minor Version number of project */
     43#undef COUENNE_VERSION_MINOR
     44
     45/* Release Version number of project */
     46#undef COUENNE_VERSION_RELEASE
    3847
    3948/* Define to 1 if you have the <cstdint> header file. */
  • trunk/Couenne/src/bound_tightening/CouenneAggrProbing.cpp

    r490 r530  
    441441  memset(newLpObj, 0, numCols_*sizeof(double));
    442442
    443   expression* exprObj = NULL;
     443  //expression* exprObj = NULL; // PB: unused
    444444  expression* extraVar = NULL;
    445445
  • trunk/Couenne/src/branch/BranchCore.cpp

    r490 r530  
    167167    if (jnlst_ -> ProduceOutput (J_ERROR, J_BRANCHING)) {
    168168
    169       printf (" x%d >= %g; ",
     169      printf (" x%d >= %g [%g,%g]; ",
    170170              indVar,
    171171              integer ? ceil (brpt) : brpt,
  • trunk/Couenne/src/branch/doStrongBranching.cpp

    r529 r530  
    121121  int returnCode = 0, iDo = 0;
    122122
     123  Bonmin::HotInfo * results = results_ ();
     124
    123125  for (;iDo < numberToDo; iDo++) {
    124126
    125     Bonmin::HotInfo * result = results_ () + iDo; // retrieve i-th object to test
     127    Bonmin::HotInfo * result = results + iDo; // retrieve i-th object to test
    126128
    127129    OsiObject *Object = solver_ -> objects () [result -> whichObject ()];
  • trunk/Couenne/src/disjunctive/getDisjunctions.cpp

    r490 r530  
    175175
    176176    if (jnlst_ -> ProduceOutput (J_DETAILED, J_DISJCUTS))
    177       printf ("have %d disjunctions\n", disjs.size ());
     177      printf ("have %d disjunctions\n", (int) (disjs.size ()));
    178178
    179179    // sanity check: for each disjunction, check if left and right
  • trunk/Couenne/src/interfaces/CouenneMINLPInterface.cpp

    r490 r530  
    2828
    2929#if 0
    30 #include "BonminConfig.h"
     30//#include "BonminConfig.h"
    3131
    3232//#include "BonOsiTMINLPInterface.hpp"
     
    3939#include "Ipopt/BonIpoptSolver.hpp"
    4040#include "Ipopt/BonIpoptWarmStart.hpp"
     41
    4142#ifdef COIN_HAS_FILTERSQP
    4243#include "Filter/BonFilterSolver.hpp"
  • trunk/Couenne/src/interfaces/CouenneUserInterface.hpp

    r488 r530  
    1414#define COUENNEUSERINTERFACE_HPP_
    1515
    16 #include "CouenneConfig.h"
     16//#include "CouenneConfig.h"
    1717#include "IpOptionsList.hpp"
    1818#include "IpJournalist.hpp"
  • trunk/Couenne/src/main/BonCouenne.cpp

    r488 r530  
    2121#include <stdlib.h>
    2222
    23 #include "CouenneConfig.h"
     23//#include "CouenneConfig.h"
    2424
    2525#include "CoinTime.hpp"
     
    5151int main (int argc, char *argv[]) {
    5252
    53     printf ("Couenne %s --  an Open-Source exact solver for MINLP\n",
     53    printf ("Couenne %s --  an Open-Source exact solver for Mixed Integer Nonlinear Optimization\n\
     54Mailing list: couenne@list.coin-or.org\n\
     55Instructions: http://www.coin-or.org/Couenne\n",
    5456            strcmp (COUENNE_VERSION, "trunk") ? COUENNE_VERSION : "");
    55 
    56     printf ("\
    57 Mailing list: couenne@list.coin-or.org\n\
    58 Instructions: http://www.coin-or.org/Couenne\n");
    5957
    6058  WindowsErrorPopupBlocker();
  • trunk/Couenne/src/main/CouTight.cpp

    r490 r530  
    2222#include "CoinTime.hpp"
    2323#include "CoinError.hpp"
    24 #include "BonminConfig.h"
     24//#include "BonminConfig.h"
    2525#include "BonCouenneInterface.hpp"
    2626#include "BonIpoptSolver.hpp"
  • trunk/Couenne/src/main/Couenne.cpp

    r488 r530  
    1111// Date : 07/06/2009
    1212
    13 #include "CouenneConfig.h"
     13//#include "CouenneConfig.h"
    1414
    1515#include <cstdlib>
  • trunk/Couenne/src/main/CouenneSolver.cpp

    r488 r530  
    1111// Date : 07/06/2009
    1212
    13 #include "CouenneConfig.h"
     13//#include "CouenneConfig.h"
    1414
    1515#include <cstdlib>
  • trunk/Couenne/src/problem/CouenneSolverInterface.cpp

    r490 r530  
    6262  T::initialSolve ();
    6363
     64  // printf ("init solution: (");
     65  // for (int i=0; i< T::getNumCols (); i++)
     66  //   printf ("%g [%g,%g] ",
     67  //        T::getColSolution () [i],
     68  //        T::getColLower    () [i],
     69  //        T::getColUpper    () [i]);
     70  // printf (")\n");
     71
    6472  if (T::getObjValue () <= - Couenne_large_bound)
    6573    knowDualInfeasible_ = true;
     
    123131  T::resolve ();
    124132
     133  // printf ("solution: (");
     134  // for (int i=0; i< T::getNumCols (); i++)
     135  //   printf ("%g ", T::getColSolution () [i]);
     136  // printf (")\n");
     137
    125138  if (T::getObjValue () <= - Couenne_large_bound)
    126139    knowDualInfeasible_ = true;
  • trunk/Couenne/src/problem/reformulate.cpp

    r490 r530  
    1010#include <vector>
    1111
    12 #include "CouenneConfig.h"
     12//#include "CouenneConfig.h"
    1313
    1414#include "CoinHelperFunctions.hpp"
  • trunk/Couenne/src/readnl/CouenneAmplInterface.cpp

    r488 r530  
    118118        if (IsNull(roptions)) {
    119119                jnlst->Printf(J_ERROR, J_INITIALIZATION, "Error: Need registered options to create AmplTMINLP object!\n");
    120                 return false;
     120                return NULL;
    121121        }
    122122       
Note: See TracChangeset for help on using the changeset viewer.