Changeset 5738


Ignore:
Timestamp:
11/06/08 15:49:44 (5 years ago)
Author:
wehart
Message:

Initial stab at setting up registrations for Coliny optimizers.

ifdefing the Hooke optimizer appropriately.

Added a missing method in src/lib/OPTpp.cpp

Location:
interfaces/trunk
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • interfaces/trunk/interfaces/Hooke.h

    r5725 r5738  
    1818 
    1919#include <acro_config.h> 
     20#ifdef ACRO_USING_THREEPO 
    2021#include <colin/colin.h> 
    2122#include <colin/OptSolver.h> 
     
    7677} // namespace interfaces 
    7778#endif 
     79#endif 
  • interfaces/trunk/interfaces/Makefile.am

    r5712 r5738  
    2020NPSOL.h\ 
    2121OPTpp.h\ 
    22 TCC.h 
     22TCC.h\ 
     23ColinyRegistrations.h 
    2324 
    2425includeinterfacesdir=$(includedir)/interfaces 
  • interfaces/trunk/src/Makefile.am

    r5731 r5738  
    2222 
    2323BOOST_FLAG=-I${top_srcdir}/tpl/boost 
    24 BOOSTLIB=$(top_builddir)/tpl/boost/libboost.a 
     24BOOSTLIB=-L$(top_builddir)/tpl/boost -lboost 
    2525 
    2626# 
     
    3939lib/Cobyla.cpp\ 
    4040lib/Hooke.cpp\ 
    41 lib/OPTpp.cpp 
     41lib/OPTpp.cpp\ 
     42lib/ColinyRegistrations.cpp 
    4243 
    4344FOO= \ 
    4445lib/factory.cpp\ 
    4546lib/APPS.cpp\ 
    46 lib/Cobyla.cpp\ 
    4747lib/DOT.cpp\ 
    48 lib/Hooke.cpp\ 
    4948lib/MOMHLib.cpp\ 
    5049lib/NPSOL.cpp\ 
     
    6665endif 
    6766 
     67if BUILD_OPTPP 
     68OPTPPLIB=$(top_builddir)/packages/optpp/lib/libopt.la\ 
     69        $(top_builddir)/packages/optpp/lib/libnewmat.la 
     70endif 
     71 
    6872#$(top_builddir)/packages/coliny/src/libcoliny.a 
    6973 
     
    7579 
    7680LDADD=-L$(TOPLIB) $(LDADD_ACRO_LIBS) \ 
    77         $(APPSPACKLIB) $(THREEPOLIB) $(MOMHLIB) $(BOOSTLIB) $(AMPLLIB) $(DLOPEN_LIBS) 
     81        $(APPSPACKLIB) $(THREEPOLIB) $(MOMHLIB) $(OPTPPLIB) $(BOOSTLIB) $(AMPLLIB) $(DLOPEN_LIBS) 
    7882 
    7983if BUILD_EXECUTABLES 
  • interfaces/trunk/src/exec/coliny.cpp

    r5732 r5738  
    1212// 
    1313 
     14#include <interfaces/ColinyRegistrations.h> 
    1415#include <colin/ColinDriver.h> 
    1516 
    1617int main(int argc, char* argv[]) 
    1718{ 
     19static_cast<void>(interfaces::StaticInitializers::static_coliny_registrations); 
    1820return colin::colin_driver(argc,argv,"coliny"); 
    1921} 
  • interfaces/trunk/src/lib/OPTpp.cpp

    r5727 r5738  
    8181 
    8282    /// 
    83     ~NLF0() {} 
     83    virtual ~NLF0() {} 
    8484 
    8585    /// 
     
    204204 
    205205    /// 
    206     ~NLF1() {} 
     206    virtual ~NLF1() {} 
    207207 
    208208    /// 
     
    242242        } 
    243243}; 
     244 
     245void OptppNLP1::NLF1::initFcn() // Initialize Function 
     246{ 
     247  if (init_flag == false)  { 
     248    utilib::TypeManager()->lexical_cast(initial_point, mem_xc); 
     249    init_flag = true; 
     250  } 
     251  else  { 
     252    cerr << "NLF1:initFcn: Warning - initialization called twice\n"; 
     253    utilib::TypeManager()->lexical_cast(initial_point, mem_xc); 
     254  } 
     255} 
    244256 
    245257double OptppNLP1::NLF1::evalF() // Evaluate Function 
Note: See TracChangeset for help on using the changeset viewer.