Fixed SciSharp#293 and added unit test.

Nucs · Nucs · commit f5c021da017a · 2019-07-01T16:51:04.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -353,3 +353,4 @@ src/NumSharp.Python/NumSharpPy/NumSharp.dll
 docfx_project/src
 /coverage.xml
 test/NumSharp.Benchmark/LocalBenches.cs
+test/NumSharp.UnitTest/DevTests.cs
diff --git a/src/NumSharp.Core/Backends/TypedArrayStorage.cs b/src/NumSharp.Core/Backends/TypedArrayStorage.cs
@@ -1185,12 +1185,14 @@ public void SetData(object value, params int[] indices)
             {
                 if (np.isscalar(nd))
                 {
-                    SetInternalValueUnsafe(nd.Array.GetValue(0), _Shape.GetIndexInShape(Slice, indices));
+                    SetOrConvertInternalValue(nd.Array.GetValue(0), _Shape.GetIndexInShape(Slice, indices));
                     return;
                 }
 
                 var targetIndex = _Shape.GetIndexInShape(Slice, indices);
 
+                //todo! we need to handle more dims.
+
                 int offset = 0;
                 if (Shape.NDim == 1)
                     offset = targetIndex + (Slice?.Start ?? 0);
diff --git a/test/NumSharp.UnitTest/Selection/NDArray.Indexing.Test.cs b/test/NumSharp.UnitTest/Selection/NDArray.Indexing.Test.cs
@@ -734,5 +734,19 @@ public void Transpose10x10()
                 }
             }).Should().NotThrow("It has to run completely.");
         }
+
+        /// <summary>
+        /// Based on issue https://github.com/SciSharp/NumSharp/issues/293
+        /// </summary>
+        [TestMethod]
+        public void CastingWhenSettingDifferentType()
+        {
+            NDArray output = np.zeros(5);
+            double newValDouble = 2;
+            int newValInt = 4;
+            output[3] = newValDouble; // This works fine
+            new Action(()=>output[4] = newValInt).Should().NotThrow<NullReferenceException>(); // throws System.NullReferenceException
+            output.Array.GetValue(4).Should().Be(newValInt);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1185,12 +1185,14 @@ public void SetData(object value, params int[] indices)`
`1185`	`1185`	`{`
`1186`	`1186`	`if (np.isscalar(nd))`
`1187`	`1187`	`{`
`1188`		`- SetInternalValueUnsafe(nd.Array.GetValue(0), _Shape.GetIndexInShape(Slice, indices));`
	`1188`	`+ SetOrConvertInternalValue(nd.Array.GetValue(0), _Shape.GetIndexInShape(Slice, indices));`
`1189`	`1189`	`return;`
`1190`	`1190`	`}`
`1191`	`1191`
`1192`	`1192`	`var targetIndex = _Shape.GetIndexInShape(Slice, indices);`
`1193`	`1193`
	`1194`	`+ //todo! we need to handle more dims.`
	`1195`	`+`
`1194`	`1196`	`int offset = 0;`
`1195`	`1197`	`if (Shape.NDim == 1)`
`1196`	`1198`	`offset = targetIndex + (Slice?.Start ?? 0);`
Original file line number	Diff line number	Diff line change
`@@ -734,5 +734,19 @@ public void Transpose10x10()`
`734`	`734`	`}`
`735`	`735`	`}).Should().NotThrow("It has to run completely.");`
`736`	`736`	`}`
	`737`	`+`
	`738`	`+ /// <summary>`
	`739`	`+ /// Based on issue https://github.com/SciSharp/NumSharp/issues/293`
	`740`	`+ /// </summary>`
	`741`	`+ [TestMethod]`
	`742`	`+ public void CastingWhenSettingDifferentType()`
	`743`	`+ {`
	`744`	`+ NDArray output = np.zeros(5);`
	`745`	`+ double newValDouble = 2;`
	`746`	`+ int newValInt = 4;`
	`747`	`+ output[3] = newValDouble; // This works fine`
	`748`	`+ new Action(()=>output[4] = newValInt).Should().NotThrow<NullReferenceException>(); // throws System.NullReferenceException`
	`749`	`+ output.Array.GetValue(4).Should().Be(newValInt);`
	`750`	`+ }`
`737`	`751`	`}`
`738`	`752`	`}`