diff options
| author | astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675> | 2011-05-03 17:15:35 +0000 | 
|---|---|---|
| committer | astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675> | 2011-05-03 17:15:35 +0000 | 
| commit | ff3d217744dc6341e965c8a3f6b3037cd2b2cf3b (patch) | |
| tree | 48552b393c8012779913f81d043c757fb1910bc2 /methods | |
| parent | 12868a2786ec1346d5a0a43c68b772515eb9a163 (diff) | |
| download | opt-utilities-ff3d217744dc6341e965c8a3f6b3037cd2b2cf3b.tar.bz2 | |
git-svn-id: file:///home/svn/opt_utilities@193 ed2142bd-67ad-457f-ba7c-d818d4011675
Diffstat (limited to 'methods')
| -rw-r--r-- | methods/bfgs/bfgs.hpp | 10 | ||||
| -rw-r--r-- | methods/gsl_simplex/gsl_simplex.hpp | 5 | ||||
| -rw-r--r-- | methods/lbfgs/lbfgs_method.hpp | 5 | 
3 files changed, 13 insertions, 7 deletions
| diff --git a/methods/bfgs/bfgs.hpp b/methods/bfgs/bfgs.hpp index 0be3cf4..0ed665c 100644 --- a/methods/bfgs/bfgs.hpp +++ b/methods/bfgs/bfgs.hpp @@ -43,17 +43,17 @@ namespace opt_utilities      element_type** invBk;      bool bstop;    private: -    const char* do_get_type_name()const -    { -      return "asexual genetic algorithm"; -    } -          rT func(const pT& x)      {        assert(p_fo!=0);        return p_fo->eval(x);      } +    const char* do_get_type_name()const +    { +      return "bfgs"; +    } +    public:      bfgs_method()        :threshold(1e-5),p_fo(0),p_optimizer(0), diff --git a/methods/gsl_simplex/gsl_simplex.hpp b/methods/gsl_simplex/gsl_simplex.hpp index f241205..a8a72d1 100644 --- a/methods/gsl_simplex/gsl_simplex.hpp +++ b/methods/gsl_simplex/gsl_simplex.hpp @@ -69,7 +69,10 @@ namespace opt_utilities        return p_fo->eval(x);      } -    +    const char* do_get_type_name()const +    { +      return "gsl simplex"; +    }    public:      gsl_simplex()        :threshold(1e-4) diff --git a/methods/lbfgs/lbfgs_method.hpp b/methods/lbfgs/lbfgs_method.hpp index 18e1814..a719f1d 100644 --- a/methods/lbfgs/lbfgs_method.hpp +++ b/methods/lbfgs/lbfgs_method.hpp @@ -85,7 +85,10 @@ namespace opt_utilities        return p_fo->eval(x);      } -    +    const char* do_get_type_name()const +    { +      return "large scale bfgs"; +    }    public:      lbfgs_method()        :threshold(1e-4) | 
