Changeset 2148


Ignore:
Timestamp:
06/19/06 22:54:37 (8 years ago)
Author:
wehart
Message:

Major rework of PICO-related packages, to rename pico-core to pebbl and
pico-milp to pico.

( Links to Acro-related mail archives at  http://software.sandia.gov/Acro/ )

Location:
coliny/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • coliny/trunk/coliny/Makefile.am

    r2141 r2148  
    4343LDADD=-L$(TOPLIB) $(top_builddir)/packages/coliny/src/libcoliny.a\ 
    4444        $(top_builddir)/packages/colin/src/libcolin.a\ 
    45         $(top_builddir)/packages/pico-core/src/libpicocore.a\ 
     45        $(top_builddir)/packages/pebbl/src/libpebbl.a\ 
    4646        $(top_builddir)/packages/utilib/src/libutilib.a\ 
    4747        $(APPSPACKLIB) $(THREEPOLIB) -lamplsolver $(DLOPEN_LIBS) 
  • coliny/trunk/coliny/PLGO.h

    r2140 r2148  
    99#ifdef ACRO_USING_PLGO 
    1010 
    11 #include <pico-core/serialLipshitzian.h> 
    12 #include <pico-core/parallelLipshitzian.h> 
     11#include <pebbl/serialLipshitzian.h> 
     12#include <pebbl/parallelLipshitzian.h> 
    1313#include <colin/ColinUtilib.h> 
    1414#include <colin/StdOptSolver.h> 
     
    8181 
    8282  /// Reset the solver's state 
    83   virtual pico::branching* base() = 0; 
     83  virtual pebbl::branching* base() = 0; 
    8484 
    8585  /// Perform minimization 
     
    102102 
    103103  /// The serial solver 
    104   pico::serialLipshitzian<PLGOProblem> solver; 
     104  pebbl::serialLipshitzian<PLGOProblem> solver; 
    105105 
    106106  /// 
     
    113113 
    114114  ///  
    115   pico::branching* base() 
     115  pebbl::branching* base() 
    116116        { return &solver; } 
    117117 
     
    147147 
    148148  /// The serial solver 
    149   pico::parallelLipshitzian<PLGOProblem> solver; 
     149  pebbl::parallelLipshitzian<PLGOProblem> solver; 
    150150 
    151151  /// 
     
    158158 
    159159  ///  
    160   pico::branching* base() 
     160  pebbl::branching* base() 
    161161        { return &solver; } 
    162162 
     
    183183#if 0 
    184184         /// WEH - this isn't portable, so I'm commenting it out for now. 
    185          static_cast<pico::serialLipshitzian<PLGOProblem> >(solver).func  
     185         static_cast<pebbl::serialLipshitzian<PLGOProblem> >(solver).func  
    186186                        = func; 
    187187#endif 
  • coliny/trunk/src/Makefile.am

    r2141 r2148  
    4343LDADD=-L$(TOPLIB) $(top_builddir)/packages/coliny/src/libcoliny.a\ 
    4444        $(top_builddir)/packages/colin/src/libcolin.a\ 
    45         $(top_builddir)/packages/pico-core/src/libpicocore.a\ 
     45        $(top_builddir)/packages/pebbl/src/libpebbl.a\ 
    4646        $(top_builddir)/packages/utilib/src/libutilib.a\ 
    4747        $(APPSPACKLIB) $(THREEPOLIB) -lamplsolver $(DLOPEN_LIBS) 
Note: See TracChangeset for help on using the changeset viewer.