RootFinding: migrate message strings to resources

ArtyomBaranovskiy · May 1, 2013 · 8742c92 · 8742c92
1 parent be5d8b9
commit 8742c92
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 14 deletions.
diff --git a/src/Numerics/Properties/Resources.Designer.cs b/src/Numerics/Properties/Resources.Designer.cs
diff --git a/src/Numerics/Properties/Resources.resx b/src/Numerics/Properties/Resources.resx
@@ -369,10 +369,16 @@
   <data name="TooManyElements" xml:space="preserve">
     <value>We only support sparse matrix with less than int.MaxValue elements.</value>
   </data>
-  <data name="Interpolation_Initialize_SamplePointsNotStrictlyAscendingOrder">
-    <value xml:space="preserve">Sample points should be sorted in strictly ascending order</value>
+  <data name="Interpolation_Initialize_SamplePointsNotStrictlyAscendingOrder" xml:space="preserve">
+    <value>Sample points should be sorted in strictly ascending order</value>
   </data>
-  <data name="Interpolation_Initialize_SamplePointsNotUnique">
-    <value xml:space="preserve">All sample points should be unique.</value>
+  <data name="Interpolation_Initialize_SamplePointsNotUnique" xml:space="preserve">
+    <value>All sample points should be unique.</value>
+  </data>
+  <data name="AccuracyNotReached" xml:space="preserve">
+    <value>The accuracy couldn't be reached with the specified number of iterations.</value>
+  </data>
+  <data name="RootNotFound" xml:space="preserve">
+    <value>The algorithm ended without root in the range.</value>
   </data>
 </root>
diff --git a/src/Numerics/RootFinding/BrentRootFinder.cs b/src/Numerics/RootFinding/BrentRootFinder.cs
@@ -1,4 +1,5 @@
 using System;
+using MathNet.Numerics.Properties;
 
 namespace MathNet.Numerics.RootFinding
 {
@@ -108,7 +109,7 @@ University Press
             }
 
             // The algorithm has exceeded the number of iterations allowed
-            throw new RootFinderException(ACCURACY_NOT_REACHED, i, new Range(XMin, XMax), Math.Abs(xMid));
+            throw new RootFinderException(Resources.AccuracyNotReached, i, new Range(XMin, XMax), Math.Abs(xMid));
         }
 	}
 }
diff --git a/src/Numerics/RootFinding/RootFinder.cs b/src/Numerics/RootFinding/RootFinder.cs
@@ -1,4 +1,5 @@
 using System;
+using MathNet.Numerics.Properties;
 
 namespace MathNet.Numerics.RootFinding
 {
@@ -41,13 +42,7 @@ public Range Range
     }
 	public abstract class RootFinder
 	{
-
-		protected const string INVALID_RANGE="Invalid range while finding root";
-        protected const string ACCURACY_NOT_REACHED = "The accuracy couldn't be reached with the specified number of iterations";
-        protected const string ROOT_NOT_FOUND = "The algorithm ended without root in the range";
-        protected const string ROOT_NOT_BRACKETED = "The algorithm could not start because the root seemed not to be bracketed";
-        protected const string INVALID_ALGORITHM = "This algorithm is not able to solve this equation";
-        protected const double DOUBLE_ACCURACY = 9.99200722162641E-16;
+	    protected const double DOUBLE_ACCURACY = 9.99200722162641E-16;
         private const int DEFAULT_MAX_ITERATIONS = 30;
         private const double DEFAULT_ACCURACY = 1e-8;
 
@@ -122,7 +117,7 @@ public bool SearchBracketsOutward(ref double xmin, ref double xmax, double facto
         {
             if (xmin >= xmax)
             {
-                throw new RootFinderException(INVALID_RANGE, 0, new Range(xmin, xmax), 0.0);
+                throw new RootFinderException(string.Format(Resources.ArgumentOutOfRangeGreater,"xmax","xmin"), 0, new Range(xmin, xmax), 0.0);
             }
 
             double fmin = _func(xmin);
@@ -144,7 +139,7 @@ public bool SearchBracketsOutward(ref double xmin, ref double xmax, double facto
                 }
             } 
 
-            throw new RootFinderException(ROOT_NOT_FOUND, i, new Range(fmin, fmax), 0.0);
+            throw new RootFinderException(Resources.RootNotFound, i, new Range(fmin, fmax), 0.0);
         }
 
 		/// <summary>Prototype algorithm for solving the equation f(x)=0.</summary>