NDArray<T>: added a constructor overload and test cases

henon · henon · commit b34bfec3edfe · 2019-04-05T08:38:13.000+02:00
diff --git a/src/NumSharp.Core/Generics/NDArrayGeneric.cs b/src/NumSharp.Core/Generics/NDArrayGeneric.cs
@@ -39,6 +39,11 @@ public NDArray(Shape shape) : this()
             Storage = new NDStorage(typeof(T));
             Storage.Allocate(this.dtype, shape);
         }
+
+        public NDArray(Array array, Shape shape) : this(shape)
+        {
+            Storage.SetData(array);
+        }
         /// <summary>
         /// indexing of generic - overridden on purpose
         /// </summary>
@@ -57,4 +62,3 @@ public NDArray(Shape shape) : this()
         }
     }
 }
- 
diff --git a/test/NumSharp.UnitTest/Generic/NDArray.Generic.Test.cs b/test/NumSharp.UnitTest/Generic/NDArray.Generic.Test.cs
@@ -0,0 +1,43 @@
+﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Numerics;
+using System.Collections.Generic;
+using System.Text;
+using System.Linq;
+using NumSharp;
+using NumSharp.Generic;
+
+namespace NumSharp.UnitTest.Generic
+{
+    [TestClass]
+    public class NDArrayGenericTest
+    {
+
+        [TestMethod]
+        public void Generic1DBool_NDArray()
+        {
+            var np1 = new NDArray<bool>(new [] { true, true, false, false }, new Shape(4));
+            var np2 = new NDArray<bool>(new Shape(2));
+            var np3 = new NDArray<bool>();
+            Assert.IsTrue(Enumerable.SequenceEqual(new [] { true, true, false, false }, np1.Storage.GetData<bool>()));
+            Assert.AreEqual(4, np1.size);
+            Assert.AreEqual(1, np1.ndim);
+            Assert.IsTrue(Enumerable.SequenceEqual(new[] { false, false }, np2.Storage.GetData<bool>()));
+            Assert.AreEqual(2, np2.size);
+            Assert.AreEqual(1, np2.ndim);
+            Assert.IsTrue(Enumerable.SequenceEqual(new[] { false }, np3.Storage.GetData<bool>()));
+            Assert.AreEqual(1, np3.size);
+            Assert.AreEqual(1, np3.ndim);
+        }
+
+        [TestMethod]
+        public void Generic2DBool_NDArrayOR()
+        {
+            var np1 = new NDArray<bool>(new Shape(2, 3));
+            np1.Storage.SetData(new bool[] { true, true, false, false, true, false });
+            Assert.IsTrue(Enumerable.SequenceEqual(new[] { true, true, false, false, true, false }, np1.Storage.GetData<bool>()));
+            Assert.AreEqual(6, np1.size);
+            Assert.AreEqual(2, np1.ndim);
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,11 @@ public NDArray(Shape shape) : this()`
`39`	`39`	`Storage = new NDStorage(typeof(T));`
`40`	`40`	`Storage.Allocate(this.dtype, shape);`
`41`	`41`	`}`
	`42`	`+`
	`43`	`+ public NDArray(Array array, Shape shape) : this(shape)`
	`44`	`+ {`
	`45`	`+ Storage.SetData(array);`
	`46`	`+ }`
`42`	`47`	`/// <summary>`
`43`	`48`	`/// indexing of generic - overridden on purpose`
`44`	`49`	`/// </summary>`
`@@ -57,4 +62,3 @@ public NDArray(Shape shape) : this()`
`57`	`62`	`}`
`58`	`63`	`}`
`59`	`64`	`}`
`60`		`-`