Changeset 6131


Ignore:
Timestamp:
12/10/08 22:36:22 (5 years ago)
Author:
wehart
Message:

Adding stubs for building EAminlp and MultiStart?. Both of these
fail to build, though, because the hybridization mechanisms
in COLIN are not well-implemented in the SCO-specific
solver interface.

Location:
scolib/trunk
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • scolib/trunk/scolib/MultiStart.h

    r6094 r6131  
    232232   for (unsigned int i = 0; i < this->sub_solver.size(); i++) 
    233233   { 
    234       this->sub_solver[i].first->set_parameter("accuracy", accuracy); 
    235       this->sub_solver[i].first->set_parameter("max_neval", max_neval); 
    236       this->sub_solver[i].first->set_parameter("max_time", max_time); 
     234      this->sub_solver[i].first->option().set_parameter("accuracy", accuracy); 
     235      this->sub_solver[i].first->option().set_parameter("max_neval", max_neval); 
     236      this->sub_solver[i].first->option().set_parameter("max_time", max_time); 
    237237   } 
    238238 
  • scolib/trunk/src/Makefile.am

    r6066 r6131  
    4040lib/DynamicGSS.cpp\ 
    4141lib/MultiStatePS.cpp\ 
     42lib/MultiStart.cpp\ 
     43lib/EAminlp.cpp\ 
    4244lib/SCORegistrations.cpp\ 
    4345lib/PLGO.cpp 
  • scolib/trunk/src/lib/SCORegistrations.cpp

    r5928 r6131  
    2222extern const volatile bool DIRECT_bool; 
    2323extern const volatile bool DockingPS_bool; 
     24//extern const volatile bool EAminlp_bool; 
     25//extern const volatile bool MultiStart_bool; 
    2426extern const volatile bool MultiStatePS_bool; 
    2527extern const volatile bool PatternSearch_bool; 
     
    3638   static_cast<void>(DIRECT_bool); 
    3739   static_cast<void>(DockingPS_bool); 
     40   //static_cast<void>(EAminlp_bool); 
     41   //static_cast<void>(MultiStart_bool); 
    3842   static_cast<void>(MultiStatePS_bool); 
    3943   static_cast<void>(PatternSearch_bool); 
Note: See TracChangeset for help on using the changeset viewer.