replace Shape.Length to Shape.NDim

Oceania2018 · Oceania2018 · commit d77369eeb698 · 2018-11-24T09:15:53.000-06:00
diff --git a/README.md b/README.md
@@ -90,4 +90,5 @@ NumSharp is referenced by:
 NumSharp is a member project of [SciSharp.org](https://github.com/SciSharp) which is the .NET based ecosystem of open-source software for mathematics, science, and engineering.
 Welcome to fork and pull request to add more APIs, and make reference list longer.
 
-<img src="https://avatars3.githubusercontent.com/u/44989469?s=200&v=4" width="80">
+<img src="https://avatars3.githubusercontent.com/u/44989469?s=200&v=4" width="80">
+Star me on [Github](https://github.com/SciSharp/NumSharp) if you like it.
diff --git a/src/NumSharp.Core/Extensions/NDArrayWithDType.AMin.cs b/src/NumSharp.Core/Extensions/NDArrayWithDType.AMin.cs
@@ -23,7 +23,7 @@ public NDArray AMin(int? axis = null)
             }
             else
             {
-                if (axis < 0 || axis >= Shape.Length)
+                if (axis < 0 || axis >= Shape.NDim)
                     throw new Exception("Invalid input: axis");
                 int[] resShapes = new int[Shape.Shapes.Count - 1];
                 int index = 0; //index for result shape set
diff --git a/src/NumSharp.Core/Extensions/NdArray.AMax.cs b/src/NumSharp.Core/Extensions/NdArray.AMax.cs
@@ -27,7 +27,7 @@ public static NDArrayGeneric<double> AMax(this NDArrayGeneric<double> np, int? a
             }
             else
             {
-                if (axis < 0 || axis >= np.Shape.Length)
+                if (axis < 0 || axis >= np.NDim)
                     throw new Exception("Invalid input: axis");
                 int[] resShapes = new int[np.Shape.Shapes.Count - 1];
                 int index = 0; //index for result shape set
diff --git a/src/NumSharp.Core/Extensions/NdArray.AMin.cs b/src/NumSharp.Core/Extensions/NdArray.AMin.cs
@@ -17,7 +17,7 @@ public static NDArrayGeneric<double> AMin(this NDArrayGeneric<double> np, int? a
             }
             else
             {
-                if (axis < 0 || axis >= np.Shape.Length)
+                if (axis < 0 || axis >= np.NDim)
                     throw new Exception("Invalid input: axis");
                 int[] resShapes = new int[np.Shape.Shapes.Count - 1];
                 int index = 0; //index for result shape set
diff --git a/src/NumSharp.Core/Extensions/NdArray.HStack.cs b/src/NumSharp.Core/Extensions/NdArray.HStack.cs
@@ -23,8 +23,8 @@ public static NDArrayGeneric<T> HStack<T>(this NDArrayGeneric<T> np1, params NDA
                 if (nps[0].Shape != ele.Shape)
                     throw new Exception("Arrays mush have same shapes");
             }
-            int total = nps[0].Shape.Length == 1 ? 1 : nps[0].Shape.Shapes[0];
-            int pageSize = nps[0].Shape.Length == 1 ? nps[0].Shape.Shapes[0] : nps[0].Shape.DimOffset[0];
+            int total = nps[0].NDim == 1 ? 1 : nps[0].Shape.Shapes[0];
+            int pageSize = nps[0].NDim == 1 ? nps[0].Shape.Shapes[0] : nps[0].Shape.DimOffset[0];
 
             //int i = 0;
             //Enumerable.Range(0, total)
diff --git a/src/NumSharp.Core/Extensions/NdArray.VStack.cs b/src/NumSharp.Core/Extensions/NdArray.VStack.cs
@@ -25,7 +25,7 @@ public static NDArrayGeneric<T> VStack<T>(this NDArrayGeneric<T> np1, params NDA
                 list.AddRange(ele.Data);
             }
             np.Data = list.ToArray();
-            if (nps[0].Shape.Length == 1)
+            if (nps[0].NDim == 1)
             {
                 np.Shape = new Shape(new int[] { nps.Length, nps[0].Shape.Shapes[0] });
             }
diff --git a/src/NumSharp.Core/LinearAlgebra/NdArray.Dot.cs b/src/NumSharp.Core/LinearAlgebra/NdArray.Dot.cs
@@ -18,7 +18,7 @@ public partial class NDArray
         /// <returns></returns>
         public NDArray dot<T>(NDArray np2)
         {
-            if ((this.Shape.Length == 1) & (np2.Shape.Length == 1))
+            if ((this.Shape.NDim == 1) & (np2.Shape.NDim == 1))
                 if (this.Shape.Shapes[0] != np2.Shape.Shapes[0])
                     throw new Exception("The Dot method does not work with this shape or was not already implemented.");
                 else
@@ -104,7 +104,7 @@ public NDArray dot<T>(NDArray np2)
                         throw new Exception("The Dot method is not implemented for the " + typeof(T).Name);
                     }
             }
-            if ((this.Shape.Length == 1) & (np2.Shape.Length == 1))
+            if ((this.Shape.NDim == 1) & (np2.Shape.NDim == 1))
             {
                 this.Shape = new Shape(Size);
                 np2.Shape = new Shape(np2.Size);
@@ -126,7 +126,7 @@ public partial class NDArrayGeneric<T>
         /// <returns></returns>
         public NDArrayGeneric<T> dot(NDArrayGeneric<T> np2)
         {
-            if ((this.Shape.Length == 1 ) & (np2.Shape.Length == 1))
+            if ((this.Shape.NDim == 1 ) & (np2.Shape.NDim == 1))
                 if (this.Shape.Shapes[0] != np2.Shape.Shapes[0])
                     throw new Exception("The Dot method does not work with this shape or was not already implemented."); 
                 else 
@@ -214,7 +214,7 @@ public NDArrayGeneric<T> dot(NDArrayGeneric<T> np2)
                     throw new Exception("The Dot method is not implemented for the "  + typeof(T).Name);
                 }
             }
-            if ((this.Shape.Length == 1 ) & (np2.Shape.Length == 1))
+            if ((this.Shape.NDim == 1 ) & (np2.Shape.NDim == 1))
             {
                 this.Shape = new Shape(this.Data.Length);
                 np2.Shape = new Shape(np2.Data.Length);
diff --git a/src/NumSharp.Core/LinearAlgebra/NdArray.multi_dot.cs b/src/NumSharp.Core/LinearAlgebra/NdArray.multi_dot.cs
@@ -20,7 +20,7 @@ public NDArrayGeneric<T> multi_dot(params NDArrayGeneric<T>[] np2Multi)
         {
             var np2 = np2Multi.Last(); 
 
-            if ((this.Shape.Length == 1 ) & (np2.Shape.Length == 1))
+            if ((this.Shape.NDim == 1 ) & (np2.Shape.NDim == 1))
                 if (this.Shape.Shapes[0] != np2.Shape.Shapes[0])
                     throw new Exception("The Dot method does not work with this shape or was not already implemented."); 
                 else 
diff --git a/src/NumSharp.Core/Manipulation/NumPy.vstack.cs b/src/NumSharp.Core/Manipulation/NumPy.vstack.cs
@@ -25,7 +25,7 @@ public NDArray vstack<T>(params NDArray[] nps)
                 list.AddRange(ele.Data<T>());
             }
             np.Set(list.ToArray());
-            if (nps[0].Shape.Length == 1)
+            if (nps[0].NDim == 1)
             {
                 np.Shape = new Shape(new int[] { nps.Length, nps[0].Shape.Shapes[0] });
             }
diff --git a/src/NumSharp.Core/Math/NumPy.amax.cs b/src/NumSharp.Core/Math/NumPy.amax.cs
@@ -18,7 +18,7 @@ public NDArray amax(NDArray nd, int? axis = null)
             }
             else
             {
-                if (axis < 0 || axis >= nd.Shape.Length)
+                if (axis < 0 || axis >= nd.NDim)
                     throw new Exception("Invalid input: axis");
                 int[] resShapes = new int[nd.NDim - 1];
                 int index = 0; //index for result shape set
diff --git a/src/NumSharp.Core/Math/NumPy.amin.cs b/src/NumSharp.Core/Math/NumPy.amin.cs
@@ -18,7 +18,7 @@ public NDArray amin<T>(NDArray nd, int? axis = null)
             }
             else
             {
-                if (axis < 0 || axis >= nd.Shape.Length)
+                if (axis < 0 || axis >= nd.NDim)
                     throw new Exception("Invalid input: axis");
                 int[] resShapes = new int[nd.NDim - 1];
                 int index = 0; //index for result shape set
@@ -60,7 +60,7 @@ public NDArray amin<T>(NDArray nd, int? axis = null)
                             min = Math.Min(min, nd.Data<double>()[start]);
                             start += sameSetOffset;
                         }
-                        res[index++] = min;
+                        res.Data<double>()[index++] = min;
                     }
                 }
             }
diff --git a/src/NumSharp.Core/NDArrayGeneric.cs b/src/NumSharp.Core/NDArrayGeneric.cs
@@ -90,7 +90,7 @@ public Shape Shape
         /// <summary>
         /// Dimension count
         /// </summary>
-        public int NDim => Shape.Length;
+        public int NDim => Shape.NDim;
 
         /// <summary>
         /// Total of elements
@@ -105,14 +105,14 @@ public NDArrayGeneric()
 
         public void Set(Shape shape, T value)
         {
-            if (shape.Length == NDim)
+            if (shape.NDim == NDim)
             {
                 throw new Exception("Please use NDArray[m, n] to access element.");
             }
             else
             {
                 int start = GetIndexInShape(shape.Shapes.ToArray());
-                int length = Shape.DimOffset[shape.Length - 1];
+                int length = Shape.DimOffset[shape.NDim - 1];
 
                 Span<T> data = Data;
                 var elements = data.Slice(start, length);
diff --git a/src/NumSharp.Core/NDStorage.cs b/src/NumSharp.Core/NDStorage.cs
@@ -123,7 +123,7 @@ public object Current
         {
             get
             {
-                if (Shape.Length == 1)
+                if (Shape.NDim == 1)
                 {
                     switch (values)
                     {
diff --git a/src/NumSharp.Core/NdArray.cs b/src/NumSharp.Core/NdArray.cs
@@ -65,7 +65,7 @@ public Shape Shape
         /// <summary>
         /// Dimension count
         /// </summary>
-        public int NDim => Shape.Length;
+        public int NDim => Shape.NDim;
 
         /// <summary>
         /// Total of elements
@@ -103,14 +103,14 @@ public void Set<T>(T[] data)
 
         public void Set<T>(Shape shape, T value)
         {
-            if (shape.Length == NDim)
+            if (shape.NDim == NDim)
             {
                 throw new Exception("Please use NDArray[m, n] to access element.");
             }
             else
             {
                 int start = Shape.GetIndexInShape(shape.Shapes.ToArray());
-                int length = Shape.DimOffset[shape.Length - 1];
+                int length = Shape.DimOffset[shape.NDim - 1];
 
                 Span<T> data = Data<T>();
                 var elements = data.Slice(start, length);
@@ -247,7 +247,7 @@ protected string _ToMatrixString<T>()
             int missingDigits;
             string elementFormat;
 
-            for (int idx = 0; idx < Shape.Length - 1; idx++)
+            for (int idx = 0; idx < Shape.NDim - 1; idx++)
             {
                 missingDigits = digitBefore - dataParsed[idx].Replace(" ", "").Split('.')[0].Length;
 
diff --git a/src/NumSharp.Core/Selection/NDArray.Enumerator.cs b/src/NumSharp.Core/Selection/NDArray.Enumerator.cs
@@ -12,7 +12,7 @@ public object Current
         {
             get
             {
-                if (shape.Length == 1)
+                if (shape.NDim == 1)
                 {
                     return Data[pos];
                 }
diff --git a/src/NumSharp.Core/Selection/NDArray.Indexing.cs b/src/NumSharp.Core/Selection/NDArray.Indexing.cs
@@ -34,8 +34,8 @@ public object this[params int[] select]
                             break;
                     }
 
-                    int[] shape = new int[Shape.Length - select.Length];
-                    for (int i = select.Length; i < Shape.Length; i++)
+                    int[] shape = new int[Shape.NDim - select.Length];
+                    for (int i = select.Length; i < Shape.NDim; i++)
                     {
                         shape[i - select.Length] = Shape[i];
                     }
@@ -123,22 +123,22 @@ public NDArrayGeneric<T> this[Shape select]
         {
             get
             {
-                if (select.Length == NDim)
+                if (select.NDim == NDim)
                 {
                     throw new Exception("Please use NDArray[m, n] to access element.");
                 }
                 else
                 {
                     int start = GetIndexInShape(select.Shapes.ToArray());
-                    int length = Shape.DimOffset[select.Length - 1];
+                    int length = Shape.DimOffset[select.NDim - 1];
 
                     var n = new NDArrayGeneric<T>();
                     Span<T> data = Data;
                     n.Data = data.Slice(start, length).ToArray();
-                    int[] shape = new int[Shape.Length - select.Length];
-                    for (int i = select.Length; i < Shape.Length; i++)
+                    int[] shape = new int[Shape.NDim - select.NDim];
+                    for (int i = select.NDim; i < Shape.NDim; i++)
                     {
-                        shape[i - select.Length] = Shape[i];
+                        shape[i - select.NDim] = Shape[i];
                     }
                     n.Shape = new Shape(shape);
                     // n.Shape = new Shape(Shape.Shapes.ToArray().AsSpan().Slice(select.Length).ToArray());
diff --git a/src/NumSharp.Core/Selection/NDArray.Slicing.cs b/src/NumSharp.Core/Selection/NDArray.Slicing.cs
@@ -14,8 +14,8 @@ public NDArrayGeneric<NDArrayGeneric<T>> this[Slice select]
                 result.Data = new NDArrayGeneric<T>[select.Length];
                 result.shape = new Shape(select.Length);
 
-                int[] shape = new int[Shape.Length];
-                for (int i = 0; i < Shape.Length; i++)
+                int[] shape = new int[Shape.NDim];
+                for (int i = 0; i < Shape.NDim; i++)
                 {
                     if (i == 0)
                     {
diff --git a/src/NumSharp.Core/Shape.cs b/src/NumSharp.Core/Shape.cs
@@ -54,7 +54,6 @@ public Shape(IReadOnlyList<int> shape)
             dimOffset = temp;
         }
 
-        public int Length => shape.Count;
         public IReadOnlyList<int> DimOffset => dimOffset;
         public IReadOnlyList<int> Shapes => shape;
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public NDArray AMin(int? axis = null)`
`23`	`23`	`}`
`24`	`24`	`else`
`25`	`25`	`{`
`26`		`- if (axis < 0 \|\| axis >= Shape.Length)`
	`26`	`+ if (axis < 0 \|\| axis >= Shape.NDim)`
`27`	`27`	`throw new Exception("Invalid input: axis");`
`28`	`28`	`int[] resShapes = new int[Shape.Shapes.Count - 1];`
`29`	`29`	`int index = 0; //index for result shape set`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public static NDArrayGeneric<double> AMax(this NDArrayGeneric<double> np, int? a`
`27`	`27`	`}`
`28`	`28`	`else`
`29`	`29`	`{`
`30`		`- if (axis < 0 \|\| axis >= np.Shape.Length)`
	`30`	`+ if (axis < 0 \|\| axis >= np.NDim)`
`31`	`31`	`throw new Exception("Invalid input: axis");`
`32`	`32`	`int[] resShapes = new int[np.Shape.Shapes.Count - 1];`
`33`	`33`	`int index = 0; //index for result shape set`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public static NDArrayGeneric<double> AMin(this NDArrayGeneric<double> np, int? a`
`17`	`17`	`}`
`18`	`18`	`else`
`19`	`19`	`{`
`20`		`- if (axis < 0 \|\| axis >= np.Shape.Length)`
	`20`	`+ if (axis < 0 \|\| axis >= np.NDim)`
`21`	`21`	`throw new Exception("Invalid input: axis");`
`22`	`22`	`int[] resShapes = new int[np.Shape.Shapes.Count - 1];`
`23`	`23`	`int index = 0; //index for result shape set`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public static NDArrayGeneric<T> VStack<T>(this NDArrayGeneric<T> np1, params NDA`
`25`	`25`	`list.AddRange(ele.Data);`
`26`	`26`	`}`
`27`	`27`	`np.Data = list.ToArray();`
`28`		`- if (nps[0].Shape.Length == 1)`
	`28`	`+ if (nps[0].NDim == 1)`
`29`	`29`	`{`
`30`	`30`	`np.Shape = new Shape(new int[] { nps.Length, nps[0].Shape.Shapes[0] });`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public partial class NDArray`
`18`	`18`	`/// <returns></returns>`
`19`	`19`	`public NDArray dot<T>(NDArray np2)`
`20`	`20`	`{`
`21`		`- if ((this.Shape.Length == 1) & (np2.Shape.Length == 1))`
	`21`	`+ if ((this.Shape.NDim == 1) & (np2.Shape.NDim == 1))`
`22`	`22`	`if (this.Shape.Shapes[0] != np2.Shape.Shapes[0])`
`23`	`23`	`throw new Exception("The Dot method does not work with this shape or was not already implemented.");`
`24`	`24`	`else`
`@@ -104,7 +104,7 @@ public NDArray dot<T>(NDArray np2)`
`104`	`104`	`throw new Exception("The Dot method is not implemented for the " + typeof(T).Name);`
`105`	`105`	`}`
`106`	`106`	`}`
`107`		`- if ((this.Shape.Length == 1) & (np2.Shape.Length == 1))`
	`107`	`+ if ((this.Shape.NDim == 1) & (np2.Shape.NDim == 1))`
`108`	`108`	`{`
`109`	`109`	`this.Shape = new Shape(Size);`
`110`	`110`	`np2.Shape = new Shape(np2.Size);`
`@@ -126,7 +126,7 @@ public partial class NDArrayGeneric<T>`
`126`	`126`	`/// <returns></returns>`
`127`	`127`	`public NDArrayGeneric<T> dot(NDArrayGeneric<T> np2)`
`128`	`128`	`{`
`129`		`- if ((this.Shape.Length == 1 ) & (np2.Shape.Length == 1))`
	`129`	`+ if ((this.Shape.NDim == 1 ) & (np2.Shape.NDim == 1))`
`130`	`130`	`if (this.Shape.Shapes[0] != np2.Shape.Shapes[0])`
`131`	`131`	`throw new Exception("The Dot method does not work with this shape or was not already implemented.");`
`132`	`132`	`else`
`@@ -214,7 +214,7 @@ public NDArrayGeneric<T> dot(NDArrayGeneric<T> np2)`
`214`	`214`	`throw new Exception("The Dot method is not implemented for the " + typeof(T).Name);`
`215`	`215`	`}`
`216`	`216`	`}`
`217`		`- if ((this.Shape.Length == 1 ) & (np2.Shape.Length == 1))`
	`217`	`+ if ((this.Shape.NDim == 1 ) & (np2.Shape.NDim == 1))`
`218`	`218`	`{`
`219`	`219`	`this.Shape = new Shape(this.Data.Length);`
`220`	`220`	`np2.Shape = new Shape(np2.Data.Length);`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public NDArrayGeneric<T> multi_dot(params NDArrayGeneric<T>[] np2Multi)`
`20`	`20`	`{`
`21`	`21`	`var np2 = np2Multi.Last();`
`22`	`22`
`23`		`- if ((this.Shape.Length == 1 ) & (np2.Shape.Length == 1))`
	`23`	`+ if ((this.Shape.NDim == 1 ) & (np2.Shape.NDim == 1))`
`24`	`24`	`if (this.Shape.Shapes[0] != np2.Shape.Shapes[0])`
`25`	`25`	`throw new Exception("The Dot method does not work with this shape or was not already implemented.");`
`26`	`26`	`else`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public NDArray vstack<T>(params NDArray[] nps)`
`25`	`25`	`list.AddRange(ele.Data<T>());`
`26`	`26`	`}`
`27`	`27`	`np.Set(list.ToArray());`
`28`		`- if (nps[0].Shape.Length == 1)`
	`28`	`+ if (nps[0].NDim == 1)`
`29`	`29`	`{`
`30`	`30`	`np.Shape = new Shape(new int[] { nps.Length, nps[0].Shape.Shapes[0] });`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public NDArray amax(NDArray nd, int? axis = null)`
`18`	`18`	`}`
`19`	`19`	`else`
`20`	`20`	`{`
`21`		`- if (axis < 0 \|\| axis >= nd.Shape.Length)`
	`21`	`+ if (axis < 0 \|\| axis >= nd.NDim)`
`22`	`22`	`throw new Exception("Invalid input: axis");`
`23`	`23`	`int[] resShapes = new int[nd.NDim - 1];`
`24`	`24`	`int index = 0; //index for result shape set`