LWG4134 Issue with Philox algorithm specification

Author: burblebee

source/numerics.tex

@@ -3133,15 +3133,13 @@
 $f_n(j)$ is defined in \tref{rand.eng.philox.f}.
 
 \begin{floattable}{Values for the word permutation $\bm{f}_{\bm{n}}\bm{(j)}$}{rand.eng.philox.f}
-{l|l|l|l|l|l|l|l|l|l|l|l|l|l|l|l|l|l}
+{l|l|l|l|l|l}
 \topline
-  \multicolumn{2}{|c|}{$\bm{f}_{\bm{n}}\bm{(j)}$} & \multicolumn{16}{c|}{$\bm{j}$} \\ \cline{3-18}
+  \multicolumn{2}{|c|}{$\bm{f}_{\bm{n}}\bm{(j)}$} & \multicolumn{4}{c|}{$\bm{j}$} \\ \cline{3-6}
   \multicolumn{2}{|c|}{}
-    & 0 & 1 & 2 & 3 & 4 & 5 & 6 & 7 & 8 & 9 & 10 & 11 & 12 & 13 & 14 & 15 \\ \hline
-  $\bm{n} $ & 2 & 0 & 1 & \multicolumn{14}{c|}{} \\ \cline{2-18}
-  & 4 & 0 & 3 & 2 & 1 & \multicolumn{12}{c|}{} \\ \cline{2-18}
-  & 8 & 2 & 1 & 4 & 7 & 6 & 5 & 0 & 3 & \multicolumn{8}{c|}{} \\ \cline{2-18}
-  & 16 & 0 & 9 & 2 & 13 & 6 & 11 & 4 & 15 & 10 & 7 & 12 & 3 & 14 & 5 & 8 & 1 \\ \cline{2-18}
+    & 0 & 1 & 2 & 3 \\ \hline
+  $\bm{n} $ & 2 & 0 & 1 & \multicolumn{2}{c|}{} \\ \cline{2-6}
+  & 4 & 2 & 1 & 0 & 3 \\ \cline{2-6}
 \end{floattable}
 \begin{note}
 For $n = 2$ the sequence is not permuted.
@@ -3150,8 +3148,8 @@
 \item
 The following computations are applied to the elements of the $V$ sequence:
 \begin{codeblock}
-@$X_{2k + 0} = \mullo(V_{2k + 1}, M_{k}, w)$@
-@$X_{2k + 1} = \mulhi(V_{2k + 1}, M_{k}, w) \xor \mathit{key}^q_k \xor V_{2k}$@
+@$X_{2k + 0} = \mulhi(V_{2k}, M_{k}, w) \xor \mathit{key}^q_k \xor V_{2k + 1}$@
+@$X_{2k + 1} = \mullo(V_{2k}, M_{k}, w)$@
 \end{codeblock}
 where:
   \begin{itemize}
@@ -3242,7 +3240,7 @@
 \mandates
 \begin{itemize}
 \item \tcode{sizeof...(consts) == n} is \tcode{true}, and
-\item \tcode{n == 2 || n == 4 || n == 8 || n == 16} is \tcode{true}, and
+\item \tcode{n == 2 || n == 4} is \tcode{true}, and
 \item \tcode{0 < r} is \tcode{true}, and
 \item \tcode{0 < w \&\& w <= numeric_limits<UIntType>::digits} is \tcode{true}.
 \end{itemize}
@@ -3910,7 +3908,7 @@
 \begin{itemdecl}
 using philox4x32 =
       philox_engine<uint_fast32_t, 32, 4, 10,
-       0xD2511F53, 0x9E3779B9, 0xCD9E8D57, 0xBB67AE85>;
+       0xCD9E8D57, 0x9E3779B9, 0xD2511F53, 0xBB67AE85>;
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -3925,7 +3923,7 @@
 \begin{itemdecl}
 using philox4x64 =
       philox_engine<uint_fast64_t, 64, 4, 10,
-       0xD2E7470EE14C6C93, 0x9E3779B97F4A7C15, 0xCA5A826395121157, 0xBB67AE8584CAA73B>;
+       0xCA5A826395121157, 0x9E3779B97F4A7C15, 0xD2E7470EE14C6C93, 0xBB67AE8584CAA73B>;
 \end{itemdecl}
 
 \begin{itemdescr}