git-svn-id: file:///home/svn/opt_utilities@92 ed2142bd-67ad-457f-ba7c-d818d4011675

14 files changed, 15 insertions, 15 deletions

diff --git a/models/beta1d.hpp b/models/beta1d.hpp
index c3a5469..283b539 100644
--- a/models/beta1d.hpp
+++ b/models/beta1d.hpp
@@ -41,9 +41,9 @@ namespace opt_utilities
       return bkg+S0*pow(1+(x*x)/(r_c*r_c),-3*beta+static_cast<T>(.5));
     }
 
-    std::string do_to_string()const
+    std::string do_get_information()const
     {
-      return "<math xmlns=\"http://www.w3.org/1998/Math/MathML\" display=\"block\" class=\"equation\"><mi>f</mi><mrow><mo class=\"MathClass-open\">(</mo><mrow><mi>x</mi><mo class=\"MathClass-punc\">;</mo><msub><mrow><mi>S</mi></mrow><mrow><mn>0</mn></mrow></msub><mo class=\"MathClass-punc\">,</mo><mi>β</mi><mo class=\"MathClass-punc\">,</mo><msub><mrow><mi>r</mi></mrow><mrow><mi>c</mi></mrow></msub><mo class=\"MathClass-punc\">,</mo><mi>b</mi><mi>k</mi><mi>g</mi></mrow><mo class=\"MathClass-close\">)</mo></mrow> <mo class=\"MathClass-rel\">=</mo> <mi>S</mi><mn>0</mn> <mo class=\"MathClass-bin\">∗</mo><msup><mrow><mfenced separators=\"\" open=\"(\" close=\")\"><mrow><mn>1</mn> <mo class=\"MathClass-bin\">+</mo><msup><mrow> <mfenced separators=\"\" open=\"(\" close=\")\"><mrow> <mfrac><mrow><mi>r</mi></mrow><mrow><msub><mrow><mi>r</mi></mrow><mrow><mi>c</mi></mrow></msub></mrow></mfrac></mrow></mfenced> </mrow><mrow><mn>2</mn></mrow></msup></mrow></mfenced> </mrow><mrow><mo class=\"MathClass-bin\">−</mo><mn>3</mn><mi>β</mi><mo class=\"MathClass-bin\">+</mo><mn>1</mn><mo class=\"MathClass-bin\">∕</mo><mn>2</mn></mrow></msup> <mo class=\"MathClass-bin\">+</mo> <mi>b</mi><mi>k</mi><mi>g</mi></math>";
+      return "<math xmlns=\"http://www.w3.org/1998/Math/MathML\" display=\"block\" class=\"equation\"><mi>f</mi><mrow><mo class=\"MathClass-open\">(</mo><mrow><mi>x</mi><mo class=\"MathClass-punc\">;</mo><msub><mrow><mi>S</mi></mrow><mrow><mn>0</mn></mrow></msub><mo class=\"MathClass-punc\">,</mo><mi>β</mi><mo class=\"MathClass-punc\">,</mo><msub><mrow><mi>r</mi></mrow><mrow><mi>c</mi></mrow></msub><mo class=\"MathClass-punc\">,</mo><mi>b</mi><mi>k</mi><mi>g</mi></mrow><mo class=\"MathClass-close\">)</mo></mrow> <mo class=\"MathClass-rel\">=</mo> <msub><mrow><mi>S</mi></mrow><mrow><mn>0</mn></mrow></msub> <mo class=\"MathClass-bin\">∗</mo><msup><mrow><mfenced separators=\"\" open=\"(\" close=\")\"><mrow><mn>1</mn> <mo class=\"MathClass-bin\">+</mo><msup><mrow> <mfenced separators=\"\" open=\"(\" close=\")\"><mrow> <mfrac><mrow><mi>r</mi></mrow><mrow><msub><mrow><mi>r</mi></mrow><mrow><mi>c</mi></mrow></msub></mrow></mfrac></mrow></mfenced> </mrow><mrow><mn>2</mn></mrow></msup></mrow></mfenced> </mrow><mrow><mo class=\"MathClass-bin\">−</mo><mn>3</mn><mi>β</mi><mo class=\"MathClass-bin\">+</mo><mn>1</mn><mo class=\"MathClass-bin\">∕</mo><mn>2</mn></mrow></msup> <mo class=\"MathClass-bin\">+</mo> <mi>b</mi><mi>k</mi><mi>g</mi></math>";
     }
   };
 }
diff --git a/models/bl1d.hpp b/models/bl1d.hpp
index 10b547f..e6ae8c7 100644
--- a/models/bl1d.hpp
+++ b/models/bl1d.hpp
@@ -47,7 +47,7 @@ namespace opt_utilities
     }
 
   private:
-    std::string do_to_string()const
+    std::string do_get_information()const
     {
       return "broken linear model\n"
 	"y=k1*(x-x_b)+y_b for x<x_b\n"
diff --git a/models/bpl1d.hpp b/models/bpl1d.hpp
index 7cb7377..e531483 100644
--- a/models/bpl1d.hpp
+++ b/models/bpl1d.hpp
@@ -47,7 +47,7 @@ namespace opt_utilities
 
 
   private:
-    std::string do_to_string()const
+    std::string do_get_information()const
     {
       return "";
       //return "<math xmlns=\"http://www.w3.org/1998/Math/MathML\" display=\"block\" class=\"equation\"><mi>f</mi><mrow><mo class=\"MathClass-open\">(</mo><mrow><mi>x</mi><mo class=\"MathClass-punc\">;</mo><msub><mrow><mi>x</mi></mrow><mrow><mi>b</mi></mrow></msub><mo class=\"MathClass-punc\">,</mo><msub><mrow><mi>y</mi></mrow><mrow><mi>b</mi></mrow></msub><mo class=\"MathClass-punc\">,</mo><msub><mrow><mi>γ</mi></mrow><mrow><mn>1</mn></mrow></msub><mo class=\"MathClass-punc\">,</mo><msub><mrow><mi>γ</mi></mrow><mrow><mn>2</mn></mrow></msub></mrow><mo class=\"MathClass-close\">)</mo></mrow> <mo class=\"MathClass-rel\">=</mo> <mfenced separators=\"\" open=\"{\" close=\"\"><mrow> <mtable style=\"\" equalrows=\"false\" equalcolumns=\"false\" class=\"array\"><mtr><mtd class=\"array\" columnalign=\"center\"><msub><mrow><mi>y</mi></mrow><mrow><mi>b</mi></mrow></msub> <mfrac><mrow><msup><mrow><mi>x</mi></mrow><mrow><msub><mrow><mi>γ</mi></mrow><mrow><mn>1</mn></mrow></msub></mrow></msup></mrow><mrow><msubsup><mrow><mi>x</mi></mrow><mrow><mi>b</mi></mrow><mrow><msub><mrow><mi>γ</mi></mrow><mrow><mn>1</mn></mrow></msub></mrow></msubsup></mrow></mfrac></mtd><mtd class=\"array\" columnalign=\"center\">   <mi>x</mi> <mo class=\"MathClass-rel\">&lt;</mo> <msub><mrow><mi>x</mi></mrow><mrow><mi>b</mi></mrow></msub></mtd></mtr><mtr><mtd class=\"array\" columnalign=\"center\"> <msub><mrow><mi>y</mi></mrow><mrow><mi>b</mi></mrow></msub> <mfrac><mrow><msup><mrow><mi>x</mi></mrow><mrow><msub><mrow><mi>γ</mi></mrow><mrow><mn>2</mn></mrow></msub></mrow></msup></mrow><mrow><msubsup><mrow><mi>x</mi></mrow><mrow><mi>b</mi></mrow><mrow><msub><mrow><mi>γ</mi></mrow><mrow><mn>2</mn></mrow></msub></mrow></msubsup></mrow></mfrac> </mtd><mtd class=\"array\" columnalign=\"center\"><mi>o</mi><mi>t</mi><mi>h</mi><mi>e</mi><mi>r</mi><mi>w</mi><mi>i</mi><mi>s</mi><mi>e</mi></mtd></mtr><mtr><mtd class=\"array\" columnalign=\"center\">        </mtd></mtr> <!--cc--></mtable></mrow></mfenced></math>";
diff --git a/models/bremss.hpp b/models/bremss.hpp
index f9be848..b516d5b 100644
--- a/models/bremss.hpp
+++ b/models/bremss.hpp
@@ -36,7 +36,7 @@ namespace opt_utilities
     }
 
   private:
-    std::string do_to_string()const
+    std::string do_get_information()const
     {
       return "<math xmlns=\"http://www.w3.org/1998/Math/MathML\" display=\"block\" class=\"equation\"><mi>f</mi><mrow><mo class=\"MathClass-open\">(</mo><mrow><mi>x</mi><mo class=\"MathClass-punc\">;</mo><mi>n</mi><mi>o</mi><mi>r</mi><mi>m</mi><mo class=\"MathClass-punc\">,</mo><mi>k</mi><mi>T</mi></mrow><mo class=\"MathClass-close\">)</mo></mrow> <mo class=\"MathClass-rel\">=</mo> <mi>n</mi><mi>o</mi><mi>r</mi><mi>m</mi><msqrt><mrow><mi>k</mi><mi>T</mi></mrow></msqrt><msup><mrow><mi>e</mi></mrow><mrow><mo class=\"MathClass-bin\">−</mo><mi>x</mi><mo class=\"MathClass-bin\">∕</mo><mi>k</mi><mi>T</mi> </mrow></msup></math>";
     }
diff --git a/models/constant.hpp b/models/constant.hpp
index ea4b85e..601df61 100644
--- a/models/constant.hpp
+++ b/models/constant.hpp
@@ -33,7 +33,7 @@ namespace opt_utilities
     }
 
   private:
-    std::string do_to_string()const
+    std::string do_get_information()const
     {
       return "Constant\n"
 	"y=C\n";
diff --git a/models/dbeta1d.hpp b/models/dbeta1d.hpp
index 53fa293..17e31e2 100644
--- a/models/dbeta1d.hpp
+++ b/models/dbeta1d.hpp
@@ -55,7 +55,7 @@ namespace opt_utilities
     }
 
   private:
-    std::string do_to_string()const
+    std::string do_get_information()const
     {
       return "double 1d beta model\n"
 	"S=beta(S01,beta1,rc1)+beta(S02,beta2,rc2)\n";
diff --git a/models/func_model.hpp b/models/func_model.hpp
index 2035def..bed5cb6 100644
--- a/models/func_model.hpp
+++ b/models/func_model.hpp
@@ -50,7 +50,7 @@ namespace opt_utilities
       return func(x,&get_element(param,0));
     }
   private:
-    std::string do_to_string()const
+    std::string do_get_information()const
     {
       return "Wrapper for necked C function\n";
     }
diff --git a/models/gauss1d.hpp b/models/gauss1d.hpp
index 1fb0b24..94a390e 100644
--- a/models/gauss1d.hpp
+++ b/models/gauss1d.hpp
@@ -39,7 +39,7 @@ namespace opt_utilities
     }
 
   private:
-    std::string do_to_string()const
+    std::string do_get_information()const
     {
       return "<math xmlns=\"http://www.w3.org/1998/Math/MathML\" display=\"block\" class=\"equation\"><mi>f</mi><mrow><mo class=\"MathClass-open\">(</mo><mrow><mi>x</mi><mo class=\"MathClass-punc\">;</mo><mi>N</mi><mo class=\"MathClass-punc\">,</mo><msub><mrow><mi>x</mi></mrow><mrow><mn>0</mn></mrow></msub><mo class=\"MathClass-punc\">,</mo><mi>σ</mi></mrow><mo class=\"MathClass-close\">)</mo></mrow> <mo class=\"MathClass-rel\">=</mo> <mi>N</mi><msup><mrow><mi>e</mi></mrow><mrow><mo class=\"MathClass-bin\">−</mo><mfrac><mrow><msup><mrow><mrow><mo class=\"MathClass-open\">(</mo><mrow><mi>x</mi><mo class=\"MathClass-bin\">−</mo><msub><mrow><mi>x</mi></mrow><mrow><mn>0</mn></mrow></msub></mrow><mo class=\"MathClass-close\">)</mo></mrow></mrow><mrow><mn>2</mn></mrow></msup></mrow><mrow><mn>2</mn><msup><mrow><mi>σ</mi></mrow><mrow><mn>2</mn></mrow></msup></mrow></mfrac>    </mrow></msup></math>";
     }
diff --git a/models/lin1d.hpp b/models/lin1d.hpp
index 6268b0d..8dc3121 100644
--- a/models/lin1d.hpp
+++ b/models/lin1d.hpp
@@ -34,7 +34,7 @@ namespace opt_utilities
     }
 
   private:
-    std::string do_to_string()const
+    std::string do_get_information()const
     {
       return "<math><mrow> <mtext>f(x;k,b)=k x+b</mtext>		\
     </mrow>								\
diff --git a/models/nbeta1d.hpp b/models/nbeta1d.hpp
index d43a8d8..613de95 100644
--- a/models/nbeta1d.hpp
+++ b/models/nbeta1d.hpp
@@ -41,7 +41,7 @@ namespace opt_utilities
     }
     
   private:
-    std::string do_to_string()const
+    std::string do_get_information()const
     {
       return "<math xmlns=\"http://www.w3.org/1998/Math/MathML\" display=\"block\" class=\"equation\"><mi>f</mi><mrow><mo class=\"MathClass-open\">(</mo><mrow><mi>x</mi><mo class=\"MathClass-punc\">;</mo><msub><mrow><mi>n</mi></mrow><mrow><mn>0</mn></mrow></msub><mo class=\"MathClass-punc\">,</mo><mi>β</mi><mo class=\"MathClass-punc\">,</mo><msub><mrow><mi>r</mi></mrow><mrow><mi>c</mi></mrow></msub><mo class=\"MathClass-punc\">,</mo><mi>b</mi><mi>k</mi><mi>g</mi></mrow><mo class=\"MathClass-close\">)</mo></mrow> <mo class=\"MathClass-rel\">=</mo> <msub><mrow><mi>n</mi></mrow><mrow><mn>0</mn></mrow></msub><msup><mrow> <mfenced separators=\"\" open=\"[\" close=\"]\"><mrow><mn>1</mn> <mo class=\"MathClass-bin\">+</mo><msup><mrow> <mfenced separators=\"\" open=\"(\" close=\")\"><mrow> <mfrac><mrow><mi>r</mi></mrow><mrow><msub><mrow><mi>r</mi></mrow><mrow><mi>c</mi></mrow></msub></mrow></mfrac></mrow></mfenced> </mrow><mrow><mn>2</mn></mrow></msup></mrow></mfenced> </mrow><mrow><mo class=\"MathClass-bin\">−</mo><mfrac><mrow><mn>3</mn></mrow><mrow><mn>2</mn></mrow></mfrac><mi>β</mi><mo class=\"MathClass-bin\">+</mo><mn>1</mn><mo class=\"MathClass-bin\">∕</mo><mn>2</mn></mrow></msup> <mo class=\"MathClass-bin\">+</mo> <mi>b</mi><mi>k</mi><mi>g</mi></math>";
     }
diff --git a/models/nfw1d.hpp b/models/nfw1d.hpp
index cb1a407..177363f 100644
--- a/models/nfw1d.hpp
+++ b/models/nfw1d.hpp
@@ -37,7 +37,7 @@ namespace opt_utilities
       return rho0/(x/rs*(1+x/rs)*(1+x/rs));
     }
 
-    std::string do_to_string()const
+    std::string do_get_information()const
     {
       return "NFW model\n"
 	"y=rho0/(r/rs*(1+r/rs)^2\n";
diff --git a/models/pl1d.hpp b/models/pl1d.hpp
index 91f70ec..598ff1c 100644
--- a/models/pl1d.hpp
+++ b/models/pl1d.hpp
@@ -35,7 +35,7 @@ namespace opt_utilities
     }
 
   private:
-    std::string do_to_string()const
+    std::string do_get_information()const
     {
       return "Simple power law model\n"
 	"y=A*x^gamma\n";
diff --git a/models/polar_ellipse.hpp b/models/polar_ellipse.hpp
index 5844301..2285a76 100644
--- a/models/polar_ellipse.hpp
+++ b/models/polar_ellipse.hpp
@@ -40,7 +40,7 @@ namespace opt_utilities
     }
 
   private:
-    std::string do_to_string()const
+    std::string do_get_information()const
     {
       return "linear model\n"
 	"y=k*x+b\n";
diff --git a/models/poly1d.hpp b/models/poly1d.hpp
index 4c14426..20a6ae5 100644
--- a/models/poly1d.hpp
+++ b/models/poly1d.hpp
@@ -53,7 +53,7 @@ namespace opt_utilities
     }
 
   private:
-    std::string do_to_string()const
+    std::string do_get_information()const
     {
       std::ostringstream ostr;
       ostr<<n<<"-order polynorminal model\n";