Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New fmtifnum DSL function; make fmtnum/fmtifnum recursive over maps and arrays #946

Merged
merged 7 commits into from
Feb 15, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
unit-test cases
  • Loading branch information
johnkerl committed Feb 15, 2022
commit d50fc5f25d1daecb4c61626de7b748db309369bd
100 changes: 0 additions & 100 deletions docs/src/20.txt

This file was deleted.

1 change: 1 addition & 0 deletions test/cases/dsl-number-formatting/0003/cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mlr --opprint --from test/input/ten.dkvp put -f ./${CASEDIR}/mlr
Empty file.
11 changes: 11 additions & 0 deletions test/cases/dsl-number-formatting/0003/expout
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
a b i x y
(error) pan 1 3.468e-01 0.7268028627434533
(error) pan 2 7.587e-01 -0.5221511083334797
(error) wye 3 2.046e-01 0.33831852551664776
(error) wye 4 3.814e-01 -0.13418874328430463
(error) pan 5 5.733e-01 0.8636244699032729
(error) pan 6 5.271e-01 -0.49322128674835697
(error) zee 7 6.118e-01 0.1878849191181694
(error) wye 8 5.986e-01 0.976181385699006
(error) wye 9 3.144e-02 -0.7495507603507059
(error) wye 10 5.026e-01 0.9526183602969864
3 changes: 3 additions & 0 deletions test/cases/dsl-number-formatting/0003/mlr
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
$a = fmtnum($a, "%8.3e");
$x = fmtnum($x, "%8.3e");

1 change: 1 addition & 0 deletions test/cases/dsl-number-formatting/0004/cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mlr --opprint --from test/input/ten.dkvp put -f ./${CASEDIR}/mlr
Empty file.
11 changes: 11 additions & 0 deletions test/cases/dsl-number-formatting/0004/expout
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
a b i x y
pan pan 1 3.468e-01 0.7268028627434533
eks pan 2 7.587e-01 -0.5221511083334797
wye wye 3 2.046e-01 0.33831852551664776
eks wye 4 3.814e-01 -0.13418874328430463
wye pan 5 5.733e-01 0.8636244699032729
zee pan 6 5.271e-01 -0.49322128674835697
eks zee 7 6.118e-01 0.1878849191181694
zee wye 8 5.986e-01 0.976181385699006
hat wye 9 3.144e-02 -0.7495507603507059
pan wye 10 5.026e-01 0.9526183602969864
3 changes: 3 additions & 0 deletions test/cases/dsl-number-formatting/0004/mlr
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
$a = fmtifnum($a, "%8.3e");
$x = fmtifnum($x, "%8.3e");

1 change: 1 addition & 0 deletions test/cases/dsl-number-formatting/0005/cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mlr --opprint --from test/input/ten.dkvp put -f ./${CASEDIR}/mlr
Empty file.
11 changes: 11 additions & 0 deletions test/cases/dsl-number-formatting/0005/expout
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
a b i x y
(error) (error) 1.000e+00 3.468e-01 7.268e-01
(error) (error) 2.000e+00 7.587e-01 -5.222e-01
(error) (error) 3.000e+00 2.046e-01 3.383e-01
(error) (error) 4.000e+00 3.814e-01 -1.342e-01
(error) (error) 5.000e+00 5.733e-01 8.636e-01
(error) (error) 6.000e+00 5.271e-01 -4.932e-01
(error) (error) 7.000e+00 6.118e-01 1.879e-01
(error) (error) 8.000e+00 5.986e-01 9.762e-01
(error) (error) 9.000e+00 3.144e-02 -7.496e-01
(error) (error) 1.000e+01 5.026e-01 9.526e-01
1 change: 1 addition & 0 deletions test/cases/dsl-number-formatting/0005/mlr
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$* = fmtnum($*, "%8.3e");
1 change: 1 addition & 0 deletions test/cases/dsl-number-formatting/0006/cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mlr --opprint --from test/input/ten.dkvp put -f ./${CASEDIR}/mlr
Empty file.
11 changes: 11 additions & 0 deletions test/cases/dsl-number-formatting/0006/expout
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
a b i x y
pan pan 1.000e+00 3.468e-01 7.268e-01
eks pan 2.000e+00 7.587e-01 -5.222e-01
wye wye 3.000e+00 2.046e-01 3.383e-01
eks wye 4.000e+00 3.814e-01 -1.342e-01
wye pan 5.000e+00 5.733e-01 8.636e-01
zee pan 6.000e+00 5.271e-01 -4.932e-01
eks zee 7.000e+00 6.118e-01 1.879e-01
zee wye 8.000e+00 5.986e-01 9.762e-01
hat wye 9.000e+00 3.144e-02 -7.496e-01
pan wye 1.000e+01 5.026e-01 9.526e-01
1 change: 1 addition & 0 deletions test/cases/dsl-number-formatting/0006/mlr
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$* = fmtifnum($*, "%8.3e");
1 change: 1 addition & 0 deletions test/cases/dsl-number-formatting/0007/cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mlr --ojson --from test/input/ten.dkvp put -f ./${CASEDIR}/mlr
Empty file.
142 changes: 142 additions & 0 deletions test/cases/dsl-number-formatting/0007/expout
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
[
{
"a": "pan",
"b": "pan",
"i": 1,
"x": 0.3467901443380824,
"y": 0.7268028627434533,
"mymap": {
"a": [2.000e+00, 3.400e+00, "e"],
"f": {
"g": [8.000e+00, 9.100e+00],
"h": 1.100e+01
}
}
},
{
"a": "eks",
"b": "pan",
"i": 2,
"x": 0.7586799647899636,
"y": -0.5221511083334797,
"mymap": {
"a": [2.000e+00, 3.400e+00, "e"],
"f": {
"g": [8.000e+00, 9.100e+00],
"h": 1.100e+01
}
}
},
{
"a": "wye",
"b": "wye",
"i": 3,
"x": 0.20460330576630303,
"y": 0.33831852551664776,
"mymap": {
"a": [2.000e+00, 3.400e+00, "e"],
"f": {
"g": [8.000e+00, 9.100e+00],
"h": 1.100e+01
}
}
},
{
"a": "eks",
"b": "wye",
"i": 4,
"x": 0.38139939387114097,
"y": -0.13418874328430463,
"mymap": {
"a": [2.000e+00, 3.400e+00, "e"],
"f": {
"g": [8.000e+00, 9.100e+00],
"h": 1.100e+01
}
}
},
{
"a": "wye",
"b": "pan",
"i": 5,
"x": 0.5732889198020006,
"y": 0.8636244699032729,
"mymap": {
"a": [2.000e+00, 3.400e+00, "e"],
"f": {
"g": [8.000e+00, 9.100e+00],
"h": 1.100e+01
}
}
},
{
"a": "zee",
"b": "pan",
"i": 6,
"x": 0.5271261600918548,
"y": -0.49322128674835697,
"mymap": {
"a": [2.000e+00, 3.400e+00, "e"],
"f": {
"g": [8.000e+00, 9.100e+00],
"h": 1.100e+01
}
}
},
{
"a": "eks",
"b": "zee",
"i": 7,
"x": 0.6117840605678454,
"y": 0.1878849191181694,
"mymap": {
"a": [2.000e+00, 3.400e+00, "e"],
"f": {
"g": [8.000e+00, 9.100e+00],
"h": 1.100e+01
}
}
},
{
"a": "zee",
"b": "wye",
"i": 8,
"x": 0.5985540091064224,
"y": 0.976181385699006,
"mymap": {
"a": [2.000e+00, 3.400e+00, "e"],
"f": {
"g": [8.000e+00, 9.100e+00],
"h": 1.100e+01
}
}
},
{
"a": "hat",
"b": "wye",
"i": 9,
"x": 0.03144187646093577,
"y": -0.7495507603507059,
"mymap": {
"a": [2.000e+00, 3.400e+00, "e"],
"f": {
"g": [8.000e+00, 9.100e+00],
"h": 1.100e+01
}
}
},
{
"a": "pan",
"b": "wye",
"i": 10,
"x": 0.5026260055412137,
"y": 0.9526183602969864,
"mymap": {
"a": [2.000e+00, 3.400e+00, "e"],
"f": {
"g": [8.000e+00, 9.100e+00],
"h": 1.100e+01
}
}
}
]
5 changes: 5 additions & 0 deletions test/cases/dsl-number-formatting/0007/mlr
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
mymap = {
"a": [2,3.4,"e"],
"f": {"g": [8, 9.1], "h": 11},
};
$mymap = fmtifnum(mymap, "%8.3e");