ndarray array operator now accepts sequences as sets of indices.

RobAmos · Apr 25, 2011 · c5a5a60 · c5a5a60
1 parent f635077
commit c5a5a60
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/numpy/NumpyDotNet/NpyUtils.cs b/numpy/NumpyDotNet/NpyUtils.cs
@@ -741,6 +741,10 @@ private static void ConvertSingleIndex(Object arg, NpyIndexes indexes)
             } else {
                 ndarray array_arg = arg as ndarray;
 
+                if (array_arg == null && arg is IEnumerable<object>) {
+                    array_arg = NpyArray.FromIEnumerable((IEnumerable<object>)arg, null, false, 0, 0);
+                }
+
                 // Boolean scalars
                 if (array_arg != null &&
                     array_arg.ndim == 0 &&

diff --git a/numpy/NumpyDotNet/ndarray.cs b/numpy/NumpyDotNet/ndarray.cs
@@ -1003,7 +1003,7 @@ public Object this[params object[] args] {
                 if (args == null) {
                     args = new object[] { null };
                 } else {
-                    if (args.Length == 1 && args[0] is IEnumerable<object> && !(args[0] is ndarray)) {
+                    if (args.Length == 1 && args[0] is PythonTuple) {
                         args = ((IEnumerable<object>)args[0]).ToArray();
                     }