Show
Ignore:
Timestamp:
12/14/08 13:54:42 (2 months ago)
Author:
wehart
Message:

Merged revisions 5997-6188 via svnmerge from
https://software.sandia.gov/svn/public/acro/scolib/trunk

……..

r6054 | wehart | 2008-12-07 23:21:14 -0700 (Sun, 07 Dec 2008) | 2 lines


Fix to avoid copying the scolib test executable to the acro/bin directory.

……..

r6056 | wehart | 2008-12-07 23:42:45 -0700 (Sun, 07 Dec 2008) | 2 lines


Removing references to 'coliny' in scolib.

……..

r6061 | wehart | 2008-12-08 00:02:56 -0700 (Mon, 08 Dec 2008) | 2 lines


Rename of solvers in scolib experiments.

……..

r6066 | jdsiiro | 2008-12-08 13:30:46 -0700 (Mon, 08 Dec 2008) | 3 lines


  • fix for logic error introduced in r6060 (see ticket #4282)
  • standardizing colin in-source references to libutilib.a to use libutilib.la

……..

r6094 | jdsiiro | 2008-12-10 15:01:44 -0700 (Wed, 10 Dec 2008) | 11 lines


Renaming several core COLIN classes to remove the "Opt" prefix:


This goes a long way toward closing #4217.

……..

r6114 | jdsiiro | 2008-12-10 17:40:06 -0700 (Wed, 10 Dec 2008) | 17 lines


Removing deprecated colin headers


Removing deprecated object files:

  • LoadAMPL.cpp (colin)
  • LoadXML.cpp (colin)
  • factory.cpp (scolib & interfaces)


This goes a long way toward addressing ticket #4274.

……..

r6131 | wehart | 2008-12-10 22:36:22 -0700 (Wed, 10 Dec 2008) | 5 lines


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.

……..

r6163 | jdsiiro | 2008-12-11 15:19:30 -0700 (Thu, 11 Dec 2008) | 4 lines


  • updating scolib solvers to return final solution in Solver_Base::final_points
  • Updating scolib tests so that they run

……..

r6166 | wehart | 2008-12-11 22:56:23 -0700 (Thu, 11 Dec 2008) | 4 lines


Various fixes.


The solvers still don't work very well… :(

……..

r6167 | jdsiiro | 2008-12-12 10:25:11 -0700 (Fri, 12 Dec 2008) | 2 lines


bugfix: building scolib when PLGO is not present

……..

r6188 | wehart | 2008-12-14 13:54:18 -0700 (Sun, 14 Dec 2008) | 2 lines


Update to SCOLIB changelog.

……..

Location:
scolib/stable/2.0
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • scolib/stable/2.0

    • Property svnmerge-integrated changed from /scolib/trunk:1-5996 to /scolib/trunk:1-6188
  • scolib/stable/2.0/test/coliny-ea-validate.study.xml

    r5014 r6189  
    1 <experimental-study name="coliny-ea-validate"> 
     1<experimental-study name="scolib-ea-validate"> 
    22  <tags> 
    33    <tag>validate</tag> 
     
    1212   
    1313      <factor name="config"> 
    14         <level>solver=coliny:ea xover_rate=0.0 mutation_rate=0.0 population_size=50 max_iters=1 max_neval=50</level> 
     14        <level>solver=sco:ea xover_rate=0.0 mutation_rate=0.0 population_size=50 max_iters=1 max_neval=50</level> 
    1515      </factor> 
    1616   
    1717    </factors> 
    1818    <controls> 
    19        <executable>coliny_test --ampl</executable> 
     19       <executable>./scolib_test --ampl</executable> 
    2020       <replication>300</replication> 
    2121    </controls> 
     
    3232 
    3333      <factor name="config"> 
    34         <level>solver=coliny:ea output_level=verbose population_size=10 
     34        <level>solver=sco:ea output_level=verbose population_size=10 
    3535                debug=10000 xover_rate=0.0 
    3636                selection_type=linear_rank 
     
    6262    </factors> 
    6363    <controls> 
    64        <executable>coliny_test --ampl</executable> 
     64       <executable>./scolib_test --ampl</executable> 
    6565       <replication>1 
    6666          <seeds>100</seeds>