diff --git a/c/containers/xvfuncs.c b/c/containers/xvfuncs.c index e9da58bbd..ec9707763 100644 --- a/c/containers/xvfuncs.c +++ b/c/containers/xvfuncs.c @@ -192,7 +192,7 @@ boxed_xval_t variadic_mapexcept_xfunc( // ---------------------------------------------------------------- // Precondition (validated before we're called): there is at least one argument // which is the map to be unkeyed. -boxed_xval_t variadic_maponly_xfunc( +boxed_xval_t variadic_mapselect_xfunc( boxed_xval_t* pbxvals, int nxvals) { diff --git a/c/containers/xvfuncs.h b/c/containers/xvfuncs.h index fc02333b4..122469aca 100644 --- a/c/containers/xvfuncs.h +++ b/c/containers/xvfuncs.h @@ -315,7 +315,7 @@ boxed_xval_t variadic_mapdiff_xfunc( boxed_xval_t variadic_mapexcept_xfunc( boxed_xval_t* pbxvals, int nxvals); -boxed_xval_t variadic_maponly_xfunc( +boxed_xval_t variadic_mapselect_xfunc( boxed_xval_t* pbxvals, int nxvals); boxed_xval_t m_ss_splitnv_xfunc( diff --git a/c/draft-release-notes.md b/c/draft-release-notes.md index bf132006a..53605b9a1 100644 --- a/c/draft-release-notes.md +++ b/c/draft-release-notes.md @@ -2,7 +2,7 @@ This is a relatively minor release, containing feature requests. **Features:** -* There is a new DSL function [**mapexcept**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-dsl.html#mapexcept) which returns a copy of the argument with specified key(s), if any, unset. Likewise, [**maponly**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-dsl.html#maponly) returns a copy of the argument with only specified key(s), if any, set. This resolves https://github.com/johnkerl/miller/issues/137. +* There is a new DSL function [**mapexcept**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-dsl.html#mapexcept) which returns a copy of the argument with specified key(s), if any, unset. Likewise, [**mapselect**](http://johnkerl.org/miller-releases/miller-5.1.0/doc/reference-dsl.html#mapselect) returns a copy of the argument with only specified key(s), if any, set. This resolves https://github.com/johnkerl/miller/issues/137. **Documentation:** diff --git a/c/dsl/function_manager.c b/c/dsl/function_manager.c index a7eb204b5..62a4b18ea 100644 --- a/c/dsl/function_manager.c +++ b/c/dsl/function_manager.c @@ -393,8 +393,8 @@ static function_lookup_t FUNCTION_LOOKUP_TABLE[] = { "With 2 or more, returns copy of arg 1 with all keys from any of remaining argument maps removed."}, {FUNC_CLASS_MAPS, "mapexcept", 1,1, "Returns a map with keys from remaining arguments, if any, unset.\n" "E.g. 'mapexcept({1:2,3:4,5:6}, 1, 5, 7)' is '{3:4}'."}, - {FUNC_CLASS_MAPS, "maponly", 1,1, "Returns a map with only keys from remaining arguments set.\n" - "E.g. 'maponly({1:2,3:4,5:6}, 1, 5, 7)' is '{1:2,5:6}'."}, + {FUNC_CLASS_MAPS, "mapselect", 1,1, "Returns a map with only keys from remaining arguments set.\n" + "E.g. 'mapselect({1:2,3:4,5:6}, 1, 5, 7)' is '{1:2,5:6}'."}, {FUNC_CLASS_MAPS, "mapsum", 0,1, "With 0 args, returns empty map. With >= 1 arg, returns a map with\n" "key-value pairs from all arguments. Rightmost collisions win, e.g. 'mapsum({1:2,3:4},{1:5})' is '{1:5,3:4}'."}, {FUNC_CLASS_MAPS, "splitkv", 3,0, "Splits string by separators into map with type inference.\n" @@ -1293,8 +1293,8 @@ static rxval_evaluator_t* fmgr_alloc_xevaluator_from_variadic_func_name( } else if (streq(function_name, "mapexcept")) { return rxval_evaluator_alloc_from_variadic_func(variadic_mapexcept_xfunc, parg_nodes, pfmgr, type_inferencing, context_flags); - } else if (streq(function_name, "maponly")) { - return rxval_evaluator_alloc_from_variadic_func(variadic_maponly_xfunc, parg_nodes, + } else if (streq(function_name, "mapselect")) { + return rxval_evaluator_alloc_from_variadic_func(variadic_mapselect_xfunc, parg_nodes, pfmgr, type_inferencing, context_flags); } else { return NULL; diff --git a/c/reg_test/expected/out b/c/reg_test/expected/out index 8a78eb258..c912c4db0 100644 --- a/c/reg_test/expected/out +++ b/c/reg_test/expected/out @@ -54146,8 +54146,8 @@ mlr --from ./reg_test/input/abixy-het put -q o = mapdiff(); dump o mlr --from ./reg_test/input/abixy-het put -q o = mapexcept(); dump o mlr: Function named "mapexcept" takes at least 1 argument; got 0. -mlr --from ./reg_test/input/abixy-het put -q o = maponly(); dump o -mlr: Function named "maponly" takes at least 1 argument; got 0. +mlr --from ./reg_test/input/abixy-het put -q o = mapselect(); dump o +mlr: Function named "mapselect" takes at least 1 argument; got 0. mlr --from ./reg_test/input/abixy-het put -q o = mapsum($*); dump o { @@ -54461,7 +54461,7 @@ mlr --from ./reg_test/input/abixy-het put -q o = mapexcept({"a":999}); dump o "a": 999 } -mlr --from ./reg_test/input/abixy-het put -q o = maponly($*); dump o +mlr --from ./reg_test/input/abixy-het put -q o = mapselect($*); dump o { } { @@ -54483,7 +54483,7 @@ mlr --from ./reg_test/input/abixy-het put -q o = maponly($*); dump o { } -mlr --from ./reg_test/input/abixy-het put -q o = maponly({"a":999}); dump o +mlr --from ./reg_test/input/abixy-het put -q o = mapselect({"a":999}); dump o { } { @@ -54859,7 +54859,7 @@ mlr --from ./reg_test/input/abixy-het put -q o = mapexcept({"a":999}, "nonesuch" "a": 999 } -mlr --from ./reg_test/input/abixy-het put -q o = maponly($*, "a"); dump o +mlr --from ./reg_test/input/abixy-het put -q o = mapselect($*, "a"); dump o { "a": "pan" } @@ -54889,7 +54889,7 @@ mlr --from ./reg_test/input/abixy-het put -q o = maponly($*, "a"); dump o "a": "pan" } -mlr --from ./reg_test/input/abixy-het put -q o = maponly({"a":999}, "a"); dump o +mlr --from ./reg_test/input/abixy-het put -q o = mapselect({"a":999}, "a"); dump o { "a": 999 } @@ -54921,7 +54921,7 @@ mlr --from ./reg_test/input/abixy-het put -q o = maponly({"a":999}, "a"); dump o "a": 999 } -mlr --from ./reg_test/input/abixy-het put -q o = maponly({"a":999}, "nonesuch"); dump o +mlr --from ./reg_test/input/abixy-het put -q o = mapselect({"a":999}, "nonesuch"); dump o { } { @@ -55231,7 +55231,7 @@ mlr --from ./reg_test/input/abixy-het put -q o = mapexcept($*, "a", "b"); dump o "y": 0.9526183602969864 } -mlr --from ./reg_test/input/abixy-het put -q o = maponly({"a":999}, "b", "nonesuch"); dump o +mlr --from ./reg_test/input/abixy-het put -q o = mapselect({"a":999}, "b", "nonesuch"); dump o { } { @@ -55253,7 +55253,7 @@ mlr --from ./reg_test/input/abixy-het put -q o = maponly({"a":999}, "b", "nonesu { } -mlr --from ./reg_test/input/abixy-het put -q o = maponly($*, "a", "b"); dump o +mlr --from ./reg_test/input/abixy-het put -q o = mapselect($*, "a", "b"); dump o { "a": "pan", "b": "pan" @@ -55291,7 +55291,7 @@ mlr --from ./reg_test/input/abixy-het put -q o = maponly($*, "a", "b"); dump o "b": "wye" } -mlr --from ./reg_test/input/abixy-het put -q o = maponly({"a":999}, "b", "nonesuch"); dump o +mlr --from ./reg_test/input/abixy-het put -q o = mapselect({"a":999}, "b", "nonesuch"); dump o { } { diff --git a/c/reg_test/run b/c/reg_test/run index cf0ab1109..685df3536 100755 --- a/c/reg_test/run +++ b/c/reg_test/run @@ -6246,7 +6246,7 @@ announce MAPSUM/MAPDIFF/MAPEXCEPT run_mlr --from $indir/abixy-het put -q 'o = mapsum(); dump o' run_mlr --from $indir/abixy-het put -q 'o = mapdiff(); dump o' mlr_expect_fail --from $indir/abixy-het put -q 'o = mapexcept(); dump o' -mlr_expect_fail --from $indir/abixy-het put -q 'o = maponly(); dump o' +mlr_expect_fail --from $indir/abixy-het put -q 'o = mapselect(); dump o' run_mlr --from $indir/abixy-het put -q 'o = mapsum($*); dump o' run_mlr --from $indir/abixy-het put -q 'o = mapsum({"a":999}); dump o' @@ -6254,8 +6254,8 @@ run_mlr --from $indir/abixy-het put -q 'o = mapdiff($*); dump o' run_mlr --from $indir/abixy-het put -q 'o = mapdiff({"a":999}); dump o' run_mlr --from $indir/abixy-het put -q 'o = mapexcept($*); dump o' run_mlr --from $indir/abixy-het put -q 'o = mapexcept({"a":999}); dump o' -run_mlr --from $indir/abixy-het put -q 'o = maponly($*); dump o' -run_mlr --from $indir/abixy-het put -q 'o = maponly({"a":999}); dump o' +run_mlr --from $indir/abixy-het put -q 'o = mapselect($*); dump o' +run_mlr --from $indir/abixy-het put -q 'o = mapselect({"a":999}); dump o' run_mlr --from $indir/abixy-het put -q 'o = mapsum($*, {"a":999}); dump o' run_mlr --from $indir/abixy-het put -q 'o = mapsum({"a":999}, $*); dump o' @@ -6264,18 +6264,18 @@ run_mlr --from $indir/abixy-het put -q 'o = mapdiff({"a":999}, $*); dump o' run_mlr --from $indir/abixy-het put -q 'o = mapexcept($*, "a"); dump o' run_mlr --from $indir/abixy-het put -q 'o = mapexcept({"a":999}, "a"); dump o' run_mlr --from $indir/abixy-het put -q 'o = mapexcept({"a":999}, "nonesuch"); dump o' -run_mlr --from $indir/abixy-het put -q 'o = maponly($*, "a"); dump o' -run_mlr --from $indir/abixy-het put -q 'o = maponly({"a":999}, "a"); dump o' -run_mlr --from $indir/abixy-het put -q 'o = maponly({"a":999}, "nonesuch"); dump o' +run_mlr --from $indir/abixy-het put -q 'o = mapselect($*, "a"); dump o' +run_mlr --from $indir/abixy-het put -q 'o = mapselect({"a":999}, "a"); dump o' +run_mlr --from $indir/abixy-het put -q 'o = mapselect({"a":999}, "nonesuch"); dump o' run_mlr --from $indir/abixy-het put -q 'o = mapsum($*, {"a":999}, {"b": 444}); dump o' run_mlr --from $indir/abixy-het put -q 'o = mapsum({"a":999}, $*, {"b": 444}); dump o' run_mlr --from $indir/abixy-het put -q 'o = mapdiff($*, {"a":999}, {"b": 444}); dump o' run_mlr --from $indir/abixy-het put -q 'o = mapdiff({"a":999}, $*, {"b": 444}); dump o' run_mlr --from $indir/abixy-het put -q 'o = mapexcept($*, "a", "b"); dump o' -run_mlr --from $indir/abixy-het put -q 'o = maponly({"a":999}, "b", "nonesuch"); dump o' -run_mlr --from $indir/abixy-het put -q 'o = maponly($*, "a", "b"); dump o' -run_mlr --from $indir/abixy-het put -q 'o = maponly({"a":999}, "b", "nonesuch"); dump o' +run_mlr --from $indir/abixy-het put -q 'o = mapselect({"a":999}, "b", "nonesuch"); dump o' +run_mlr --from $indir/abixy-het put -q 'o = mapselect($*, "a", "b"); dump o' +run_mlr --from $indir/abixy-het put -q 'o = mapselect({"a":999}, "b", "nonesuch"); dump o' # ---------------------------------------------------------------- announce EXTENDED TYPEOF diff --git a/c/todo.txt b/c/todo.txt index 53d85673e..620201031 100644 --- a/c/todo.txt +++ b/c/todo.txt @@ -6,7 +6,6 @@ BUGFIXES ================================================================ FUNDAM: -* push * synctool alias/flag handling ... ================================================================ diff --git a/doc/data-examples.html b/doc/data-examples.html index 2b72b9522..809aa0269 100644 --- a/doc/data-examples.html +++ b/doc/data-examples.html @@ -208,24 +208,10 @@ obtained from
 $ head -n 2 data/flins.csv | mlr --icsv --oxtab cat
-policyID           119736
-statecode          FL
-county             CLAY COUNTY
-eq_site_limit      498960
-hu_site_limit      498960
-fl_site_limit      498960
-fr_site_limit      498960
-tiv_2011           498960
-tiv_2012           792148.9
-eq_site_deductible 0
-hu_site_deductible 9979.2
-fl_site_deductible 0
-fr_site_deductible 0
-point_latitude     30.102261
-point_longitude    -81.711777
-line               Residential
-construction       Masonry
-point_granularity  1
+county   Seminole
+tiv_2011 22890.55
+tiv_2012 20848.71
+line     Residential
 

@@ -234,16 +220,13 @@ point_granularity 1

 $ mlr --from data/flins.csv --icsv --opprint count-distinct -f county | head
-county              count
-CLAY COUNTY         363
-SUWANNEE COUNTY     154
-NASSAU COUNTY       135
-COLUMBIA COUNTY     125
-ST  JOHNS COUNTY    657
-BAKER COUNTY        70
-BRADFORD COUNTY     31
-HAMILTON COUNTY     35
-UNION COUNTY        15
+county     count
+Seminole   1
+Miami Dade 2
+Palm Beach 1
+Highlands  2
+Duval      1
+St. Johns  1
 

@@ -251,12 +234,6 @@ UNION COUNTY 15

 $ mlr --from data/flins.csv --icsv --opprint count-distinct -f construction,line
-construction        line        count
-Masonry             Residential 9257
-Wood                Residential 21581
-Reinforced Concrete Commercial  1299
-Reinforced Masonry  Commercial  4225
-Steel Frame         Commercial  272
 

@@ -266,7 +243,7 @@ Steel Frame Commercial 272

 $ mlr --from data/flins.csv --icsv --opprint stats1 -a min,mean,max -f tiv_2012
 tiv_2012_min tiv_2012_mean  tiv_2012_max
-73.370000    2571004.097342 1701000000.000000
+19757.910000 1061531.463750 2785551.630000
 

@@ -274,12 +251,6 @@ tiv_2012_min tiv_2012_mean tiv_2012_max

 $ mlr --from data/flins.csv --icsv --opprint stats1 -a min,mean,max -f tiv_2012 -g construction,line
-construction        line        tiv_2012_min   tiv_2012_mean    tiv_2012_max
-Masonry             Residential 261168.070000  1041986.129217   3234970.920000
-Wood                Residential 73.370000      113493.017049    649046.120000
-Reinforced Concrete Commercial  6416016.010000 20212428.681840  60570000.000000
-Reinforced Masonry  Commercial  1287817.340000 4621372.981117   16650000.000000
-Steel Frame         Commercial  29790000       133492500.000000 1701000000
 

@@ -288,13 +259,13 @@ Steel Frame Commercial 29790000 133492500.000000 1701000000

 $ mlr --from data/flins.csv --icsv --oxtab stats1 -a p0,p10,p50,p90,p95,p99,p100 -f hu_site_deductible
-hu_site_deductible_p0   0
-hu_site_deductible_p10  0
-hu_site_deductible_p50  0
-hu_site_deductible_p90  76.500000
-hu_site_deductible_p95  6829.200000
-hu_site_deductible_p99  126270
-hu_site_deductible_p100 7380000
+hu_site_deductible_p0
+hu_site_deductible_p10
+hu_site_deductible_p50
+hu_site_deductible_p90
+hu_site_deductible_p95
+hu_site_deductible_p99
+hu_site_deductible_p100
 

@@ -302,16 +273,13 @@ hu_site_deductible_p100 7380000

 $ mlr --from data/flins.csv --icsv --opprint stats1 -a p95,p99,p100 -f hu_site_deductible -g county then sort -f county | head
-county              hu_site_deductible_p95 hu_site_deductible_p99 hu_site_deductible_p100
-ALACHUA COUNTY      30630.600000           107312.400000          1641375
-BAKER COUNTY        0                      0                      0
-BAY COUNTY          26131.500000           181912.500000          630000
-BRADFORD COUNTY     3355.200000            8163                   8163
-BREVARD COUNTY      5360.400000            78975                  1973461.500000
-BROWARD COUNTY      0                      148500                 3258900
-CALHOUN COUNTY      0                      33339.600000           33339.600000
-CHARLOTTE COUNTY    5400                   52650                  250994.700000
-CITRUS COUNTY       1332.900000            79974.900000           483785.100000
+county     hu_site_deductible_p95 hu_site_deductible_p99 hu_site_deductible_p100
+Duval      -                      -                      -
+Highlands  -                      -                      -
+Miami Dade -                      -                      -
+Palm Beach -                      -                      -
+Seminole   -                      -                      -
+St. Johns  -                      -                      -
 

@@ -319,11 +287,11 @@ CITRUS COUNTY 1332.900000 79974.900000 483785.100000

 $ mlr --from data/flins.csv --icsv --oxtab stats2 -a corr,linreg-ols,r2 -f tiv_2011,tiv_2012
-tiv_2011_tiv_2012_corr  0.973050
-tiv_2011_tiv_2012_ols_m 0.983558
-tiv_2011_tiv_2012_ols_b 433854.642897
-tiv_2011_tiv_2012_ols_n 36634
-tiv_2011_tiv_2012_r2    0.946826
+tiv_2011_tiv_2012_corr  0.935363
+tiv_2011_tiv_2012_ols_m 1.089091
+tiv_2011_tiv_2012_ols_b 103095.523356
+tiv_2011_tiv_2012_ols_n 8
+tiv_2011_tiv_2012_r2    0.874904
 

@@ -331,74 +299,13 @@ tiv_2011_tiv_2012_r2 0.946826

 $ mlr --from data/flins.csv --icsv --opprint stats2 -a corr,linreg-ols,r2 -f tiv_2011,tiv_2012 -g county
-county              tiv_2011_tiv_2012_corr tiv_2011_tiv_2012_ols_m tiv_2011_tiv_2012_ols_b tiv_2011_tiv_2012_ols_n tiv_2011_tiv_2012_r2
-CLAY COUNTY         0.962716               1.090115                46450.531268            363                     0.926822
-SUWANNEE COUNTY     0.989208               1.074658                36253.003174            154                     0.978533
-NASSAU COUNTY       0.973135               1.296321                -45369.242673           135                     0.946993
-COLUMBIA COUNTY     0.999492               0.931447                117183.548383           125                     0.998985
-ST  JOHNS COUNTY    0.966170               1.230056                -596.623856             657                     0.933485
-BAKER COUNTY        0.963515               0.942771                29063.065747            70                      0.928360
-BRADFORD COUNTY     0.999766               0.849029                69544.341944            31                      0.999533
-HAMILTON COUNTY     0.987026               1.224952                1045.052170             35                      0.974220
-UNION COUNTY        0.997745               1.432575                -56.125738              15                      0.995495
-MADISON COUNTY      0.985213               1.512114                -84278.028498           81                      0.970645
-LAFAYETTE COUNTY    0.967499               1.134289                9904.860798             68                      0.936055
-FLAGLER COUNTY      0.984854               1.007922                95340.508354            204                     0.969937
-DUVAL COUNTY        0.978815               1.245630                -60831.675023           1894                    0.958079
-LAKE COUNTY         0.999727               1.293864                -107695.848518          206                     0.999455
-VOLUSIA COUNTY      0.994636               1.202247                -36277.755477           1367                    0.989300
-PUTNAM COUNTY       0.961167               1.176294                6405.060826             268                     0.923841
-MARION COUNTY       0.975774               1.175642                20434.945602            1138                    0.952136
-SUMTER COUNTY       0.989760               1.372395                -62648.989750           158                     0.979625
-LEON COUNTY         0.978644               1.259681                -90816.033261           246                     0.957743
-FRANKLIN COUNTY     0.989430               1.048513                36026.508852            37                      0.978972
-LIBERTY COUNTY      0.995175               1.369834                -79755.544362           36                      0.990373
-GADSDEN COUNTY      0.997898               1.180585                7335.013009             196                     0.995801
-WAKULLA COUNTY      0.978267               1.192350                44607.922080            85                      0.957006
-JEFFERSON COUNTY    0.976543               0.976066                74884.170791            57                      0.953637
-TAYLOR COUNTY       0.981770               1.386188                -56856.945239           113                     0.963873
-BAY COUNTY          0.975404               1.004452                373000.300167           403                     0.951412
-WALTON COUNTY       0.985855               1.319583                -83273.091503           288                     0.971909
-JACKSON COUNTY      0.991195               1.171538                8128.438198             208                     0.982468
-CALHOUN COUNTY      0.967974               1.274077                -739.602262             68                      0.936973
-HOLMES COUNTY       0.997366               1.159384                42610.647058            40                      0.994738
-WASHINGTON COUNTY   0.982582               1.213413                -13125.214494           116                     0.965468
-GULF COUNTY         0.990367               1.135626                26094.474571            72                      0.980826
-ESCAMBIA COUNTY     0.986666               1.195336                46106.277408            494                     0.973509
-SANTA ROSA COUNTY   0.972696               1.013849                30496.045069            856                     0.946138
-OKALOOSA COUNTY     0.970781               1.462083                -116127.032201          1115                    0.942416
-ALACHUA COUNTY      0.982825               1.142748                52671.269211            973                     0.965945
-GILCHRIST COUNTY    0.977467               1.375740                -15309.425813           39                      0.955442
-LEVY COUNTY         0.956302               1.200506                265.391211              126                     0.914513
-DIXIE COUNTY        0.995780               1.640150                -98273.767115           40                      0.991578
-SEMINOLE COUNTY     0.985925               0.880108                427892.123991           1100                    0.972048
-ORANGE COUNTY       0.990658               0.872027                1298970.668186          1811                    0.981403
-BREVARD COUNTY      0.978015               1.271225                -19295.177646           872                     0.956513
-INDIAN RIVER COUNTY 0.985673               1.284620                -116579.613922          380                     0.971550
-MIAMI DADE COUNTY   0.987833               1.293106                -237168.505282          4315                    0.975815
-BROWARD COUNTY      0.983847               1.187689                81931.896276            3193                    0.967954
-MONROE COUNTY       0.982555               1.013142                455469.576218           152                     0.965414
-PALM BEACH COUNTY   0.982591               1.247594                -77252.429421           2791                    0.965485
-MARTIN COUNTY       0.975896               1.032873                8668.746202             109                     0.952374
-HENDRY COUNTY       0.971645               0.969699                208613.031856           74                      0.944093
-PASCO COUNTY        0.986556               1.288225                -152936.104164          790                     0.973294
-GLADES COUNTY       0.983518               0.982993                125666.627729           22                      0.967308
-HILLSBOROUGH COUNTY 0.985446               1.211620                214512.927989           1166                    0.971103
-HERNANDO COUNTY     0.974068               0.759748                701096.129434           120                     0.948809
-PINELLAS COUNTY     0.987215               1.154797                38609.763660            1774                    0.974593
-POLK COUNTY         0.979963               1.094848                153371.308143           1629                    0.960327
-North Fort Myers    -                      -                       -                       1                       -
-Orlando             -                      -                       -                       1                       -
-HIGHLANDS COUNTY    0.993054               1.528760                -300198.361569          369                     0.986157
-HARDEE COUNTY       0.977999               1.323440                -98513.434797           81                      0.956482
-MANATEE COUNTY      0.967526               1.068496                137190.708238           518                     0.936106
-OSCEOLA COUNTY      -                      -                       -                       1                       -
-LEE COUNTY          0.978945               1.252722                -16843.109269           678                     0.958334
-CHARLOTTE COUNTY    0.979024               1.013211                178461.328878           414                     0.958488
-COLLIER COUNTY      0.958031               1.169759                110270.385201           787                     0.917824
-SARASOTA COUNTY     0.984781               1.292514                -109939.723017          417                     0.969793
-DESOTO COUNTY       0.980130               1.286205                -9987.042982            108                     0.960654
-CITRUS COUNTY       0.989943               0.965940                138635.818880           384                     0.979986
+county     tiv_2011_tiv_2012_corr tiv_2011_tiv_2012_ols_m tiv_2011_tiv_2012_ols_b tiv_2011_tiv_2012_ols_n tiv_2011_tiv_2012_r2
+Seminole   -                      -                       -                       1                       -
+Miami Dade 1.000000               0.930643                -2311.154328            2                       1.000000
+Palm Beach -                      -                       -                       1                       -
+Highlands  1.000000               1.055693                -4529.793939            2                       1.000000
+Duval      -                      -                       -                       1                       -
+St. Johns  -                      -                       -                       1                       -
 

diff --git a/doc/manpage.html b/doc/manpage.html index ff4691712..08a187d73 100644 --- a/doc/manpage.html +++ b/doc/manpage.html @@ -338,7 +338,7 @@ OPTIONS asserting_map asserting_nonempty_map asserting_not_empty asserting_not_map asserting_not_null asserting_null asserting_numeric asserting_present asserting_string boolean float fmtnum hexfmt int string typeof depth haskey - joink joinkv joinv leafcount length mapdiff mapexcept maponly mapsum splitkv + joink joinkv joinv leafcount length mapdiff mapexcept mapselect mapsum splitkv splitkvx splitnv splitnvx Please use "mlr --help-function {function name}" for function-specific help. @@ -1820,9 +1820,9 @@ FUNCTIONS FOR FILTER/PUT (class=maps variadic): Returns a map with keys from remaining arguments, if any, unset. E.g. 'mapexcept({1:2,3:4,5:6}, 1, 5, 7)' is '{3:4}'. - maponly + mapselect (class=maps variadic): Returns a map with only keys from remaining arguments set. - E.g. 'maponly({1:2,3:4,5:6}, 1, 5, 7)' is '{1:2,5:6}'. + E.g. 'mapselect({1:2,3:4,5:6}, 1, 5, 7)' is '{1:2,5:6}'. mapsum (class=maps variadic): With 0 args, returns empty map. With >= 1 arg, returns a map with @@ -2204,7 +2204,7 @@ SEE ALSO - 2017-04-25 MILLER(1) + 2017-04-26 MILLER(1)

diff --git a/doc/manpage.txt b/doc/manpage.txt index 972a76048..f2123f694 100644 --- a/doc/manpage.txt +++ b/doc/manpage.txt @@ -145,7 +145,7 @@ OPTIONS asserting_map asserting_nonempty_map asserting_not_empty asserting_not_map asserting_not_null asserting_null asserting_numeric asserting_present asserting_string boolean float fmtnum hexfmt int string typeof depth haskey - joink joinkv joinv leafcount length mapdiff mapexcept maponly mapsum splitkv + joink joinkv joinv leafcount length mapdiff mapexcept mapselect mapsum splitkv splitkvx splitnv splitnvx Please use "mlr --help-function {function name}" for function-specific help. @@ -1627,9 +1627,9 @@ FUNCTIONS FOR FILTER/PUT (class=maps variadic): Returns a map with keys from remaining arguments, if any, unset. E.g. 'mapexcept({1:2,3:4,5:6}, 1, 5, 7)' is '{3:4}'. - maponly + mapselect (class=maps variadic): Returns a map with only keys from remaining arguments set. - E.g. 'maponly({1:2,3:4,5:6}, 1, 5, 7)' is '{1:2,5:6}'. + E.g. 'mapselect({1:2,3:4,5:6}, 1, 5, 7)' is '{1:2,5:6}'. mapsum (class=maps variadic): With 0 args, returns empty map. With >= 1 arg, returns a map with @@ -2011,4 +2011,4 @@ SEE ALSO - 2017-04-25 MILLER(1) + 2017-04-26 MILLER(1) diff --git a/doc/mlr.1 b/doc/mlr.1 index 29b1a6e66..fe0b25b63 100644 --- a/doc/mlr.1 +++ b/doc/mlr.1 @@ -2,12 +2,12 @@ .\" Title: mlr .\" Author: [see the "AUTHOR" section] .\" Generator: ./mkman.rb -.\" Date: 2017-04-25 +.\" Date: 2017-04-26 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "MILLER" "1" "2017-04-25" "\ \&" "\ \&" +.TH "MILLER" "1" "2017-04-26" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Portability definitions .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -194,7 +194,7 @@ output separator to the given value. asserting_map asserting_nonempty_map asserting_not_empty asserting_not_map asserting_not_null asserting_null asserting_numeric asserting_present asserting_string boolean float fmtnum hexfmt int string typeof depth haskey - joink joinkv joinv leafcount length mapdiff mapexcept maponly mapsum splitkv + joink joinkv joinv leafcount length mapdiff mapexcept mapselect mapsum splitkv splitkvx splitnv splitnvx Please use "mlr --help-function {function name}" for function-specific help. @@ -2812,13 +2812,13 @@ E.g. 'mapexcept({1:2,3:4,5:6}, 1, 5, 7)' is '{3:4}'. .fi .if n \{\ .RE -.SS "maponly" +.SS "mapselect" .if n \{\ .RS 0 .\} .nf (class=maps variadic): Returns a map with only keys from remaining arguments set. -E.g. 'maponly({1:2,3:4,5:6}, 1, 5, 7)' is '{1:2,5:6}'. +E.g. 'mapselect({1:2,3:4,5:6}, 1, 5, 7)' is '{1:2,5:6}'. .fi .if n \{\ .RE diff --git a/doc/reference-dsl.html b/doc/reference-dsl.html index 4a6620ee3..46ae9124f 100644 --- a/doc/reference-dsl.html +++ b/doc/reference-dsl.html @@ -331,7 +331,7 @@ Miller commands were run with pretty-print-tabular output format.     • madd
    • mapdiff
    • mapexcept
-    • maponly
+    • mapselect
    • mapsum
    • max
    • mexp
@@ -4774,13 +4774,13 @@ E.g. 'mapexcept({1:2,3:4,5:6}, 1, 5, 7)' is '{3:4}'. -

maponly

+

mapselect

-maponly (class=maps variadic): Returns a map with only keys from remaining arguments set.
-E.g. 'maponly({1:2,3:4,5:6}, 1, 5, 7)' is '{1:2,5:6}'.
+mapselect (class=maps variadic): Returns a map with only keys from remaining arguments set.
+E.g. 'mapselect({1:2,3:4,5:6}, 1, 5, 7)' is '{1:2,5:6}'.
 
diff --git a/doc/reference.html b/doc/reference.html index 5e7756b96..bd01dd3f7 100644 --- a/doc/reference.html +++ b/doc/reference.html @@ -1378,7 +1378,7 @@ Functions for the filter and put verbs: asserting_not_map asserting_not_null asserting_null asserting_numeric asserting_present asserting_string boolean float fmtnum hexfmt int string typeof depth haskey joink joinkv joinv leafcount length mapdiff mapexcept - maponly mapsum splitkv splitkvx splitnv splitnvx + mapselect mapsum splitkv splitkvx splitnv splitnvx Please use "mlr --help-function {function name}" for function-specific help.