Discussion related to cado-nfs

[hermann@stamm-wilbrandt.de]

Dear Paul,

On 2023-07-28 19:26, Paul Zimmermann wrote:
> feel free to submit a patch for this. It is the best way to get this 
> feature
> in CADO-NFS real soon now!
find patch at bottom.

Here small functionality test, append " [...]" only >=1h, and not above 
365d:

pi@pi400-64:~/cado-nfs $ python tft.py



 [01:00:00]
 [23:59:59]
 [1d 00:00:01]
 [7d 00:00:01]
 [365d 23:59:59]

pi@pi400-64:~/cado-nfs $ cat tft.py
from tf import tstr


print(tstr(0.499))
print(tstr(0.5))
print(tstr(3599.4))
print(tstr(3600))
print(tstr(24 * 3600 - 1))
print(tstr(24 * 3600 + 1))
print(tstr(7 * 24 * 3600 + 1))
print(tstr(366 * 24 * 3600 - 1))
print(tstr(366 * 24 * 3600))
pi@pi400-64:~/cado-nfs $


And here is git diff:

pi@pi400-64:~/cado-nfs $ git diff scripts/cadofactor/cadotask.py
diff --git a/scripts/cadofactor/cadotask.py 
b/scripts/cadofactor/cadotask.py
index b2eb9844d..d606709b5 100755
--- a/scripts/cadofactor/cadotask.py
+++ b/scripts/cadofactor/cadotask.py
@@ -59,6 +59,17 @@ def re_cap_n_fp(prefix, n, suffix=""):
     return template.format(**REGEXES)


+def tstr(s):
+    i = round(s)
+    if i < 3600 or i >= 366 * 24 * 3600:
+        return ""
+    fmt = ""
+    if i >= 24 * 3600:
+        fmt = "%-jd "
+        i -= 24 * 3600
+    return " [" + time.strftime(fmt + "%H:%M:%S", time.gmtime(i)) + "]"
+
+
 class Polynomial(list):
     """
     >>> p = Polynomial()
@@ -6324,7 +6335,7 @@ class CompleteFactorization(HasState, 
wudb.DbAccess,
             self.logger.info("Total cpu/elapsed time for entire %s: 
%g/%g",
                          self.title, self.cputotal, self.elapsed)
         else:
-            self.logger.info("Total cpu/elapsed time for entire %s 
%g/%g",
+            self.logger.info("Total cpu/elapsed time for entire %s 
%g/%g" + tstr(self.elapsed),
                          self.title, self.cputotal, self.elapsed)

         if last_task and not last_status:
pi@pi400-64:~/cado-nfs $


Regards,

Hermann.