Fix : ToString() just showed 2 elements (fix complete)

Author: dotchris90

src/NumSharp.Core/Casting/NdArray.ToString.cs

@@ -14,39 +14,29 @@ public override string ToString()
 
             if (this.ndim == 2)
             {
-                if(dtype == typeof(int))
-                {
-                    output = this._ToMatrixString<int>();
-                }
-                else if(dtype == typeof(double))
-                {
-                    output = this._ToMatrixString<double>();
-                }
-                
+                output = this._ToMatrixString();
             }
             else
             {
-                if (dtype == typeof(int))
-                {
-                    //output = this._ToVectorString<int>();
-                }
-                else if (dtype == typeof(double))
-                {
-                    //output = this._ToVectorString<double>();
-                }
+                output = this._ToVectorString();
             }
 
             return output;
         }
-        protected string _ToVectorString<T>()
+        protected string _ToVectorString()
         {
             string returnValue = "array([";
 
             int digitBefore = 0;
             int digitAfter = 0;
 
-            var dataParsed = Storage.GetData<T>().Select(x => _ParseNumber(x,ref digitBefore,ref digitAfter)).ToArray();
+            string[] dataParsed = new string[Storage.GetData().Length];
+
+            Array strg = Storage.GetData();
 
+            for (int idx = 0; idx < dataParsed.Length;idx++)
+                dataParsed[idx] = _ParseNumber(strg.GetValue(idx),ref digitBefore, ref digitAfter);
+            
             string elementFormatStart = "{0:";
 
             string elementFormatEnd = "";
@@ -64,25 +54,30 @@ protected string _ToVectorString<T>()
 
                 elementFormat = elementFormatStart + new string(Enumerable.Repeat<char>(' ',missingDigits).ToArray()) + "0." + elementFormatEnd; 
 
-                returnValue += (String.Format(new CultureInfo("en-us"),elementFormat, Storage.GetData<T>()[idx]) + ", ");
+                returnValue += (String.Format(new CultureInfo("en-us"),elementFormat, strg.GetValue(idx)) + ", ");
             }
             missingDigits =  digitBefore - dataParsed.Last().Replace(" ","").Split('.')[0].Length;
 
             elementFormat = elementFormatStart + new string(Enumerable.Repeat<char>(' ',missingDigits).ToArray()) + "." + elementFormatEnd; 
 
-            returnValue += (String.Format(new CultureInfo("en-us"),elementFormat, Storage.GetData<T>().Last()) + "])");
+            returnValue += (String.Format(new CultureInfo("en-us"),elementFormat, strg.GetValue(strg.Length-1)) + "])");
 
             return returnValue;
         }
-        protected string _ToMatrixString<T>()
+        protected string _ToMatrixString()
         {
             string returnValue = "array([[";
 
             int digitBefore = 0;
             int digitAfter = 0;
 
-            string[] dataParsed = Storage.GetData<T>().Select(x => _ParseNumber(x, ref digitBefore, ref digitAfter)).ToArray();
+            string[] dataParsed = new string[Storage.GetData().Length];
+
+            Array strg = Storage.GetData();
 
+            for (int idx = 0; idx < dataParsed.Length;idx++)
+                dataParsed[idx] = _ParseNumber(strg.GetValue(idx),ref digitBefore, ref digitAfter);
+            
             string elementFormatStart = "{0:";
 
             string elementFormatEnd = "";
@@ -94,27 +89,27 @@ protected string _ToMatrixString<T>()
             int missingDigits;
             string elementFormat;
 
-            for (int idx = 0; idx < this.ndim - 1; idx++)
+            for (int idx = 0; idx < dataParsed.Length - 1; idx++)
             {
                 missingDigits = digitBefore - dataParsed[idx].Replace(" ", "").Split('.')[0].Length;
 
                 elementFormat = elementFormatStart + new string(Enumerable.Repeat<char>(' ', missingDigits).ToArray()) + "0." + elementFormatEnd;
 
                 if (((idx + 1) % shape[1]) == 0)
                 {
-                    returnValue += (String.Format(new CultureInfo("en-us"), elementFormat, Storage.GetData<T>()[idx]) + "],   \n       [");
+                    returnValue += (String.Format(new CultureInfo("en-us"), elementFormat, strg.GetValue(idx)) + "],   \n       [");
                 }
                 else
                 {
-                    returnValue += (String.Format(new CultureInfo("en-us"), elementFormat, Storage.GetData<T>()[idx]) + ", ");
+                    returnValue += (String.Format(new CultureInfo("en-us"), elementFormat, strg.GetValue(idx)) + ", ");
                 }
             }
 
             missingDigits =  digitBefore - dataParsed.Last().Replace(" ","").Split('.')[0].Length;
 
             elementFormat = elementFormatStart + new string(Enumerable.Repeat<char>(' ',missingDigits).ToArray()) + "." + elementFormatEnd; 
 
-            returnValue += (String.Format(new CultureInfo("en-us"),elementFormat, Storage.GetData<T>().Last()) + "]])");
+            returnValue += (String.Format(new CultureInfo("en-us"),elementFormat, strg.GetValue(strg.Length-1)) + "]])");
 
             return returnValue;    
         }

test/NumSharp.UnitTest/NdArray.Test.cs

@@ -14,26 +14,26 @@ public class NDArrayTest
         [TestMethod]
         public void StringCheck()
         {
-            /* 
-            var nd =  np.arange(9.0).reshape(3,3);
+            
+            var nd =  np.arange(9.0).reshape(3,3).MakeGeneric<double>();
 
             var random = new Random();
-            nd.Set(nd.Data<double>().Select(x => x + random.NextDouble()).ToArray());
+            nd.Storage.SetData(nd.Data<double>().Select(x => x + random.NextDouble()).ToArray());
             nd[1,0] = 1.0;
             nd[0,0] = 9.0;
             nd[2,2] = 7.0;
-            //nd.Storage[3] -= 20;
-            //nd.Storage[8] += 23;
+            nd[0,2] = nd[0,2] - 20.0;
+            nd[2,2] += 23;
 
             var stringOfNp = nd.ToString();
 
-            /*Assert.IsTrue(stringOfNp.Contains("[[ 0."));
+            Assert.IsTrue(stringOfNp.Contains("[["));
 
-            nd = np.arange(9).reshape(3,3);
+            nd = np.arange(9).reshape(3,3).MakeGeneric<double>();
 
             stringOfNp = nd.ToString();        
 
-            Assert.IsTrue(stringOfNp.Contains("([[ 0,"));*/
+            Assert.IsTrue(stringOfNp.Contains("([[ 0,"));
 
         }
         [TestMethod]