This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository r-cran-plyr.
commit 9b70679a6ecbf3b68543ae2d37a11142aeecb01d Author: Andreas Tille <[email protected]> Date: Sun Oct 30 07:06:10 2016 +0100 New upstream version 1.8.4 --- DESCRIPTION | 9 +- MD5 | 220 ++++++++++++++++++++--------------------- NAMESPACE | 3 +- R/l_ply.r | 2 +- R/llply.r | 2 +- R/loop_apply.R | 3 +- R/progress-time.r | 6 +- R/progress.r | 12 +-- R/quote.r | 2 +- R/rbind-fill-matrix.r | 2 +- R/rbind-fill.r | 2 +- R/vaggregate.r | 2 +- README.md | 5 +- man/a_ply.Rd | 8 +- man/aaply.Rd | 10 +- man/adply.Rd | 10 +- man/alply.Rd | 10 +- man/amv_dim.Rd | 2 +- man/amv_dimnames.Rd | 2 +- man/arrange.Rd | 2 +- man/as.data.frame.function.Rd | 2 +- man/as.list.split.Rd | 2 +- man/as.quoted.Rd | 2 +- man/baseball.Rd | 2 +- man/colwise.Rd | 2 +- man/compact.Rd | 2 +- man/count.Rd | 2 +- man/create_progress_bar.Rd | 2 +- man/d_ply.Rd | 8 +- man/daply.Rd | 10 +- man/ddply.Rd | 10 +- man/defaults.Rd | 2 +- man/desc.Rd | 2 +- man/dims.Rd | 2 +- man/dlply.Rd | 10 +- man/each.Rd | 2 +- man/empty.Rd | 2 +- man/eval.quoted.Rd | 2 +- man/failwith.Rd | 2 +- man/get-split.Rd | 2 +- man/here.Rd | 2 +- man/id.Rd | 2 +- man/id_var.Rd | 2 +- man/idata.frame.Rd | 2 +- man/indexed_array.Rd | 2 +- man/indexed_df.Rd | 2 +- man/is.discrete.Rd | 2 +- man/is.formula.Rd | 2 +- man/isplit2.Rd | 2 +- man/join.Rd | 2 +- man/join.keys.Rd | 2 +- man/join_all.Rd | 2 +- man/l_ply.Rd | 6 +- man/laply.Rd | 8 +- man/ldply.Rd | 8 +- man/liply.Rd | 2 +- man/list_to_array.Rd | 4 +- man/list_to_dataframe.Rd | 4 +- man/list_to_vector.Rd | 4 +- man/llply.Rd | 8 +- man/loop_apply.Rd | 2 +- man/m_ply.Rd | 8 +- man/maply.Rd | 10 +- man/mapvalues.Rd | 4 +- man/match_df.Rd | 2 +- man/mdply.Rd | 10 +- man/mlply.Rd | 10 +- man/mutate.Rd | 2 +- man/name_rows.Rd | 2 +- man/names.quoted.Rd | 2 +- man/nunique.Rd | 2 +- man/ozone.Rd | 2 +- man/plyr-deprecated.Rd | 2 +- man/plyr.Rd | 2 +- man/print.quoted.Rd | 2 +- man/print.split.Rd | 2 +- man/progress_none.Rd | 6 +- man/progress_text.Rd | 6 +- man/progress_time.Rd | 6 +- man/progress_tk.Rd | 6 +- man/progress_win.Rd | 6 +- man/quickdf.Rd | 2 +- man/quoted.Rd | 2 +- man/r_ply.Rd | 2 +- man/raply.Rd | 2 +- man/rbind.fill.Rd | 2 +- man/rbind.fill.matrix.Rd | 2 +- man/rdply.Rd | 2 +- man/reduce_dim.Rd | 2 +- man/rename.Rd | 2 +- man/revalue.Rd | 4 +- man/rlply.Rd | 2 +- man/round_any.Rd | 2 +- man/splat.Rd | 2 +- man/split_indices.Rd | 2 +- man/split_labels.Rd | 2 +- man/splitter_a.Rd | 2 +- man/splitter_d.Rd | 2 +- man/strip_splits.Rd | 2 +- man/summarise.Rd | 2 +- man/take.Rd | 2 +- man/true.Rd | 2 +- man/try_default.Rd | 2 +- man/tryapply.Rd | 2 +- man/unrowname.Rd | 2 +- man/vaggregate.Rd | 4 +- src/loop_apply.c | 2 +- tests/testthat/test-array.r | 7 +- tests/testthat/test-parallel.r | 14 +-- tests/testthat/test-rbind.r | 2 +- tests/testthat/test-revalue.r | 18 ++-- 111 files changed, 325 insertions(+), 318 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 7c525e6..e1ba8f3 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: plyr -Version: 1.8.3 +Version: 1.8.4 Title: Tools for Splitting, Applying and Combining Data Description: A set of tools that solves a common set of problems: you need to break a big problem down into manageable pieces, operate on each @@ -15,12 +15,13 @@ Depends: R (>= 3.1.0) Imports: Rcpp (>= 0.11.0) LinkingTo: Rcpp Suggests: abind, testthat, tcltk, foreach, doParallel, itertools, - iterators + iterators, covr License: MIT + file LICENSE LazyData: true +RoxygenNote: 5.0.1 NeedsCompilation: yes -Packaged: 2015-06-11 13:04:58 UTC; hadley +Packaged: 2016-06-07 19:58:36 UTC; hadley Author: Hadley Wickham [aut, cre] Maintainer: Hadley Wickham <[email protected]> Repository: CRAN -Date/Publication: 2015-06-12 11:05:51 +Date/Publication: 2016-06-08 10:40:15 diff --git a/MD5 b/MD5 index bf1ec98..fccadba 100644 --- a/MD5 +++ b/MD5 @@ -1,6 +1,6 @@ -36d5fb6a0ec237c345163967fc9bd932 *DESCRIPTION +0eabd769da21390813bfa84e25ff25d0 *DESCRIPTION 7bb6b2019939096672a443d7b6e80d5b *LICENSE -7d27e6544333941b8a6bb428284e94a5 *NAMESPACE +4b64244b65e48806ddb6e52b08e29701 *NAMESPACE b2c019f5dfd0df9d5bbbd15200be5f71 *R/RcppExports.R 2cacb3ab0a140e444938f826a09b7a0d *R/a_ply.r 4b2f1db5592db1334de9bd61ee98436b *R/aaply.r @@ -26,15 +26,15 @@ fc14994abc7f86af89a188295a2dc5f5 *R/indexed-array.r 4e3adb71aeb565d48c87cb1592b13714 *R/indexed.r cd70a68dd7556c7b463c64fbb0de98f2 *R/join-all.r bd3b37f2d0c588b577729987a7b390b2 *R/join.r -6e34c47b9056f5f36376eef6843d05da *R/l_ply.r +fbad4b6c69bc03fe649a893c6ee41061 *R/l_ply.r 49db6bd50575429654a36aec5fca75dc *R/laply.r 5c0761febd091075fd2c3c375458b9de *R/ldply.r 996456dbd8d9748c3d7273a0b66b3cc0 *R/liply.r b082625367148bbede12cdeae2d9676d *R/list-to-array.r d2d461c086c0a59c3e8bcdc2f5760086 *R/list-to-dataframe.r 0235ddca614287ca137a2a5ec80b6ecc *R/list-to-vector.r -9327d643dd06cd7024a6524be121a838 *R/llply.r -a111fc796dbb2bb6d98e8c7a44a3cf16 *R/loop_apply.R +5b11e23dbf190ed0cdfae2c6377ad257 *R/llply.r +145b339ac4875b011469243ce1c072a5 *R/loop_apply.R 138f6c83d529bbf8c68f8830d7081570 *R/m_ply.r 233c43c50f214fb7b6cb4da744bda204 *R/maply.r 8c2d4fbdc639835b6a7d5fa2f01f0026 *R/match-df.r @@ -45,14 +45,14 @@ f883208d0ce69464dfbe690812161a44 *R/name-rows.r 45c5b329e5a1ab0aac2a6ccec2c2e60d *R/parallel.r f66e62cbef6484534c99dc3934eba248 *R/plyr-deprecated.r 988021b688b3a21394e3ac8796297a0c *R/plyr.r -badb88183c38a06b59b0d15b494dc519 *R/progress-time.r -1b4dc98ab2f6f64e05a42a267af62735 *R/progress.r +22232615909daf78127cfde12d5e199d *R/progress-time.r +77e7c5e10eb6de675e000b27e006c805 *R/progress.r 87b4723fec09c203ea9c98373d87cb4b *R/quickdf.r -641e1f551f467a54bdbb1defabd16dda *R/quote.r +4505d22d30f983ade43482967a8873d3 *R/quote.r d2d78e4a2a595733f0f9b15b50a36ce0 *R/r_ply.r 9280ab29ec7162e29f330717de5ee90e *R/raply.r -5a5535287db53f7ae90e471c26d931b7 *R/rbind-fill-matrix.r -ef73a8bd57984bfce6b86508dcc971c2 *R/rbind-fill.r +4fb819a754a3c96194ce9c11ef181f52 *R/rbind-fill-matrix.r +51f151575d5a523b7a0f856d8e7a7672 *R/rbind-fill.r 514f68d869a789c77abde662808b7649 *R/rdply.r 415e517a3aa9f222679efad6c5729a3c *R/rename.r ddd658679cca81363137627bfe7edaa2 *R/revalue.r @@ -67,111 +67,111 @@ c3f4bc5baaa2be00a96fae50f235097a *R/strip-splits.r def748e3cbe191df41ddbf5804d48bd2 *R/take.r 74343cc970ed6691fa2d2a0b18c3a7c5 *R/try.r 40779d49b8ac7f779f3201fb22c5bb6b *R/utils.r -3d73325ab592dff535a8e7bd8e869967 *R/vaggregate.r -f43b813417d6d38f110c67421bd1076f *README.md +3114568678a3ce43b5347986cb14597b *R/vaggregate.r +72f816f344c8c8a37c320782f07229ae *README.md 9b2d63a08f6c4d1718642d2c904c230a *data/baseball.rda 12d6f72bbc8c97a10e7c4c235aab3ae3 *data/ozone.rda c064ec8464bce62b7862acec50e8475b *inst/CITATION -caf5876bb99c8c2e8122dd9db252f165 *man/a_ply.Rd -e72dac246e26d382e434de1d4f612dec *man/aaply.Rd -afedd2e651288a80b5bb8236a513c784 *man/adply.Rd -ec51e7f298a0c4597e0c1b5c48bd6e01 *man/alply.Rd -3b1249bc9a1a479e82b5ff9693ff2c94 *man/amv_dim.Rd -6ae5223e0b33b5db448bdd2b23fcb201 *man/amv_dimnames.Rd -010031bc6a1a3065db034cfa70728e56 *man/arrange.Rd -d0a98d1d724a37ece6bc40686c383e20 *man/as.data.frame.function.Rd -6b4cb393820b5757bedbd1fa76058f57 *man/as.list.split.Rd -276259ef61c905c0fce473da39534765 *man/as.quoted.Rd -ad978bf18a5de0479db966c6b8a6a950 *man/baseball.Rd -bdabf7d4e155af663e00ebc1da9f26aa *man/colwise.Rd -7ef78838916143fb90d200ff57aad888 *man/compact.Rd -1930736a0850bc1e3a785528a05da166 *man/count.Rd -f98627cd445404017be1c58829086356 *man/create_progress_bar.Rd -b68a9ce2908c502496a92e715b0b77b9 *man/d_ply.Rd -57d4318ad8d8a267307db2bbf608c319 *man/daply.Rd -257aa384d37d3e0f4af4433057e4318f *man/ddply.Rd -b74a45fa9c9554f843d179c37941a70b *man/defaults.Rd -3789c3c8129fa4e91276245e5fce1e21 *man/desc.Rd -80785e432be58dfdebed88cd370cd178 *man/dims.Rd -e03a62ecdcde450bee8d7c6ce26cd1c4 *man/dlply.Rd -d73378dcd563e56fd5a2d24da49ae33e *man/each.Rd -5c752faa49755e77a217e80fbcf7f5be *man/empty.Rd -75fefc6601949877eb269f8b819fd59c *man/eval.quoted.Rd -06869ea759c562a42bb0a00f201ba530 *man/failwith.Rd -690781f44d863717dc4795f03b0fef5b *man/get-split.Rd -b19cb8666a6fee4ca2a19edac8932e6d *man/here.Rd -8ac34ba27df7ed26903df0673d62d03c *man/id.Rd -2804bb90e68e281cfbf329b0a18fda0d *man/id_var.Rd -0b30ec7644b16ee5ea4b2846a553c988 *man/idata.frame.Rd -c89b60dd956330c5cf55a139d4a1362b *man/indexed_array.Rd -242828e535b14a54ecd16ced8c39ebc1 *man/indexed_df.Rd -a97d04f93a64e35926fc64978f515800 *man/is.discrete.Rd -15e9a80bcc4f46a0b3f165f92c9408ac *man/is.formula.Rd -a99d014b5ab17bd2a66de3ab2e93c390 *man/isplit2.Rd -398a0958d0c668f4e6dfbcd07e8fd9ac *man/join.Rd -5ab682fc0801b3a4cd1a920fad61873a *man/join.keys.Rd -e2e79a57461afaead13f4c0cb7992580 *man/join_all.Rd -56400990678ef64cd3572a943736dde0 *man/l_ply.Rd -e33c2239ab9befa79196e9e11266ae45 *man/laply.Rd -f996a8c1f7863b59237ca08e6ac10976 *man/ldply.Rd -377bb95354ac4b6651078bb12ce2b635 *man/liply.Rd -a7dcf23a609466cc1478de635fd045c3 *man/list_to_array.Rd -a43956555960f0b5a7d4b6a674d155a5 *man/list_to_dataframe.Rd -20c7cfaf8727dacd964246d2cfee0b28 *man/list_to_vector.Rd -0584d4b0940bc4ea30ccd54990ca03ae *man/llply.Rd -2ed27775e4acebdd60b1527f7a452936 *man/loop_apply.Rd -65f5e0e95f1a6276b2ed315d08147031 *man/m_ply.Rd -f6bd855d526f8dd5df8dc6532b604816 *man/maply.Rd -8d771e56bcc3363225828522d4273128 *man/mapvalues.Rd -61eed27bb572fc76e11193f9a60f712d *man/match_df.Rd -e5402f266968d3d84cd4f19ee051c68c *man/mdply.Rd -463aaf31b4c7504d990b9d1d718c968d *man/mlply.Rd -d0c8af9547a5ebba782b8afbf3ae3cdc *man/mutate.Rd -5285507591bcd979dd6545105359f4e2 *man/name_rows.Rd -7cc0a6c673a855e939d93d026a28a9e8 *man/names.quoted.Rd -33223d90096b2527e1d3cea49087ffbd *man/nunique.Rd -7248e7c7384044eef8b805f64ae451aa *man/ozone.Rd -bd4ef16c4c39642f389938bd2d791e70 *man/plyr-deprecated.Rd -aae8937364ff9974db3a24c3077d5fa8 *man/plyr.Rd -6e9c8e5c43e7ff1d3eaa914004b63301 *man/print.quoted.Rd -083caa3bb6be08f67794b27a1eddbbd0 *man/print.split.Rd -06454aac6caa6718cfe1daf5a103571f *man/progress_none.Rd -493931b9c2e9769efae7f14a94cbf397 *man/progress_text.Rd -6c0a0341a1eb177675e5aed9566b49f9 *man/progress_time.Rd -78ec987c14786b9292d9c7a5324761ea *man/progress_tk.Rd -c44a03ef29c84fb7e3488787ebb90f6b *man/progress_win.Rd -28f7603d32115974abb28b82733f1fb2 *man/quickdf.Rd -f6d664ae71520cb31d0c148a42e64a06 *man/quoted.Rd -566949848731086546362f16a5ac1419 *man/r_ply.Rd -ed99abf2e90ea03186b7f307ddef3566 *man/raply.Rd -32e1a003cab556c7c68d9c4c69be1c82 *man/rbind.fill.Rd -d4084e4ae97a7f8d88658b0c25497a51 *man/rbind.fill.matrix.Rd -3aabc8d9dd03a6babba5fc8b2db127f4 *man/rdply.Rd -ded9dbc9add6e7f62448c0cb5109147a *man/reduce_dim.Rd -07fc0a4cc6aad4f89d6c77391c0b9b02 *man/rename.Rd -1b288c85b3c2fe7fb0b7ae06d1693e56 *man/revalue.Rd -755fd8d851acb3d77b0cf16805e58573 *man/rlply.Rd -b8792304a4bce43aa4281acb3f4b16c5 *man/round_any.Rd -a594dff3b30027f36a1a6e47c77288ef *man/splat.Rd -1cb8f3c87e6e298a19a03c89df256184 *man/split_indices.Rd -e6371e29421010c9abc7e6e16ee9ef4f *man/split_labels.Rd -ba1eda06bf67249f56058b9445e4a816 *man/splitter_a.Rd -6e6b484b87c29a9d3534ff175c2ce31a *man/splitter_d.Rd -c480006cbbf66e5d98a8d56662abd184 *man/strip_splits.Rd -0b48a85f24a6c470f41fce52def64f97 *man/summarise.Rd -80ba275b63f3c66642652aceb55b7dff *man/take.Rd -e39c43fe49511debdacd49013cce44aa *man/true.Rd -aded20eb2772aa7f1962c2c74b93b628 *man/try_default.Rd -1ce73bea5a47f823df43f0f8d8a342bb *man/tryapply.Rd -5a818b6a4c68dc746da9098e4ca1333c *man/unrowname.Rd -e4978a17a149ed6951b4660f61996f6f *man/vaggregate.Rd +271239540d56a146f875e6dcf88a2713 *man/a_ply.Rd +755afa4be556a49d2820b61e1fda1b4e *man/aaply.Rd +9783dcae6cb3be2ba2dcf9590b889940 *man/adply.Rd +60770c7c7c807230bab1357ecf810462 *man/alply.Rd +b0feb05e1da0a84f4b24caf71184fd52 *man/amv_dim.Rd +acb48ccc3800cc8ff98d746039e5d183 *man/amv_dimnames.Rd +37b3129af6dd0613e70361287079fc3d *man/arrange.Rd +1055e20b3dc197decdd276d55e1f8d89 *man/as.data.frame.function.Rd +c634ebdbd65a76e51a5a56ade6b1721a *man/as.list.split.Rd +e1d9343d11ed8b5ab148a6fba9d64c16 *man/as.quoted.Rd +6e9bf7449092ba4c9a85585bd6e1e6f5 *man/baseball.Rd +8c890f57c81ff6854117bd34fc5f4463 *man/colwise.Rd +ccbeccc8b80ed16e739e27a82fdce7dc *man/compact.Rd +e407f46a34a570c16bf3ea30d4d4aabb *man/count.Rd +f0e364e2351aa62cee3d954c50d68a4f *man/create_progress_bar.Rd +21648554620e20a68bc9bfeabc876682 *man/d_ply.Rd +fbcb13b5e1b1d08c3ee722ec9befdee6 *man/daply.Rd +b6668bce154d7fcff2e1eb359d28aa50 *man/ddply.Rd +7cc10633442945aea43b37afa0500e3b *man/defaults.Rd +af6e25d69f244c508682f07219bfecf0 *man/desc.Rd +882306a62dfbb14a440d58487e88654c *man/dims.Rd +fb5c0a49242ae81a56c9c18ad908c934 *man/dlply.Rd +17d8464f5eb97446be57980348b18878 *man/each.Rd +bbf281517ac7db48c41f70c7e4401780 *man/empty.Rd +c26f181838e491d80c20d069fbbbffe6 *man/eval.quoted.Rd +daa926aa3cb6944e31797f584f619cd8 *man/failwith.Rd +6f7fa1eba432b4d2334a04300b704ce5 *man/get-split.Rd +ffaabc964d729af39e89a121f72a6162 *man/here.Rd +b4c33aded6736bbed7757a9e32de2911 *man/id.Rd +a7cd557226de8bbce135ec44af51de63 *man/id_var.Rd +6ea43a03a13d1254b9479df4fd7a6598 *man/idata.frame.Rd +6a538cdce37b36ab061bbaca94384a15 *man/indexed_array.Rd +f781be6bf51fd396bf1d3703345f2283 *man/indexed_df.Rd +344e8c59c12161362e195c716df5e6d9 *man/is.discrete.Rd +415c7c9354707df22eb2536926ff1013 *man/is.formula.Rd +a6272ccbd9d7dc2086e075b404f343d3 *man/isplit2.Rd +65ebd0dde772eb06dd28e7a404e2fa4d *man/join.Rd +e40351d58c09b4b0a165d7f848674d45 *man/join.keys.Rd +bf4154efcef274743020fbae426544c3 *man/join_all.Rd +8070bfa8b4d1a9d45451d9ee7a41dc19 *man/l_ply.Rd +8ce55a8da390a5f16512f23882be592c *man/laply.Rd +a5f50ecdf0c92c61b16602d398c814b8 *man/ldply.Rd +d10088717473dbbe7b28c461fdc35cff *man/liply.Rd +f12d275ae13a5cd62509bde7939dc055 *man/list_to_array.Rd +083ea754ecaf400cc61344ae07696d36 *man/list_to_dataframe.Rd +d979c64d10d3de44ac6f8b3799c88949 *man/list_to_vector.Rd +15d631c43b98b4b159e99a70bbe1ff9e *man/llply.Rd +a35c7bb83b737304f86867a429f3d91e *man/loop_apply.Rd +6aa28c05105280313c57948849da5068 *man/m_ply.Rd +e443316094ee57fea1e6efbc21964afa *man/maply.Rd +88c8d59a11b2e3e5081929c6c561064c *man/mapvalues.Rd +98b60d2a6ea7a0cd1b130a8512010860 *man/match_df.Rd +a8f7638104bfc99d0e5c9a4b430c2f6d *man/mdply.Rd +5abd240272a8b8390a869cc197344505 *man/mlply.Rd +d599d7169bbf2963c8f433aad97ec827 *man/mutate.Rd +3c567c3ecd3971134bd81b8abdd08740 *man/name_rows.Rd +ed676c9f2db1cfecc686872d0e1644ab *man/names.quoted.Rd +890fab96ab468943c9805f0fddc62820 *man/nunique.Rd +c1020c6f1c8aedf4c9e9d350def9626b *man/ozone.Rd +50386b437e69a271f9fb5f51731a8d63 *man/plyr-deprecated.Rd +1e9f8399d00f22adc0207d4e3f82fb3a *man/plyr.Rd +a6e1ac64d2075b7c9cdc6b0eef0cfd89 *man/print.quoted.Rd +a90f5b053997fb7e5733ca4f824c13e3 *man/print.split.Rd +3c120376b017acda7fbab3a69de91d99 *man/progress_none.Rd +ec7b77b5a3a2834ad6a5661fac706cb8 *man/progress_text.Rd +eaf9a6bc4690fce57de65353b88b1236 *man/progress_time.Rd +2a9db33f861fbf959fd5edc0c6f23b1e *man/progress_tk.Rd +a05f44c388fb9d2355ba9fc57a0ac4fa *man/progress_win.Rd +3ffb3b97f5439ed72cd6415d116c4430 *man/quickdf.Rd +e4c4b286021c48a7b0809b548e20986b *man/quoted.Rd +29e8a6f89b6504e53f9bdd4a49e3d454 *man/r_ply.Rd +7120203b692e1b4825af6310deff0439 *man/raply.Rd +64a20340aba8e902a21633b67a510840 *man/rbind.fill.Rd +efd035018fd2ff3fe32edb108b78d55f *man/rbind.fill.matrix.Rd +53092a8b2fdc028b9395c99efd6a0812 *man/rdply.Rd +3b7d15065382081bfe1148b9a32acf3f *man/reduce_dim.Rd +51543a5540e1fb33957a64af3fe28ba7 *man/rename.Rd +ddff8ca6ad04dcfa9e50f4fc2a261109 *man/revalue.Rd +acfbf7efc1073acd4fafd21ef0851f61 *man/rlply.Rd +b425a17495bb8b09da722b5172953330 *man/round_any.Rd +b5169560671c346c56502a8d7fb63a4b *man/splat.Rd +7a1d7d40a3b822af6513dd6fe6b48972 *man/split_indices.Rd +d8507d4da74b3d053af150437f882c13 *man/split_labels.Rd +d05abc431d724abfdadf254cd027bfb2 *man/splitter_a.Rd +ec605226f5d837f7156869fe9af4c76d *man/splitter_d.Rd +cdca92a3eed9a98e3932e475135834b9 *man/strip_splits.Rd +569dbf864b161062ed1940c5f07e0dac *man/summarise.Rd +d0632c368f1a85129cf99ef396688555 *man/take.Rd +7adfcc5aa9a0d0a189c6ed8bb111c624 *man/true.Rd +864d2a3a5cd409f6d6666adda617bc4e *man/try_default.Rd +d71b18bf0dea8745124dd6af2e286755 *man/tryapply.Rd +2f72b64634ade621ac77a71f83b7d1e9 *man/unrowname.Rd +8d33f326a3a74881c35c1380197e9ba9 *man/vaggregate.Rd 023038c8fd8345b5b892162bd7c6e5c9 *src/RcppExports.cpp -84f02af9633d0c631a97bc17a8518c59 *src/loop_apply.c +75d31e4f078aa79bd86e91ee5f85b322 *src/loop_apply.c 635efc489b194a6b73c08a2e2896b36f *src/split-numeric.cpp 3c5e14d243849a45ef414e14aa5a5184 *tests/testthat.R d564b7820ed6c9598ef0e9f39913a4dc *tests/testthat/quickdf.r 276325b0874ec8b9dae723d82a2be520 *tests/testthat/test-arrange.r -98227dadd35a099b244e08944b9ad126 *tests/testthat/test-array.r +05359b6d7232906cab6f6ef7238d541a *tests/testthat/test-array.r 187e40ad2a81d6d05ff7d359b3abcdc0 *tests/testthat/test-count.r 8e4432b2f786df04c93acbc3df0e6dd8 *tests/testthat/test-data-frame.r e48e8b4ea198110449eee62660bb7f87 *tests/testthat/test-debug.r @@ -185,14 +185,14 @@ d09ac8d7646b3d6c434c50467580dc8c *tests/testthat/test-list.r e4a2dbcd3e829d98895ac697916dbfc5 *tests/testthat/test-mapply.r 0d1b884651b4e602c267673c4f86c130 *tests/testthat/test-mutate.r c66dedf6251001e69782f7c3f5a54349 *tests/testthat/test-ninteraction.r -90617f3820f3ffd03fb4fb0dd4212dfc *tests/testthat/test-parallel.r +a862ac5d7ab225e96258d6d67d820239 *tests/testthat/test-parallel.r 146c98c42bcdd398d2805c35aaf83b6d *tests/testthat/test-progress.r 173260708c547a2ebd96c2cd797c8e07 *tests/testthat/test-quote.r 226e8fd21e0da1a8a7edfb46e81a0ebc *tests/testthat/test-rbind.matrix.r -aee48ac33dc689320266734d9aa21aba *tests/testthat/test-rbind.r +efaeb4f1816d9f4daa5011b1d192c9b0 *tests/testthat/test-rbind.r 567571b52e4ddee6873533f2f1ed3185 *tests/testthat/test-rename.r 30bab23a097dc350296100a63088b04e *tests/testthat/test-replicate.r -661bace3a8cc6b8ac00d475fa88d9b9d *tests/testthat/test-revalue.r +a4727a9d37fcf4385aab5b72866d8332 *tests/testthat/test-revalue.r 949976e498103b10ace8b99e01d8c38a *tests/testthat/test-rply.r c2a2f2887e3926a850e1923ae62689a0 *tests/testthat/test-simplify-df.r 8333352212f7d58b1e53ce26a60afb5f *tests/testthat/test-split-data-frame.r diff --git a/NAMESPACE b/NAMESPACE index 99774c8..3f1ca00 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -1,4 +1,4 @@ -# Generated by roxygen2 (4.1.1): do not edit by hand +# Generated by roxygen2: do not edit by hand S3method("[",idf) S3method("[",indexed) @@ -110,3 +110,4 @@ export(vaggregate) importFrom(Rcpp,sourceCpp) importFrom(stats,setNames) useDynLib(plyr) +useDynLib(plyr,loop_apply_) diff --git a/R/l_ply.r b/R/l_ply.r index 624ed43..5f174ea 100644 --- a/R/l_ply.r +++ b/R/l_ply.r @@ -40,7 +40,7 @@ l_ply <- function(.data, .fun = NULL, ..., .progress = "none", .inform = FALSE, if (.inform) { res <- try(.fun(piece, ...)) if (inherits(res, "try-error")) { - piece <- paste(capture.output(print(piece)), collapse = "\n") + piece <- paste(utils::capture.output(print(piece)), collapse = "\n") stop("with piece ", i, ": \n", piece, call. = FALSE) } } else { diff --git a/R/llply.r b/R/llply.r index 90e28f7..db11e23 100644 --- a/R/llply.r +++ b/R/llply.r @@ -56,7 +56,7 @@ llply <- function(.data, .fun = NULL, ..., .progress = "none", .inform = FALSE, if (.inform) { res <- try(.fun(piece, ...)) if (inherits(res, "try-error")) { - piece <- paste(capture.output(print(piece)), collapse = "\n") + piece <- paste(utils::capture.output(print(piece)), collapse = "\n") stop("with piece ", i, ": \n", piece, call. = FALSE) } } else { diff --git a/R/loop_apply.R b/R/loop_apply.R index 9905326..d484d61 100644 --- a/R/loop_apply.R +++ b/R/loop_apply.R @@ -7,7 +7,8 @@ #' @param f function to apply to each integer #' @param env environment in which to evaluate function #' @useDynLib plyr +#' @useDynLib plyr loop_apply_ #' @keywords internal manip loop_apply <- function(n, f, env = parent.frame()) { - .Call("loop_apply", as.integer(n), f, env) + .Call(loop_apply_, as.integer(n), f, env) } diff --git a/R/progress-time.r b/R/progress-time.r index 57feaeb..d08bc7e 100644 --- a/R/progress-time.r +++ b/R/progress-time.r @@ -13,11 +13,11 @@ progress_time <- function() { list( init = function(x) { txt <<- txtTimerBar(x) - setTxtProgressBar(txt, 0) + utils::setTxtProgressBar(txt, 0) }, step = function() { n <<- n + 1 - setTxtProgressBar(txt, n) + utils::setTxtProgressBar(txt, n) }, term = function() close(txt) ) @@ -82,7 +82,7 @@ cat_line <- function(...) { msg <- paste(..., sep = "", collapse = "") gap <- max(c(0, getOption("width") - nchar(msg, "width"))) cat("\r", msg, rep.int(" ", gap), sep = "") - flush.console() + utils::flush.console() } str_rep <- function(x, i) { diff --git a/R/progress.r b/R/progress.r index d38b9e1..ea4d8ff 100644 --- a/R/progress.r +++ b/R/progress.r @@ -89,12 +89,12 @@ progress_text <- function(style = 3, ...) { list( init = function(x) { - txt <<- txtProgressBar(max = x, style = style, ...) - setTxtProgressBar(txt, 0) + txt <<- utils::txtProgressBar(max = x, style = style, ...) + utils::setTxtProgressBar(txt, 0) }, step = function() { n <<- n + 1 - setTxtProgressBar(txt, n) + utils::setTxtProgressBar(txt, n) }, term = function() close(txt) ) @@ -158,12 +158,12 @@ progress_win <- function(title = "plyr progress", ...) { list( init = function(x) { - win <<- winProgressBar(max = x, title = title, ...) # nolint - setWinProgressBar(win, 0) # nolint + win <<- utils::winProgressBar(max = x, title = title, ...) # nolint + utils::setWinProgressBar(win, 0) # nolint }, step = function() { n <<- n + 1 - setWinProgressBar(win, n) # nolint + utils::setWinProgressBar(win, n) # nolint }, term = function() close(win) ) diff --git a/R/quote.r b/R/quote.r index 1506e25..06582a7 100644 --- a/R/quote.r +++ b/R/quote.r @@ -50,7 +50,7 @@ is.quoted <- function(x) inherits(x, "quoted") #' #' @keywords internal #' @export -print.quoted <- function(x, ...) str(x) +print.quoted <- function(x, ...) utils::str(x) #' Compute names of quoted variables. #' diff --git a/R/rbind-fill-matrix.r b/R/rbind-fill-matrix.r index f823a39..8652bda 100644 --- a/R/rbind-fill-matrix.r +++ b/R/rbind-fill-matrix.r @@ -70,7 +70,7 @@ rbind.fill.matrix <- function(...) { ## fill in the new matrix for (i in seq_along(rows)) { - rng <- seq(pos[i, 1], length = pos[i, 2]) + rng <- seq(pos[i, 1], length.out = pos[i, 2]) output[rng, lcols[[i]]] <- matrices[[i]] } diff --git a/R/rbind-fill.r b/R/rbind-fill.r index bf38c85..0e2335f 100644 --- a/R/rbind-fill.r +++ b/R/rbind-fill.r @@ -63,7 +63,7 @@ rbind.fill <- function(...) { # Copy inputs into output for (i in seq_along(rows)) { - rng <- seq(pos[i, 1], length = pos[i, 2]) + rng <- seq(pos[i, 1], length.out = pos[i, 2]) df <- dfs[[i]] for (var in names(df)) { diff --git a/R/vaggregate.r b/R/vaggregate.r index 4c07212..933f337 100644 --- a/R/vaggregate.r +++ b/R/vaggregate.r @@ -19,7 +19,7 @@ #' @export #' @examples #' # Some examples of use borrowed from ?tapply -#' n <- 17; fac <- factor(rep(1:3, length = n), levels = 1:5) +#' n <- 17; fac <- factor(rep(1:3, length.out = n), levels = 1:5) #' table(fac) #' vaggregate(1:n, fac, sum) #' vaggregate(1:n, fac, sum, .default = NA_integer_) diff --git a/README.md b/README.md index c79d97c..c9c5a8b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ -[](https://travis-ci.org/hadley/plyr) [](https://coveralls.io/r/hadley/plyr?branch=master) - # plyr +[](https://travis-ci.org/hadley/plyr) +[](https://codecov.io/github/hadley/plyr?branch=master) + plyr is a set of tools for a common set of problems: you need to __split__ up a big data structure into homogeneous pieces, __apply__ a function to each piece and then __combine__ all the results back together. For example, you might want to: * fit the same model each patient subsets of a data frame diff --git a/man/a_ply.Rd b/man/a_ply.Rd index aecfb72..66ecbd6 100644 --- a/man/a_ply.Rd +++ b/man/a_ply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/a_ply.r \name{a_ply} \alias{a_ply} @@ -65,10 +65,10 @@ Hadley Wickham (2011). The Split-Apply-Combine Strategy \url{http://www.jstatsoft.org/v40/i01/}. } \seealso{ -Other array input: \code{\link{aaply}}; - \code{\link{adply}}; \code{\link{alply}} +Other array input: \code{\link{aaply}}, + \code{\link{adply}}, \code{\link{alply}} -Other no output: \code{\link{d_ply}}; \code{\link{l_ply}}; +Other no output: \code{\link{d_ply}}, \code{\link{l_ply}}, \code{\link{m_ply}} } \keyword{manip} diff --git a/man/aaply.Rd b/man/aaply.Rd index d960954..c453a4f 100644 --- a/man/aaply.Rd +++ b/man/aaply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/aaply.r \name{aaply} \alias{aaply} @@ -98,11 +98,11 @@ Hadley Wickham (2011). The Split-Apply-Combine Strategy \url{http://www.jstatsoft.org/v40/i01/}. } \seealso{ -Other array input: \code{\link{a_ply}}; - \code{\link{adply}}; \code{\link{alply}} +Other array input: \code{\link{a_ply}}, + \code{\link{adply}}, \code{\link{alply}} -Other array output: \code{\link{daply}}; - \code{\link{laply}}; \code{\link{maply}} +Other array output: \code{\link{daply}}, + \code{\link{laply}}, \code{\link{maply}} } \keyword{manip} diff --git a/man/adply.Rd b/man/adply.Rd index c9f1794..c26ed13 100644 --- a/man/adply.Rd +++ b/man/adply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/adply.r \name{adply} \alias{adply} @@ -76,11 +76,11 @@ Hadley Wickham (2011). The Split-Apply-Combine Strategy \url{http://www.jstatsoft.org/v40/i01/}. } \seealso{ -Other array input: \code{\link{a_ply}}; - \code{\link{aaply}}; \code{\link{alply}} +Other array input: \code{\link{a_ply}}, + \code{\link{aaply}}, \code{\link{alply}} -Other data frame output: \code{\link{ddply}}; - \code{\link{ldply}}; \code{\link{mdply}} +Other data frame output: \code{\link{ddply}}, + \code{\link{ldply}}, \code{\link{mdply}} } \keyword{manip} diff --git a/man/alply.Rd b/man/alply.Rd index dfe047e..3def811 100644 --- a/man/alply.Rd +++ b/man/alply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/alply.r \name{alply} \alias{alply} @@ -77,11 +77,11 @@ Hadley Wickham (2011). The Split-Apply-Combine Strategy \url{http://www.jstatsoft.org/v40/i01/}. } \seealso{ -Other array input: \code{\link{a_ply}}; - \code{\link{aaply}}; \code{\link{adply}} +Other array input: \code{\link{a_ply}}, + \code{\link{aaply}}, \code{\link{adply}} -Other list output: \code{\link{dlply}}; - \code{\link{llply}}; \code{\link{mlply}} +Other list output: \code{\link{dlply}}, + \code{\link{llply}}, \code{\link{mlply}} } \keyword{manip} diff --git a/man/amv_dim.Rd b/man/amv_dim.Rd index f208013..f8bd16d 100644 --- a/man/amv_dim.Rd +++ b/man/amv_dim.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/dimensions.r \name{amv_dim} \alias{amv_dim} diff --git a/man/amv_dimnames.Rd b/man/amv_dimnames.Rd index 8732ebe..1f1e147 100644 --- a/man/amv_dimnames.Rd +++ b/man/amv_dimnames.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/dimensions.r \name{amv_dimnames} \alias{amv_dimnames} diff --git a/man/arrange.Rd b/man/arrange.Rd index 7af1331..1a8436a 100644 --- a/man/arrange.Rd +++ b/man/arrange.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/arrange.r \name{arrange} \alias{arrange} diff --git a/man/as.data.frame.function.Rd b/man/as.data.frame.function.Rd index 7b98552..b36bf0a 100644 --- a/man/as.data.frame.function.Rd +++ b/man/as.data.frame.function.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/data-frame.r \name{as.data.frame.function} \alias{as.data.frame.function} diff --git a/man/as.list.split.Rd b/man/as.list.split.Rd index f09f337..32c8c38 100644 --- a/man/as.list.split.Rd +++ b/man/as.list.split.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/split.r \name{as.list.split} \alias{as.list.split} diff --git a/man/as.quoted.Rd b/man/as.quoted.Rd index 28f381c..bd62e64 100644 --- a/man/as.quoted.Rd +++ b/man/as.quoted.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/quote.r \name{as.quoted} \alias{as.quoted} diff --git a/man/baseball.Rd b/man/baseball.Rd index 92c18c4..c40315e 100644 --- a/man/baseball.Rd +++ b/man/baseball.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/data.r \docType{data} \name{baseball} diff --git a/man/colwise.Rd b/man/colwise.Rd index 0f6da91..eaefecc 100644 --- a/man/colwise.Rd +++ b/man/colwise.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/colwise.r \name{colwise} \alias{catcolwise} diff --git a/man/compact.Rd b/man/compact.Rd index ee4ff93..c0c5a4d 100644 --- a/man/compact.Rd +++ b/man/compact.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/utils.r \name{compact} \alias{compact} diff --git a/man/count.Rd b/man/count.Rd index c061c4d..b9d1fb1 100644 --- a/man/count.Rd +++ b/man/count.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/count.r \name{count} \alias{count} diff --git a/man/create_progress_bar.Rd b/man/create_progress_bar.Rd index 5483bf5..eb07501 100644 --- a/man/create_progress_bar.Rd +++ b/man/create_progress_bar.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/progress.r \name{create_progress_bar} \alias{create_progress_bar} diff --git a/man/d_ply.Rd b/man/d_ply.Rd index 87eaf6f..9babffb 100644 --- a/man/d_ply.Rd +++ b/man/d_ply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/d_ply.r \name{d_ply} \alias{d_ply} @@ -64,10 +64,10 @@ Hadley Wickham (2011). The Split-Apply-Combine Strategy \url{http://www.jstatsoft.org/v40/i01/}. } \seealso{ -Other data frame input: \code{\link{daply}}; - \code{\link{ddply}}; \code{\link{dlply}} +Other data frame input: \code{\link{daply}}, + \code{\link{ddply}}, \code{\link{dlply}} -Other no output: \code{\link{a_ply}}; \code{\link{l_ply}}; +Other no output: \code{\link{a_ply}}, \code{\link{l_ply}}, \code{\link{m_ply}} } \keyword{manip} diff --git a/man/daply.Rd b/man/daply.Rd index 8deb34c..159056f 100644 --- a/man/daply.Rd +++ b/man/daply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/daply.r \name{daply} \alias{daply} @@ -78,11 +78,11 @@ Hadley Wickham (2011). The Split-Apply-Combine Strategy \url{http://www.jstatsoft.org/v40/i01/}. } \seealso{ -Other array output: \code{\link{aaply}}; - \code{\link{laply}}; \code{\link{maply}} +Other array output: \code{\link{aaply}}, + \code{\link{laply}}, \code{\link{maply}} -Other data frame input: \code{\link{d_ply}}; - \code{\link{ddply}}; \code{\link{dlply}} +Other data frame input: \code{\link{d_ply}}, + \code{\link{ddply}}, \code{\link{dlply}} } \keyword{manip} diff --git a/man/ddply.Rd b/man/ddply.Rd index 30a703d..95b74e4 100644 --- a/man/ddply.Rd +++ b/man/ddply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/ddply.r \name{ddply} \alias{ddply} @@ -100,11 +100,11 @@ Hadley Wickham (2011). The Split-Apply-Combine Strategy \seealso{ \code{\link{tapply}} for similar functionality in the base package -Other data frame input: \code{\link{d_ply}}; - \code{\link{daply}}; \code{\link{dlply}} +Other data frame input: \code{\link{d_ply}}, + \code{\link{daply}}, \code{\link{dlply}} -Other data frame output: \code{\link{adply}}; - \code{\link{ldply}}; \code{\link{mdply}} +Other data frame output: \code{\link{adply}}, + \code{\link{ldply}}, \code{\link{mdply}} } \keyword{manip} diff --git a/man/defaults.Rd b/man/defaults.Rd index f02fa29..54e53e0 100644 --- a/man/defaults.Rd +++ b/man/defaults.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/defaults.r \name{defaults} \alias{defaults} diff --git a/man/desc.Rd b/man/desc.Rd index 39774ad..bbc55cb 100644 --- a/man/desc.Rd +++ b/man/desc.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/arrange.r \name{desc} \alias{desc} diff --git a/man/dims.Rd b/man/dims.Rd index 1ec5191..bee09e8 100644 --- a/man/dims.Rd +++ b/man/dims.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/dimensions.r \name{dims} \alias{dims} diff --git a/man/dlply.Rd b/man/dlply.Rd index df9b6c9..2242aed 100644 --- a/man/dlply.Rd +++ b/man/dlply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/dlply.r \name{dlply} \alias{dlply} @@ -73,11 +73,11 @@ Hadley Wickham (2011). The Split-Apply-Combine Strategy \url{http://www.jstatsoft.org/v40/i01/}. } \seealso{ -Other data frame input: \code{\link{d_ply}}; - \code{\link{daply}}; \code{\link{ddply}} +Other data frame input: \code{\link{d_ply}}, + \code{\link{daply}}, \code{\link{ddply}} -Other list output: \code{\link{alply}}; - \code{\link{llply}}; \code{\link{mlply}} +Other list output: \code{\link{alply}}, + \code{\link{llply}}, \code{\link{mlply}} } \keyword{manip} diff --git a/man/each.Rd b/man/each.Rd index 51ed81b..c2741af 100644 --- a/man/each.Rd +++ b/man/each.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/each.r \name{each} \alias{each} diff --git a/man/empty.Rd b/man/empty.Rd index 5050a8d..195cb7d 100644 --- a/man/empty.Rd +++ b/man/empty.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/utils.r \name{empty} \alias{empty} diff --git a/man/eval.quoted.Rd b/man/eval.quoted.Rd index 1a54380..66aa332 100644 --- a/man/eval.quoted.Rd +++ b/man/eval.quoted.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/quote.r \name{eval.quoted} \alias{eval.quoted} diff --git a/man/failwith.Rd b/man/failwith.Rd index d231c0f..eb58a84 100644 --- a/man/failwith.Rd +++ b/man/failwith.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/try.r \name{failwith} \alias{failwith} diff --git a/man/get-split.Rd b/man/get-split.Rd index 87bf5a3..e9ef77f 100644 --- a/man/get-split.Rd +++ b/man/get-split.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/split.r \name{[.split} \alias{[.split} diff --git a/man/here.Rd b/man/here.Rd index 259350c..64cb07f 100644 --- a/man/here.Rd +++ b/man/here.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/here.r \name{here} \alias{here} diff --git a/man/id.Rd b/man/id.Rd index dec3384..f10205d 100644 --- a/man/id.Rd +++ b/man/id.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/id.r \name{id} \alias{id} diff --git a/man/id_var.Rd b/man/id_var.Rd index 6b8ae3c..c9f0324 100644 --- a/man/id_var.Rd +++ b/man/id_var.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/id.r \name{id_var} \alias{id_var} diff --git a/man/idata.frame.Rd b/man/idata.frame.Rd index 268b294..e2526c7 100644 --- a/man/idata.frame.Rd +++ b/man/idata.frame.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/idataframe.r \name{idata.frame} \alias{idata.frame} diff --git a/man/indexed_array.Rd b/man/indexed_array.Rd index 41add9e..2ba51b0 100644 --- a/man/indexed_array.Rd +++ b/man/indexed_array.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/indexed-array.r \name{indexed_array} \alias{[[.indexed_array} diff --git a/man/indexed_df.Rd b/man/indexed_df.Rd index 6faabd7..d31ad1d 100644 --- a/man/indexed_df.Rd +++ b/man/indexed_df.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/indexed-data-frame.r \name{indexed_df} \alias{indexed_df} diff --git a/man/is.discrete.Rd b/man/is.discrete.Rd index ffccd5d..a94d8cc 100644 --- a/man/is.discrete.Rd +++ b/man/is.discrete.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/utils.r \name{is.discrete} \alias{is.discrete} diff --git a/man/is.formula.Rd b/man/is.formula.Rd index 3852bda..1f27d1d 100644 --- a/man/is.formula.Rd +++ b/man/is.formula.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/utils.r \name{is.formula} \alias{is.formula} diff --git a/man/isplit2.Rd b/man/isplit2.Rd index 51fffad..b8cbf9b 100644 --- a/man/isplit2.Rd +++ b/man/isplit2.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/liply.r \name{isplit2} \alias{isplit2} diff --git a/man/join.Rd b/man/join.Rd index 2e2582c..e6d92ac 100644 --- a/man/join.Rd +++ b/man/join.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/join.r \name{join} \alias{join} diff --git a/man/join.keys.Rd b/man/join.keys.Rd index 7c881df..6248ef9 100644 --- a/man/join.keys.Rd +++ b/man/join.keys.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/join.r \name{join.keys} \alias{join.keys} diff --git a/man/join_all.Rd b/man/join_all.Rd index ffe854c..edcca9f 100644 --- a/man/join_all.Rd +++ b/man/join_all.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/join-all.r \name{join_all} \alias{join_all} diff --git a/man/l_ply.Rd b/man/l_ply.Rd index d3fa766..6e4f7ea 100644 --- a/man/l_ply.Rd +++ b/man/l_ply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/l_ply.r \name{l_ply} \alias{l_ply} @@ -59,10 +59,10 @@ Hadley Wickham (2011). The Split-Apply-Combine Strategy \url{http://www.jstatsoft.org/v40/i01/}. } \seealso{ -Other list input: \code{\link{laply}}; \code{\link{ldply}}; +Other list input: \code{\link{laply}}, \code{\link{ldply}}, \code{\link{llply}} -Other no output: \code{\link{a_ply}}; \code{\link{d_ply}}; +Other no output: \code{\link{a_ply}}, \code{\link{d_ply}}, \code{\link{m_ply}} } \keyword{manip} diff --git a/man/laply.Rd b/man/laply.Rd index 211a75b..350fe7b 100644 --- a/man/laply.Rd +++ b/man/laply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/laply.r \name{laply} \alias{laply} @@ -74,10 +74,10 @@ Hadley Wickham (2011). The Split-Apply-Combine Strategy \url{http://www.jstatsoft.org/v40/i01/}. } \seealso{ -Other array output: \code{\link{aaply}}; - \code{\link{daply}}; \code{\link{maply}} +Other array output: \code{\link{aaply}}, + \code{\link{daply}}, \code{\link{maply}} -Other list input: \code{\link{l_ply}}; \code{\link{ldply}}; +Other list input: \code{\link{l_ply}}, \code{\link{ldply}}, \code{\link{llply}} } \keyword{manip} diff --git a/man/ldply.Rd b/man/ldply.Rd index d38ff2b..272e4de 100644 --- a/man/ldply.Rd +++ b/man/ldply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/ldply.r \name{ldply} \alias{ldply} @@ -64,10 +64,10 @@ Hadley Wickham (2011). The Split-Apply-Combine Strategy \url{http://www.jstatsoft.org/v40/i01/}. } \seealso{ -Other data frame output: \code{\link{adply}}; - \code{\link{ddply}}; \code{\link{mdply}} +Other data frame output: \code{\link{adply}}, + \code{\link{ddply}}, \code{\link{mdply}} -Other list input: \code{\link{l_ply}}; \code{\link{laply}}; +Other list input: \code{\link{l_ply}}, \code{\link{laply}}, \code{\link{llply}} } \keyword{manip} diff --git a/man/liply.Rd b/man/liply.Rd index b88c12f..13a1b58 100644 --- a/man/liply.Rd +++ b/man/liply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/liply.r \name{liply} \alias{liply} diff --git a/man/list_to_array.Rd b/man/list_to_array.Rd index 8d175c2..caec826 100644 --- a/man/list_to_array.Rd +++ b/man/list_to_array.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/list-to-array.r \name{list_to_array} \alias{list_to_array} @@ -17,7 +17,7 @@ list_to_array(res, labels = NULL, .drop = FALSE) Reduce/simplify a list of homogenous objects to an array } \seealso{ -Other list simplification functions: \code{\link{list_to_dataframe}}; +Other list simplification functions: \code{\link{list_to_dataframe}}, \code{\link{list_to_vector}} } \keyword{internal} diff --git a/man/list_to_dataframe.Rd b/man/list_to_dataframe.Rd index 66b4055..f59033a 100644 --- a/man/list_to_dataframe.Rd +++ b/man/list_to_dataframe.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/list-to-dataframe.r \name{list_to_dataframe} \alias{list_to_dataframe} @@ -21,7 +21,7 @@ Reduce/simplify a list of homogenous objects to a data frame. All or all data frames. } \seealso{ -Other list simplification functions: \code{\link{list_to_array}}; +Other list simplification functions: \code{\link{list_to_array}}, \code{\link{list_to_vector}} } \keyword{internal} diff --git a/man/list_to_vector.Rd b/man/list_to_vector.Rd index ed21b67..a545356 100644 --- a/man/list_to_vector.Rd +++ b/man/list_to_vector.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/list-to-vector.r \name{list_to_vector} \alias{list_to_vector} @@ -13,7 +13,7 @@ list_to_vector(res) Reduce/simplify a list of homogenous objects to a vector } \seealso{ -Other list simplification functions: \code{\link{list_to_array}}; +Other list simplification functions: \code{\link{list_to_array}}, \code{\link{list_to_dataframe}} } \keyword{internal} diff --git a/man/llply.Rd b/man/llply.Rd index d1d0d6d..cc483e2 100644 --- a/man/llply.Rd +++ b/man/llply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/llply.r \name{llply} \alias{llply} @@ -64,11 +64,11 @@ Hadley Wickham (2011). The Split-Apply-Combine Strategy \url{http://www.jstatsoft.org/v40/i01/}. } \seealso{ -Other list input: \code{\link{l_ply}}; \code{\link{laply}}; +Other list input: \code{\link{l_ply}}, \code{\link{laply}}, \code{\link{ldply}} -Other list output: \code{\link{alply}}; - \code{\link{dlply}}; \code{\link{mlply}} +Other list output: \code{\link{alply}}, + \code{\link{dlply}}, \code{\link{mlply}} } \keyword{manip} diff --git a/man/loop_apply.Rd b/man/loop_apply.Rd index f3ac11b..a92bcb4 100644 --- a/man/loop_apply.Rd +++ b/man/loop_apply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/loop_apply.R \name{loop_apply} \alias{loop_apply} diff --git a/man/m_ply.Rd b/man/m_ply.Rd index 35434cd..2c2e39c 100644 --- a/man/m_ply.Rd +++ b/man/m_ply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/m_ply.r \name{m_ply} \alias{m_ply} @@ -66,10 +66,10 @@ Hadley Wickham (2011). The Split-Apply-Combine Strategy \url{http://www.jstatsoft.org/v40/i01/}. } \seealso{ -Other multiple arguments input: \code{\link{maply}}; - \code{\link{mdply}}; \code{\link{mlply}} +Other multiple arguments input: \code{\link{maply}}, + \code{\link{mdply}}, \code{\link{mlply}} -Other no output: \code{\link{a_ply}}; \code{\link{d_ply}}; +Other no output: \code{\link{a_ply}}, \code{\link{d_ply}}, \code{\link{l_ply}} } \keyword{manip} diff --git a/man/maply.Rd b/man/maply.Rd index ef96ad8..2aeedc6 100644 --- a/man/maply.Rd +++ b/man/maply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/maply.r \name{maply} \alias{maply} @@ -73,11 +73,11 @@ Hadley Wickham (2011). The Split-Apply-Combine Strategy \url{http://www.jstatsoft.org/v40/i01/}. } \seealso{ -Other array output: \code{\link{aaply}}; - \code{\link{daply}}; \code{\link{laply}} +Other array output: \code{\link{aaply}}, + \code{\link{daply}}, \code{\link{laply}} -Other multiple arguments input: \code{\link{m_ply}}; - \code{\link{mdply}}; \code{\link{mlply}} +Other multiple arguments input: \code{\link{m_ply}}, + \code{\link{mdply}}, \code{\link{mlply}} } \keyword{manip} diff --git a/man/mapvalues.Rd b/man/mapvalues.Rd index 942a775..39bc614 100644 --- a/man/mapvalues.Rd +++ b/man/mapvalues.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/revalue.r \name{mapvalues} \alias{mapvalues} @@ -14,7 +14,7 @@ mapvalues(x, from, to, warn_missing = TRUE) \item{to}{a vector of replacement values} \item{warn_missing}{print a message if any of the old values are - not actually present in \code{x}} +not actually present in \code{x}} } \description{ Item in \code{x} that match items \code{from} will be replaced by diff --git a/man/match_df.Rd b/man/match_df.Rd index e38a173..418c566 100644 --- a/man/match_df.Rd +++ b/man/match_df.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/match-df.r \name{match_df} \alias{match_df} diff --git a/man/mdply.Rd b/man/mdply.Rd index 79c45a7..007b213 100644 --- a/man/mdply.Rd +++ b/man/mdply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/mdply.r \name{mdply} \alias{mdply} @@ -75,11 +75,11 @@ Hadley Wickham (2011). The Split-Apply-Combine Strategy \url{http://www.jstatsoft.org/v40/i01/}. } \seealso{ -Other data frame output: \code{\link{adply}}; - \code{\link{ddply}}; \code{\link{ldply}} +Other data frame output: \code{\link{adply}}, + \code{\link{ddply}}, \code{\link{ldply}} -Other multiple arguments input: \code{\link{m_ply}}; - \code{\link{maply}}; \code{\link{mlply}} +Other multiple arguments input: \code{\link{m_ply}}, + \code{\link{maply}}, \code{\link{mlply}} } \keyword{manip} diff --git a/man/mlply.Rd b/man/mlply.Rd index 1467a4b..36628ab 100644 --- a/man/mlply.Rd +++ b/man/mlply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/mlply.r \name{mlply} \alias{mlply} @@ -70,11 +70,11 @@ Hadley Wickham (2011). The Split-Apply-Combine Strategy \url{http://www.jstatsoft.org/v40/i01/}. } \seealso{ -Other list output: \code{\link{alply}}; - \code{\link{dlply}}; \code{\link{llply}} +Other list output: \code{\link{alply}}, + \code{\link{dlply}}, \code{\link{llply}} -Other multiple arguments input: \code{\link{m_ply}}; - \code{\link{maply}}; \code{\link{mdply}} +Other multiple arguments input: \code{\link{m_ply}}, + \code{\link{maply}}, \code{\link{mdply}} } \keyword{manip} diff --git a/man/mutate.Rd b/man/mutate.Rd index a4d929d..ad913b4 100644 --- a/man/mutate.Rd +++ b/man/mutate.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/mutate.r \name{mutate} \alias{mutate} diff --git a/man/name_rows.Rd b/man/name_rows.Rd index 99cf38c..47a596f 100644 --- a/man/name_rows.Rd +++ b/man/name_rows.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/name-rows.r \name{name_rows} \alias{name_rows} diff --git a/man/names.quoted.Rd b/man/names.quoted.Rd index a9c5870..ab28b25 100644 --- a/man/names.quoted.Rd +++ b/man/names.quoted.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/quote.r \name{names.quoted} \alias{names.quoted} diff --git a/man/nunique.Rd b/man/nunique.Rd index 447cb6d..99c6a67 100644 --- a/man/nunique.Rd +++ b/man/nunique.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/utils.r \name{nunique} \alias{nunique} diff --git a/man/ozone.Rd b/man/ozone.Rd index 2961c74..cd53595 100644 --- a/man/ozone.Rd +++ b/man/ozone.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/data.r \docType{data} \name{ozone} diff --git a/man/plyr-deprecated.Rd b/man/plyr-deprecated.Rd index 9ce9ca7..357b8f3 100644 --- a/man/plyr-deprecated.Rd +++ b/man/plyr-deprecated.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/plyr-deprecated.r \name{plyr-deprecated} \alias{plyr-deprecated} diff --git a/man/plyr.Rd b/man/plyr.Rd index 7e6e1ea..f5e5c6e 100644 --- a/man/plyr.Rd +++ b/man/plyr.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/plyr.r \docType{package} \name{plyr} diff --git a/man/print.quoted.Rd b/man/print.quoted.Rd index a1101b0..36b7d77 100644 --- a/man/print.quoted.Rd +++ b/man/print.quoted.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/quote.r \name{print.quoted} \alias{print.quoted} diff --git a/man/print.split.Rd b/man/print.split.Rd index cda3ba0..a6efecb 100644 --- a/man/print.split.Rd +++ b/man/print.split.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/split.r \name{print.split} \alias{print.split} diff --git a/man/progress_none.Rd b/man/progress_none.Rd index a0b1289..3c3e5ed 100644 --- a/man/progress_none.Rd +++ b/man/progress_none.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/progress.r \name{progress_none} \alias{progress_none} @@ -17,8 +17,8 @@ understand - it does nothing! l_ply(1:100, identity, .progress = "none") } \seealso{ -Other progress bars: \code{\link{progress_text}}; - \code{\link{progress_time}}; \code{\link{progress_tk}}; +Other progress bars: \code{\link{progress_text}}, + \code{\link{progress_time}}, \code{\link{progress_tk}}, \code{\link{progress_win}} } \keyword{internal} diff --git a/man/progress_text.Rd b/man/progress_text.Rd index 6ad2ac9..9e090b3 100644 --- a/man/progress_text.Rd +++ b/man/progress_text.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/progress.r \name{progress_text} \alias{progress_text} @@ -24,8 +24,8 @@ l_ply(1:100, identity, .progress = "text") l_ply(1:100, identity, .progress = progress_text(char = "-")) } \seealso{ -Other progress bars: \code{\link{progress_none}}; - \code{\link{progress_time}}; \code{\link{progress_tk}}; +Other progress bars: \code{\link{progress_none}}, + \code{\link{progress_time}}, \code{\link{progress_tk}}, \code{\link{progress_win}} } diff --git a/man/progress_time.Rd b/man/progress_time.Rd index 15ce00a..c98233a 100644 --- a/man/progress_time.Rd +++ b/man/progress_time.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/progress-time.r \name{progress_time} \alias{progress_time} @@ -14,8 +14,8 @@ estimated time remaining and, when finished, total duration. l_ply(1:100, function(x) Sys.sleep(.01), .progress = "time") } \seealso{ -Other progress bars: \code{\link{progress_none}}; - \code{\link{progress_text}}; \code{\link{progress_tk}}; +Other progress bars: \code{\link{progress_none}}, + \code{\link{progress_text}}, \code{\link{progress_tk}}, \code{\link{progress_win}} } diff --git a/man/progress_tk.Rd b/man/progress_tk.Rd index ed1bd64..faaff60 100644 --- a/man/progress_tk.Rd +++ b/man/progress_tk.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/progress.r \name{progress_tk} \alias{progress_tk} @@ -29,8 +29,8 @@ l_ply(1:100, identity, .progress = progress_tk(label="")) \seealso{ \code{\link[tcltk]{tkProgressBar}} for the function that powers this progress bar -Other progress bars: \code{\link{progress_none}}; - \code{\link{progress_text}}; \code{\link{progress_time}}; +Other progress bars: \code{\link{progress_none}}, + \code{\link{progress_text}}, \code{\link{progress_time}}, \code{\link{progress_win}} } diff --git a/man/progress_win.Rd b/man/progress_win.Rd index 0a96197..6825a56 100644 --- a/man/progress_win.Rd +++ b/man/progress_win.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/progress.r \name{progress_win} \alias{progress_win} @@ -26,8 +26,8 @@ l_ply(1:100, identity, .progress = progress_win(title="Working...")) \seealso{ \code{winProgressBar} for the function that powers this progress bar -Other progress bars: \code{\link{progress_none}}; - \code{\link{progress_text}}; \code{\link{progress_time}}; +Other progress bars: \code{\link{progress_none}}, + \code{\link{progress_text}}, \code{\link{progress_time}}, \code{\link{progress_tk}} } diff --git a/man/quickdf.Rd b/man/quickdf.Rd index 05ae8c6..24e944d 100644 --- a/man/quickdf.Rd +++ b/man/quickdf.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/quickdf.r \name{quickdf} \alias{quickdf} diff --git a/man/quoted.Rd b/man/quoted.Rd index 2d1f8e9..cbd6b72 100644 --- a/man/quoted.Rd +++ b/man/quoted.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/quote.r \name{.} \alias{.} diff --git a/man/r_ply.Rd b/man/r_ply.Rd index 7a0ab5d..8f4f96a 100644 --- a/man/r_ply.Rd +++ b/man/r_ply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/r_ply.r \name{r_ply} \alias{r_ply} diff --git a/man/raply.Rd b/man/raply.Rd index 36587c5..e0e9069 100644 --- a/man/raply.Rd +++ b/man/raply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/raply.r \name{raply} \alias{raply} diff --git a/man/rbind.fill.Rd b/man/rbind.fill.Rd index cd81b70..c66d195 100644 --- a/man/rbind.fill.Rd +++ b/man/rbind.fill.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/rbind-fill.r \name{rbind.fill} \alias{rbind.fill} diff --git a/man/rbind.fill.matrix.Rd b/man/rbind.fill.matrix.Rd index 397813b..f0bd622 100644 --- a/man/rbind.fill.matrix.Rd +++ b/man/rbind.fill.matrix.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/rbind-fill-matrix.r \name{rbind.fill.matrix} \alias{rbind.fill.matrix} diff --git a/man/rdply.Rd b/man/rdply.Rd index ea80a60..b135088 100644 --- a/man/rdply.Rd +++ b/man/rdply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/rdply.r \name{rdply} \alias{rdply} diff --git a/man/reduce_dim.Rd b/man/reduce_dim.Rd index 3f7be63..19e96da 100644 --- a/man/reduce_dim.Rd +++ b/man/reduce_dim.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/dimensions.r \name{reduce_dim} \alias{reduce_dim} diff --git a/man/rename.Rd b/man/rename.Rd index 322d5cc..76428f5 100644 --- a/man/rename.Rd +++ b/man/rename.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/rename.r \name{rename} \alias{rename} diff --git a/man/revalue.Rd b/man/revalue.Rd index 97e2bdb..7eae875 100644 --- a/man/revalue.Rd +++ b/man/revalue.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/revalue.r \name{revalue} \alias{revalue} @@ -13,7 +13,7 @@ revalue(x, replace = NULL, warn_missing = TRUE) old values as names.} \item{warn_missing}{print a message if any of the old values are - not actually present in \code{x}} +not actually present in \code{x}} } \description{ If \code{x} is a factor, the named levels of the factor will be diff --git a/man/rlply.Rd b/man/rlply.Rd index 96f23d0..6107aad 100644 --- a/man/rlply.Rd +++ b/man/rlply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/rlply.r \name{rlply} \alias{rlply} diff --git a/man/round_any.Rd b/man/round_any.Rd index 7fff842..e0a25c0 100644 --- a/man/round_any.Rd +++ b/man/round_any.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/round-any.r \name{round_any} \alias{round_any} diff --git a/man/splat.Rd b/man/splat.Rd index b3943be..8174847 100644 --- a/man/splat.Rd +++ b/man/splat.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/splat.r \name{splat} \alias{splat} diff --git a/man/split_indices.Rd b/man/split_indices.Rd index 545132f..c1d0f2b 100644 --- a/man/split_indices.Rd +++ b/man/split_indices.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/RcppExports.R \name{split_indices} \alias{split_indices} diff --git a/man/split_labels.Rd b/man/split_labels.Rd index 6f8ed38..fa02bb7 100644 --- a/man/split_labels.Rd +++ b/man/split_labels.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/splitter-d.r \name{split_labels} \alias{split_labels} diff --git a/man/splitter_a.Rd b/man/splitter_a.Rd index 0e039b0..a10ea7e 100644 --- a/man/splitter_a.Rd +++ b/man/splitter_a.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/splitter-a.r \name{splitter_a} \alias{splitter_a} diff --git a/man/splitter_d.Rd b/man/splitter_d.Rd index 5873044..7bcdb5a 100644 --- a/man/splitter_d.Rd +++ b/man/splitter_d.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/splitter-d.r \name{splitter_d} \alias{splitter_d} diff --git a/man/strip_splits.Rd b/man/strip_splits.Rd index ec68d18..81d25b6 100644 --- a/man/strip_splits.Rd +++ b/man/strip_splits.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/strip-splits.r \name{strip_splits} \alias{strip_splits} diff --git a/man/summarise.Rd b/man/summarise.Rd index fcad932..415a373 100644 --- a/man/summarise.Rd +++ b/man/summarise.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/summarise.r \name{summarise} \alias{summarise} diff --git a/man/take.Rd b/man/take.Rd index 37286a7..87f6699 100644 --- a/man/take.Rd +++ b/man/take.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/take.r \name{take} \alias{take} diff --git a/man/true.Rd b/man/true.Rd index 52fc7b8..4082682 100644 --- a/man/true.Rd +++ b/man/true.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/utils.r \name{true} \alias{true} diff --git a/man/try_default.Rd b/man/try_default.Rd index af5ae64..bd5d2c1 100644 --- a/man/try_default.Rd +++ b/man/try_default.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/try.r \name{try_default} \alias{tryNULL} diff --git a/man/tryapply.Rd b/man/tryapply.Rd index a9bfa98..d8b9066 100644 --- a/man/tryapply.Rd +++ b/man/tryapply.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/try.r \name{tryapply} \alias{tryapply} diff --git a/man/unrowname.Rd b/man/unrowname.Rd index 7215172..250ee8e 100644 --- a/man/unrowname.Rd +++ b/man/unrowname.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/utils.r \name{unrowname} \alias{unrowname} diff --git a/man/vaggregate.Rd b/man/vaggregate.Rd index a534ac0..1e32360 100644 --- a/man/vaggregate.Rd +++ b/man/vaggregate.Rd @@ -1,4 +1,4 @@ -% Generated by roxygen2 (4.1.1): do not edit by hand +% Generated by roxygen2: do not edit by hand % Please edit documentation in R/vaggregate.r \name{vaggregate} \alias{vaggregate} @@ -33,7 +33,7 @@ because it avoids making a copy of the data. } \examples{ # Some examples of use borrowed from ?tapply -n <- 17; fac <- factor(rep(1:3, length = n), levels = 1:5) +n <- 17; fac <- factor(rep(1:3, length.out = n), levels = 1:5) table(fac) vaggregate(1:n, fac, sum) vaggregate(1:n, fac, sum, .default = NA_integer_) diff --git a/src/loop_apply.c b/src/loop_apply.c index 9938a68..01fdff8 100644 --- a/src/loop_apply.c +++ b/src/loop_apply.c @@ -1,7 +1,7 @@ #include <R.h> #include <Rdefines.h> -SEXP loop_apply(SEXP n, SEXP f, SEXP rho) { +SEXP loop_apply_(SEXP n, SEXP f, SEXP rho) { if(!isFunction(f)) error("'f' must be a function"); if(!isEnvironment(rho)) error("'rho' should be an environment"); diff --git a/tests/testthat/test-array.r b/tests/testthat/test-array.r index 368779e..766b143 100644 --- a/tests/testthat/test-array.r +++ b/tests/testthat/test-array.r @@ -186,7 +186,6 @@ test_that("no support for duplicate names (#211)", { setNames(x, letters[c(1:9,2)]) } B <- list(X=n(1:10), Y=n(11:20), Z=n(21:30)) - expect_warning(laply(B, identity), "Duplicate names") AB <- c('a', 'b', 'a', 'b') @@ -194,6 +193,10 @@ test_that("no support for duplicate names (#211)", { ar <- array(rep(rep(rep(1:4, 4), 4), 2), dim=c(4, 4, 2), dimnames=list(ABCD, ABCD, c('i', 'ii'))) ar[,,2] <- ar[,,2]+4 dimnames(ar)[1:2] <- list(AB, AB) - expect_warning(aaply(ar, 3, identity), "Duplicate names") + if (getRversion() >= "3.4.0") { + expect_error(aaply(ar, 3, identity), "duplicated") + } else { + expect_warning(aaply(ar, 3, identity), "Duplicate names") + } }) diff --git a/tests/testthat/test-parallel.r b/tests/testthat/test-parallel.r index 106c5b0..250cbfb 100644 --- a/tests/testthat/test-parallel.r +++ b/tests/testthat/test-parallel.r @@ -9,13 +9,13 @@ with_parallel <- function(code) { code } -test_that("l_ply respects .parallel", { - with_parallel( - expect_that( - l_ply(c(0.1, 0.1), Sys.sleep, .parallel = TRUE), - takes_less_than(0.18)) - ) -}) +# test_that("l_ply respects .parallel", { +# with_parallel( +# expect_that( +# l_ply(c(0.1, 0.1), Sys.sleep, .parallel = TRUE), +# takes_less_than(0.18)) +# ) +# }) test_that("l_ply + .parallel complains about invalid arguments", { with_parallel({ diff --git a/tests/testthat/test-rbind.r b/tests/testthat/test-rbind.r index 6309510..3a6ca80 100644 --- a/tests/testthat/test-rbind.r +++ b/tests/testthat/test-rbind.r @@ -279,7 +279,7 @@ expect_linear_enough <- function(timings, threshold=0.1) { #expect that no more than `threshold` of a `size` input's runtime is #accounted for by quadratic behavior model <- lm(I(user.self / size) ~ size, timings) - expect_less_than(threshold, summary(model)$coefficients[2,4]) + expect_lt(threshold, summary(model)$coefficients[2,4]) } test_that("rbind.fill performance linear", { diff --git a/tests/testthat/test-revalue.r b/tests/testthat/test-revalue.r index dce10c0..12aecb1 100644 --- a/tests/testthat/test-revalue.r +++ b/tests/testthat/test-revalue.r @@ -121,17 +121,17 @@ test_that("revalue and mapvalues accept empty vectors and NULL", { test_that("revalue and mapvalues respect warn_missing", { # revalue - expect_that(revalue("a", c("a"="A")), not(shows_message())) - expect_that(revalue("a", c("b"="B"), warn_missing=TRUE), shows_message()) - expect_that(revalue("a", c("b"="B"), warn_missing=FALSE), not(shows_message())) + expect_message(revalue("a", c("a"="A")), NA) + expect_message(revalue("a", c("b"="B"), warn_missing=TRUE)) + expect_message(revalue("a", c("b"="B"), warn_missing=FALSE), NA) # mapvalues - expect_that(mapvalues("a", "a", "A"), not(shows_message())) - expect_that(mapvalues("a", "b", "B", warn_missing=TRUE), shows_message()) - expect_that(mapvalues("a", "b", "B", warn_missing=FALSE), not(shows_message())) + expect_message(mapvalues("a", "a", "A"), NA) + expect_message(mapvalues("a", "b", "B", warn_missing=TRUE)) + expect_message(mapvalues("a", "b", "B", warn_missing=FALSE), NA) # mapvalues with factors - expect_that(mapvalues(factor("a"), "a", "A"), not(shows_message())) - expect_that(mapvalues(factor("a"), "b", "B", warn_missing=TRUE), shows_message()) - expect_that(mapvalues(factor("a"), "b", "B", warn_missing=FALSE), not(shows_message())) + expect_message(mapvalues(factor("a"), "a", "A"), NA) + expect_message(mapvalues(factor("a"), "b", "B", warn_missing=TRUE)) + expect_message(mapvalues(factor("a"), "b", "B", warn_missing=FALSE), NA) }) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-cran-plyr.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
