Changeset 93


Ignore:
Timestamp:
Oct 26, 2006 1:04:22 PM (13 years ago)
Author:
pbonami
Message:

Fix makefile

Location:
branches/devel/Bonmin/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Bonmin/src/Apps/Makefile.am

    r90 r93  
    6363
    6464bonmin_LDADD = \
    65         ../BonminAmplInterface/libamplinterface.la\
     65        ../Interfaces/Ampl/libamplinterface.la\
    6666        libbonmin.la \
    6767        $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
     
    124124
    125125nodeSolver_LDADD = \
    126         ../BonminAmplInterface/libamplinterface.la \
     126        ../Interfaces/Ampl/libamplinterface.la \
    127127        libbonmin.la \
    128128        $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
  • branches/devel/Bonmin/src/Apps/Makefile.in

    r90 r93  
    100100        $(COINUTILSOBJDIR)/src/libCoinUtils.la $(am__DEPENDENCIES_3) \
    101101        $(am__DEPENDENCIES_4)
    102 bonmin_DEPENDENCIES = ../BonminAmplInterface/libamplinterface.la \
     102bonmin_DEPENDENCIES = ../Interfaces/Ampl/libamplinterface.la \
    103103        libbonmin.la \
    104104        $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
     
    107107am_nodeSolver_OBJECTS = nodeSolver.$(OBJEXT)
    108108nodeSolver_OBJECTS = $(am_nodeSolver_OBJECTS)
    109 nodeSolver_DEPENDENCIES = ../BonminAmplInterface/libamplinterface.la \
     109nodeSolver_DEPENDENCIES = ../Interfaces/Ampl/libamplinterface.la \
    110110        libbonmin.la \
    111111        $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
     
    367367bonmin_SOURCES = BonMin.cpp
    368368bonmin_LDADD = \
    369         ../BonminAmplInterface/libamplinterface.la\
     369        ../Interfaces/Ampl/libamplinterface.la\
    370370        libbonmin.la \
    371371        $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
     
    407407nodeSolver_SOURCES = nodeSolver.cpp
    408408nodeSolver_LDADD = \
    409         ../BonminAmplInterface/libamplinterface.la \
     409        ../Interfaces/Ampl/libamplinterface.la \
    410410        libbonmin.la \
    411411        $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
  • branches/devel/Bonmin/src/Interfaces/Filter/BonFilterSolver.cpp

    r90 r93  
    314314{
    315315  assert(tnlp == cached_->tnlp_);
    316   cached_->ifail = -1;
     316  cached_->ifail = 0;//-1;
    317317  //rescan bounds which may have changed
    318318  assert(cached_->bounds);
     
    533533  cpuTime_ = - CoinCpuTime();
    534534  fint cstype_len = 1;
     535  rho = 10;
    535536  filtersqp_(&n, &m, &kmax, & maxa, &maxf, &mlp, &maxWk,
    536537             &maxiWk, &iprint, &nout, &ifail, &rho, x,
Note: See TracChangeset for help on using the changeset viewer.