Replaces multi-var str() concat with %-format #124
Conversation
"%s" % (str(1)) -> "%d" % (1) fname+": %d" % 3 -> "%s: %d" % (fname, 3)
| @@ -286,8 +286,9 @@ if args.estrate: | |||
| terr += err | |||
| total += n | |||
| confusions += conf | |||
| print_info("%.5f"%(terr*1.0/total) + " " + terr+ " " + total + " " + args.model) | |||
| print_info("%.5f %d %d %d" % (terr*1.0/total, terr, total, args.model)) | |||
There was a problem hiding this comment.
args.model is a string, i.e. use %s for the last variable.
| return | ||
| if scale<args.minscale: | ||
| print_error("%s: scale (%s) less than --minscale; skipping\n"%(fname,str(scale))) | ||
| print_error("%s: scale (%g) less than --minscale; skipping\n" % (fname, scale)) |
There was a problem hiding this comment.
Any reason you do here first a %f and not as in the subsequent lines %g? (This looks inconsistent also it may not be changing much, because the numbers for scale are normally not that large.)
There was a problem hiding this comment.
%f by default is more precise, 19.493589 seemed preferable to 19.4936 to me in this case. In the other instances, I just stuck with the original formatting since I couldn't test it. I'm not a big fan of exponential format.
There was a problem hiding this comment.
Okay, let us leave it as you have here then.
| return | ||
|
|
||
| # find columns and text lines | ||
|
|
||
| if not args.quiet: print_info("computing segmentation") | ||
| segmentation = compute_segmentation(binary,scale) | ||
| if amax(segmentation)>args.maxlines: | ||
| print_error(fname + ": too many lines" + str(amax(segmentation))) | ||
| print_error("%s too many lines %g" % (fname, amax(segmentation))) |
| print_info("#" + fname) | ||
| if args.parallel<2: print_info("=== "+fname+ " " +str(i)) | ||
| print_info("# %s" % (fname)) | ||
| if args.parallel<2: print_info("=== %s%-3d" % (fname, i)) |
There was a problem hiding this comment.
Add a space here again. This currently looks like
INFO: === tests/testpage.png1
| @@ -192,7 +192,7 @@ def process1(job): | |||
| bin = 1*(flat>args.threshold) | |||
|
|
|||
| # output the normalized grayscale and the thresholded images | |||
| print_info(fname+" lo-hi (%.2f %.2f) angle %4.1f"%(lo,hi,angle) + comment) | |||
| print_info("%s lo-hi (%.2f %.2f) angle %4.1f %s" % (fname, lo, hi, angle, comment)) | |||
There was a problem hiding this comment.
This produces sometimes double spaces, e.g.
INFO: tests/testpage.png lo-hi (0.39 1.44) angle 0.1 no-normalization
There was a problem hiding this comment.
Or is this just reserving enough space for %4.1f?
There was a problem hiding this comment.
The first two spaces are because of %4.f for a value < 10. The second two spaces are fixed now.
|
This looks pretty good. I have one larger remark (which you already changed) and some small nits. |
|
Thank you very much! With this PR you solved two other issues! 🎉 |
This cleans up the print_* calls in those files that redundantly cast numbers to string (as mentioned in #103)