From 5b2bdc039bccf3aef80deadba35b2e62668bb8e1 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Thu, 5 Oct 2017 13:33:25 -0700
Subject: [PATCH] Properly reset cout to dec in pcg-test-noadvance

---
 test-high/expected/check-pcg32_c1024.out      | 8 ++++----
 test-high/expected/check-pcg32_c1024_fast.out | 8 ++++----
 test-high/expected/check-pcg32_c64.out        | 8 ++++----
 test-high/expected/check-pcg32_c64_fast.out   | 8 ++++----
 test-high/expected/check-pcg32_c64_oneseq.out | 8 ++++----
 test-high/expected/check-pcg64_c1024.out      | 8 ++++----
 test-high/expected/check-pcg64_c1024_fast.out | 8 ++++----
 test-high/expected/check-pcg64_c32.out        | 8 ++++----
 test-high/expected/check-pcg64_c32_fast.out   | 8 ++++----
 test-high/expected/check-pcg64_c32_oneseq.out | 8 ++++----
 test-high/pcg-test-noadvance.cpp              | 2 +-
 11 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/test-high/expected/check-pcg32_c1024.out b/test-high/expected/check-pcg32_c1024.out
index 7fa2e23..9100eb5 100644
--- a/test-high/expected/check-pcg32_c1024.out
+++ b/test-high/expected/check-pcg32_c1024.out
@@ -12,7 +12,7 @@ Round 1:
 	 Td Kc 2d Ks Jh 4c 4d Tc
 
 Round 2:
-  20bit: 0x566843ac 0x905997f7 0x5b238391 0x66aed7fc 0xba6c7310 0x977fc9df
+  32bit: 0x566843ac 0x905997f7 0x5b238391 0x66aed7fc 0xba6c7310 0x977fc9df
   Coins: TTHTTTTHHTTHTHHTHTHTTTHHHHTHHHHTTHHHHTHTTTTTHHHHHHHTHHHTTHTTHTTHH
   Rolls: 3 6 5 6 3 3 3 5 2 2 3 2 6 2 1 5 5 4 4 3 3 3 1 3 4 5 1 4 5 6 4 4 1
   Cards: 2h As 2c Qh 7d 5s Jc 6s 7h Kh 9s 4h 3s 2d 6h Qc Kc 8c Ah Tc 4c 7c
@@ -20,7 +20,7 @@ Round 2:
 	 Js 4d Ac Td Qs Kd 3h 9d
 
 Round 3:
-  20bit: 0xddea7331 0x79f2e4e5 0x60cc53a2 0xa5c5ccc5 0x3e3053ad 0x1434a470
+  32bit: 0xddea7331 0x79f2e4e5 0x60cc53a2 0xa5c5ccc5 0x3e3053ad 0x1434a470
   Coins: TTTTTTTHHTHHHTHHTHHHTTTTHHTTHHHHTTTHTTTHTTHTHHHTHTHHTHTTHHTHTTTTT
   Rolls: 5 6 1 5 3 2 4 1 4 3 4 2 4 2 2 2 5 6 6 3 5 4 3 4 2 1 3 1 1 1 3 2 2
   Cards: 4s Kh 6c Qc 5s Jc 3d 2s 6h 7s Th 3s 5d Ts Ks 9c Jd 5c Qh Ah 8s Td
@@ -28,7 +28,7 @@ Round 3:
 	 Kd 8d Tc Js Kc 3h 4d 4c
 
 Round 4:
-  20bit: 0x37d70079 0x274cad70 0xbcab1ee3 0x423840d4 0xf1becf52 0x26cfcace
+  32bit: 0x37d70079 0x274cad70 0xbcab1ee3 0x423840d4 0xf1becf52 0x26cfcace
   Coins: HTHTHHTTHHTHHTHHTHTHHTTHTTTHTHHTHTTTHTTTHTHHTTTTTTTTHTHHHHTTHTHTT
   Rolls: 5 5 5 2 1 1 1 2 2 1 3 2 5 5 3 1 6 5 5 2 3 4 6 1 4 4 5 3 1 5 6 5 4
   Cards: Jh 8d 3s 5c 5d Ac 3c Kd 4s Jd Tc Qs Qd Js 8h 9h Th Kh Ts 7d Td 7h
@@ -36,7 +36,7 @@ Round 4:
 	 8c Ah 6h 5h 9s 8s As 2h
 
 Round 5:
-  20bit: 0x85d178c2 0xc263a20b 0x232a5ea9 0xaf7570ce 0x2e0b0f69 0x11823de5
+  32bit: 0x85d178c2 0xc263a20b 0x232a5ea9 0xaf7570ce 0x2e0b0f69 0x11823de5
   Coins: TTTHTHHHTTHTTHHHTHTTHHTTTHHTTHTTTHTTHHTTHTTTHTTHTTHHTHTHHHHTTTTTH
   Rolls: 1 5 2 1 4 3 3 6 1 5 6 1 5 5 4 4 1 6 2 3 6 1 3 5 5 3 2 2 5 3 6 4 4
   Cards: 3d 8c 2d 2s As 4s 4c Tc Kc 7c Jd 5s 3c 2h 7h 6c 8s 5c Ah 6h Jc 7d
diff --git a/test-high/expected/check-pcg32_c1024_fast.out b/test-high/expected/check-pcg32_c1024_fast.out
index bf51e7b..b7d6687 100644
--- a/test-high/expected/check-pcg32_c1024_fast.out
+++ b/test-high/expected/check-pcg32_c1024_fast.out
@@ -12,7 +12,7 @@ Round 1:
 	 Tc 9s 6h Jh 7d 9h 3h 6d
 
 Round 2:
-  20bit: 0x2a0995a5 0x33960b87 0x44137706 0x1c4df60f 0x03788d7f 0x20a26cfa
+  32bit: 0x2a0995a5 0x33960b87 0x44137706 0x1c4df60f 0x03788d7f 0x20a26cfa
   Coins: HHTTTTTTTHHHHHTHHTHHHTHHTTTTTTHHHTHTTTTHHTHHHTHHTHHHTHTTTHHTHHTHH
   Rolls: 5 5 6 1 2 6 5 3 3 6 4 5 4 5 4 4 6 2 5 5 1 6 2 5 5 5 1 5 2 5 6 4 3
   Cards: Qc 4s 6c 6d Qd 2h Ts 2s Qs 7h Ad 3h 5c 4c Kd 6s 2d 4d Jh Ac 7d 3s
@@ -20,7 +20,7 @@ Round 2:
 	 4h 3d Jd 9c Kh 5h Jc As
 
 Round 3:
-  20bit: 0x163fedf6 0xf81a02e1 0x5337b072 0xb1089395 0xcb17724c 0xd19f73d1
+  32bit: 0x163fedf6 0xf81a02e1 0x5337b072 0xb1089395 0xcb17724c 0xd19f73d1
   Coins: HHHHHTTHHHHHTTTTHHTHHHTTTHHHTTTHHHHHHHTHTTHHHTHHHHTHTTTHTHTHTTTTT
   Rolls: 4 4 3 5 3 2 6 2 3 3 6 1 6 2 2 2 5 5 6 1 2 5 1 4 1 1 3 4 6 6 6 6 4
   Cards: 2c Jd 8c Kh 2d Qh Jc 7c Ah 7d Qd 3h 8h Td 5h 8s 6c 9s Th Qs 6h Tc
@@ -28,7 +28,7 @@ Round 3:
 	 4d Kc 4s As Ac 7h 9c 4c
 
 Round 4:
-  20bit: 0x4ca9b37f 0x5f024b85 0x6dfb8620 0xbf0d2c53 0x1408579f 0xf8915f8b
+  32bit: 0x4ca9b37f 0x5f024b85 0x6dfb8620 0xbf0d2c53 0x1408579f 0xf8915f8b
   Coins: HTTHHTTHTHTHTTTHHTTHTTHTHHHHTTTTHHTHHTHHHHHTTHTHTHHHHTTHTHHTHHTTH
   Rolls: 1 6 2 4 4 5 6 3 1 3 5 2 4 3 4 4 6 6 5 2 3 3 2 2 4 1 6 4 5 2 5 5 2
   Cards: Jc 4h 8c 3c 5c 7d 4c 2c Ad Kh Ah 3h 2d Qs 7h Qh Qc Ks 7s 4d Th Ts
@@ -36,7 +36,7 @@ Round 4:
 	 6d 5h Ac 8h 5s 3d 5d 9d
 
 Round 5:
-  20bit: 0x242c363b 0x1fa88c24 0xd3dc68bb 0xc935d193 0xce165b29 0x5cbafaf4
+  32bit: 0x242c363b 0x1fa88c24 0xd3dc68bb 0xc935d193 0xce165b29 0x5cbafaf4
   Coins: TTHHTTHTHHHHTHHTTHTTTTHHTHHTTTTTHTTHTHHTHHTHHTHTTHTTHTHHTTHTTHTTT
   Rolls: 5 6 1 2 5 2 4 6 3 5 3 4 1 4 2 4 5 3 2 3 6 4 4 6 1 6 2 3 2 2 3 3 5
   Cards: Jd 7c Ad Kc 4h 5d 7d 8d 6d Th 7h 9s Ac 5h 4d Tc 9h Kh As 9c Qs 3c
diff --git a/test-high/expected/check-pcg32_c64.out b/test-high/expected/check-pcg32_c64.out
index e640dd1..fbe5808 100644
--- a/test-high/expected/check-pcg32_c64.out
+++ b/test-high/expected/check-pcg32_c64.out
@@ -12,7 +12,7 @@ Round 1:
 	 2h Tc 6s 7d 3c Jc 4d 7h
 
 Round 2:
-  20bit: 0x24751219 0x62509dfc 0xad1edbf0 0x8358d34a 0x281bfe2a 0x6fb4e17d
+  32bit: 0x24751219 0x62509dfc 0xad1edbf0 0x8358d34a 0x281bfe2a 0x6fb4e17d
   Coins: HHTHTHTHTHHHHTHTTHTTHHTTHHTTTHHTHHHHTTHHTTTHTTHHHHHTHHHHHHTTTHTTT
   Rolls: 6 1 5 3 1 3 4 6 3 3 3 2 6 1 3 1 3 6 5 2 4 2 3 6 6 3 4 3 4 4 6 5 3
   Cards: 6c Jc Qh 7c Qd 5d 6s Ks Ts 5h 6d 2s 5c Kh 4d 8h As 9h 9s 2d Qc Jh
@@ -20,7 +20,7 @@ Round 2:
 	 3d 7h 3c 9d 4h 4s 3s Ac
 
 Round 3:
-  20bit: 0xaefc5f6a 0x8837288e 0x99485a39 0x6b33e8ec 0x3b0d9da8 0xa22e1914
+  32bit: 0xaefc5f6a 0x8837288e 0x99485a39 0x6b33e8ec 0x3b0d9da8 0xa22e1914
   Coins: HTTHTHHTTHHTHHHTHHTHTHTTHTHTTTTHHTHHTHHHHHHHHHHHTHHTHHHTTTTTTTHHT
   Rolls: 2 4 6 4 2 6 2 3 2 5 1 4 3 5 6 5 6 1 3 2 4 6 4 6 2 3 3 3 3 3 4 6 1
   Cards: 7s 3c Ad Jh 7d Qs As 2d 4d 9d Kc 8h 9s 3s 2c 8c 5c 6h Jd Ah 9h Th
@@ -28,7 +28,7 @@ Round 3:
 	 4h 6d Ac 7c 9c 3d 3h 5h
 
 Round 4:
-  20bit: 0x910a66f1 0xfaea9f3a 0x1fb82293 0x4842083e 0xe10fbb53 0x9f265bdf
+  32bit: 0x910a66f1 0xfaea9f3a 0x1fb82293 0x4842083e 0xe10fbb53 0x9f265bdf
   Coins: HHTTHHTHHHHHHTHHHHHTTHHTTHHTHTTTHHTHTHHHHHHTHHTTHHTHTTHHHHTTTHHTT
   Rolls: 1 3 2 6 4 3 2 4 4 3 6 5 1 5 4 3 2 4 2 1 2 3 2 5 5 3 6 2 6 2 6 1 1
   Cards: 5d 3s Ac Kd Qc Qs 4s 6s Ks 8h 3c Jc Th Ad 5h 9s 9c 5c 2s 9d 7h 4d
@@ -36,7 +36,7 @@ Round 4:
 	 3d 6h 8s 2h Js 4c Jh 8d
 
 Round 5:
-  20bit: 0xd8fe156d 0xeee08bf3 0x6e5beff9 0x1defb7b7 0xbc64b375 0x11e75f12
+  32bit: 0xd8fe156d 0xeee08bf3 0x6e5beff9 0x1defb7b7 0xbc64b375 0x11e75f12
   Coins: HHHHHTTTHTTHTHHHHHHHHHHHTHHTTTHHTHTTHHTHTHTHHTTHHTTTTTTHHHHHTTTTH
   Rolls: 5 1 5 5 6 1 3 6 1 4 6 4 2 4 1 3 3 5 3 2 4 6 2 2 3 4 6 3 6 4 5 3 2
   Cards: 7d 3s 2d Ac 9s 9d Qh Jh 5c 4c 6h 9c 9h 5h Td 5s 7h Jc 4d 6s 3d Js
diff --git a/test-high/expected/check-pcg32_c64_fast.out b/test-high/expected/check-pcg32_c64_fast.out
index f85010e..df90086 100644
--- a/test-high/expected/check-pcg32_c64_fast.out
+++ b/test-high/expected/check-pcg32_c64_fast.out
@@ -12,7 +12,7 @@ Round 1:
 	 Jc 3h As 6s Qh 4d Js 5h
 
 Round 2:
-  20bit: 0x33668329 0x05512f11 0x86b4a881 0xe69e1d73 0x078ed3c7 0xd05cee1e
+  32bit: 0x33668329 0x05512f11 0x86b4a881 0xe69e1d73 0x078ed3c7 0xd05cee1e
   Coins: HTHTTTHHTTTHTTHHTHHHHHHTTHHHTHHHHHHHTTHHHTTTHHHHHTTHTHHHTHTTTTTTH
   Rolls: 1 1 5 3 5 6 6 4 1 4 4 1 1 4 5 2 2 2 4 1 4 6 5 1 4 2 4 6 3 5 2 4 3
   Cards: Ad 3d Kc Tc 6c 3c Ts Qd Qh 6d Jd Ks Td 8s 4h Jh As 5d Th 3s Kh 9d
@@ -20,7 +20,7 @@ Round 2:
 	 8d 3h 7c Qc 2c Jc Kd 5s
 
 Round 3:
-  20bit: 0x0ef168f2 0x0e0f90fe 0x34f4889d 0x78274f67 0xee43a56f 0x966c625a
+  32bit: 0x0ef168f2 0x0e0f90fe 0x34f4889d 0x78274f67 0xee43a56f 0x966c625a
   Coins: HHHTTTHHHHTHHHHHTHHHHTHHHTTTTTTTHTHHHTTTHHTHTHTTTTTHHTHHTHTHTTHHH
   Rolls: 4 4 2 2 1 1 5 1 3 3 1 2 2 4 2 5 1 4 4 3 5 2 3 2 4 5 1 1 1 6 6 6 4
   Cards: Qs 8s 2d Qd 8c 6c Kh Ts Ah 4h 3d 3c 5h Qc 3s 4d Kd Ks 6s 3h Kc Jc
@@ -28,7 +28,7 @@ Round 3:
 	 As 8d Js 5d 5s 9c Th Tc
 
 Round 4:
-  20bit: 0xeb88b9b7 0x6877b6d1 0xe4689557 0x8e7a0f18 0x1f111185 0x1c862358
+  32bit: 0xeb88b9b7 0x6877b6d1 0xe4689557 0x8e7a0f18 0x1f111185 0x1c862358
   Coins: HHTTHHHTHHHTTTTTHHTTHTTTHTTHTTTTHTHHHTHTTTHHHHTHHTTTTTTTHHHTHHTTH
   Rolls: 1 1 2 4 2 1 4 1 5 1 4 1 5 5 6 3 6 4 4 3 6 6 1 5 2 5 1 1 6 4 5 1 4
   Cards: Kc 7c 4s 6s Js 3d 8c 2d 9s 5c 6c 6d Qc Qd 2h 2c Tc 7s 2s 5h 5d 9h
@@ -36,7 +36,7 @@ Round 4:
 	 8d 3h 5s Jh Ks 4d Kh Ac
 
 Round 5:
-  20bit: 0x92c5be80 0xf87ee090 0x9d648d40 0xf7de421a 0xba013d74 0xdb8c6381
+  32bit: 0x92c5be80 0xf87ee090 0x9d648d40 0xf7de421a 0xba013d74 0xdb8c6381
   Coins: TTTTTTHHHTHTTTTTHHTTTHTTTTHTHHHTTTHHTHTHHHHTHTTTTHTTTHHHTTTHHTTHT
   Rolls: 1 6 1 2 5 4 3 5 5 2 4 4 5 5 2 1 1 2 2 1 3 5 1 6 2 6 3 3 5 6 4 1 6
   Cards: 5s 3h 5c Td Ah 7c 3d Tc 7h 6d 5h Th 4h Qc 9s 6c 6h Jc 4d Ts 8c 9h
diff --git a/test-high/expected/check-pcg32_c64_oneseq.out b/test-high/expected/check-pcg32_c64_oneseq.out
index 4a81f7a..0af8eff 100644
--- a/test-high/expected/check-pcg32_c64_oneseq.out
+++ b/test-high/expected/check-pcg32_c64_oneseq.out
@@ -12,7 +12,7 @@ Round 1:
 	 Jd 3d 4s 6c Ks 7c Ah Qs
 
 Round 2:
-  20bit: 0x4c0edc92 0x07406631 0x62de4826 0x27621708 0xf3fe1e49 0x812b2e17
+  32bit: 0x4c0edc92 0x07406631 0x62de4826 0x27621708 0xf3fe1e49 0x812b2e17
   Coins: THHHHHHHHHTTTHTHTTTTHTTTHTHHTTTTTTTHHTTHTTHHTHTHHTTTTTTTTTHTTHTHH
   Rolls: 2 5 4 2 6 6 1 6 4 1 4 2 3 1 2 2 2 3 3 6 6 1 2 1 2 1 3 4 2 6 2 6 2
   Cards: Tc 4c Qs Td Ac Qh 7c 5d Ts 9s 2c 8d Ah Jd Th 5s 9c As 6d 8h 8s 3h
@@ -20,7 +20,7 @@ Round 2:
 	 9h Js 2d 3d Kh Ad 6c 4s
 
 Round 3:
-  20bit: 0xe761bbf8 0x7993beb4 0xaff5e793 0x391ebef8 0xa4397fba 0xfba6ecaa
+  32bit: 0xe761bbf8 0x7993beb4 0xaff5e793 0x391ebef8 0xa4397fba 0xfba6ecaa
   Coins: TTHHTHTHTHTTHHTTHHTTHHTHHTHTHTHHTHHHHTTHHHTTTTTTHTHHHTTHTTTTHHHHT
   Rolls: 2 1 4 4 2 4 2 3 6 2 3 1 5 5 1 4 1 6 6 6 1 4 6 5 1 1 6 2 5 5 6 3 3
   Cards: 9h 8h 9c Tc 2d 3h Kh Jd As 7d Qc Ts 3s 7s Ks 5d 3d Kd Jh 7h 8c 4h
@@ -28,7 +28,7 @@ Round 3:
 	 Js Qs 4c 6d Qd 4s 3c 5c
 
 Round 4:
-  20bit: 0x32a474ca 0x33a6179f 0x9184ae8c 0x9277ff8a 0xfc81ddca 0x844a798f
+  32bit: 0x32a474ca 0x33a6179f 0x9184ae8c 0x9277ff8a 0xfc81ddca 0x844a798f
   Coins: THTTTTTHTTHHHTHHTTTHTHHHTHHHTTTHHTHHHTHTTHHHHHHHHHTHHTHHTHHTTHTTH
   Rolls: 1 4 5 2 4 5 1 4 5 6 5 3 2 6 2 3 3 1 6 1 3 2 4 4 4 6 6 2 2 1 4 5 4
   Cards: 5s Js 2c 2h 5h Tc Kh 8h 2s 2d 8c Kd 8s As Qs 3d Th 5d Qd Ac Td 4c
@@ -36,7 +36,7 @@ Round 4:
 	 Qh Jd Ad 9c 6s 7s 7h Ah
 
 Round 5:
-  20bit: 0xb8af4d5e 0x3b843775 0xa811b5aa 0xcd63ad11 0xa26b78e2 0x6c6704ec
+  32bit: 0xb8af4d5e 0x3b843775 0xa811b5aa 0xcd63ad11 0xa26b78e2 0x6c6704ec
   Coins: TTTHTHTTHHTTTHTTTTTTHTTHTHTTHTHTTTHHTTHHTHTHHHHTHHHHHTTTHTHTTHHTH
   Rolls: 6 5 2 1 4 5 2 3 5 4 4 3 5 2 5 5 1 4 2 3 2 3 5 4 2 4 1 1 3 5 3 4 6
   Cards: Ah 3s Th Ks 4d 2d 2s Qh 3c 6d 7s 3h 5d 6h Ts 8c Jc Jd 2c Jh 6s Kd
diff --git a/test-high/expected/check-pcg64_c1024.out b/test-high/expected/check-pcg64_c1024.out
index c444abe..788bb37 100644
--- a/test-high/expected/check-pcg64_c1024.out
+++ b/test-high/expected/check-pcg64_c1024.out
@@ -13,7 +13,7 @@ Round 1:
 	 3h 9h 6h Ah 8h 4c 4h 7d
 
 Round 2:
-  40bit: 0x25fd681dcf01e40e 0x15b20d676e3c3ad8 0xd62454123f18447b
+  64bit: 0x25fd681dcf01e40e 0x15b20d676e3c3ad8 0xd62454123f18447b
 	 0xd2ed41a518ff61ba 0xf4625131fa78629c 0xcf5f2a2bc592ed41
   Coins: TTTHHHHTHTTTHHHTTHHHTHHHHTTHHTTTHHHTHTTHTTHHHTTTHTTTHHTTHHTHHTTHT
   Rolls: 1 5 3 5 3 1 5 5 5 3 5 2 1 2 2 1 4 5 3 2 3 6 5 5 2 4 1 4 4 2 5 2 6
@@ -22,7 +22,7 @@ Round 2:
 	 2c Qd Ts 2d 4s 6s Kc 7d
 
 Round 3:
-  40bit: 0x7246882f97ca618d 0x6bfacfdb29810ed3 0xece86a774cd51bfd
+  64bit: 0x7246882f97ca618d 0x6bfacfdb29810ed3 0xece86a774cd51bfd
 	 0x52ef744f62744c94 0x62567a265fafb889 0xe1b1c00d183ee96a
   Coins: THTHTHTTHHHHTHHTTHTTHTHTTTTTTHHTTTTHHTTHHHHTTTHTHHHHTHHHHHTTTTHTH
   Rolls: 1 5 1 6 6 4 3 4 2 2 6 1 6 5 1 1 3 3 3 3 6 5 1 1 4 2 5 4 4 3 6 4 4
@@ -31,7 +31,7 @@ Round 3:
 	 Ks 3c Kd 8c 7d 6h 6s 5d
 
 Round 4:
-  40bit: 0x8c19c475c51bd13b 0xd283cb08853371e7 0x123c48d92fa977f2
+  64bit: 0x8c19c475c51bd13b 0xd283cb08853371e7 0x123c48d92fa977f2
 	 0xcac972ff67005a54 0x2db2dd6e5f4cbba6 0xf22c80b048063362
   Coins: TTHTTTHTHHHTHTHTTTTHHHHHHTHHTTTTTTHHTTHHHHHHHHTTTHTTHHHTTHTTTTTHT
   Rolls: 5 1 4 3 4 5 5 4 1 6 2 5 5 1 3 4 2 3 3 6 2 1 3 3 5 5 3 2 6 4 6 2 1
@@ -40,7 +40,7 @@ Round 4:
 	 Ac 7c 5d 6s 2c 8h Jc Qh
 
 Round 5:
-  40bit: 0xcd297aeff4ebb56a 0xe7bac4baf02a88ae 0xb309261fdd99f0ee
+  64bit: 0xcd297aeff4ebb56a 0xe7bac4baf02a88ae 0xb309261fdd99f0ee
 	 0x22801c7fe80eb42f 0xcf1a7245e5c59690 0x6aee2db8a6176987
   Coins: TTTHHTTTTHTTHHTTTTTHHHHTTTTTHHTTHTHHTTTHHTHTTTTHHTTTHTTTTHTTHTTHT
   Rolls: 3 3 5 2 1 1 2 5 4 3 3 4 6 5 3 2 4 3 2 6 6 2 3 5 4 2 2 5 6 2 5 6 4
diff --git a/test-high/expected/check-pcg64_c1024_fast.out b/test-high/expected/check-pcg64_c1024_fast.out
index b56d363..956a2cb 100644
--- a/test-high/expected/check-pcg64_c1024_fast.out
+++ b/test-high/expected/check-pcg64_c1024_fast.out
@@ -13,7 +13,7 @@ Round 1:
 	 4d 3s 4h Qs 9c Kd 8h Ac
 
 Round 2:
-  40bit: 0xacc17347a5e62cfb 0xbd254b04c901de89 0xd04990b28a2de92c
+  64bit: 0xacc17347a5e62cfb 0xbd254b04c901de89 0xd04990b28a2de92c
 	 0xa18498a3c28e7579 0x2da084ee4056e2fd 0xe087775f49f66d33
   Coins: HHTHHTTHHTHTHHTHTHTTHHHHTTHHHTTTHTHTHHHHHHTTTHTHTTHTTHTHTTHHTHTHT
   Rolls: 5 4 2 4 2 2 2 6 5 1 6 1 1 2 1 6 1 6 4 1 4 6 6 3 6 2 3 6 4 2 4 4 2
@@ -22,7 +22,7 @@ Round 2:
 	 3d 5c 8s Jd 5d Ah 4d 6s
 
 Round 3:
-  40bit: 0x36adb072902e8a7f 0xb0ecc5bbd3a64e7d 0x2849bc91170b00f6
+  64bit: 0x36adb072902e8a7f 0xb0ecc5bbd3a64e7d 0x2849bc91170b00f6
 	 0xf5c2550ebb3fe21f 0x4ee68fc51aa05b8d 0x4e34d4b191ccecb1
   Coins: HTHTHHTTHTTHTHTTTHHHHTHTHTHTHTTTHTTHTHHTTHTHTHTHHTHTHHTHTHHHTHTTT
   Rolls: 2 1 5 6 3 2 5 3 6 4 3 4 3 1 4 2 5 1 5 1 1 2 1 6 3 5 5 3 5 5 2 5 5
@@ -31,7 +31,7 @@ Round 3:
 	 8c 7h 6h 8s 6d 3s 9c 7c
 
 Round 4:
-  40bit: 0x11f84c40c21e0095 0x9b2997036eb49e12 0xa38479388dc5edbc
+  64bit: 0x11f84c40c21e0095 0x9b2997036eb49e12 0xa38479388dc5edbc
 	 0xe5be8c81f92df921 0xe37566cbb95fa05b 0x316f422cb4d4c6c7
   Coins: HHHHTTTHTTHTHTHHTTHTTHTHTTTTHTTHHHTTHTTHTTHHTHHTTTHTTTTHHHTTHHTHT
   Rolls: 1 6 6 5 4 6 6 2 2 2 2 3 5 3 4 4 2 5 1 5 4 1 1 4 3 2 4 4 6 2 1 6 6
@@ -40,7 +40,7 @@ Round 4:
 	 Jc 8c Kh Ts 4s Ks 3c 9s
 
 Round 5:
-  40bit: 0x4a9b182682cc6f6c 0xad05fd2a2371d288 0x35aeda738467fa7a
+  64bit: 0x4a9b182682cc6f6c 0xad05fd2a2371d288 0x35aeda738467fa7a
 	 0xb31217ade0c408d7 0xbe558337184cc9bb 0x53dc9a7087a99250
   Coins: THHTHTHTHTTHHTHHTTHTTHHHHTTHHTHTTHHHTHHHHHTTHHTHTTTTHTHTHHTTTHHHT
   Rolls: 5 4 2 1 5 3 5 3 1 3 5 4 5 3 6 2 2 2 4 4 3 4 5 2 5 4 1 6 3 3 1 1 1
diff --git a/test-high/expected/check-pcg64_c32.out b/test-high/expected/check-pcg64_c32.out
index ea57cf0..22b5aef 100644
--- a/test-high/expected/check-pcg64_c32.out
+++ b/test-high/expected/check-pcg64_c32.out
@@ -13,7 +13,7 @@ Round 1:
 	 Kh 7s 8s 5h 6d 4c 8h Qh
 
 Round 2:
-  40bit: 0xa0f1d0aca239a53b 0x898fe5131e4ccb68 0xf75d2bf2ace26841
+  64bit: 0xa0f1d0aca239a53b 0x898fe5131e4ccb68 0xf75d2bf2ace26841
 	 0xb8ae157b92baa061 0x5d81af69594697df 0xdce14e9cff8ec370
   Coins: HHTHTTTHHTHTHHTHHHTTHTTTTHHHTHTHHTHHHTTHHTHTTTTTTTHTHHHTHHTHHHTHH
   Rolls: 1 3 3 3 6 2 3 1 5 4 2 1 6 5 1 6 5 6 5 4 5 3 5 5 1 2 6 4 3 1 6 3 1
@@ -22,7 +22,7 @@ Round 2:
 	 8d 9h 3h 6c Js Ad Qh 9d
 
 Round 3:
-  40bit: 0x91b7889987aa1ec6 0x0ed5084055a71e1e 0xd9235ff37902ab6e
+  64bit: 0x91b7889987aa1ec6 0x0ed5084055a71e1e 0xd9235ff37902ab6e
 	 0x3f587978e907a6e4 0xa4b0d25c45e6a5b6 0x1d5af98fe7046ebc
   Coins: HHHTHHTTHTHTTTTHTHHHTHHHTTTTTTHHHTTHHTHHTTHTHHTTHTTTTTTHHTTTHTHHH
   Rolls: 2 5 1 2 4 4 2 6 2 5 4 6 5 4 3 3 6 1 1 5 1 3 5 4 4 3 6 3 4 5 3 5 6
@@ -31,7 +31,7 @@ Round 3:
 	 2h Qh Th 6s 7c 4s Ts Kc
 
 Round 4:
-  40bit: 0xb9bd5d2cdacdda6d 0x8df76d5c83998fdd 0x47ffde0b04c8e4c7
+  64bit: 0xb9bd5d2cdacdda6d 0x8df76d5c83998fdd 0x47ffde0b04c8e4c7
 	 0xc0f51b1946a32345 0x327d52590dcae958 0x8fd4cf60789eec4a
   Coins: HHTHHHTTTHTHTHHTHTTHTTHHHHTHHHTTHTTHTTHHTHHTTHHHHTHTHTTHHHHHHTTTT
   Rolls: 5 2 1 2 3 6 6 4 1 3 5 4 2 2 4 5 6 4 2 3 5 5 5 5 4 5 4 3 2 2 2 6 2
@@ -40,7 +40,7 @@ Round 4:
 	 4c 4s 9s Qc 2c Kc 9h Kd
 
 Round 5:
-  40bit: 0x087140d144b810b7 0x56fb1cc84113d2da 0xc92332d25992ed0a
+  64bit: 0x087140d144b810b7 0x56fb1cc84113d2da 0xc92332d25992ed0a
 	 0xc47bbb3a90cea863 0x3d73ce0952a62a2b 0xd7e60982f60a00aa
   Coins: HTHHTHHHHTTTHHTTTTTHHTHHTHTTHTTHTHHTTHTHTTTHTTHHTHHHHTTTHTTHTHTTH
   Rolls: 6 4 1 6 1 5 3 4 2 6 6 5 6 3 3 2 4 6 6 6 6 1 1 1 3 6 5 2 4 4 6 2 2
diff --git a/test-high/expected/check-pcg64_c32_fast.out b/test-high/expected/check-pcg64_c32_fast.out
index 6ffe163..589ffd2 100644
--- a/test-high/expected/check-pcg64_c32_fast.out
+++ b/test-high/expected/check-pcg64_c32_fast.out
@@ -13,7 +13,7 @@ Round 1:
 	 Ah 8c Js Jc 2s 4h 6d 7h
 
 Round 2:
-  40bit: 0x1365608a27ecbe73 0x1710ffa1040e1777 0x73bc625a07e2a046
+  64bit: 0x1365608a27ecbe73 0x1710ffa1040e1777 0x73bc625a07e2a046
 	 0x4b7559ba56e977e4 0xbb21240566940491 0x6abfbecb80b1ff1d
   Coins: TTHHHTHTTTTHHTHHHTTTTHTHHHTHTHTTTHTHTHHHHTHHHHTTTHHHHTTTTHHHTHHHT
   Rolls: 6 6 6 3 5 3 2 1 3 6 3 3 2 3 1 1 6 2 4 3 2 2 5 3 5 3 3 1 3 3 5 2 6
@@ -22,7 +22,7 @@ Round 2:
 	 7h Qd 4h As 5d Jc 2s Tc
 
 Round 3:
-  40bit: 0x2da6bd5828fedd55 0x9360e79d3218b8ce 0x7a9ca1bfb4ae99fa
+  64bit: 0x2da6bd5828fedd55 0x9360e79d3218b8ce 0x7a9ca1bfb4ae99fa
 	 0xdb7e60857a9bb076 0xed1bdd0db1089228 0x039882d1422cbc3d
   Coins: HTTHHTTTHHHTHTHTTTTTTTHHTHHTTTHHTTHHHTHTHTHHTTHTHTTTTTHHHHTTHHHTH
   Rolls: 6 1 4 3 4 6 1 2 3 1 1 6 5 6 2 5 2 3 3 5 2 1 1 4 6 2 5 3 1 4 6 2 2
@@ -31,7 +31,7 @@ Round 3:
 	 Kc 9s Ts 2d 7s Th Ad Js
 
 Round 4:
-  40bit: 0xcf2b14d23f2c5e0c 0x46ff4fe90f397ca0 0x563c15e615148eed
+  64bit: 0xcf2b14d23f2c5e0c 0x46ff4fe90f397ca0 0x563c15e615148eed
 	 0x517a7e4a24bdcc9e 0x627bd4295ec1ca63 0xf215acf4ee0dda66
   Coins: HTHTHTHTHTHHHHHTTHTHTHTTTHTTHTHHHTTTHTTHHTHTTTTTTHTHHHHHTTHTTTHHH
   Rolls: 2 6 4 2 5 3 1 1 1 2 5 2 6 5 1 1 4 6 5 1 1 2 6 2 6 1 3 1 4 5 4 5 5
@@ -40,7 +40,7 @@ Round 4:
 	 Td 4h Ah Qc Ks 6c Th 3d
 
 Round 5:
-  40bit: 0xc843447bfaca04a4 0x438faa7f4fd7fd4b 0x3734fddb3819962d
+  64bit: 0xc843447bfaca04a4 0x438faa7f4fd7fd4b 0x3734fddb3819962d
 	 0xe2db1ef1e551c13c 0xbe6c37b5b98bab8d 0x53c0265dab44b2b1
   Coins: THTTTTTTTTHTTTHTTTHHHHHTTTHHHTHTHTHTTTTHHTHTTHHTTTTHHHTTHHTHTTHTH
   Rolls: 2 3 6 3 3 4 6 4 5 5 1 6 1 1 2 4 1 6 6 2 6 4 6 3 2 4 4 3 1 2 3 3 3
diff --git a/test-high/expected/check-pcg64_c32_oneseq.out b/test-high/expected/check-pcg64_c32_oneseq.out
index 57d0f39..6e02424 100644
--- a/test-high/expected/check-pcg64_c32_oneseq.out
+++ b/test-high/expected/check-pcg64_c32_oneseq.out
@@ -13,7 +13,7 @@ Round 1:
 	 5s 4h 8c As Kh 3s Jc 9s
 
 Round 2:
-  40bit: 0x512b5aafa488800c 0xfdee3c27da7686a9 0x41fe7ffbc0a8ef66
+  64bit: 0x512b5aafa488800c 0xfdee3c27da7686a9 0x41fe7ffbc0a8ef66
 	 0xe76b420836ecccc7 0x1083b5aec0846e99 0x40a0f567b36dc10f
   Coins: HHTTTHTHTHTHHTHHTTHHTTHTHTTTHHHTTHHHTTHTHHHTTHHTHTHTTHTHTHTTTHTTH
   Rolls: 3 5 3 4 4 2 1 4 1 1 6 1 1 1 3 6 2 1 6 3 5 6 6 3 3 6 2 6 2 2 6 6 4
@@ -22,7 +22,7 @@ Round 2:
 	 5c 6d 9c 5h 8d 9h Kd Jd
 
 Round 3:
-  40bit: 0x2dbd95ce2bb203e2 0xa38f7b3be5eb97d3 0x4f343774560b7753
+  64bit: 0x2dbd95ce2bb203e2 0xa38f7b3be5eb97d3 0x4f343774560b7753
 	 0xf0a9e5743a450957 0xe31ff462c5c9b5ae 0x5a1c3ec0609a8cb1
   Coins: HHTTHHTTHHTHHHTTTTHTHTHHTHTHHTHHTHTHTHHHTHTTHHTHTTHHHHTHHTTTHTTHH
   Rolls: 3 3 1 1 3 6 5 3 5 2 5 2 2 1 1 4 6 1 3 2 1 2 4 3 3 5 1 4 4 5 6 6 1
@@ -31,7 +31,7 @@ Round 3:
 	 3d 3s Ts Ac Qs 7c Tc 4c
 
 Round 4:
-  40bit: 0xfb8eab4ddeff6324 0x41403a4419e4cf9a 0xbaf19e0432c6062f
+  64bit: 0xfb8eab4ddeff6324 0x41403a4419e4cf9a 0xbaf19e0432c6062f
 	 0xc89ade15d828ef9a 0xf14e9ab7f6fd226e 0xf40d5df6e172b649
   Coins: HTHHTTHTHHTTHTHHTHHTHHTTHTTHHHTTTHHHHHHHTTTHTTTHTHTHTTHHHTTTTHHHT
   Rolls: 2 6 6 2 1 3 4 1 1 3 1 4 2 4 1 1 3 4 1 4 3 6 5 2 2 5 6 6 3 3 2 6 5
@@ -40,7 +40,7 @@ Round 4:
 	 3s Td Qh 8h 2d 8s Jd Ts
 
 Round 5:
-  40bit: 0x1109ba6f20c9c9b9 0x4fcc9e6d4bf4cbd3 0xcd8ae4b2edbe29bd
+  64bit: 0x1109ba6f20c9c9b9 0x4fcc9e6d4bf4cbd3 0xcd8ae4b2edbe29bd
 	 0x59a447b4fdd0e5ba 0xaf03a68ef8b853a3 0x8b6e215c53d25ad9
   Coins: TTHHHHTTHTTTHHTTHTTTTHTHTTHHHTTHTTTHHHTTHTTHTTHTHHHHHTHTHTTHHHHTH
   Rolls: 6 6 3 1 3 2 2 1 4 5 6 6 4 2 1 5 1 5 3 4 6 2 1 1 5 1 1 4 2 1 1 3 2
diff --git a/test-high/pcg-test-noadvance.cpp b/test-high/pcg-test-noadvance.cpp
index 6e9362b..60cd698 100644
--- a/test-high/pcg-test-noadvance.cpp
+++ b/test-high/pcg-test-noadvance.cpp
@@ -116,7 +116,7 @@ int main(int argc, char** argv)
             cout << " 0x" << hex << setfill('0') 
                  << setw(sizeof(RNG::result_type)*2) << rng();
         }
-        cout << endl;
+        cout << dec << endl;
 
         /* Toss some coins */
         cout << "  Coins: ";