int parameters can now be formatted by %d #2431
Conversation
matthewrmshin
force-pushed
the
allow-percent-d-tmpl-for-int-params
branch
from
4a0e6f8
to
0db4996
Compare
matthewrmshin
requested review from
hjoliver,
oliver-sanders and
dvalters
and removed request for
hjoliver
lib/cylc/param_expand.py
Outdated
| @@ -296,7 +295,8 @@ def expand(self, line): | |||
| except ValueError: | |||
| nval = val | |||
| else: | |||
| nval = val.zfill(len(self.param_cfg[pname][0])) | |||
| nval = val.zfill( | |||
| len(str(self.param_cfg[pname][0]))) | |||
There was a problem hiding this comment.
Why has this case been handled differently to the previous example https://github.com/cylc/cylc/pull/2431/files#diff-4b401b4bbdbea5e41b7f93c7b9ef92d8R157?
lib/cylc/param_expand.py
Outdated
| ivals = [str(i) for i in range(2)] | ||
| jvals = [str(j) for j in range(3)] | ||
| kvals = [str(k) for k in range(2)] | ||
| ivals = [i for i in range(2)] |
There was a problem hiding this comment.
list(range(2)) (actually just range(2) works for python 2.x)?
|
All comments addressed. |
It is now OK to use `%d` template for integer-only parameters.
doc/src/cylc-user-guide/cug.tex
Outdated
| [[parameters]] | ||
| p = 3..14 | ||
| [[parameter templates]] | ||
| p = %%p%(p)03d # suffixes = %p003, %p004, ..., %p013, %p014 |
There was a problem hiding this comment.
I think this may be clearer without the escaped %:
p = p%(p)03d # suffixes = p003, p004, ..., p013, p014There was a problem hiding this comment.
In which case, I'll add another example. (I think it will still be useful to have an example on how to have a % in your template.)
doc/src/cylc-user-guide/cug.tex
Outdated
| @@ -4658,11 +4664,11 @@ \subsubsection{Selecting Partial Parameter Ranges} | |||
| \begin{lstlisting} | |||
| [cylc] | |||
| [[parameters]] | |||
| run = 1..10 # 01, 02, ..., 10 | |||
| runx = 1..03 # 01, 02, 03 (note `03' to get correct padding) | |||
| run = 1..10 # 1, 2, ..., 10 | |||
There was a problem hiding this comment.
This still results in 01, 02, ... 10?
There was a problem hiding this comment.
The numbers are now stored internally as int 1, 2, ..., 10, but will then have a default template like _run%(run)02d, so the suffixes will continue to be _run01, _run02, ..., _run10.
doc/src/cylc-user-guide/cug.tex
Outdated
| [[parameter templates]] | ||
| run = _R%(run)s | ||
| runx = _R%(runx)s | ||
| run = _R%(run)02d |
There was a problem hiding this comment.
Perhaps move the comments here i.e:
run = _R%(run)02d # _R01, _R02, ..., _R10
runx = _R%(runx)02d # _R01, _R02, _R03
|
Updated as the original version of this comment was factually incorrect. As an aside, it looks like we have a similar issue with Before #2360, the value was zero-padded for integer parameters with width fixed to the maximum as-defined string width. After #2360, the value is still zero-padded, but with width fixed to the width of the maximum integer value. Zero padded decimal is:
The current change means that the value of Thinking aloud, perhaps it is worth having a bit more flexibility for the value (and even the naming of) the environment variable? The |
|
Note: #2435 is somewhat related to this. |
Allow and test usage of a
%dformat in a parameter template (for task suffixes).