diff options
| author | astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675> | 2010-11-04 17:26:48 +0000 |
|---|---|---|
| committer | astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675> | 2010-11-04 17:26:48 +0000 |
| commit | cfcf2b9fc6b091c6db0997c2dea45b701955a696 (patch) | |
| tree | 892b88e4689e5908e149d953d30df26d3695615f | |
| parent | 7771f4d41778d9010ee716fe11162bd121836f53 (diff) | |
| download | opt-utilities-cfcf2b9fc6b091c6db0997c2dea45b701955a696.tar.bz2 | |
git-svn-id: file:///home/svn/opt_utilities@142 ed2142bd-67ad-457f-ba7c-d818d4011675
| -rw-r--r-- | methods/lbfgs/lbfgs_method.hpp | 4 | ||||
| -rw-r--r-- | test/many_dims.cpp | 15 |
2 files changed, 10 insertions, 9 deletions
diff --git a/methods/lbfgs/lbfgs_method.hpp b/methods/lbfgs/lbfgs_method.hpp index 112d50e..eecde76 100644 --- a/methods/lbfgs/lbfgs_method.hpp +++ b/methods/lbfgs/lbfgs_method.hpp @@ -1,5 +1,5 @@ -#ifndef BFGS_METHOD -#define BFGS_METHOD +#ifndef LBFGS_METHOD +#define LBFGS_METHOD #define OPT_HEADER #include <core/optimizer.hpp> //#include <blitz/array.h> diff --git a/test/many_dims.cpp b/test/many_dims.cpp index f7a1ebc..a09e358 100644 --- a/test/many_dims.cpp +++ b/test/many_dims.cpp @@ -4,6 +4,7 @@ #include <methods/powell/powell_method.hpp> //#include <methods/gsl_simplex/gsl_simplex.hpp> #include <methods/bfgs/bfgs.hpp> +#include <methods/lbfgs/lbfgs_method.hpp> #include <methods/aga/aga.hpp> #include <vector> #include <iostream> @@ -122,7 +123,7 @@ class foo5 void test_opt(const func_obj<double,vector<double> >& fo, const opt_method<double,vector<double> >& optm) { - const int problem_size=500; + const int problem_size=500000; optimizer<double,vector<double> > opt; opt.set_func_obj(fo); @@ -154,7 +155,7 @@ void test_opt(const func_obj<double,vector<double> >& fo, cout<<"the result is:\n"; for(int i=0;i<p.size();++i) { - cout<<p[i]<<endl; + // cout<<p[i]<<endl; } cout<<"The result of the object function is:\n" <<opt.eval(p)<<endl; @@ -165,12 +166,12 @@ void test_opt(const func_obj<double,vector<double> >& fo, int main() { //gsl_simplex<double,vector<double> > agam; - bfgs_method<double,vector<double> > agam; + lbfgs_method<double,vector<double> > agam; //powell_method<double,vector<double> > agam; //aga_method<double,vector<double> > agam(100,50); test_opt(foo1(),agam); - test_opt(foo2(),agam); - test_opt(foo3(),agam); - test_opt(foo4(),agam); - test_opt(foo5(),agam); + // test_opt(foo2(),agam); + //test_opt(foo3(),agam); + //test_opt(foo4(),agam); + //test_opt(foo5(),agam); } |