Changeset 85


Ignore:
Timestamp:
Oct 23, 2006 2:18:59 PM (13 years ago)
Author:
pbonami
Message:

Update Bcp makefiles for new directory layout

Location:
branches/devel/Bonmin/experimental/Bcp
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Bonmin/experimental/Bcp/BM.cpp

    r70 r85  
    149149    argv[1] = strdup(par.entry(BM_par::NL_filename).c_str());
    150150    argv[2] = NULL;
    151     nlpSolver.readAmplNlFile(argv, 0, 0, new Bonmin::IpoptSolver);
     151    nlpSolver.readAmplNlFile(argv,new Bonmin::IpoptSolver,  0, 0);
    152152    free(argv[1]);
    153153 
     
    239239    argv[1] = strdup(par.entry(BM_par::NL_filename).c_str());
    240240    argv[2] = NULL;
    241     nlpSolver.readAmplNlFile(argv, 0, 0, new Bonmin::IpoptSolver);
     241    nlpSolver.readAmplNlFile(argv, new Bonmin::IpoptSolver, 0, 0);
    242242    free(argv[1]);
    243243    OsiClpSolverInterface clp;
  • branches/devel/Bonmin/experimental/Bcp/BM_pack.cpp

    r70 r85  
    88
    99#include "BM.hpp"
    10 
     10#include "BonIpoptSolver.hpp"
    1111//#############################################################################
    1212
     
    6868    std::string ipopt_content(ipopt_file_content.c_str());
    6969    std::string nl_content(nl_file_content.c_str());
    70     nlp.readAmplNlFile(argv, &ipopt_content, &nl_content,
    71                        new Bonmin::IpoptSolver);
     70    nlp.readAmplNlFile(argv, new Bonmin::IpoptSolver, &ipopt_content, &nl_content);
    7271    free(argv[1]);
    7372
  • branches/devel/Bonmin/experimental/Bcp/Makefile.am

    r82 r85  
    3434
    3535########################################################################
    36 #                                bonmin                                #
     36#                                bonminbcp                                #
    3737########################################################################
    3838
     
    7575bonminbcp_LDADD = \
    7676        ../../src/Apps/libbonmin.la \
    77         ../../src/BonminAmplInterface/libamplinterface.la \
     77        ../../src/Interfaces/Ampl/libamplinterface.la \
    7878        $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
    7979        $(IPOPTLIBS) \
     
    9393        -I`$(CYGPATH_W) $(srcdir)/../../src/OaInterface` \
    9494        -I`$(CYGPATH_W) $(srcdir)/../../src/Interfaces` \
    95         -I`$(CYGPATH_W) $(srcdir)/../../src/BonminAmplInterface` \
     95        -I`$(CYGPATH_W) $(srcdir)/../../src/Interfaces/Ipopt` \
     96        -I`$(CYGPATH_W) $(srcdir)/../../src/Interfaces/Ampl` \
    9697        -I`$(CYGPATH_W) $(srcdir)/../../src/CbcBonmin` \
    9798        -I`$(CYGPATH_W) $(IPOPTOBJDIR)/inc` \
  • branches/devel/Bonmin/experimental/Bcp/Makefile.in

    r82 r85  
    321321
    322322########################################################################
    323 #                                bonmin                                #
     323#                                bonminbcp                                #
    324324########################################################################
    325325bonminbcp_SOURCES = BB_cut.hpp BB_cut.cpp BM.hpp BM.cpp BM_pack.cpp bm_var.hpp
     
    334334bonminbcp_LDADD = \
    335335        ../../src/Apps/libbonmin.la \
    336         ../../src/BonminAmplInterface/libamplinterface.la \
     336        ../../src/Interfaces/Ampl/libamplinterface.la \
    337337        $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
    338338        $(IPOPTLIBS) \
     
    352352AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../../src/OaInterface` \
    353353        -I`$(CYGPATH_W) $(srcdir)/../../src/Interfaces` \
    354         -I`$(CYGPATH_W) $(srcdir)/../../src/BonminAmplInterface` \
     354        -I`$(CYGPATH_W) $(srcdir)/../../src/Interfaces/Ipopt` \
     355        -I`$(CYGPATH_W) $(srcdir)/../../src/Interfaces/Ampl` \
    355356        -I`$(CYGPATH_W) $(srcdir)/../../src/CbcBonmin` -I`$(CYGPATH_W) \
    356357        $(IPOPTOBJDIR)/inc` -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Common` \
Note: See TracChangeset for help on using the changeset viewer.