From be84d8d0448f1629dfb802e1040efe9e8b374544 Mon Sep 17 00:00:00 2001
From: astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675>
Date: Thu, 2 Apr 2009 15:15:26 +0000
Subject: git-svn-id: file:///home/svn/opt_utilities@14
 ed2142bd-67ad-457f-ba7c-d818d4011675

---
 models/add_model.hpp | 12 ++++++------
 models/mul_model.hpp | 12 ++++++------
 models/pow_model.hpp |  6 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'models')

diff --git a/models/add_model.hpp b/models/add_model.hpp
index ffac9dc..ddc3316 100644
--- a/models/add_model.hpp
+++ b/models/add_model.hpp
@@ -33,13 +33,13 @@ namespace opt_utilities
       for(int i=0;i<np1;++i)
 	{
 	  param_info<Tp,Tstr> p(m1.get_param_info(i));
-	  param_info<Tp,Tstr> p1(p.get_name()+"1",p.get_default_value());
+	  param_info<Tp,Tstr> p1(p.get_name()+"1",p.get_value());
 	  this->push_param_info(p1);
 	}
       for(int i=0;i<np2;++i)
 	{
 	  param_info<Tp,Tstr> p(m2.get_param_info(i));
-	  param_info<Tp,Tstr> p2(p.get_name()+"2",p.get_default_value());
+	  param_info<Tp,Tstr> p2(p.get_name()+"2",p.get_value());
 	  this->push_param_info(p2);
 	}
     }
@@ -55,7 +55,7 @@ namespace opt_utilities
 	  for(int i=0;i<np1;++i)
 	    {
 	      param_info<Tp,Tstr> p(rhs.pm1->get_param_info(i));
-	      param_info<Tp,Tstr> p1(p.get_name()+"1",p.get_default_value());
+	      param_info<Tp,Tstr> p1(p.get_name()+"1",p.get_value());
 	      this->push_param_info(p1);
 	    }
 	}
@@ -66,7 +66,7 @@ namespace opt_utilities
 	  for(int i=0;i<np2;++i)
 	    {
 	      param_info<Tp,Tstr> p(rhs.pm2->get_param_info(i));
-	      param_info<Tp,Tstr> p2(p.get_name()+"2",p.get_default_value());
+	      param_info<Tp,Tstr> p2(p.get_name()+"2",p.get_value());
 	      this->push_param_info(p2);
 	    }
 	}
@@ -96,7 +96,7 @@ namespace opt_utilities
 	  for(int i=0;i<np1;++i)
 	    {
 	      param_info<Tp,Tstr> p(rhs.pm1->get_param_info(i));
-	      param_info<Tp,Tstr> p1(p.get_name()+"1",p.get_default_value());
+	      param_info<Tp,Tstr> p1(p.get_name()+"1",p.get_value());
 	      this->push_param_info(p1);
 	    }
 	}
@@ -107,7 +107,7 @@ namespace opt_utilities
 	  for(int i=0;i<np2;++i)
 	    {
 	      param_info<Tp,Tstr> p(rhs.pm2->get_param_info(i));
-	      param_info<Tp,Tstr> p2(p.get_name()+"2",p.get_default_value());
+	      param_info<Tp,Tstr> p2(p.get_name()+"2",p.get_value());
 	      this->push_param_info(p2);
 	    }
 	}
diff --git a/models/mul_model.hpp b/models/mul_model.hpp
index 0e64c1b..b5cc06b 100644
--- a/models/mul_model.hpp
+++ b/models/mul_model.hpp
@@ -33,13 +33,13 @@ namespace opt_utilities
       for(int i=0;i<np1;++i)
 	{
 	  param_info<Tp,Tstr> p(m1.get_param_info(i));
-	  param_info<Tp,Tstr> p1(p.get_name()+"1",p.get_default_value());
+	  param_info<Tp,Tstr> p1(p.get_name()+"1",p.get_value());
 	  this->push_param_info(p1);
 	}
       for(int i=0;i<np2;++i)
 	{
 	  param_info<Tp,Tstr> p(m2.get_param_info(i));
-	  param_info<Tp,Tstr> p2(p.get_name()+"2",p.get_default_value());
+	  param_info<Tp,Tstr> p2(p.get_name()+"2",p.get_value());
 	  this->push_param_info(p2);
 	}
     }
@@ -55,7 +55,7 @@ namespace opt_utilities
 	  for(int i=0;i<np1;++i)
 	    {
 	      param_info<Tp,Tstr> p(rhs.pm1->get_param_info(i));
-	      param_info<Tp,Tstr> p1(p.get_name()+"1",p.get_default_value());
+	      param_info<Tp,Tstr> p1(p.get_name()+"1",p.get_value());
 	      this->push_param_info(p1);
 	    }
 	}
@@ -66,7 +66,7 @@ namespace opt_utilities
 	  for(int i=0;i<np2;++i)
 	    {
 	      param_info<Tp,Tstr> p(rhs.pm2->get_param_info(i));
-	      param_info<Tp,Tstr> p2(p.get_name()+"2",p.get_default_value());
+	      param_info<Tp,Tstr> p2(p.get_name()+"2",p.get_value());
 	      this->push_param_info(p2);
 	    }
 	}
@@ -96,7 +96,7 @@ namespace opt_utilities
 	  for(int i=0;i<np1;++i)
 	    {
 	      param_info<Tp,Tstr> p(rhs.pm1->get_param_info(i));
-	      param_info<Tp,Tstr> p1(p.get_name()+"1",p.get_default_value());
+	      param_info<Tp,Tstr> p1(p.get_name()+"1",p.get_value());
 	      this->push_param_info(p1);
 	    }
 	}
@@ -107,7 +107,7 @@ namespace opt_utilities
 	  for(int i=0;i<np2;++i)
 	    {
 	      param_info<Tp,Tstr> p(rhs.pm2->get_param_info(i));
-	      param_info<Tp,Tstr> p2(p.get_name()+"2",p.get_default_value());
+	      param_info<Tp,Tstr> p2(p.get_name()+"2",p.get_value());
 	      this->push_param_info(p2);
 	    }
 	}
diff --git a/models/pow_model.hpp b/models/pow_model.hpp
index 79baa4b..0aae2e1 100644
--- a/models/pow_model.hpp
+++ b/models/pow_model.hpp
@@ -33,7 +33,7 @@ namespace opt_utilities
       for(int i=0;i<np1;++i)
 	{
 	  param_info<Tp,Tstr> p(m1.get_param_info(i));
-	  //param_info<Tp,Tstr> p1(p.get_name(),p.get_default_value());
+	  //param_info<Tp,Tstr> p1(p.get_name(),p.get_value());
 	  this->push_param_info(p);
 	}
     }
@@ -49,7 +49,7 @@ namespace opt_utilities
 	  for(int i=0;i<np1;++i)
 	    {
 	      param_info<Tp,Tstr> p(rhs.pm1->get_param_info(i));
-	      param_info<Tp,Tstr> p1(p.get_name()+"1",p.get_default_value());
+	      param_info<Tp,Tstr> p1(p.get_name()+"1",p.get_value());
 	      this->push_param_info(p1);
 	    }
 	}
@@ -76,7 +76,7 @@ namespace opt_utilities
 	  for(int i=0;i<np1;++i)
 	    {
 	      param_info<Tp,Tstr> p(rhs.pm1->get_param_info(i));
-	      // param_info<Tp,Tstr> p1(p.get_name()+"1",p.get_default_value());
+	      // param_info<Tp,Tstr> p1(p.get_name()+"1",p.get_value());
 	      this->push_param_info(p);
 	    }
 	}
-- 
cgit v1.2.2