fix #147 (#150)

9il · web-flow · commit 094b840a6821 · 2018-09-10T03:46:39.000+07:00
diff --git a/source/mir/algorithm/iteration.d b/source/mir/algorithm/iteration.d
@@ -2263,7 +2263,7 @@ template count(alias fun)
         slices.checkShapesMatch;
         static if (__traits(isSame, fun, naryFun!"true"))
         {
-            return slices[0].elementsCount;
+            return slices[0].elementCount;
         }
         else
         static if (areAllContiguousSlices!Slices)
diff --git a/source/mir/array/primitives.d b/source/mir/array/primitives.d
@@ -198,4 +198,8 @@ unittest
 }
 
 ///
-alias elementsCount = length;
+alias elementCount = length;
+
+deprecated("use elementCount instead")
+alias elementsCount = elementCount;
+
diff --git a/source/mir/interpolate/constant.d b/source/mir/interpolate/constant.d
@@ -163,7 +163,7 @@ struct Constant(F, size_t N = 1, FirstGridIterator = immutable(F)*, NextGridIter
             shape[i] = x.length;
         }
 
-        auto data_ptr = cast(F*) (alignedAllocate(F.sizeof * shape.iota.elementsCount + alignment, alignment) + alignment);
+        auto data_ptr = cast(F*) (alignedAllocate(F.sizeof * shape.iota.elementCount + alignment, alignment) + alignment);
         if(data_ptr is null)
             assert(0, "No memory");
 
diff --git a/source/mir/interpolate/linear.d b/source/mir/interpolate/linear.d
@@ -247,7 +247,7 @@ struct Linear(F, size_t N = 1, FirstGridIterator = immutable(F)*, NextGridIterat
             shape[i] = x.length;
         }
 
-        auto data_ptr = cast(F*) (alignedAllocate(F.sizeof * shape.iota.elementsCount + alignment, alignment) + alignment);
+        auto data_ptr = cast(F*) (alignedAllocate(F.sizeof * shape.iota.elementCount + alignment, alignment) + alignment);
         if(data_ptr is null)
             assert(0, "No memory");
 
diff --git a/source/mir/interpolate/spline.d b/source/mir/interpolate/spline.d
@@ -491,7 +491,7 @@ struct Spline(F, size_t N = 1, FirstGridIterator = immutable(F)*, NextGridIterat
             //     "].length should be equal to values.length!" ~ i.stringof ~ ".");
         }
 
-        auto data_ptr = cast(F[2 ^^ N]*) (alignedAllocate(F[2 ^^ N].sizeof * shape.iota.elementsCount + alignment, alignment) + alignment);
+        auto data_ptr = cast(F[2 ^^ N]*) (alignedAllocate(F[2 ^^ N].sizeof * shape.iota.elementCount + alignment, alignment) + alignment);
         if(data_ptr is null)
             assert(0);
 
diff --git a/source/mir/ndslice/allocation.d b/source/mir/ndslice/allocation.d
@@ -116,7 +116,7 @@ version(mir_test)
 {
     auto tensor = slice!int(5, 6, 7);
     assert(tensor.length == 5);
-    assert(tensor.elementsCount == 5 * 6 * 7);
+    assert(tensor.elementCount == 5 * 6 * 7);
     static assert(is(typeof(tensor) == Slice!(int*, 3)));
 
     // creates duplicate using `slice`
@@ -129,7 +129,7 @@ version(mir_test)
 @safe pure nothrow unittest
 {
     auto tensor = slice([2, 3], 5);
-    assert(tensor.elementsCount == 2 * 3);
+    assert(tensor.elementCount == 2 * 3);
     assert(tensor[1, 1] == 5);
 }
 
@@ -212,7 +212,7 @@ version(mir_test)
 {
     auto tensor = uninitSlice!int(5, 6, 7);
     assert(tensor.length == 5);
-    assert(tensor.elementsCount == 5 * 6 * 7);
+    assert(tensor.elementCount == 5 * 6 * 7);
     static assert(is(typeof(tensor) == Slice!(int*, 3)));
 }
 
@@ -242,7 +242,7 @@ version(mir_test)
     auto tensor = uninitAlignedSlice!double([5, 6, 7], 64);
     tensor[] = 0;
     assert(tensor.length == 5);
-    assert(tensor.elementsCount == 5 * 6 * 7);
+    assert(tensor.elementCount == 5 * 6 * 7);
     assert(cast(size_t)(tensor.ptr) % 64 == 0);
     static assert(is(typeof(tensor) == Slice!(double*, 3)));
 }
@@ -370,7 +370,7 @@ version(mir_test)
     auto ar = sl.field;
     assert(ar.ptr is sl.iterator);
     assert(ar.length           == 24);
-    assert(sl.elementsCount    == 24);
+    assert(sl.elementCount    == 24);
 
     Mallocator.instance.dispose(ar);
 }
@@ -640,7 +640,7 @@ version(mir_test)
 {
     auto tensor = stdcUninitAlignedSlice!double([5, 6, 7], 64);
     assert(tensor.length == 5);
-    assert(tensor.elementsCount == 5 * 6 * 7);
+    assert(tensor.elementCount == 5 * 6 * 7);
     assert(cast(size_t)(tensor.ptr) % 64 == 0);
     static assert(is(typeof(tensor) == Slice!(double*, 3)));
     stdcFreeAlignedSlice(tensor);
diff --git a/source/mir/ndslice/concatenation.d b/source/mir/ndslice/concatenation.d
@@ -288,14 +288,17 @@ struct Concatenation(size_t dim, Slices...)
     }
 
     /// Total elements count in the concatenation.
-    size_t elementsCount()() const @property
+    size_t elementCount()() const @property
     {
         size_t count = 1;
         foreach(i; Iota!N)
             count *= length!i;
         return count;
     }
 
+    deprecated("use elementCount instead")
+    alias elementsCount = elementCount;
+
     /// Shape of the concatenation.
     size_t[N] shape()() const @property
     {
diff --git a/source/mir/ndslice/connect/cpython.d b/source/mir/ndslice/connect/cpython.d
@@ -117,7 +117,7 @@ PythonBufferErrorCode toPythonBuffer(T, size_t N, SliceKind kind)(Slice!(T*, N,
     /////////////////////
     view.buf = slice._iterator;
     // skip view.obj
-    view.len = slice.elementsCount * T.sizeof;
+    view.len = slice.elementCount * T.sizeof;
     view.itemsize = T.sizeof;
     view.ndim = N;
     view.internal = null;
diff --git a/source/mir/ndslice/field.d b/source/mir/ndslice/field.d
@@ -115,10 +115,10 @@ struct MapField(Field, alias _fun)
         return _field.shape;
     }
 
-    static if (__traits(hasMember, Field, "elementsCount"))
-    auto elementsCount()() @property
+    static if (__traits(hasMember, Field, "elementCount"))
+    auto elementCount()() @property
     {
-        return _field.elementsCount;
+        return _field.elementCount;
     }
 
     static if (hasZeroShiftFieldMember!Field)
@@ -176,10 +176,10 @@ struct VmapField(Field, Fun)
         return _field.shape;
     }
 
-    static if (__traits(hasMember, Field, "elementsCount"))
-    auto elementsCount()() @property
+    static if (__traits(hasMember, Field, "elementCount"))
+    auto elementCount()() @property
     {
-        return _field.elementsCount;
+        return _field.elementCount;
     }
 
     static if (hasZeroShiftFieldMember!Field)
diff --git a/source/mir/ndslice/ndfield.d b/source/mir/ndslice/ndfield.d
@@ -109,11 +109,11 @@ struct Cartesian(NdFields...)
     }
 
     ///
-    size_t elementsCount()() @property
+    size_t elementCount()() @property
     {
         size_t ret = 1;
         foreach (ref field; _fields)
-            ret *= field.elementsCount;
+            ret *= field.elementCount;
         ret;
     }
 
@@ -205,11 +205,11 @@ struct Kronecker(alias fun, NdFields...)
     }
 
     ///
-    size_t elementsCount()() @property
+    size_t elementCount()() @property
     {
         size_t ret = 1;
         foreach (ref field; _fields)
-            ret *= field.elementsCount;
+            ret *= field.elementCount;
         ret;
     }
 
diff --git a/source/mir/ndslice/package.d b/source/mir/ndslice/package.d
@@ -412,7 +412,7 @@ void main(string[] args)
             name.stripExtension ~ "_filtered.png",
             ret.length!1,
             ret.length!0,
-            (&ret[0, 0, 0])[0 .. ret.elementsCount]);
+            (&ret[0, 0, 0])[0 .. ret.elementCount]);
     }
 }
 -------
diff --git a/source/mir/ndslice/slice.d b/source/mir/ndslice/slice.d
@@ -1007,9 +1007,9 @@ public:
     auto field()() @trusted @property
     {
         static assert(kind == Contiguous, "Slice.field is defined only for contiguous slices. Slice kind is " ~ kind.stringof);
-        static if (is(typeof(_iterator[size_t(0) .. elementsCount])))
+        static if (is(typeof(_iterator[size_t(0) .. elementCount])))
         {
-            return _iterator[size_t(0) .. elementsCount];
+            return _iterator[size_t(0) .. elementCount];
         }
         else
         {
@@ -1485,7 +1485,7 @@ public:
     {
         static if (kind == Contiguous)
         {
-            return elementsCount - 1;
+            return elementCount - 1;
         }
         else
         {
@@ -1621,20 +1621,23 @@ public:
     /++
     Returns: Total number of elements in a slice
     +/
-    size_t elementsCount() @safe const
+    size_t elementCount()() @safe const
     {
         size_t len = 1;
         foreach (i; Iota!N)
             len *= _lengths[i];
         return len;
     }
 
+    deprecated("use elementCount instead")
+    alias elementsCount = elementCount;
+
     static if (doUnittest)
     /// Regular slice
     @safe @nogc pure nothrow version(mir_test) unittest
     {
         import mir.ndslice.topology : iota;
-        assert(iota(3, 4, 5).elementsCount == 60);
+        assert(iota(3, 4, 5).elementCount == 60);
     }
 
 
@@ -1645,9 +1648,9 @@ public:
         import mir.ndslice.topology : pack, evertPack, iota;
         auto slice = iota(3, 4, 5, 6, 7, 8);
         auto p = slice.pack!2;
-        assert(p.elementsCount == 360);
-        assert(p[0, 0, 0, 0].elementsCount == 56);
-        assert(p.evertPack.elementsCount == 56);
+        assert(p.elementCount == 360);
+        assert(p[0, 0, 0, 0].elementCount == 56);
+        assert(p.evertPack.elementCount == 56);
     }
 
     /++
diff --git a/source/mir/ndslice/topology.d b/source/mir/ndslice/topology.d
@@ -90,7 +90,7 @@ and the type of element of $(LREF flattened) is `Slice!(Iterator, K)`.
 Another way to use $(LREF pack) is transposition of dimension packs using
 $(LREF evertPack). 
 Examples of use of subspace selectors are available for selectors,
-$(SUBREF slice, Slice.shape), and $(SUBREF slice, Slice.elementsCount).
+$(SUBREF slice, Slice.shape), and $(SUBREF slice, Slice.elementCount).
 
 
 License:   $(HTTP boost.org/LICENSE_1_0.txt, Boost License 1.0).
@@ -1229,8 +1229,8 @@ Slice!(Iterator, M, kind) reshape
             lengths[i] = rlengths[i];
 
         /// Code size optimization
-        immutable size_t eco = slice.elementsCount;
-        size_t ecn = lengths[0 .. rlengths.length].iota.elementsCount;
+        immutable size_t eco = slice.elementCount;
+        size_t ecn = lengths[0 .. rlengths.length].iota.elementCount;
         if (eco == 0)
         {
             err = ReshapeError.empty;
@@ -1416,7 +1416,7 @@ Slice!(FlattenedIterator!(Iterator, N, kind))
     size_t[Ret.N] lengths;
     auto strides = sizediff_t[Ret.S].init;
     sizediff_t[typeof(return)._iterator._indexes.length] indexes;
-    lengths[0] = slice.elementsCount;
+    lengths[0] = slice.elementCount;
     return Ret(lengths, strides, FlattenedIterator!(Iterator, N, kind)(indexes, slice));
 }
 
@@ -1433,7 +1433,7 @@ Slice!Iterator
     else
     {
         size_t[typeof(return).N] lengths;
-        lengths[0] = slice.elementsCount;
+        lengths[0] = slice.elementCount;
         return typeof(return)(lengths, sizediff_t[0].init, slice._iterator);
     }
 }
@@ -1619,7 +1619,7 @@ nothrow version(mir_test) unittest
         static assert(hasLength!S);
     }
 
-    assert(elems0.length == slice0.elementsCount);
+    assert(elems0.length == slice0.elementCount);
     assert(elems1.length == 5 * 4 * 3);
 
     auto elems2 = elems1;
@@ -1634,9 +1634,9 @@ nothrow version(mir_test) unittest
     assert(elems2.empty);
 
     elems0.popFront();
-    elems0.popFrontExactly(slice0.elementsCount - 14);
+    elems0.popFrontExactly(slice0.elementCount - 14);
     assert(elems0.length == 13);
-    assert(elems0 == range[slice0.elementsCount - 13 .. slice0.elementsCount]);
+    assert(elems0 == range[slice0.elementCount - 13 .. slice0.elementCount]);
 
     foreach (elem; elems0) {}
 }
diff --git a/source/mir/primitives.d b/source/mir/primitives.d
@@ -131,10 +131,10 @@ bool anyEmpty(Range)(Range range) @property
 }
 
 ///
-size_t elementsCount(Range)(Range range) @property
-    if (hasShape!Range || __traits(hasMember, Range, "elementsCount"))
+size_t elementCount(Range)(Range range) @property
+    if (hasShape!Range || __traits(hasMember, Range, "elementCount"))
 {
-    static if (__traits(hasMember, Range, "elementsCount"))
+    static if (__traits(hasMember, Range, "elementCount"))
     {
         return range;
     }
@@ -150,6 +150,10 @@ size_t elementsCount(Range)(Range range) @property
     }
 }
 
+deprecated("use elementCount instead")
+alias elementsCount = elementCount;
+
+
 /++
 Returns the element type of a struct with `.DeepElement` inner alias or a type of common array.
 Returns `ForeachType` if struct does not have `.DeepElement` member.

Original file line number	Diff line number	Diff line change
`@@ -2263,7 +2263,7 @@ template count(alias fun)`
`2263`	`2263`	`slices.checkShapesMatch;`
`2264`	`2264`	`static if (__traits(isSame, fun, naryFun!"true"))`
`2265`	`2265`	`{`
`2266`		`- return slices[0].elementsCount;`
	`2266`	`+ return slices[0].elementCount;`
`2267`	`2267`	`}`
`2268`	`2268`	`else`
`2269`	`2269`	`static if (areAllContiguousSlices!Slices)`
Original file line number	Diff line number	Diff line change
`@@ -198,4 +198,8 @@ unittest`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`///`
`201`		`-alias elementsCount = length;`
	`201`	`+alias elementCount = length;`
	`202`	`+`
	`203`	`+deprecated("use elementCount instead")`
	`204`	`+alias elementsCount = elementCount;`
	`205`	`+`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ struct Constant(F, size_t N = 1, FirstGridIterator = immutable(F)*, NextGridIter`
`163`	`163`	`shape[i] = x.length;`
`164`	`164`	`}`
`165`	`165`
`166`		`- auto data_ptr = cast(F) (alignedAllocate(F.sizeof shape.iota.elementsCount + alignment, alignment) + alignment);`
	`166`	`+ auto data_ptr = cast(F) (alignedAllocate(F.sizeof shape.iota.elementCount + alignment, alignment) + alignment);`
`167`	`167`	`if(data_ptr is null)`
`168`	`168`	`assert(0, "No memory");`
`169`	`169`
Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ struct Linear(F, size_t N = 1, FirstGridIterator = immutable(F)*, NextGridIterat`
`247`	`247`	`shape[i] = x.length;`
`248`	`248`	`}`
`249`	`249`
`250`		`- auto data_ptr = cast(F) (alignedAllocate(F.sizeof shape.iota.elementsCount + alignment, alignment) + alignment);`
	`250`	`+ auto data_ptr = cast(F) (alignedAllocate(F.sizeof shape.iota.elementCount + alignment, alignment) + alignment);`
`251`	`251`	`if(data_ptr is null)`
`252`	`252`	`assert(0, "No memory");`
`253`	`253`
Original file line number	Diff line number	Diff line change
`@@ -491,7 +491,7 @@ struct Spline(F, size_t N = 1, FirstGridIterator = immutable(F)*, NextGridIterat`
`491`	`491`	`// "].length should be equal to values.length!" ~ i.stringof ~ ".");`
`492`	`492`	`}`
`493`	`493`
`494`		`- auto data_ptr = cast(F[2 ^^ N]) (alignedAllocate(F[2 ^^ N].sizeof shape.iota.elementsCount + alignment, alignment) + alignment);`
	`494`	`+ auto data_ptr = cast(F[2 ^^ N]) (alignedAllocate(F[2 ^^ N].sizeof shape.iota.elementCount + alignment, alignment) + alignment);`
`495`	`495`	`if(data_ptr is null)`
`496`	`496`	`assert(0);`
`497`	`497`
Original file line number	Diff line number	Diff line change
`@@ -288,14 +288,17 @@ struct Concatenation(size_t dim, Slices...)`
`288`	`288`	`}`
`289`	`289`
`290`	`290`	`/// Total elements count in the concatenation.`
`291`		`- size_t elementsCount()() const @property`
	`291`	`+ size_t elementCount()() const @property`
`292`	`292`	`{`
`293`	`293`	`size_t count = 1;`
`294`	`294`	`foreach(i; Iota!N)`
`295`	`295`	`count *= length!i;`
`296`	`296`	`return count;`
`297`	`297`	`}`
`298`	`298`
	`299`	`+ deprecated("use elementCount instead")`
	`300`	`+ alias elementsCount = elementCount;`
	`301`	`+`
`299`	`302`	`/// Shape of the concatenation.`
`300`	`303`	`size_t[N] shape()() const @property`
`301`	`304`	`{`
Original file line number	Diff line number	Diff line change
`@@ -115,10 +115,10 @@ struct MapField(Field, alias _fun)`
`115`	`115`	`return _field.shape;`
`116`	`116`	`}`
`117`	`117`
`118`		`- static if (__traits(hasMember, Field, "elementsCount"))`
`119`		`- auto elementsCount()() @property`
	`118`	`+ static if (__traits(hasMember, Field, "elementCount"))`
	`119`	`+ auto elementCount()() @property`
`120`	`120`	`{`
`121`		`- return _field.elementsCount;`
	`121`	`+ return _field.elementCount;`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`static if (hasZeroShiftFieldMember!Field)`
`@@ -176,10 +176,10 @@ struct VmapField(Field, Fun)`
`176`	`176`	`return _field.shape;`
`177`	`177`	`}`
`178`	`178`
`179`		`- static if (__traits(hasMember, Field, "elementsCount"))`
`180`		`- auto elementsCount()() @property`
	`179`	`+ static if (__traits(hasMember, Field, "elementCount"))`
	`180`	`+ auto elementCount()() @property`
`181`	`181`	`{`
`182`		`- return _field.elementsCount;`
	`182`	`+ return _field.elementCount;`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`static if (hasZeroShiftFieldMember!Field)`
Original file line number	Diff line number	Diff line change
`@@ -109,11 +109,11 @@ struct Cartesian(NdFields...)`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`///`
`112`		`- size_t elementsCount()() @property`
	`112`	`+ size_t elementCount()() @property`
`113`	`113`	`{`
`114`	`114`	`size_t ret = 1;`
`115`	`115`	`foreach (ref field; _fields)`
`116`		`- ret *= field.elementsCount;`
	`116`	`+ ret *= field.elementCount;`
`117`	`117`	`ret;`
`118`	`118`	`}`
`119`	`119`
`@@ -205,11 +205,11 @@ struct Kronecker(alias fun, NdFields...)`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`///`
`208`		`- size_t elementsCount()() @property`
	`208`	`+ size_t elementCount()() @property`
`209`	`209`	`{`
`210`	`210`	`size_t ret = 1;`
`211`	`211`	`foreach (ref field; _fields)`
`212`		`- ret *= field.elementsCount;`
	`212`	`+ ret *= field.elementCount;`
`213`	`213`	`ret;`
`214`	`214`	`}`
`215`	`215`