Changeset 70


Ignore:
Timestamp:
Oct 16, 2006 11:22:35 PM (13 years ago)
Author:
pbonami
Message:

Fix Bcp version with new code and remove mistakenly added file.

Location:
branches/devel/Bonmin
Files:
1 deleted
3 edited

Legend:

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

    r61 r70  
    2020#include "BonAmplInterface.hpp"
    2121#include "BonTMINLP.hpp"
     22#include "BonIpoptSolver.hpp"
    2223#include "OsiClpSolverInterface.hpp"
    2324#include "BCP_parameters.hpp"
     
    148149    argv[1] = strdup(par.entry(BM_par::NL_filename).c_str());
    149150    argv[2] = NULL;
    150     nlpSolver.readAmplNlFile(argv, 0, 0);
     151    nlpSolver.readAmplNlFile(argv, 0, 0, new Bonmin::IpoptSolver);
    151152    free(argv[1]);
    152153 
     
    238239    argv[1] = strdup(par.entry(BM_par::NL_filename).c_str());
    239240    argv[2] = NULL;
    240     nlpSolver.readAmplNlFile(argv, 0, 0);
     241    nlpSolver.readAmplNlFile(argv, 0, 0, new Bonmin::IpoptSolver);
    241242    free(argv[1]);
    242243    OsiClpSolverInterface clp;
  • branches/devel/Bonmin/experimental/Bcp/BM_pack.cpp

    r1 r70  
    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);
     70    nlp.readAmplNlFile(argv, &ipopt_content, &nl_content,
     71                       new Bonmin::IpoptSolver);
    7172    free(argv[1]);
    7273
  • branches/devel/Bonmin/src/BonminAmplInterface/BonAmplInterface.hpp

    r67 r70  
    2929        std::string* ipopt_file_content =NULL,
    3030        std::string* nl_file_content = NULL,
    31         Ipopt::SmartPtr<TNLPSolver> app = IpoptSolver() );
     31        Ipopt::SmartPtr<TNLPSolver> app = new Bonmin::IpoptSolver());
    3232    /** write ampl solution file */
    3333    void writeAmplSolFile(std::string message,const double * primalSol = NULL,const double * dualSol = NULL);
Note: See TracChangeset for help on using the changeset viewer.