overload np.asarray

Oceania2018 · Oceania2018 · commit 77877588fb6f · 2018-12-27T09:51:09.000-06:00
support all kind of value type and string
diff --git a/src/NumSharp.Core/Creation/np.asarray.cs b/src/NumSharp.Core/Creation/np.asarray.cs
@@ -9,31 +9,32 @@ namespace NumSharp.Core
 {
     public static partial class np
     {
-        public static NDArray asarray(double[] data, int ndim = 1)
+        public static NDArray asarray(string data)
         {
-            var nd = new NDArray(typeof(double), data.Length);
-            nd.Storage.SetData(data);
+            var nd = new NDArray(typeof(string), new int[0]);
+            nd.Storage.SetData(new string[] { data });
             return nd;
         }
 
-        public static NDArray asarray(float data)
+        public static NDArray asarray<T>(T data) where T : struct
         {
-            return new NDArray(new float[] { data });
+            var nd = new NDArray(typeof(T), new int[0]);
+            nd.Storage.SetData(new T[] { data });
+            return nd;
         }
 
-        public static NDArray asarray(float[] data, int ndim = 1)
+        public static NDArray asarray(string[] data, int ndim = 1)
         {
-            var nd = new NDArray(typeof(float), data.Length);
+            var nd = new NDArray(typeof(string), data.Length);
             nd.Storage.SetData(data);
             return nd;
         }
-        /*
-        public static NDArray asarray(matrix mx, int ndim = 1)
+
+        public static NDArray asarray<T>(T[] data, int ndim = 1) where T : struct
         {
-            var nd = new NDArray(mx.dtype, mx.shape);
-            nd.Storage = mx.Storage;
+            var nd = new NDArray(typeof(T), data.Length);
+            nd.Storage.SetData(data);
             return nd;
         }
-        */
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,31 +9,32 @@ namespace NumSharp.Core`
`9`	`9`	`{`
`10`	`10`	`public static partial class np`
`11`	`11`	`{`
`12`		`- public static NDArray asarray(double[] data, int ndim = 1)`
	`12`	`+ public static NDArray asarray(string data)`
`13`	`13`	`{`
`14`		`- var nd = new NDArray(typeof(double), data.Length);`
`15`		`- nd.Storage.SetData(data);`
	`14`	`+ var nd = new NDArray(typeof(string), new int[0]);`
	`15`	`+ nd.Storage.SetData(new string[] { data });`
`16`	`16`	`return nd;`
`17`	`17`	`}`
`18`	`18`
`19`		`- public static NDArray asarray(float data)`
	`19`	`+ public static NDArray asarray<T>(T data) where T : struct`
`20`	`20`	`{`
`21`		`- return new NDArray(new float[] { data });`
	`21`	`+ var nd = new NDArray(typeof(T), new int[0]);`
	`22`	`+ nd.Storage.SetData(new T[] { data });`
	`23`	`+ return nd;`
`22`	`24`	`}`
`23`	`25`
`24`		`- public static NDArray asarray(float[] data, int ndim = 1)`
	`26`	`+ public static NDArray asarray(string[] data, int ndim = 1)`
`25`	`27`	`{`
`26`		`- var nd = new NDArray(typeof(float), data.Length);`
	`28`	`+ var nd = new NDArray(typeof(string), data.Length);`
`27`	`29`	`nd.Storage.SetData(data);`
`28`	`30`	`return nd;`
`29`	`31`	`}`
`30`		`- /*`
`31`		`- public static NDArray asarray(matrix mx, int ndim = 1)`
	`32`	`+`
	`33`	`+ public static NDArray asarray<T>(T[] data, int ndim = 1) where T : struct`
`32`	`34`	`{`
`33`		`- var nd = new NDArray(mx.dtype, mx.shape);`
`34`		`- nd.Storage = mx.Storage;`
	`35`	`+ var nd = new NDArray(typeof(T), data.Length);`
	`36`	`+ nd.Storage.SetData(data);`
`35`	`37`	`return nd;`
`36`	`38`	`}`
`37`		`- */`
`38`	`39`	`}`
`39`	`40`	`}`