Improve .csv output for various fields.

tpn · Dec 7, 2022 · 716a0dc · 716a0dc
1 parent 8c37bff
commit 716a0dc
Showing 5 changed files with 34 additions and 25 deletions.
diff --git a/src/PerfectHash/BulkCreateBestCsv.h b/src/PerfectHash/BulkCreateBestCsv.h
@@ -104,27 +104,27 @@ Module Name:
                                                                                              \
     ENTRY(RngStartSeed,                                                                      \
           Context->RngSeed,                                                                  \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(RngStartSubsequence,                                                               \
           Context->RngSubsequence,                                                           \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(RngStartOffset,                                                                    \
           Context->RngOffset,                                                                \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(RngWinningSeed,                                                                    \
           Table->RngSeed,                                                                    \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(RngWinningSubsequence,                                                             \
           Table->RngSubsequence,                                                             \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(RngWinningOffset,                                                                  \
           Table->RngOffset,                                                                  \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(MaximumConcurrency,                                                                \
           Context->MaximumConcurrency,                                                       \
@@ -6492,11 +6492,11 @@ Module Name:
                                                                                              \
     ENTRY(KeysMinValue,                                                                      \
           Keys->Stats.MinValue,                                                              \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(KeysMaxValue,                                                                      \
           Keys->Stats.MaxValue,                                                              \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(KeysFullPath,                                                                      \
           &Keys->File->Path->FullPath,                                                       \

diff --git a/src/PerfectHash/BulkCreateCsv.h b/src/PerfectHash/BulkCreateCsv.h
@@ -95,27 +95,27 @@ Module Name:
                                                                                              \
     ENTRY(RngStartSeed,                                                                      \
           Context->RngSeed,                                                                  \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(RngStartSubsequence,                                                               \
           Context->RngSubsequence,                                                           \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(RngStartOffset,                                                                    \
           Context->RngOffset,                                                                \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(RngWinningSeed,                                                                    \
           Table->RngSeed,                                                                    \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(RngWinningSubsequence,                                                             \
           Table->RngSubsequence,                                                             \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(RngWinningOffset,                                                                  \
           Table->RngOffset,                                                                  \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(MaximumConcurrency,                                                                \
           Context->MaximumConcurrency,                                                       \
@@ -683,11 +683,11 @@ Module Name:
                                                                                              \
     ENTRY(KeysMinValue,                                                                      \
           Keys->Stats.MinValue,                                                              \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(KeysMaxValue,                                                                      \
           Keys->Stats.MaxValue,                                                              \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(KeysFullPath,                                                                      \
           &Keys->File->Path->FullPath,                                                       \

diff --git a/src/PerfectHash/RtlOutput.h b/src/PerfectHash/RtlOutput.h
@@ -529,6 +529,11 @@ static PCSZ Exclamation = "!";
 #define OUTPUT_RAW(String)                                          \
     AppendCharBufferToCharBuffer(&Output, String, sizeof(String)-1)
 
+#define OUTPUT_BITMAP_RAW(String)                                   \
+    *Output++ = '0';                                                \
+    *Output++ = 'b';                                                \
+    AppendCharBufferToCharBuffer(&Output, String, sizeof(String)-1)
+
 #define OUTPUT_HEX(Integer) AppendIntegerToCharBufferAsHex(&Output, Integer)
 #define OUTPUT_HEX64(Integer) \
     AppendLongLongIntegerToCharBufferAsHex(&Output, Integer)

diff --git a/src/PerfectHash/TableCreateCsv.h b/src/PerfectHash/TableCreateCsv.h
@@ -84,27 +84,27 @@ Module Name:
                                                                                              \
     ENTRY(RngStartSeed,                                                                      \
           Context->RngSeed,                                                                  \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(RngStartSubsequence,                                                               \
           Context->RngSubsequence,                                                           \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(RngStartOffset,                                                                    \
           Context->RngOffset,                                                                \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(RngWinningSeed,                                                                    \
           Table->RngSeed,                                                                    \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(RngWinningSubsequence,                                                             \
           Table->RngSubsequence,                                                             \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(RngWinningOffset,                                                                  \
           Table->RngOffset,                                                                  \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(MaximumConcurrency,                                                                \
           Context->MaximumConcurrency,                                                       \
@@ -658,21 +658,25 @@ Module Name:
           Coverage->Score,                                                                   \
           OUTPUT_INT)                                                                        \
                                                                                              \
+    ENTRY(Rank,                                                                              \
+          Coverage->Rank,                                                                    \
+          OUTPUT_DOUBLE)                                                                     \
+                                                                                             \
     ENTRY(KeysMinValue,                                                                      \
           Keys->Stats.MinValue,                                                              \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(KeysMaxValue,                                                                      \
           Keys->Stats.MaxValue,                                                              \
-          OUTPUT_INT)                                                                        \
+          OUTPUT_HEX64)                                                                      \
                                                                                              \
     ENTRY(KeysFullPath,                                                                      \
           &Keys->File->Path->FullPath,                                                       \
           OUTPUT_UNICODE_STRING_FAST)                                                        \
                                                                                              \
     ENTRY(KeysBitmapString,                                                                  \
           Keys->Stats.KeysBitmap.String,                                                     \
-          OUTPUT_RAW)                                                                        \
+          OUTPUT_BITMAP_RAW)                                                                 \
                                                                                              \
     ENTRY(Remark,                                                                            \
           Table->Remark,                                                                     \

diff --git a/...align-trailing-slashes-on-csv-headers.bat → ...align-trailing-slashes-in-csv-headers.bat b/...align-trailing-slashes-on-csv-headers.bat → ...align-trailing-slashes-in-csv-headers.bat