Test Osc(subseq(X)) <= Osc(X) only for unique elements

Author: Morwenn

docs/Measures-of-disorder.md

@@ -305,9 +305,11 @@ Computes the *Oscillation* measure described by C. Levcopoulos and O. Petersson
 
 `max_for_size`: it is reached when the values in $X$ are strongly oscillating, and equals $\frac{|X|(|X| - 2)}{2}$ when $|X|$ is even, and $\frac{|X|(|X| - 2) - 1}{2}$ when $|X|$ is odd.
 
-**Note:** *Osc* does not respect Mannila's criterion 4: $Osc(\langle 0 \rangle) = 0$ and $Osc(\langle 3, 2, 1 \rangle) = 0$, but $Osc(\langle 0, 3, 2, 1 \rangle) = 2$.
+**Note:** *Osc* does not seem to respect Mannila's criterion 3 in the presence of *equivalent elements*.
 
-**Note²:** *Osc* does not respect Mannila's criterion 5: $Osc(\langle 2, 4, 1, 3, 1, 3 \rangle) \not \le |\langle 4, 1, 3, 1, 3 \rangle| + Osc(\langle 4, 1, 3, 1, 3 \rangle)$, though it is possible that it only happens when equivalent elements are involved.
+**Note²:** *Osc* does not respect Mannila's criterion 4: $Osc(\langle 0 \rangle) = 0$ and $Osc(\langle 3, 2, 1 \rangle) = 0$, but $Osc(\langle 0, 3, 2, 1 \rangle) = 2$.
+
+**Note³:** *Osc* does not respect Mannila's criterion 5: $Osc(\langle 2, 4, 1, 3, 1, 3 \rangle) \not \le |\langle 4, 1, 3, 1, 3 \rangle| + Osc(\langle 4, 1, 3, 1, 3 \rangle)$, though it is possible that it only happens when equivalent elements are involved.
 
 ### *Rem*
 

tests/probes/every_probe_common.cpp

@@ -171,7 +171,6 @@ TEMPLATE_TEST_CASE( "test M(subsequence(X)) <= M(X) for most probes M", "[probe]
                     decltype(cppsort::probe::inv),
                     decltype(cppsort::probe::max),
                     decltype(cppsort::probe::mono),
-                    decltype(cppsort::probe::osc),
                     decltype(cppsort::probe::rem),
                     decltype(cppsort::probe::runs),
                     decltype(cppsort::probe::spear),
@@ -189,6 +188,7 @@ TEMPLATE_TEST_CASE( "test M(subsequence(X)) <= M(X) for most probes M", "[probe]
 }
 
 TEMPLATE_TEST_CASE( "test M(subsequence(X)) <= M(X) for most probes M (unique elements)", "[probe]",
+                    decltype(cppsort::probe::osc),
                     decltype(cppsort::probe::block) )
 {
     // Same as above, but for probes that aren't well-behaved