change primitives constraints

Author: 9il

source/mir/interpolate/linear.d

@@ -302,7 +302,6 @@ struct Linear(F, size_t N = 1, FirstGridIterator = F*, NextGridIterators = Repea
     alias withDerivative = opCall!1;
 }
 
-///
 struct LinearKernel(uint derivative, X)
     if (derivative <= 3)
 {
@@ -319,7 +318,6 @@ struct LinearKernel(uint derivative, X)
         w1 = c1 / step;
     }
 
-    ///
     auto opCall(Y)(in Y y0, in Y y1)
     {
         auto r0 = y0 * w1;

source/mir/interpolate/spline.d

@@ -384,6 +384,7 @@ struct Spline(F, size_t N = 1, FirstGridIterator = F*, NextGridIterators = Repea
     Params:
         lbc = left boundary condition
         rbc = right boundary condition
+
     $(RED For internal use.)
     +/
     void _computeDerivatives()(SplineBoundaryCondition!F lbc, SplineBoundaryCondition!F rbc) @trusted nothrow @nogc
@@ -762,7 +763,6 @@ void splineSlopes(F, T, IP, IV, IS, SliceKind gkind, SliceKind vkind, SliceKind
     }
 }
 
-///
 struct SplineKernel(uint derivative, X)
     if (derivative <= 3)
 {
@@ -781,7 +781,6 @@ struct SplineKernel(uint derivative, X)
         wq = w0 * w1;
     }
 
-    ///
     auto opCall(Y)(in Y y0, in Y y1, in Y s0, in Y s1)
     {
         auto diff = y1 - y0;

source/mir/ndslice/sorting.d

@@ -83,9 +83,9 @@ unittest
 }
 
 import mir.ndslice.slice;
-import mir.internal.utility;
+import mir.math.common: optmath;
 
-@fastmath:
+@optmath:
 
 deprecated(`Use 'yourSlice.pairwise!"a <= b".all' instead. Imports:
     import mir.ndslice.algorithm: all;
@@ -95,7 +95,7 @@ template isSorted(alias less = "!(a >= b)")
 {
     import mir.functional: naryFun;
     static if (__traits(isSame, naryFun!less, less))
-    @fastmath bool isSorted(SliceKind kind, size_t[] packs, Iterator)
+    @optmath bool isSorted(SliceKind kind, size_t[] packs, Iterator)
         (Slice!(kind, packs, Iterator) slice)
         if (packs.length == 1)
     {
@@ -116,7 +116,7 @@ template isStrictlyMonotonic(alias less = "a < b")
 {
     import mir.functional: naryFun;
     static if (__traits(isSame, naryFun!less, less))
-    @fastmath bool isStrictlyMonotonic(SliceKind kind, size_t[] packs, Iterator)
+    @optmath bool isStrictlyMonotonic(SliceKind kind, size_t[] packs, Iterator)
         (Slice!(kind, packs, Iterator) slice)
         if (packs.length == 1)
     {
@@ -168,7 +168,7 @@ template sort(alias less = "a < b")
     import mir.functional: naryFun;
     static if (__traits(isSame, naryFun!less, less))
     ///
-    @fastmath Slice!(kind, packs, Iterator) sort(SliceKind kind, size_t[] packs, Iterator)
+    @optmath Slice!(kind, packs, Iterator) sort(SliceKind kind, size_t[] packs, Iterator)
         (Slice!(kind, packs, Iterator) slice)
         if (packs.length == 1)
     {

source/mir/primitives.d

@@ -68,8 +68,8 @@ enum bool hasShape(R) = is(typeof(
 }
 
 ///
-auto shape(Range)(Range range)
-    if (__traits(hasMember, Range, "shape") || __traits(hasMember, Range, "length") || isArray!Range)
+auto shape(Range)(auto ref Range range)
+    if (hasLength!Range || hasShape!Range)
 {
     static if (__traits(hasMember, Range, "shape"))
     {
@@ -101,11 +101,7 @@ template DimensionCount(T)
 
 ///
 bool anyEmpty(Range)(Range range)
-    if (
-        __traits(compiles, { bool b = range.anyEmpty; }) || 
-        __traits(compiles, { auto b = range.shape; enum size_t e = b.length; }) ||
-        __traits(compiles, { bool b = range.empty; })
-        )
+    if (hasShape!Range || __traits(hasMember, Range, "anyEmpty"))
 {
     static if (__traits(hasMember, Range, "anyEmpty"))
     {
@@ -128,13 +124,13 @@ bool anyEmpty(Range)(Range range)
 
 ///
 size_t elementsCount(Range)(Range range)
+    if (hasShape!Range || __traits(hasMember, Range, "elementsCount"))
 {
     static if (__traits(hasMember, Range, "elementsCount"))
     {
         return range;
     }
     else
-    static if (__traits(hasMember, Range, "shape"))
     {
         auto sh = range.shape;
         size_t ret = sh[0];
@@ -144,8 +140,4 @@ size_t elementsCount(Range)(Range range)
         }
         return ret;
     }
-    else
-    {
-        return range.length;
-    }
 }