Adjusting zip index

jmh530 · 9il · commit 8099de87ef88 · 2017-07-11T10:49:49.000+07:00
Fixing a bug in the way zip checks for lengths and strides.
diff --git a/source/mir/ndslice/topology.d b/source/mir/ndslice/topology.d
@@ -2479,9 +2479,9 @@ auto zip
     foreach(i, S; Slices[1 .. $])
     {
         static assert(isSlice!S == packs, "zip: all Slices must have the same shape packs");
-        assert(slices[i]._lengths == slices[0]._lengths, "zip: all slices must have the same lengths");
+        assert(slices[i + 1]._lengths == slices[0]._lengths, "zip: all slices must have the same lengths");
         static if (sameStrides)
-            assert(slices[i].unpack.strides == slices[0].unpack.strides, "zip: all slices must have the same strides");
+            assert(slices[i + 1].unpack.strides == slices[0].unpack.strides, "zip: all slices must have the same strides");
     }
     static if (!sameStrides && minElem(staticMap!(kindOf, Slices)) != Contiguous)
     {

Original file line number	Diff line number	Diff line change
`@@ -2479,9 +2479,9 @@ auto zip`
`2479`	`2479`	`foreach(i, S; Slices[1 .. $])`
`2480`	`2480`	`{`
`2481`	`2481`	`static assert(isSlice!S == packs, "zip: all Slices must have the same shape packs");`
`2482`		`- assert(slices[i]._lengths == slices[0]._lengths, "zip: all slices must have the same lengths");`
	`2482`	`+ assert(slices[i + 1]._lengths == slices[0]._lengths, "zip: all slices must have the same lengths");`
`2483`	`2483`	`static if (sameStrides)`
`2484`		`- assert(slices[i].unpack.strides == slices[0].unpack.strides, "zip: all slices must have the same strides");`
	`2484`	`+ assert(slices[i + 1].unpack.strides == slices[0].unpack.strides, "zip: all slices must have the same strides");`
`2485`	`2485`	`}`
`2486`	`2486`	`static if (!sameStrides && minElem(staticMap!(kindOf, Slices)) != Contiguous)`
`2487`	`2487`	`{`