version 1.0.5

cran · Feb 17, 2017 · fcfcc42 · fcfcc42
1 parent 192c3f4
commit fcfcc42
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 82 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,25 @@
 monitoR
+Version 1.0.5
+2017 February 16 Sasha D. Hafner
+
+*cutw.R
+Removed file
+
+*NAMESPACE
+Removed cutw
+
+*cutw.Rd
+Removed file
+
+*survey_anno.Rda
+Changed extension to rda
+
+2015 December 11 Jon Katz
+Version 1.0.4
+
+*cutw.Rd
+Removed \alias{biogas-deprecated}
+
 2015 September 18 Sasha D. Hafner
 Version 1.0.4
 

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: monitoR
 Type: Package
 Title: Acoustic Template Detection in R
-Version: 1.0.4
-Date: 2015-09-18
+Version: 1.0.5
+Date: 2017-02-17
 Author: Sasha D. Hafner <sdh11@cornell.edu> and Jon Katz <jonkatz4@gmail.com>, with code for the Fourier transform from the seewave package (by Jerome Sueur, Thierry Aubin, and Caroline Simonis), and code for the readMP3 function from the tuneR package (by Uwe Ligges). Therese Donovan provided creative direction and database design support. 
 Maintainer: Sasha D. Hafner <sdh11@cornell.edu>
 Depends: R (>= 2.10), tuneR, methods
@@ -13,6 +13,6 @@ License: GPL-2
 URL: http://www.uvm.edu/rsenr/vtcfwru/R/?Page=monitoR/monitoR.htm
 VignetteBuilder: knitr
 NeedsCompilation: no
-Packaged: 2015-09-18 09:48:58 UTC; sasha
+Packaged: 2017-02-17 05:52:22 UTC; sasha
 Repository: CRAN
-Date/Publication: 2015-09-18 13:36:02
+Date/Publication: 2017-02-17 22:15:13
diff --git a/MD5 b/MD5
@@ -1,7 +1,7 @@
-13395539e6e9925a37854a7caca4d06a *ChangeLog
-0796f53c73b860054462ffd8466df4e7 *DESCRIPTION
-2fa227dc455c9b5900589988ec3d1756 *NAMESPACE
-ce504871165d2a8ab99e502f26a87bc3 *NEWS
+a2387257b9c885252a08e10f67e653ee *ChangeLog
+0c953c4168e6a795dcac86a6803fb3af *DESCRIPTION
+7a725bf5757e0706357f1411bf95778b *NAMESPACE
+18c5fc00ed8f436ad68b9e6c5b01487f *NEWS
 6be4a778b8c01d16512cdbcc187dfd23 *R/Classes.R
 f51dc3623a2cd58c471ab2380df0be22 *R/Methods-index.R
 aa6efeb66710eb2fa4bd98375a95679b *R/Methods-plot.R
@@ -18,7 +18,6 @@ f661ed0cd74e1ef049c43655b0fe1998 *R/combineCorTemplates.R
 5640f17d8ec52265ed30d64e3a4c12e4 *R/compareTemplates.R
 4f949b2fedb2a7428b66de98ad300f60 *R/corMatch.R
 12122ea7e1da55b0da0058b53be19df7 *R/cutWave.R
-ec69317830eea3d616e0800eb7ffeddf *R/cutw.R
 5f37514cc5c689c8900013cc3a883001 *R/dBweight.R
 18a5bd547abd05722c84488228631541 *R/dbDownloadCardRecorderID.R
 b279060c2b807bf6cec93313e0c8c51f *R/dbDownloadResult.R
@@ -63,16 +62,16 @@ d358681f44a9f6bf28d6414e462bbf02 *R/templatePath.R
 bf725431c4826a4065ca999cfdbf8933 *R/writeOneBinTemplate.R
 0f85c6418b3f2f2e72b2ce967e540aa6 *R/writeOneCorTemplate.R
 6cd39b8e53968856d140cdf5a6b91845 *README
-f880fba3af7bc04c1bbc1b6bfce7202c *build/vignette.rds
-e97fbe3a6b26b81556491063544e7f3f *data/btnw.rda
+56a02b99b2495ec3e2958f892234ea95 *build/vignette.rds
+4af2037cdc8c5459148447923e88a5c2 *data/btnw.rda
 b2da440985d2cf8b17b2da2b08defe79 *data/datalist
-42e3129f2485b3e6350683c3e111704e *data/oven.rda
-aa89321bda890477b4137c5a3c752b15 *data/survey.rda
-5400d562dcf8f09e77e4db7703889be3 *data/survey_anno.rda
+c7e6661e4c440bcbd6b80776862b67b5 *data/oven.rda
+3df1af594ac82fd79fcde4d5bec5b8db *data/survey.rda
+b638e4063ba07a4d5c2259a42c8bf714 *data/survey_anno.rda
 18d2740e1d288bf81ee2eb903dfde0c7 *inst/CITATION
 aab5ffd971572a4d56466120baaef484 *inst/doc/monitoR_QuickStart.R
 9e6634eb345140fcdc46cde955dbcd79 *inst/doc/monitoR_QuickStart.Rnw
-4dc34024656fcd1072b49446fe3f2c99 *inst/doc/monitoR_QuickStart.pdf
+b60b5895ce74911d794e514341e884cc *inst/doc/monitoR_QuickStart.pdf
 da0b7d27ab83a8de8cd6cb4e662ed89a *man/Template-class.Rd
 bf8ea8dade96bbe4ff203014f665dced *man/TemplateList-class.Rd
 b9e86b467cee867e97ee4530b4f2236e *man/batchDetection.Rd
@@ -83,7 +82,6 @@ fbb79353fa301a1bd4cbaf52eb1fe52f *man/collapseClips.Rd
 236c741de41a04eb1514604a383492db *man/combineTemplates.Rd
 f4b3e28f519bd696d3b38d48c4423161 *man/compareTemplates.Rd
 4cb5aeccbd82b5ed624b56378f0de8d2 *man/cutWave.Rd
-0a3488af611d2c76466d38f15ff8d541 *man/cutw.Rd
 aedd031255ad945ebcf02697955323e2 *man/dbDownload.Rd
 ac22d64fc0a7c561bc1a86bb9eb3619e *man/dbDownloadResult.Rd
 55e4d01a37b78cca74e7359eeca5680d *man/dbDownloadTemplate.Rd

diff --git a/NAMESPACE b/NAMESPACE
@@ -16,7 +16,6 @@ export(
   combineCorTemplates,
   compareTemplates,
   corMatch,
-  cutw,
   cutWave,
   dbDownloadCardRecorderID,
   dbDownloadResult,

diff --git a/NEWS b/NEWS
@@ -1,3 +1,13 @@
+--------------------------------------------------------------------------------
+monitoR 1.0.5
+2017 February 17
+--------------------------------------------------------------------------------
+
+CHANGED FUNCTION NAME
+*The cutw() function was renamed cutWave() in the last version of monitoR to 
+avoid conflict with the cutw() function in the seewave package. The cutw() 
+function has now been removed.
+
 --------------------------------------------------------------------------------
 monitoR 1.0.4
 2015 September 18

diff --git a/R/cutw.R b/R/cutw.R
diff --git a/build/vignette.rds b/build/vignette.rds
diff --git a/data/btnw.rda b/data/btnw.rda
diff --git a/data/oven.rda b/data/oven.rda
diff --git a/data/survey.rda b/data/survey.rda
diff --git a/data/survey_anno.rda b/data/survey_anno.rda
diff --git a/inst/doc/monitoR_QuickStart.pdf b/inst/doc/monitoR_QuickStart.pdf
diff --git a/man/cutw.Rd b/man/cutw.Rd