Changeset 804


Ignore:
Timestamp:
Jan 30, 2012 6:40:42 PM (8 years ago)
Author:
pbelotti
Message:

passing CouenneTNLP instead of Bonmin::TMINLP in non-AMPL -- testing before allowing construction of own problem

Location:
trunk/Couenne/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/bound_tightening/Makefile.am

    r786 r804  
    4747        -I`$(CYGPATH_W) $(srcdir)/../main` \
    4848        -I`$(CYGPATH_W) $(srcdir)/../expression` \
     49        -I`$(CYGPATH_W) $(srcdir)/../expression/partial` \
     50        -I`$(CYGPATH_W) $(srcdir)/../interfaces` \
    4951        -I`$(CYGPATH_W) $(srcdir)/../branch` \
    5052        -I`$(CYGPATH_W) $(srcdir)/../expression/operators` \
  • trunk/Couenne/src/bound_tightening/Makefile.in

    r786 r804  
    352352        -I`$(CYGPATH_W) $(srcdir)/../main` \
    353353        -I`$(CYGPATH_W) $(srcdir)/../expression` \
     354        -I`$(CYGPATH_W) $(srcdir)/../expression/partial` \
     355        -I`$(CYGPATH_W) $(srcdir)/../interfaces` \
    354356        -I`$(CYGPATH_W) $(srcdir)/../branch` \
    355357        -I`$(CYGPATH_W) $(srcdir)/../expression/operators` \
  • trunk/Couenne/src/main/BonCouenneSetup.cpp

    r800 r804  
    152152      assert (couenneProb_ != NULL);
    153153      assert (IsValid (tminlp)); //TODO would be great to setup own TMINLP based on CouenneProblem formulation
    154       ci -> initialize (roptions_, options_, journalist_, tminlp);
     154      ci -> initialize (roptions_, options_, journalist_, 
     155                        Ipopt::SmartPtr <Bonmin::TMINLP> (dynamic_cast <Bonmin::TMINLP *> (Ipopt::GetRawPtr (tminlp))));
    155156    }
    156157  }
  • trunk/Couenne/src/main/BonCouenneSetup.hpp

    r749 r804  
    1616#include "CbcFeasibilityBase.hpp"
    1717
     18#include "CouenneTNLP.hpp"
     19
    1820struct ASL;
    1921
     
    2729  class CouenneCutGenerator;
    2830  class CouenneProblem;
     31  class CouenneTNLP;
    2932
    3033  class SmartAsl : public Ipopt::ReferencedObject{
     
    7881    virtual void readOptionsFile(){
    7982      if (readOptions_) return;
    80       Bonmin::BabSetupBase::readOptionsFile("couenne.opt");
     83      Bonmin::BabSetupBase::readOptionsFile ("couenne.opt");
    8184    }
    8285
  • trunk/Couenne/src/main/Makefile.am

    r793 r804  
    3333        -I`$(CYGPATH_W) $(srcdir)/../expression` \
    3434        -I`$(CYGPATH_W) $(srcdir)/../expression/operators` \
     35        -I`$(CYGPATH_W) $(srcdir)/../expression/partial` \
    3536        -I`$(CYGPATH_W) $(srcdir)/../interfaces` \
    3637        -I`$(CYGPATH_W) $(srcdir)/../heuristics` \
  • trunk/Couenne/src/main/Makefile.in

    r793 r804  
    336336        -I`$(CYGPATH_W) $(srcdir)/../expression` \
    337337        -I`$(CYGPATH_W) $(srcdir)/../expression/operators` \
     338        -I`$(CYGPATH_W) $(srcdir)/../expression/partial` \
    338339        -I`$(CYGPATH_W) $(srcdir)/../interfaces` \
    339340        -I`$(CYGPATH_W) $(srcdir)/../heuristics` \
Note: See TracChangeset for help on using the changeset viewer.