Merge remote-tracking branch 'upstream/master'

Author: dotchris90

src/NumSharp.Core/Casting/NdArray.ToString.cs

@@ -11,8 +11,27 @@ public partial class NDArray
         public override string ToString()
         {
             string output = "";
-
-            if (this.ndim == 2)
+            if (this.ndim == 0)
+            {
+                switch (dtype.Name)
+                {
+                    case "Int16":
+                        output = Data<short>()[0].ToString();
+                        break;
+                    case "Int32":
+                        output = Data<int>()[0].ToString();
+                        break;
+                    case "Double":
+                        output = Data<double>()[0].ToString();
+                        break;
+                    case "String":
+                        output = Data<string>()[0].ToString();
+                        break;
+                    default:
+                        throw new NotImplementedException("NDArray ToString()");
+                }
+            }
+            else if (this.ndim == 2)
             {
                 output = this._ToMatrixString();
             }

src/NumSharp.Core/LinearAlgebra/NdArray.Dot.cs

@@ -23,6 +23,15 @@ public NDArray dot(NDArray nd2)
             // in case must do a reshape
             var oldStorage1 = this.Storage;
             var oldStorage2 = nd2.Storage;
+            if ((this.ndim == 0) & (nd2.ndim == 0))
+            {
+                if (this.dtype == typeof(int))
+                {
+                    var ret = this.Data<int>()[0] * nd2.Data<int>()[0];
+                    return new NDArray(new int[] { ret }).reshape();
+                }
+                
+            }
 
             if ((this.ndim == 1 ) & (nd2.ndim == 1))
                 if (this.shape[0] != nd2.shape[0])

src/NumSharp.Core/NDStorage.cs

@@ -178,7 +178,14 @@ public int DTypeSize
         {
             get
             {
-                return Marshal.SizeOf(_DType);
+                if(_DType == typeof(string))
+                {
+                    return 0;
+                }
+                else
+                {
+                    return Marshal.SizeOf(_DType);
+                }
             }
         }
         /// <summary>

src/NumSharp.Core/NumSharp.Core.csproj

@@ -75,4 +75,23 @@ Add T randn&lt;T&gt;()</PackageReleaseNotes>
     <Content CopyToOutputDirectory="PreserveNewest" Include="./runtimes/linux-x64/native/lapack.so" Link="lapack.so" Pack="true" PackagePath="runtimes/linux-x64/native/lapack.so" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="Operations\NdArray.ElementsWise.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>NdArray.ElementsWise.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Operations\NdArray.ElementsWise.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NdArray.ElementsWise.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
 </Project>

src/NumSharp.Core/Operations/NdArray.ElementsWise.cs

@@ -0,0 +1 @@
+

test/NumSharp.UnitTest/LinearAlgebra/NdArray.Dot.Test.cs

@@ -31,12 +31,24 @@ public void DotTwo1Int()
 
             var yArray = y.Storage.GetData<int>();
 
+
             Assert.AreEqual(yArray[0], 5);
             Assert.AreEqual(yArray[1], 8);
             Assert.AreEqual(yArray[2], 10);
             Assert.AreEqual(yArray[3], 13);
         }
 
+        [TestMethod]
+        public void DotTwoScalar()
+        {
+
+            int sca1 = 2;
+            int sca2 = 3;
+            var sca3 = np.dot(sca1, sca2);
+
+            Assert.AreEqual(sca3.Data<int>()[0], 6);
+        }
+
         [TestMethod]
         public void DotTwo1DDouble()
         {