fixed and tested np.column_stack

henon · henon · commit 93a730725a7a · 2020-06-05T11:33:02.000+02:00
diff --git a/src/CodeMinion.ApiGenerator/NumPy/ApiGenerator.cs b/src/CodeMinion.ApiGenerator/NumPy/ApiGenerator.cs
@@ -817,6 +817,9 @@ private void PostProcess(Function decl)
                     decl.Returns.Clear();
                     decl.Returns.Add(new Argument() { Type = "NDarray", Name = "array", IsReturnValue = true });
                     break;
+                case "column_stack":
+                    decl.ManualOverride = true;
+                    break;
             }
         }
 
diff --git a/src/CodeMinion.Core/CodeGenerator.cs b/src/CodeMinion.Core/CodeGenerator.cs
@@ -43,12 +43,7 @@ public CodeGenerator()
             @"using System.Linq;",
             @"using System.Runtime.InteropServices;",
             @"using System.Text;",
-            @"#if NET_STANDARD
-using Python.Runtime;
-#else
-using Pythonnet;
-#endif
-",
+            @"using Python.Runtime;",
         };
         public string StaticApiFilesPath { get; set; }
         public string DynamicApiFilesPath { get; set; }
diff --git a/src/Examples/NeuralNetworkExample/NeuralNetworkExample.csproj b/src/Examples/NeuralNetworkExample/NeuralNetworkExample.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\src\Numpy\Numpy.csproj" />
+    <ProjectReference Include="..\..\Numpy.Bare\Numpy.Bare.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Examples/WebApiExample/WebApiExample.csproj b/src/Examples/WebApiExample/WebApiExample.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\src\Numpy.Bare\Numpy.Bare.csproj" />
+    <ProjectReference Include="..\..\Numpy.Bare\Numpy.Bare.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Numpy.Bare.Dotnet/Numpy.Bare.Dotnet.csproj b/src/Numpy.Bare.Dotnet/Numpy.Bare.Dotnet.csproj
@@ -33,7 +33,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Python.Runtime, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\pythonnet_netframework_win_py37.2.4.1\lib\net40\Python.Runtime.dll</HintPath>
+      <HintPath>..\..\packages\pythonnet_py37_win.2.4.1\lib\net40\Python.Runtime.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -57,6 +57,9 @@
     <Compile Include="..\Numpy\Manual\np.array.cs">
       <Link>Manual\np.array.cs</Link>
     </Compile>
+    <Compile Include="..\Numpy\Manual\np.column_stack.cs">
+      <Link>Manual\np.column_stack.cs</Link>
+    </Compile>
     <Compile Include="..\Numpy\Manual\np.concatenate.cs">
       <Link>Manual\np.concatenate.cs</Link>
     </Compile>
diff --git a/src/Numpy.Bare.Dotnet/packages.config b/src/Numpy.Bare.Dotnet/packages.config
@@ -1,5 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="pythonnet_netframework_win_py37" version="2.4.1" targetFramework="net452" />
+  <package id="pythonnet_py37_win" version="2.4.1" targetFramework="net45" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net452" />
 </packages>
diff --git a/src/Numpy.Bare/Numpy.Bare.csproj b/src/Numpy.Bare/Numpy.Bare.csproj
@@ -33,6 +33,7 @@
     <Compile Include="..\Numpy\Manual\ctypes.module.cs" Link="Manual\ctypes.module.cs" />
     <Compile Include="..\Numpy\Manual\np.aliases.cs" Link="Manual\np.aliases.cs" />
     <Compile Include="..\Numpy\Manual\np.array.cs" Link="Manual\np.array.cs" />
+    <Compile Include="..\Numpy\Manual\np.column_stack.cs" Link="Manual\np.column_stack.cs" />
     <Compile Include="..\Numpy\Manual\np.concatenate.cs" Link="Manual\np.concatenate.cs" />
     <Compile Include="..\Numpy\Manual\np.constants.cs" Link="Manual\np.constants.cs" />
     <Compile Include="..\Numpy\Manual\np.linalg.norm.cs" Link="Manual\np.linalg.norm.cs" />
diff --git a/src/Numpy/Manual/np.column_stack.cs b/src/Numpy/Manual/np.column_stack.cs
@@ -0,0 +1,53 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using Numpy;
+using Numpy.Models;
+using Python.Runtime;
+
+namespace Numpy
+{
+    /// <summary>
+    /// Manual type conversions
+    /// </summary>
+    public static partial class np
+    {
+
+        /// <summary>
+        ///	Stack 1-D arrays as columns into a 2-D array.<br></br>
+        ///	
+        ///	Take a sequence of 1-D arrays and stack them as columns
+        ///	to make a single 2-D array.<br></br>
+        ///	 2-D arrays are stacked as-is,
+        ///	just like with hstack.<br></br>
+        ///	  1-D arrays are turned into 2-D columns
+        ///	first.
+        /// </summary>
+        /// <param name="tup">
+        ///	Arrays to stack.<br></br>
+        ///	All of them must have the same first dimension.
+        /// </param>
+        /// <returns>
+        ///	The array formed by stacking the given arrays.
+        /// </returns>
+        public static NDarray column_stack(params NDarray[] tup)
+        {
+            //auto-generated code, do not change
+            var __self__ = self;
+            PyTuple pyargs;
+            if (tup.Length == 1)
+            {
+                pyargs = ToTuple(new object[] { tup[0], });
+            }
+            else
+            {
+                pyargs = ToTuple(new object[] { tup, });
+            }
+            var kwargs = new PyDict();
+            dynamic py = __self__.InvokeMethod("column_stack", pyargs, kwargs);
+            return ToCsharp<NDarray>(py);
+        }
+    }
+}
diff --git a/src/Numpy/Numpy.csproj b/src/Numpy/Numpy.csproj
@@ -39,8 +39,4 @@
     <PackageReference Include="Python.Included" Version="3.7.3.4"></PackageReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Manual\" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Numpy/np.array_manipulation.gen.cs b/src/Numpy/np.array_manipulation.gen.cs
@@ -881,36 +881,6 @@ public static NDarray stack(NDarray[] arrays, int? axis = 0, NDarray @out = null
             return ToCsharp<NDarray>(py);
         }
         
-        /// <summary>
-        ///	Stack 1-D arrays as columns into a 2-D array.<br></br>
-        ///	
-        ///	Take a sequence of 1-D arrays and stack them as columns
-        ///	to make a single 2-D array.<br></br>
-        ///	 2-D arrays are stacked as-is,
-        ///	just like with hstack.<br></br>
-        ///	  1-D arrays are turned into 2-D columns
-        ///	first.
-        /// </summary>
-        /// <param name="tup">
-        ///	Arrays to stack.<br></br>
-        ///	All of them must have the same first dimension.
-        /// </param>
-        /// <returns>
-        ///	The array formed by stacking the given arrays.
-        /// </returns>
-        public static NDarray column_stack(params NDarray[] tup)
-        {
-            //auto-generated code, do not change
-            var __self__=self;
-            var pyargs=ToTuple(new object[]
-            {
-                tup,
-            });
-            var kwargs=new PyDict();
-            dynamic py = __self__.InvokeMethod("column_stack", pyargs, kwargs);
-            return ToCsharp<NDarray>(py);
-        }
-        
         /// <summary>
         ///	Stack arrays in sequence depth wise (along third axis).<br></br>
         ///	
diff --git a/test/Numpy.UnitTest/NumPy_array_manipulation.tests.cs b/test/Numpy.UnitTest/NumPy_array_manipulation.tests.cs
@@ -969,9 +969,9 @@ public void concatenateTest()
             // 
 
 
-            var a = np.array(new[,] {{1, 2}, {3, 4}});
-            var b = np.array(new[,] {{5, 6}});
-            var given = np.concatenate(new[] {a, b}, axis: 0);
+            var a = np.array(new[,] { { 1, 2 }, { 3, 4 } });
+            var b = np.array(new[,] { { 5, 6 } });
+            var given = np.concatenate(new[] { a, b }, axis: 0);
             var expected =
                 "array([[1, 2],\n" +
                 "       [3, 4],\n" +
@@ -1121,16 +1121,14 @@ public void column_stackTest()
             //        [3, 4]])
             // 
 
-#if TODO
-            var given=  a = np.array((1,2,3));
-             given=  b = np.array((2,3,4));
-             given=  np.column_stack((a,b));
-            var expected=
+            var a = np.array(1, 2, 3);
+            var b = np.array(2, 3, 4);
+            var given = np.column_stack(a, b);
+            var expected =
                 "array([[1, 2],\n" +
                 "       [2, 3],\n" +
                 "       [3, 4]])";
             Assert.AreEqual(expected, given.repr);
-#endif
         }
 
 
@@ -1741,8 +1739,8 @@ public void appendTest()
             // array([1, 2, 3, 4, 5, 6, 7, 8, 9])
             // 
 
-            var given=  np.append(new int[]{1, 2, 3}, new int[,]{{4, 5, 6}, {7, 8, 9}});
-            var expected=
+            var given = np.append(new int[] { 1, 2, 3 }, new int[,] { { 4, 5, 6 }, { 7, 8, 9 } });
+            var expected =
                 "array([1, 2, 3, 4, 5, 6, 7, 8, 9])";
             Assert.AreEqual(expected, given.repr);
             // When axis is specified, values must have the correct shape.
@@ -1752,11 +1750,11 @@ public void appendTest()
             //        [4, 5, 6],
             //        [7, 8, 9]])
 
-             given=  np.append(new int[,] { {1, 2, 3}, {4, 5, 6}}, new int[,] { {7, 8, 9}}, axis: 0);
-             expected=
-                "array([[1, 2, 3],\n" +
-                "       [4, 5, 6],\n" +
-                "       [7, 8, 9]])";
+            given = np.append(new int[,] { { 1, 2, 3 }, { 4, 5, 6 } }, new int[,] { { 7, 8, 9 } }, axis: 0);
+            expected =
+               "array([[1, 2, 3],\n" +
+               "       [4, 5, 6],\n" +
+               "       [7, 8, 9]])";
             Assert.AreEqual(expected, given.repr);
         }
 
diff --git a/test/Numpy.UnitTest/NumpyTest.cs b/test/Numpy.UnitTest/NumpyTest.cs
@@ -160,7 +160,8 @@ public void ndarray_T()
             var t = x.T;
             Console.WriteLine(t.repr);
             Assert.AreEqual("[[1. 3.]\n [2. 4.]]", t.ToString());
-            Assert.AreEqual(new[] { 1f, 2f, 3f, 4f }, t.GetData<float>());
+            // getting data of transposed array returns transposed array!
+            Assert.AreEqual(new[] { 1f, 3f, 2f, 4f }, t.GetData<float>());
         }
 
         [TestMethod]
@@ -487,6 +488,46 @@ public void CopyDataInAndOutExample()
             Assert.AreEqual(new double[]{ 1.41, 2,3,5 }, roots.GetData<double>().Select(x=>Math.Round(x, 2)).ToArray());
         }
 
+        [TestMethod]
+        public void QuestionByPiyushspss()
+        {
+            // np.column_stack(np.where(mat > 0))
+
+            //>>> a = np.array([1, 0, 0, 1, 2, 3, 0, 1]).reshape(2, 4)
+            //         >>> a
+            //array([[1, 0, 0, 1],
+            //       [2, 3, 0, 1]])
+            //>>> np.column_stack(a)
+            //array([[1, 2],
+            //       [0, 3],
+            //       [0, 0],
+            //       [1, 1]])
+            //>>> np.where(a > 0)
+            //(array([0, 0, 1, 1, 1], dtype = int64), array([0, 3, 0, 1, 3], dtype = int64))
+            //>>> np.column_stack(np.where(a > 0))
+            //array([[0, 0],
+            //       [0, 3],
+            //       [1, 0],
+            //       [1, 1],
+            //       [1, 3]], dtype = int64)
+            //>>>
+            var a = np.array(new[] {1, 0, 0, 1, 2, 3, 0, 1}).reshape(2, 4);
+            var expected =
+                "array([[1, 2],\n" +
+                "       [0, 3],\n" +
+                "       [0, 0],\n" +
+                "       [1, 1]])";
+            Assert.AreEqual(expected, np.column_stack(a).repr);
+            Assert.AreEqual("(array([0, 0, 1, 1, 1], dtype=int64), array([0, 3, 0, 1, 3], dtype=int64))", np.where(a>0).repr);
+            expected =
+                "array([[0, 0],\n" +
+                "       [0, 3],\n" +
+                "       [1, 0],\n" +
+                "       [1, 1],\n" +
+                "       [1, 3]], dtype=int64)";
+            Assert.AreEqual(expected, np.column_stack(np.where(a > 0)).repr);
+        }
+
         // TODO:  https://docs.scipy.org/doc/numpy/user/basics.indexing.html?highlight=slice#structural-indexing-tools
         // TODO:  https://docs.scipy.org/doc/numpy/user/basics.indexing.html?highlight=slice#assigning-values-to-indexed-arrays
         // TODO:  https://docs.scipy.org/doc/numpy/user/basics.indexing.html?highlight=slice#dealing-with-variable-numbers-of-indices-within-programs

Original file line number	Diff line number	Diff line change
`@@ -817,6 +817,9 @@ private void PostProcess(Function decl)`
`817`	`817`	`decl.Returns.Clear();`
`818`	`818`	`decl.Returns.Add(new Argument() { Type = "NDarray", Name = "array", IsReturnValue = true });`
`819`	`819`	`break;`
	`820`	`+ case "column_stack":`
	`821`	`+ decl.ManualOverride = true;`
	`822`	`+ break;`
`820`	`823`	`}`
`821`	`824`	`}`
`822`	`825`