Merging changes.

Author: Woodrow-Fields

4.8.1/Numerics/Data/Interpolation/Bilinear.cs

@@ -56,6 +56,7 @@ namespace Numerics.Data
     /// <see href="https://en.wikipedia.org/wiki/Bilinear_interpolation"/>
     /// </para>
     /// </remarks>
+    [Serializable]
     public class Bilinear
     {
 

4.8.1/Numerics/Data/Interpolation/CubicSpline.cs

@@ -28,6 +28,7 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+using System;
 using System.Collections.Generic;
 
 namespace Numerics.Data
@@ -59,6 +60,7 @@ namespace Numerics.Data
     /// </description></item>
     /// </list>
     /// </remarks>
+    [Serializable]
     public class CubicSpline : Interpolater
     {
 

4.8.1/Numerics/Data/Interpolation/Linear.cs

@@ -53,6 +53,7 @@ namespace Numerics.Data
     /// <b> References: </b>
     /// <see href="https://en.wikipedia.org/wiki/Linear_interpolation"/>
     /// </remarks>
+    [Serializable]
     public class Linear : Interpolater
     {
         /// <summary>

4.8.1/Numerics/Data/Interpolation/Polynomial.cs

@@ -60,6 +60,7 @@ namespace Numerics.Data
     /// </description></item>
     /// </list>
     /// </remarks>
+    [Serializable]
     public class Polynomial : Interpolater
     {
         /// <summary>

4.8.1/Numerics/Data/Interpolation/Support/Interpolater.cs

@@ -48,6 +48,7 @@ namespace Numerics.Data
     /// <b> References: </b>
     /// <see href="https://en.wikipedia.org/wiki/Interpolation"/>
     /// </remarks>
+    [Serializable]
     public abstract class Interpolater
     {
 

4.8.1/Numerics/Data/Interpolation/Support/Search.cs

@@ -73,6 +73,7 @@ namespace Numerics.Data
     /// </description></item>
     /// </list>
     /// </remarks>
+    [Serializable]
     public class Search
     {
         /// <summary>

4.8.1/Numerics/Data/Interpolation/Support/SortOrder.cs

@@ -28,6 +28,8 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+using System;
+
 namespace Numerics.Data
 {
     /// <summary>
@@ -39,6 +41,7 @@ namespace Numerics.Data
     ///     Haden Smith, USACE Risk Management Center, cole.h.smith@usace.army.mil
     /// </para>
     /// </remarks>
+    [Serializable]
     public enum SortOrder
     {
         /// <summary>

4.8.1/Numerics/Data/Interpolation/Support/Transform.cs

@@ -28,6 +28,7 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+using System;
 using System.ComponentModel.DataAnnotations;
 
 namespace Numerics.Data
@@ -41,6 +42,7 @@ namespace Numerics.Data
     ///     Haden Smith, USACE Risk Management Center, cole.h.smith@usace.army.mil
     /// </para>
     /// </remarks>
+    [Serializable]
     public enum Transform
     {
         /// <summary>

4.8.1/Numerics/Data/Paired Data/UncertainOrderedPairedData.cs

@@ -32,6 +32,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.Globalization;
 using System.Linq;
 using System.Xml.Linq;
 using Numerics.Distributions;
@@ -46,6 +47,7 @@ namespace Numerics.Data
     ///     <b> Authors:</b>
     ///     Woodrow Fields, USACE Risk Management Center, woodrow.l.fields@usace.army.mil
     /// </remarks> 
+    [Serializable]
     public class UncertainOrderedPairedData : IList<UncertainOrdinate>, INotifyCollectionChanged
     {
         #region Members
@@ -175,26 +177,6 @@ public SortOrder OrderY
 
         #region Construction
 
-        /*public UncertainOrderedPairedData(bool strictOnX, SortOrder xOrder, bool strictOnY, SortOrder yOrder, UnivariateDistributionType distributionType)
-        {
-            Distribution = distributionType;
-            _uncertainOrdinates = new List<UncertainOrdinate>();
-            _strictX = strictOnX;
-            _strictY = strictOnY;
-            _orderX = xOrder;
-            _orderY = yOrder;
-        }
-
-        public UncertainOrderedPairedData(int capacity, bool strictOnX, SortOrder xOrder, bool strictOnY, SortOrder yOrder, UnivariateDistributionType distributionType)
-        {
-            Distribution = distributionType;
-            _uncertainOrdinates = new List<UncertainOrdinate>(capacity);
-            _strictX = strictOnX;
-            _strictY = strictOnY;
-            _orderX = xOrder;
-            _orderY = yOrder;
-        }*/
-
         /// <summary>
         /// Create empty instance of the uncertain ordered paired data class.
         /// </summary>
@@ -333,14 +315,14 @@ public UncertainOrderedPairedData(XElement el)
                 {
                     foreach (XElement o in curveEl.Elements("Ordinate"))
                     {
-                        double.TryParse(o.Attribute("X").Value, out var xout);
+                        double.TryParse(o.Attribute("X").Value, NumberStyles.Any, CultureInfo.InvariantCulture, out var xout);
                         xData.Add(xout);
                         var dist = UnivariateDistributionFactory.CreateDistribution(Distribution);
                         var props = dist.GetParameterPropertyNames;
                         var paramVals = new double[(props.Count())];
                         for (int i = 0; i < props.Count(); i++)
                         {
-                            double.TryParse(o.Attribute(props[i]).Value, out var result);
+                            double.TryParse(o.Attribute(props[i]).Value, NumberStyles.Any, CultureInfo.InvariantCulture, out var result);
                             paramVals[i] = result;
                         }
 

4.8.1/Numerics/Data/Paired Data/UncertainOrdinate.cs

@@ -28,6 +28,7 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -52,6 +53,7 @@ namespace Numerics.Data
     /// </list>
     /// </para>
     /// </remarks>
+    [Serializable]
     public struct UncertainOrdinate
     {
 
@@ -97,15 +99,15 @@ public UncertainOrdinate(XElement xElement)
         public UncertainOrdinate(XElement xElement, UnivariateDistributionType distributionType)
         {
             double x = 0;
-            if (xElement.Attribute(nameof(X)) != null) double.TryParse(xElement.Attribute(nameof(X)).Value, out x);
+            if (xElement.Attribute(nameof(X)) != null) double.TryParse(xElement.Attribute(nameof(X)).Value, NumberStyles.Any, CultureInfo.InvariantCulture, out x);
             // backwards compatibility
             var dist = UnivariateDistributionFactory.CreateDistribution(distributionType);
             var props = dist.GetParameterPropertyNames;
             var paramVals = new double[(props.Count())];
             for (int i = 0; i < props.Count(); i++)
             {
                 double p = 0;
-                if (xElement.Attribute(props[i]) != null) double.TryParse(xElement.Attribute(props[i]).Value, out p);
+                if (xElement.Attribute(props[i]) != null) double.TryParse(xElement.Attribute(props[i]).Value, NumberStyles.Any, CultureInfo.InvariantCulture, out p);
                 paramVals[i] = p;
             }
             dist.SetParameters(paramVals);