Display + Modification JsonBuilder

Author: cherubrock-seb

include/io/CliParser.hpp

@@ -94,7 +94,7 @@ struct CliOptions {
     uint64_t max_e_bits = 268'435'456ULL;
     uint64_t curves_tested_for_found = 0;
     int invarianterror = 0;
-
+    uint32_t ecm_progress_interval_ms = 2000;
 };
 
 class CliParser {

src/io/CliParser.cpp

@@ -94,6 +94,8 @@ void printUsage(const char* progName) {
     std::cout << "  -torsion16           : (Optional) use torsion-16" << std::endl;
     std::cout << "  -notorsion           : (Optional) use no torsion instead of default torsion-16" << std::endl;
     std::cout << "  -ecm_check_interval <value> : ECM Error Check interval in seconds (300s by default)" << std::endl;
+    std::cout << "  -ecm_progress_ms <value>    : ECM progress update interval in milliseconds (default: 2000 ms)" << std::endl;
+
     //std::cout << "  -brent [<d>]         : (Optional) use Brent-Suyama variant with default or specified degree d (e.g., -brent 6)" << std::endl;
     //std::cout << "  -bsgs                : (Optional) enable batching of multipliers in ECM stage 2 to reduce ladder calls" << std::endl;
     std::cout << "  -marin               : (Optional) deactivate use of marin backend" << std::endl;
@@ -328,6 +330,10 @@ CliOptions CliParser::parse(int argc, char** argv ) {
             opts.ecm_check_interval = std::strtoull(argv[i + 1], nullptr, 10);  // base 10
             ++i;
         }
+        else if (std::strcmp(argv[i], "-ecm_progress_ms") == 0 && i + 1 < argc) {
+            opts.ecm_progress_interval_ms = std::strtoull(argv[i + 1], nullptr, 10);  // base 10
+            ++i;
+        }
 
         else if (std::strcmp(argv[i], "-llsafeb") == 0 && i + 1 < argc) {
             opts.llsafe_block = std::strtoull(argv[i + 1], nullptr, 10);  // base 10

src/modes/RunEcm.cpp

@@ -104,6 +104,7 @@ int App::runECMMarin()
     uint64_t curves = options.nmax ? options.nmax : (options.K ? options.K : 250);
     const bool verbose = true;
     const bool forceSigma = (options.curve_seed != 0ULL);
+    const uint32_t ui_interval_ms = options.ecm_progress_interval_ms ? options.ecm_progress_interval_ms : 2000;
     if (forceSigma) curves = 1ULL;
 
     auto splitmix64_step = [](uint64_t& x)->uint64_t{ x += 0x9E3779B97f4A7C15ULL; uint64_t z=x; z^=z>>30; z*=0xBF58476D1CE4E5B9ULL; z^=z>>27; z*=0x94D049BB133111EBULL; z^=z>>31; return z; };
@@ -834,15 +835,20 @@ int App::runECMMarin()
                 else      { xDBLADD_strict(2,3, 0,1); }
 
                 auto now = high_resolution_clock::now();
-                if (duration_cast<milliseconds>(now - last_ui).count() >= 400 || i+1 == total_bits) {
+                if (duration_cast<milliseconds>(now - last_ui).count() >= ui_interval_ms || i+1 == total_bits) {
                     double done = double(i + 1), total = double(total_bits);
                     double elapsed = duration<double>(now - t0).count() + saved_et;
                     double ips = done / std::max(1e-9, elapsed);
                     double eta = (total > done && ips > 0.0) ? (total - done) / ips : 0.0;
                     std::ostringstream line;
-                    line<<"\r[ECM] Curve "<<(c+1)<<"/"<<curves<<" | Stage1 "<<(i+1)<<"/"<<total_bits<<" ("<<fixed<<setprecision(2)<<(done*100.0/total)<<"%) | ETA "<<fmt_hms(eta);
-                    std::cout<<line.str()<<std::flush; last_ui = now;
+                    line << "\r[ECM] Curve " << (c+1) << "/" << curves
+                        << " | Stage1 " << (i+1) << "/" << total_bits
+                        << " (" << std::fixed << std::setprecision(1)  // <== moins de digits
+                        << (done * 100.0 / total) << "%) | ETA " << fmt_hms(eta);
+                    std::cout << line.str() << std::flush;
+                    last_ui = now;
                 }
+
                 if (duration_cast<seconds>(now - last_save).count() >= backup_period) { double elapsed = duration<double>(now - t0).count() + saved_et; save_ckpt((uint32_t)(i + 1), elapsed); last_save = now; }
                 if (interrupted) { double elapsed = duration<double>(now - t0).count() + saved_et; save_ckpt((uint32_t)(i + 1), elapsed); std::cout<<"\n[ECM] Interrupted at curve "<<(c+1)<<", bit "<<(i+1)<<"/"<<total_bits<<"\n"; if (guiServer_) { std::ostringstream oss; oss<<"[ECM] Interrupted at curve "<<(c+1)<<", bit "<<(i+1)<<"/"<<total_bits; guiServer_->appendLog(oss.str()); } curves_tested_for_found=c+1; options.curves_tested_for_found = c+1 ; write_result(); delete eng; return 0; }
             }
@@ -912,20 +918,21 @@ int App::runECMMarin()
                 else        xDBLADD_strict2(2,3, 0,1);
 
                 auto now2 = high_resolution_clock::now();
-                if (duration_cast<milliseconds>(now2 - last2_ui).count() >= 400 || i+1 == stage2_bits) {
+                if (duration_cast<milliseconds>(now2 - last2_ui).count() >= ui_interval_ms || i+1 == stage2_bits) {
                     double done = double(i+1), total = double(stage2_bits);
                     double elapsed = duration<double>(now2 - t2_0).count() + saved_et2;
                     double ips = done / std::max(1e-9, elapsed);
                     double eta = (total > done && ips > 0.0) ? (total - done) / ips : 0.0;
                     std::ostringstream line;
                     line << "\r[ECM] Curve " << (c+1) << "/" << curves
                         << " | Stage2 " << (i+1) << "/" << stage2_bits
-                        << " (" << std::fixed << std::setprecision(2)
+                        << " (" << std::fixed << std::setprecision(1)
                         << (total ? (done*100.0/total) : 100.0)
                         << "%) | ETA " << fmt_hms(eta);
                     std::cout << line.str() << std::flush;
                     last2_ui = now2;
                 }
+
                 if (duration_cast<seconds>(now2 - last2_save).count() >= backup_period) {
                     double elapsed = duration<double>(now2 - t2_0).count() + saved_et2;
                     save_ckpt2((uint32_t)(i + 1), elapsed, stage2_bits);

src/modes/RunEcmTwistedEdwards.cpp

@@ -201,6 +201,7 @@ int App::runECMMarinTwistedEdwards()
     const bool verbose = true;
     const bool forceCurve = (options.curve_seed != 0ULL);
     if (forceCurve) curves =1ULL;
+    const uint32_t progress_interval_ms = (options.ecm_progress_interval_ms > 0) ? options.ecm_progress_interval_ms : 2000;
 
     auto u64_bits = [](uint64_t x)->size_t{ if(!x) return 1; size_t n=0; while(x){ ++n; x>>=1; } return n; };
 
@@ -1518,7 +1519,7 @@ int App::runECMMarinTwistedEdwards()
                 }*/
                 last_check = now;
             }
-            if (duration_cast<milliseconds>(now - last_ui).count() >= 400 || i+1 == total_steps) {
+            if (duration_cast<milliseconds>(now - last_ui).count() >= progress_interval_ms || i+1 == total_steps) {
                 double done = double(i + 1), total = double(total_steps? total_steps:1);
                 double elapsed = duration<double>(now - t0).count() + saved_et;
                 double ips = done / std::max(1e-9, elapsed);
@@ -1675,7 +1676,7 @@ int App::runECMMarinTwistedEdwards()
                 int b = mpz_tstbit(M.get_mpz_t(), bit) ? 1 : 0;
                 if (b==0) xDBLADD_strict(0,1, 2,3); else xDBLADD_strict(2,3, 0,1);
                 auto now2 = high_resolution_clock::now();
-                if (duration_cast<milliseconds>(now2 - last2_ui).count() >= 400 || i+1==stage2_bits){
+                if (duration_cast<milliseconds>(now2 - last2_ui).count() >= progress_interval_ms || i+1==stage2_bits) {
                     double done = double(i+1), total = double(stage2_bits);
                     double elapsed = duration<double>(now2 - t2_0).count() + saved_et2;
                     double ips = done / std::max(1e-9, elapsed);