Make distribution diagrams stop splitting report lines

Twilight-Dream-Of-Magic · Dec 9, 2023 · 7ba2801 · 7ba2801
1 parent addcede
commit 7ba2801
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/util/Analyze.cpp b/util/Analyze.cpp
@@ -767,8 +767,7 @@ static bool TestDistribution( std::vector<hashtype> & hashes, std::vector<hidx_t
     }
 
     if (!REPORT(QUIET, reportFlags)) {
-        printf("Testing distribution   (any  %2i..%2i bits)%s", minwidth, maxwidth,
-                REPORT(DIAGRAMS, reportFlags) ? "\n[" : " - ");
+        printf("Testing distribution   (any  %2i..%2i bits) - ", minwidth, maxwidth);
     }
 
     std::vector<double> scores(hashbits * (maxwidth - minwidth + 1));

diff --git a/util/Reporting.cpp b/util/Reporting.cpp
@@ -716,16 +716,12 @@ bool ReportDistribution( const std::vector<double> & scores, int tests, int hash
         for (int width = maxwidth; width >= minwidth; width--) {
             double n = *worstptr++;
 
-            if (REPORT(DIAGRAMS, flags)) { plot(GetStdNormalPValue(n), tests); }
-
             if (worstN    <= n) {
                 worstN     = n;
                 worstWidth = width;
                 worstStart = startbit;
             }
         }
-
-        if (REPORT(DIAGRAMS, flags)) { printf("]\n%s", ((startbit + 1) == hashbits) ? "" : "["); }
     }
 
     addVCodeResult((uint32_t)worstN);
@@ -782,5 +778,16 @@ bool ReportDistribution( const std::vector<double> & scores, int tests, int hash
         }
     }
 
+    if (REPORT(DIAGRAMS, flags)) {
+        printf("[");
+        for (int startbit = 0; startbit < hashbits; startbit++) {
+            const double * worstptr = &scores[startbit * (maxwidth - minwidth + 1)];
+            for (int width = maxwidth; width >= minwidth; width--) {
+                plot(GetStdNormalPValue(*worstptr++), tests);
+            }
+            printf("]\n%s", ((startbit + 1) == hashbits) ? "" : "[");
+        }
+    }
+
     return !failure;
 }