Changeset 55


Ignore:
Timestamp:
Sep 29, 2006 1:29:08 PM (13 years ago)
Author:
pbonami
Message:

Adding prefix Bon to filenames

Location:
branches/devel/Bonmin/src/IpoptInterface
Files:
12 added
5 deleted
2 edited
18 moved

Legend:

Unmodified
Added
Removed
  • branches/devel/Bonmin/src/IpoptInterface/BonBoundsReader.cpp

    r53 r55  
    88// Date : 26/05/2005
    99
    10 #include "BoundsReader.hpp"
     10#include "BonBoundsReader.hpp"
    1111
    1212#include <fstream>
  • branches/devel/Bonmin/src/IpoptInterface/BonColReader.cpp

    r53 r55  
    77//
    88// Date : 26/05/2005
    9 #include "IpCbcColReader.hpp"
     9#include "BonColReader.hpp"
    1010#include <fstream>
    1111#include <iostream>
     12
     13namespace Bonmin{
    1214/** Keywords of the .int file */
    1315static std::string keywords[]= { "priorities", "PRIORITIES",
    1416    "special_ordered_set_1",
    1517    "SPECIAL_ORDERED_SET_1"};
    16 IpCbcColReader::IpCbcColReader(const char * fileName)
     18ColReader::ColReader(const char * fileName)
    1719    :
    1820    fileName_(), varIndices_(), varNames_()
     
    2123  fileName_=fileName;
    2224}
    23 IpCbcColReader::IpCbcColReader(const std::string & fileName)
     25ColReader::ColReader(const std::string & fileName)
    2426    :
    2527    fileName_(fileName), varIndices_(), varNames_()
    2628{}
    2729
    28 bool IpCbcColReader::readFile()
     30bool ColReader::readFile()
    2931{
    3032  std::string colFileName = fileName_;
     
    5961
    6062void
    61 IpCbcColReader::copyNames(std::string *varNames, int n_var)
     63ColReader::copyNames(std::string *varNames, int n_var)
    6264{
    6365  assert(n_var >= 0 && (unsigned int) n_var==varNames_.size());
     
    6668  }
    6769}
     70}
  • branches/devel/Bonmin/src/IpoptInterface/BonColReader.hpp

    r53 r55  
    1818//#include <tr1/unordered_map>
    1919#include <map>
     20
     21namespace Bonmin{
    2022/** A class for reading a .col file containing name for variable (ampl generated file).
    2123   */
     
    6062  std::vector<std::string> varNames_;
    6163};
    62 
     64}
    6365#endif
  • branches/devel/Bonmin/src/IpoptInterface/BonIpoptInterface.cpp

    r53 r55  
    1111
    1212
    13 #include "IpoptInterface.hpp"
    14 #include "TMINLP.hpp"
    15 #include "IpCbcColReader.hpp"
     13#include "BonIpoptInterface.hpp"
     14#include "BonTMINLP.hpp"
     15#include "BonColReader.hpp"
    1616#include "CoinTime.hpp"
    17 #include "IpoptWarmStart.hpp"
    18 #include "IpoptIntegerBias.hpp"
    19 #include "IpoptInteriorWarmStarter.hpp"
     17#include "BonminIpoptWarmStart.hpp"
     18#include "BonIpoptInteriorWarmStarter.hpp"
    2019#include <string>
    2120#include <sstream>
  • branches/devel/Bonmin/src/IpoptInterface/BonIpoptInteriorWarmStarter.cpp

    r52 r55  
    77// Authors:  Andreas Waechter          IBM    2006-03-09
    88
    9 #include "IpoptInteriorWarmStarter.hpp"
     9#include "BonIpoptInteriorWarmStarter.hpp"
    1010#include "IpDenseVector.hpp"
    1111
  • branches/devel/Bonmin/src/IpoptInterface/BonStartPointReader.cpp

    r53 r55  
    77//
    88// Date : 26/05/2005
    9 #include "IpCbcStartPointReader.hpp"
     9#include "BonStartPointReader.hpp"
    1010
    1111
    1212namespace Bonmin {
    1313
    14   bool IpCbcStartPointReader::readFile()
     14  bool StartPointReader::readFile()
    1515  {
    1616    std::ifstream inFile(fileName_.c_str());
     
    3434  }
    3535
    36   bool IpCbcStartPointReader::readAndApply(IpoptInterface& solver)
     36  bool StartPointReader::readAndApply(OsiTMINLPInterface * solver)
    3737  {
    3838    readFile();
    39     solver.setWarmStartOptions();
     39    solver->setWarmStartOptions();
    4040    if(primals_)
    41       solver.setColSolution(primals_);
     41      solver->setColSolution(primals_);
    4242    else {
    4343      std::cerr<<"No warm start info ???"<<std::endl;
     
    4545    }
    4646    if(duals_)
    47       solver.setRowPrice(duals_);
     47      solver->setRowPrice(duals_);
    4848    else {
    4949      std::cerr<<"No warm start info ???"<<std::endl;
  • branches/devel/Bonmin/src/IpoptInterface/BonStartPointReader.hpp

    r53 r55  
    88// Date : 26/05/2005
    99
    10 #ifndef _IPCBCSTARTPOINTREADER_H_
    11 #define _IPCBCSTARTPOINTREADER_H_
     10#ifndef _BONSTARTPOINTREADER_H_
     11#define _BONSTARTPOINTREADER_H_
    1212#include <string>
    1313#include <list>
    1414#include <fstream>
    1515#include <iostream>
    16 #include "IpoptInterface.hpp"
     16#include "OsiTMINLPInterface.hpp"
    1717
    1818
     
    2121/** This class reads a file with a starting point for Ipopt initalization. File format is number of primals number of duals then values one after another
    2222 * Numbering of variables is first variables, then duals on lower bounds duals on upper bounds and to finish duals on constraints */
    23 class IpCbcStartPointReader
     23class StartPointReader
    2424{
    2525public:
    2626  /** Constructor with fileName_ given by a string (and default) */
    27   IpCbcStartPointReader(std::string fileName = ""):
     27  StartPointReader(std::string fileName = ""):
    2828      fileName_(fileName),
    2929      primals_(NULL),
     
    3131  {}
    3232  /** Constructor with fileName_ given by a const char * */
    33   IpCbcStartPointReader(const char * fileName):
     33  StartPointReader(const char * fileName):
    3434      fileName_(fileName),
    3535      primals_(NULL),
     
    4646  }
    4747  /** Read warmstart info and apply to an IpoptInterface */
    48   bool readAndApply(IpoptInterface& solver);
    49   ~IpCbcStartPointReader()
     48  bool readAndApply(OsiTMINLPInterface * solver);
     49  ~StartPointReader()
    5050  {
    5151    gutsOfDestructor();
  • branches/devel/Bonmin/src/IpoptInterface/BonTMINLP.cpp

    r53 r55  
    88// Date : 26/09/2006
    99
    10 #include "TMINLP.hpp"
     10#include "BonTMINLP.hpp"
    1111#include "IpBlas.hpp"
    1212
  • branches/devel/Bonmin/src/IpoptInterface/BonTMINLP2TNLP.cpp

    r53 r55  
    1111
    1212
    13 #include "TMINLP2TNLP.hpp"
     13#include "BonTMINLP2TNLP.hpp"
    1414#include "IpBlas.hpp"
    1515#include "IpAlgTypes.hpp"
  • branches/devel/Bonmin/src/IpoptInterface/BonTMINLP2TNLP.hpp

    r53 r55  
    1414
    1515#include "IpTNLP.hpp"
    16 #include "TMINLP.hpp"
     16#include "BonTMINLP.hpp"
    1717#include "IpSmartPtr.hpp"
    1818#include "IpIpoptApplication.hpp"
    1919#include "IpOptionsList.hpp"
    20 #include "IpoptInteriorWarmStarter.hpp"
     20#include "BonIpoptInteriorWarmStarter.hpp"
    2121
    2222namespace Bonmin
  • branches/devel/Bonmin/src/IpoptInterface/BonTNLP2FPNLP.cpp

    r53 r55  
    99
    1010
    11 #include "TNLP2FPNLP.hpp"
     11#include "BonTNLP2FPNLP.hpp"
    1212#include "IpBlas.hpp"
    1313namespace Bonmin
  • branches/devel/Bonmin/src/IpoptInterface/BonTNLP2FPNLP.hpp

    r53 r55  
    1010
    1111#include "IpTNLP.hpp"
    12 #include "TMINLP.hpp"
     12#include "BonTMINLP.hpp"
    1313#include "IpSmartPtr.hpp"
    1414
  • branches/devel/Bonmin/src/IpoptInterface/BonminIpoptWarmStart.cpp

    r53 r55  
    1010
    1111
    12 #include "IpoptWarmStart.hpp"
     12#include "BonminIpoptWarmStart.hpp"
    1313#include "CoinHelperFunctions.hpp"
    1414
    1515
    1616
    17 #include "IpoptInterface.hpp"
    18 #include "IpoptInteriorWarmStarter.hpp"
     17#include "BonIpoptInterface.hpp"
     18#include "BonIpoptInteriorWarmStarter.hpp"
    1919
    2020
  • branches/devel/Bonmin/src/IpoptInterface/BonminIpoptWarmStart.hpp

    r53 r55  
    1414#include "CoinWarmStartBasis.hpp"
    1515#include "CoinPackedVector.hpp"
    16 #include "IpoptInteriorWarmStarter.hpp"
     16#include "BonIpoptInteriorWarmStarter.hpp"
    1717
    1818
  • branches/devel/Bonmin/src/IpoptInterface/Makefile.am

    r53 r55  
    1717# List all source files, including headers
    1818libipoptinterface_la_SOURCES = \
    19         BoundsReader.cpp BoundsReader.hpp \
    20         IpCbcColReader.cpp IpCbcColReader.hpp \
    21         IpCbcStartPointReader.cpp IpCbcStartPointReader.hpp \
    22         IpoptIntegerBias.hpp \
    23         IpoptInterface.cpp IpoptInterface.hpp \
     19        BonBoundsReader.cpp BonBoundsReader.hpp \
     20        BonColReader.cpp BonColReader.hpp \
     21        BonStartPointReader.cpp BonStartPointReader.hpp \
     22        BonIpoptInterface.cpp BonIpoptInterface.hpp \
    2423        OsiTMINLPInterface.cpp OsiTMINLPInterface.hpp \
    25         IpoptInteriorWarmStarter.cpp IpoptInteriorWarmStarter.hpp \
    26         IpoptWarmStart.cpp IpoptWarmStart.hpp \
    27         TMINLP2TNLP.cpp TMINLP2TNLP.hpp \
    28         TMINLP.cpp TMINLP.hpp \
     24        BonIpoptInteriorWarmStarter.cpp BonIpoptInteriorWarmStarter.hpp \
     25        BonminIpoptWarmStart.cpp BonminIpoptWarmStart.hpp \
     26        BonTMINLP2TNLP.cpp BonTMINLP2TNLP.hpp \
     27        BonTMINLP.cpp BonTMINLP.hpp \
    2928        IpoptSolver.hpp IpoptSolver.cpp \
    3029        TNLPSolver.hpp TNLPSolver.cpp \
    31         TNLP2FPNLP.cpp TNLP2FPNLP.hpp
     30        BonTNLP2FPNLP.cpp BonTNLP2FPNLP.hpp
    3231
    3332# This is for libtool (on Windows)
     
    5958
    6059include_HEADERS = \
    61         IpoptInterface.hpp \
     60        BonIpoptInterface.hpp \
    6261        OsiTMINLPInterface.hpp \
    63         IpoptInteriorWarmStarter.hpp \
    64         TMINLP2TNLP.hpp \
    65         TMINLP.hpp \
    66         TNLP2FPNLP.hpp \
     62        BonIpoptInteriorWarmStarter.hpp \
     63        BonTMINLP2TNLP.hpp \
     64        BonTMINLP.hpp \
     65        BonTNLP2FPNLP.hpp \
    6766        TNLPSolver.hpp \
    6867        IpoptSolver.hpp
  • branches/devel/Bonmin/src/IpoptInterface/Makefile.in

    r53 r55  
    5757LTLIBRARIES = $(noinst_LTLIBRARIES)
    5858libipoptinterface_la_LIBADD =
    59 am_libipoptinterface_la_OBJECTS = BoundsReader.lo IpCbcColReader.lo \
    60         IpCbcStartPointReader.lo IpoptInterface.lo \
    61         OsiTMINLPInterface.lo IpoptInteriorWarmStarter.lo \
    62         IpoptWarmStart.lo TMINLP2TNLP.lo TMINLP.lo IpoptSolver.lo \
    63         TNLPSolver.lo TNLP2FPNLP.lo
     59am_libipoptinterface_la_OBJECTS = BonBoundsReader.lo BonColReader.lo \
     60        BonStartPointReader.lo BonIpoptInterface.lo \
     61        OsiTMINLPInterface.lo BonIpoptInteriorWarmStarter.lo \
     62        BonminIpoptWarmStart.lo BonTMINLP2TNLP.lo BonTMINLP.lo \
     63        IpoptSolver.lo TNLPSolver.lo BonTNLP2FPNLP.lo
    6464libipoptinterface_la_OBJECTS = $(am_libipoptinterface_la_OBJECTS)
    6565depcomp = $(SHELL) $(top_srcdir)/../depcomp
     
    310310# List all source files, including headers
    311311libipoptinterface_la_SOURCES = \
    312         BoundsReader.cpp BoundsReader.hpp \
    313         IpCbcColReader.cpp IpCbcColReader.hpp \
    314         IpCbcStartPointReader.cpp IpCbcStartPointReader.hpp \
    315         IpoptIntegerBias.hpp \
    316         IpoptInterface.cpp IpoptInterface.hpp \
     312        BonBoundsReader.cpp BonBoundsReader.hpp \
     313        BonColReader.cpp BonColReader.hpp \
     314        BonStartPointReader.cpp BonStartPointReader.hpp \
     315        BonIpoptInterface.cpp BonIpoptInterface.hpp \
    317316        OsiTMINLPInterface.cpp OsiTMINLPInterface.hpp \
    318         IpoptInteriorWarmStarter.cpp IpoptInteriorWarmStarter.hpp \
    319         IpoptWarmStart.cpp IpoptWarmStart.hpp \
    320         TMINLP2TNLP.cpp TMINLP2TNLP.hpp \
    321         TMINLP.cpp TMINLP.hpp \
     317        BonIpoptInteriorWarmStarter.cpp BonIpoptInteriorWarmStarter.hpp \
     318        BonminIpoptWarmStart.cpp BonminIpoptWarmStart.hpp \
     319        BonTMINLP2TNLP.cpp BonTMINLP2TNLP.hpp \
     320        BonTMINLP.cpp BonTMINLP.hpp \
    322321        IpoptSolver.hpp IpoptSolver.cpp \
    323322        TNLPSolver.hpp TNLPSolver.cpp \
    324         TNLP2FPNLP.cpp TNLP2FPNLP.hpp
     323        BonTNLP2FPNLP.cpp BonTNLP2FPNLP.hpp
    325324
    326325
     
    353352########################################################################
    354353include_HEADERS = \
    355         IpoptInterface.hpp \
     354        BonIpoptInterface.hpp \
    356355        OsiTMINLPInterface.hpp \
    357         IpoptInteriorWarmStarter.hpp \
    358         TMINLP2TNLP.hpp \
    359         TMINLP.hpp \
    360         TNLP2FPNLP.hpp \
     356        BonIpoptInteriorWarmStarter.hpp \
     357        BonTMINLP2TNLP.hpp \
     358        BonTMINLP.hpp \
     359        BonTNLP2FPNLP.hpp \
    361360        TNLPSolver.hpp \
    362361        IpoptSolver.hpp
     
    443442        -rm -f *.tab.c
    444443
    445 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BoundsReader.Plo@am__quote@
    446 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IpCbcColReader.Plo@am__quote@
    447 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IpCbcStartPointReader.Plo@am__quote@
    448 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IpoptInterface.Plo@am__quote@
    449 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IpoptInteriorWarmStarter.Plo@am__quote@
     444@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonBoundsReader.Plo@am__quote@
     445@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonColReader.Plo@am__quote@
     446@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonIpoptInterface.Plo@am__quote@
     447@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonIpoptInteriorWarmStarter.Plo@am__quote@
     448@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonStartPointReader.Plo@am__quote@
     449@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonTMINLP.Plo@am__quote@
     450@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonTMINLP2TNLP.Plo@am__quote@
     451@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonTNLP2FPNLP.Plo@am__quote@
     452@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonminIpoptWarmStart.Plo@am__quote@
    450453@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IpoptSolver.Plo@am__quote@
    451 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IpoptWarmStart.Plo@am__quote@
    452454@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OsiTMINLPInterface.Plo@am__quote@
    453 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TMINLP.Plo@am__quote@
    454 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TMINLP2TNLP.Plo@am__quote@
    455 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TNLP2FPNLP.Plo@am__quote@
    456455@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TNLPSolver.Plo@am__quote@
    457456
Note: See TracChangeset for help on using the changeset viewer.