From d9f662d8857c1ae15d72d6212b616a10a5181f67 Mon Sep 17 00:00:00 2001
From: astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675>
Date: Sun, 14 Nov 2010 17:15:48 +0000
Subject: git-svn-id: file:///home/svn/opt_utilities@143
ed2142bd-67ad-457f-ba7c-d818d4011675
---
test/makefile | 2 +-
test/many_dims.cpp | 18 +++++++++++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
(limited to 'test')
diff --git a/test/makefile b/test/makefile
index 761475c..bebfc9c 100644
--- a/test/makefile
+++ b/test/makefile
@@ -6,7 +6,7 @@ test_optimizer:test_optimizer.cpp
$(CXX) $< -o $@ -I .. -O3 -g
many_dims:many_dims.cpp
- $(CXX) $< -o $@ -I .. -O3 -g
+ $(CXX) $< -o $@ -I .. -O3 -g -p
test_fitter:test_fitter.cpp
$(CXX) $< -o $@ -I .. -O3 -g
diff --git a/test/many_dims.cpp b/test/many_dims.cpp
index a09e358..a142628 100644
--- a/test/many_dims.cpp
+++ b/test/many_dims.cpp
@@ -15,13 +15,28 @@ using namespace std;
class foo1
:public func_obj<double,vector<double> >
{
+ long long n_eval;
+public:
+ foo1()
+ :n_eval(0)
+ {
+ }
+
+ ~foo1()
+ {
+ cerr<<n_eval<<" evaluations done"<<endl;
+ }
+
foo1* do_clone()const
{
return new foo1(*this);
}
+
+
double do_eval(const vector<double>& p)
{
+ ++n_eval;
double result=0;
for(int i=0;i!=p.size();++i)
{
@@ -123,7 +138,7 @@ class foo5
void test_opt(const func_obj<double,vector<double> >& fo,
const opt_method<double,vector<double> >& optm)
{
- const int problem_size=500000;
+ const int problem_size=100000;
optimizer<double,vector<double> > opt;
opt.set_func_obj(fo);
@@ -170,6 +185,7 @@ int main()
//powell_method<double,vector<double> > agam;
//aga_method<double,vector<double> > agam(100,50);
test_opt(foo1(),agam);
+ // test_opt(foo1(),agam);
// test_opt(foo2(),agam);
//test_opt(foo3(),agam);
//test_opt(foo4(),agam);
--
cgit v1.2.2