Changeset 609


Ignore:
Timestamp:
Jun 7, 2011 8:35:03 AM (9 years ago)
Author:
pbelotti
Message:

skipping FP on continuous NLPs

Location:
trunk/Couenne/src
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/bound_tightening/twoImpliedBT/Makefile.in

    r608 r609  
    1515@SET_MAKE@
    1616
    17 # $Id: Makefile.am 501 2011-02-14 17:43:46Z pbelotti $
     17# $Id: Makefile.am 608 2011-06-07 10:55:15Z pbelotti $
    1818#
    1919# Copyright (C) 2006 International Business Machines and others.
  • trunk/Couenne/src/heuristics/CouenneFPFindSolution.cpp

    r595 r609  
    99 */
    1010
    11 //#include "CbcModel.hpp"
    12 //#include "CoinTime.hpp"
    13 //#include "CoinHelperFunctions.hpp"
    14 
    1511#include "CouenneFeasPump.hpp"
    16 //#include "CouenneMINLPInterface.hpp"
    17 //#include "CouenneProblem.hpp"
    18 //#include "CouenneProblemElem.hpp"
    1912
    2013using namespace Couenne;
     
    5144
    5245  /// solve MILP
     46
    5347  milp_ -> branchAndBound ();
    5448}
  • trunk/Couenne/src/heuristics/CouenneFPSolveMILP.cpp

    r600 r609  
    159159     // create constraints
    160160     for (int i=0; i<nconss; i++) {
     161
    161162        SCIP_CONS* cons;
    162163       
  • trunk/Couenne/src/heuristics/CouenneFPSolveNLP.cpp

    r595 r609  
    6262  problem_ -> domain () -> push (problem_ -> nVars (),
    6363                                 iSol,
    64                                  NULL, //problem_ -> domain () -> lb (),
    65                                  NULL, //problem_ -> domain () -> ub (),
     64                                 NULL, // replaces problem_ -> domain () -> lb (),
     65                                 NULL, // replaces problem_ -> domain () -> ub (),
    6666                                 false);
    6767
  • trunk/Couenne/src/heuristics/CouenneFeasPump.cpp

    r597 r609  
    3131int CouenneFeasPump::solution (double &objVal, double *newSolution) {
    3232
     33  if (problem_ -> nIntVars () <= 0)
     34    return 0;
     35
    3336  printf ("FP ====================================\n");
    3437
Note: See TracChangeset for help on using the changeset viewer.