Merge branch 'master' of https://github.com/Oceania2018/NumSharp

Oceania2018 · Oceania2018 · commit 4b1724a0011a · 2019-01-29T16:35:43.000-06:00
diff --git a/src/NumSharp.Core/Casting/Implicit/NdArray.Implicit.ValueTypes.cs b/src/NumSharp.Core/Casting/Implicit/NdArray.Implicit.ValueTypes.cs
@@ -29,6 +29,14 @@ namespace NumSharp.Core
 {
     public partial class NDArray
     {
+        public static implicit operator string(NDArray nd)
+        {
+            if (nd.ndim > 0)
+                throw new IncorrectShapeException();
+
+            return nd.Data<string>(0);
+        }
+
         public static implicit operator NDArray(float d)
         {
             var ndArray = new NDArray(typeof(float), new int[0]);

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,14 @@ namespace NumSharp.Core`
`29`	`29`	`{`
`30`	`30`	`public partial class NDArray`
`31`	`31`	`{`
	`32`	`+ public static implicit operator string(NDArray nd)`
	`33`	`+ {`
	`34`	`+ if (nd.ndim > 0)`
	`35`	`+ throw new IncorrectShapeException();`
	`36`	`+`
	`37`	`+ return nd.Data<string>(0);`
	`38`	`+ }`
	`39`	`+`
`32`	`40`	`public static implicit operator NDArray(float d)`
`33`	`41`	`{`
`34`	`42`	`var ndArray = new NDArray(typeof(float), new int[0]);`