Merge pull request #156 from dotChris90/master

Made sure all methods and tests do not use the generic numpy

Author: dotChris90

src/NumSharp.Core/Creation/NdArray.HStack.cs

@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NumSharp.Core
+{
+    public partial class NDArray
+    {   
+        /// <summary>
+        /// Stack arrays in sequence horizontally
+        /// </summary>
+        /// <param name="nps"></param>
+        /// <returns></returns>
+        public NDArray hstack(params NDArray[] nps)
+        {
+            if (nps == null || nps.Length == 0)
+                throw new Exception("Input arrays can not be empty");
+
+            var npAll = new NDArray[nps.Length+1];
+            npAll[0] = this;
+
+            for (int idx = 0; idx < nps.Length; idx++)
+                if (nps[0].shape != nps[idx].shape)
+                    throw new Exception("Arrays mush have same shapes");
+                else
+                    npAll[idx+1] = nps[idx];
+
+            NDArray np = new NDArray();
+
+            // easy 1D case
+            if (this.ndim == 1)
+            {
+                var list1D = new List<object>();
+                for (int idx = 0; idx < npAll.Length;idx++)
+                    list1D.AddRange(npAll[idx].Storage.GetData<object>().ToList());
+                
+                np = NumPy.array(list1D.ToArray(),this.dtype);
+            }
+            else
+            {
+                var list = new List<object>();
+
+                int total = npAll[0].ndim == 1 ? 1 : npAll[0].shape.Shapes[0];
+
+                int pageSize = npAll[0].ndim == 1 ? npAll[0].shape.Shapes[0] : npAll[0].shape.DimOffset[0];
+
+                for (int i = 0; i < total; i++)
+                {
+                    for (int k = 0; k < npAll.Length; k++)
+                    {
+                        for (int j = i * pageSize; j < (i + 1) * pageSize; j++)
+                        list.Add(npAll[k].Storage.GetData<object>()[j]);
+                    }
+                }
+                
+                np.Storage.SetData( list.ToArray());
+
+                int[] shapes = npAll[0].shape.Shapes.ToArray();
+
+                if (shapes.Length == 1)
+                    shapes[0] *= npAll.Length;
+                else
+                    shapes[1] *= npAll.Length;
+
+                np.Storage.Shape = new Shape(shapes);
+
+            
+            }
+
+            return np;
+        }
+    }
+}

src/NumSharp.Core/Creation/NdArray.VStack.cs

@@ -11,40 +11,31 @@ public NDArray vstack(params NDArray[] nps)
         {
             if (nps == null || nps.Length == 0)
                 throw new Exception("Input arrays can not be empty");
+            
+            List<object> list = this.Storage.GetData<object>().ToList();
 
-            int dataLength = this.Storage.Length;
-
-            for (int idx = 0;idx < nps.Length;idx++)     
-                dataLength += nps[idx].Storage.Length;       
-
-            Array dataSysArr = Array.CreateInstance(this.dtype,dataLength);
-            NDArray np = new NDArray(this.dtype);
-
-            this.Storage.GetData(this.dtype).CopyTo(dataSysArr,0);
-
-            int idxOfLastCopyiedElement = this.Storage.Length;
+            NDArray np = new NDArray(dtype);
 
-            for (int idx = 0; idx < nps.Length;idx++)
+            foreach (NDArray ele in nps)
             {
-                nps[idx].Storage.GetData(this.dtype).CopyTo(dataSysArr,idxOfLastCopyiedElement);
-                idxOfLastCopyiedElement += nps[idx].Storage.Length;
+                if (nps[0].shape != ele.shape)
+                    throw new Exception("Arrays mush have same shapes");
+                
+                list.AddRange(ele.Storage.GetData<object>());
             }
-            
-            var check = dataSysArr.GetValue(idxOfLastCopyiedElement-1);
 
-            if (ndim == 1)
+            np.Storage.SetData(list.ToArray());
+            
+            if (nps[0].shape.Shapes.Count == 1)
             {
-                np.Storage.Shape = new Shape(new int[] { nps.Length+1, shape.Shapes[0] });
+                np.Storage.Shape = new Shape(new int[] { nps.Length +1, nps[0].shape.Shapes[0] });
             }
             else
             {
                 int[] shapes = nps[0].shape.Shapes.ToArray();
-                shapes[0] *= nps.Length;
-                np.Storage.Shape = new Shape(shapes);
+                shapes[0] *= nps.Length + 1;
+                np.Storage.Shape = new Shape(shapes) ;
             }
-
-            np.Storage.SetData(dataSysArr);
-
             return np;
         }
     }

src/NumSharp.Core/Creation/NumPy.hstack.cs

@@ -0,0 +1,21 @@
+using NumSharp.Core.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace NumSharp.Core
+{
+    public static partial class NumPy
+    {
+        public static NDArray hstack(params NDArray[] nps)
+        {
+            var np1 = nps[0];
+
+            var npn = new NDArray[nps.Length-1];
+            for (int idx = 1;idx < nps.Length;idx++)
+                npn[idx-1] = nps[idx];
+
+            return np1.hstack(npn);
+        }
+    }
+}

src/NumSharp.Core/Creation/NumPy.ones.cs

@@ -63,32 +63,5 @@ public static NDArray ones<T>(params int[] shapes)
         }
     }
 
-    public static partial class NumPyExtensions
-    {
-        /// <summary>
-        /// Return a new array of given shape and type, filled with ones.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="np"></param>
-        /// <param name="shape"></param>
-        /// <returns></returns>
-        public static NDArrayGeneric<T> ones<T>(this NumPyGeneric<T> np, Shape shape)
-        {
-            var nd = new NDArrayGeneric<T>();
-            nd.Shape = shape;
-
-            switch (default(T))
-            {
-                case int data:
-                    nd.Data = Enumerable.Range(0, nd.Size).Select(x => (T)(object)1).ToArray();
-                    break;
-
-                case double data:
-                    nd.Data = Enumerable.Range(0, nd.Size).Select(x => (T)(object)1.0).ToArray();
-                    break;
-            } 
-
-            return nd;
-        }
-    }
+    
 }

src/NumSharp.Core/Creation/NumPy.ones_like.cs

@@ -5,11 +5,11 @@
 
 namespace NumSharp.Core
 {
-    public static partial class NumPyExtensions
+    public static partial class NumPy
     {
-        public static NDArrayGeneric<T> ones_like<T>(this NumPyGeneric<T> np, NDArrayGeneric<T> nd, string order = "C")
+        public static NDArray ones_like(NDArray nd, string order = "C")
         {
-            return np.ones(new Shape(nd.Shape.Shapes));
+            return NumPy.ones(new Shape(nd.shape.Shapes));
         }
     }
 }

src/NumSharp.Core/Creation/NumPy.vstack.cs

@@ -0,0 +1,21 @@
+using NumSharp.Core.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace NumSharp.Core
+{
+    public static partial class NumPy
+    {
+        public static NDArray vstack(params NDArray[] nps)
+        {
+            var np1 = nps[0];
+
+            var npn = new NDArray[nps.Length-1];
+            for (int idx = 1;idx < nps.Length;idx++)
+                npn[idx-1] = nps[idx];
+            
+            return np1.vstack(npn);
+        }
+    }
+}