diff --git a/.travis.yml b/.travis.yml index 8d6232076c5fe3d553587184c56bce8df8a7b4e9..46f01ff33e006bda5534592c8fcf6115ca97e36f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ before_script: - chmod 755 ./travis-tool.sh - "./travis-tool.sh bootstrap" - "./travis-tool.sh install_deps - ./travis-tool.sh install_r zoo XML RCurl dplyr reshape2 lubridate" - - "./travis-tool.sh install_github USGS-R/EGRET" + - "./travis-tool.sh install_github USGS-R/EGRETdemo" on_failure: - "./travis-tool.sh dump_logs" diff --git a/DESCRIPTION b/DESCRIPTION index 73570bad48fafca586ec36126bb9c4a948046640..7ad57cc8518af5fefa55c6c449d41ca3814bfb5f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -25,7 +25,7 @@ Imports: dplyr Suggests: xtable, - EGRET, + EGRETdemo, knitr, testthat LazyLoad: yes diff --git a/README.md b/README.md index 8ad02cc77a2f65e88f2a5423239d43a095b71608..b202a70fd313e87e39b485dd5dfd3fc4e95b84f5 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Web service retrieval functions: * `Common 4` = siteNumber, parameterCd, startDate, endDate -Moving `EGRET` specific functions to `EGRET` (version 2.0.0 and greater): +Moving `EGRETdemo` specific functions to `EGRETdemo` (version 2.0.0 and greater): |Information Source | Site Query | Meta Data | Data | @@ -64,7 +64,7 @@ To install the dataRetrievaldemo package, you must be using R 3.0 or greater and ###dataRetrievaldemo 1.5.0 -* Changing naming convention one last time. Migrating `EGRET` specific retrievals to `EGRET`. +* Changing naming convention one last time. Migrating `EGRETdemo` specific retrievals to `EGRETdemo`. * Added back WaterML2 parsing tool * Added specific groundwater, rating, peak, and surfacewater measurement functions diff --git a/appveyor.yml b/appveyor.yml index 2129c268144f8a87106397a68dd7b92ec708b501..18271661310654ace0136659623973772f2768d5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,7 @@ install: ps: Bootstrap build_script: - - travis-tool.sh install_github USGS-R/EGRET + - travis-tool.sh install_github USGS-R/EGRETdemo - travis-tool.sh install_deps test_script: diff --git a/inst/doc/dataRetrieval.Rnw b/inst/doc/dataRetrieval.Rnw index de316036f0da99203894ba3c3518f2217975b92c..edf969f18b15c1576ce4c77cb9dca51c288abc80 100644 --- a/inst/doc/dataRetrieval.Rnw +++ b/inst/doc/dataRetrieval.Rnw @@ -1,7 +1,7 @@ %\VignetteIndexEntry{Introduction to the dataRetrievaldemo package} %\VignetteEngine{knitr::knitr} %\VignetteDepends{} -%\VignetteSuggests{xtable,EGRET} +%\VignetteSuggests{xtable,EGRETdemo} %\VignetteImports{zoo, XML, RCurl, reshape2,lubridate} %\VignettePackage{dataRetrievaldemo} @@ -181,10 +181,10 @@ addSpace <- function(x) ifelse(x != "1", "[5pt]","") %------------------------------------------------------------ \section{Introduction to dataRetrievaldemo} %------------------------------------------------------------ -The dataRetrievaldemo package was created to simplify the process of loading hydrologic data into the R environment. It has been specifically designed to work seamlessly with the EGRET R package: Exploration and Graphics for RivEr Trends. See: \url{https://github.com/USGS-R/EGRET/wiki} or \url{http://dx.doi.org/10.3133/tm4A10} for information on EGRET. EGRET is designed to provide analysis of water quality data sets using the Weighted Regressions on Time, Discharge and Season (WRTDS) method as well as analysis of discharge trends using robust time-series smoothing techniques. Both of these capabilities provide both tabular and graphical analyses of long-term data sets. +The dataRetrievaldemo package was created to simplify the process of loading hydrologic data into the R environment. It has been specifically designed to work seamlessly with the EGRETdemo R package: Exploration and Graphics for RivEr Trends. See: \url{https://github.com/USGS-R/EGRETdemo/wiki} or \url{http://dx.doi.org/10.3133/tm4A10} for information on EGRETdemo. EGRETdemo is designed to provide analysis of water quality data sets using the Weighted Regressions on Time, Discharge and Season (WRTDS) method as well as analysis of discharge trends using robust time-series smoothing techniques. Both of these capabilities provide both tabular and graphical analyses of long-term data sets. -The dataRetrievaldemo package is designed to retrieve many of the major data types of U.S. Geological Survey (USGS) hydrologic data that are available on the Web. Users may also load data from other sources (text files, spreadsheets) using dataRetrievaldemo. Section \ref{sec:genRetrievals} provides examples of how one can obtain raw data from USGS sources on the Web and load them into dataframes within the R environment. The functionality described in section \ref{sec:genRetrievals} is for general use and is not tailored for the specific uses of the EGRET package. The functionality described in section \ref{sec:EGRETdfs} is tailored specifically to obtaining input from the Web and structuring it for use in the EGRET package. The functionality described in section \ref{sec:userFiles} is for converting hydrologic data from user-supplied files and structuring it specifically for use in the EGRET package. +The dataRetrievaldemo package is designed to retrieve many of the major data types of U.S. Geological Survey (USGS) hydrologic data that are available on the Web. Users may also load data from other sources (text files, spreadsheets) using dataRetrievaldemo. Section \ref{sec:genRetrievals} provides examples of how one can obtain raw data from USGS sources on the Web and load them into dataframes within the R environment. The functionality described in section \ref{sec:genRetrievals} is for general use and is not tailored for the specific uses of the EGRETdemo package. The functionality described in section \ref{sec:EGRETdfs} is tailored specifically to obtaining input from the Web and structuring it for use in the EGRETdemo package. The functionality described in section \ref{sec:userFiles} is for converting hydrologic data from user-supplied files and structuring it specifically for use in the EGRETdemo package. For information on getting started in R and installing the package, see (\ref{sec:appendix1}): Getting Started. Any use of trade, firm, or product names is for descriptive purposes only and does not imply endorsement by the U.S. Government. diff --git a/inst/doc/dataRetrieval.pdf b/inst/doc/dataRetrieval.pdf index 7c224c975fa30ab1c0faae9e60cd37659bca922f..737ab9617951e85a155faa2d213cfa7711d125aa 100644 Binary files a/inst/doc/dataRetrieval.pdf and b/inst/doc/dataRetrieval.pdf differ diff --git a/vignettes/dataRetrieval.Rnw b/vignettes/dataRetrieval.Rnw index de316036f0da99203894ba3c3518f2217975b92c..edf969f18b15c1576ce4c77cb9dca51c288abc80 100644 --- a/vignettes/dataRetrieval.Rnw +++ b/vignettes/dataRetrieval.Rnw @@ -1,7 +1,7 @@ %\VignetteIndexEntry{Introduction to the dataRetrievaldemo package} %\VignetteEngine{knitr::knitr} %\VignetteDepends{} -%\VignetteSuggests{xtable,EGRET} +%\VignetteSuggests{xtable,EGRETdemo} %\VignetteImports{zoo, XML, RCurl, reshape2,lubridate} %\VignettePackage{dataRetrievaldemo} @@ -181,10 +181,10 @@ addSpace <- function(x) ifelse(x != "1", "[5pt]","") %------------------------------------------------------------ \section{Introduction to dataRetrievaldemo} %------------------------------------------------------------ -The dataRetrievaldemo package was created to simplify the process of loading hydrologic data into the R environment. It has been specifically designed to work seamlessly with the EGRET R package: Exploration and Graphics for RivEr Trends. See: \url{https://github.com/USGS-R/EGRET/wiki} or \url{http://dx.doi.org/10.3133/tm4A10} for information on EGRET. EGRET is designed to provide analysis of water quality data sets using the Weighted Regressions on Time, Discharge and Season (WRTDS) method as well as analysis of discharge trends using robust time-series smoothing techniques. Both of these capabilities provide both tabular and graphical analyses of long-term data sets. +The dataRetrievaldemo package was created to simplify the process of loading hydrologic data into the R environment. It has been specifically designed to work seamlessly with the EGRETdemo R package: Exploration and Graphics for RivEr Trends. See: \url{https://github.com/USGS-R/EGRETdemo/wiki} or \url{http://dx.doi.org/10.3133/tm4A10} for information on EGRETdemo. EGRETdemo is designed to provide analysis of water quality data sets using the Weighted Regressions on Time, Discharge and Season (WRTDS) method as well as analysis of discharge trends using robust time-series smoothing techniques. Both of these capabilities provide both tabular and graphical analyses of long-term data sets. -The dataRetrievaldemo package is designed to retrieve many of the major data types of U.S. Geological Survey (USGS) hydrologic data that are available on the Web. Users may also load data from other sources (text files, spreadsheets) using dataRetrievaldemo. Section \ref{sec:genRetrievals} provides examples of how one can obtain raw data from USGS sources on the Web and load them into dataframes within the R environment. The functionality described in section \ref{sec:genRetrievals} is for general use and is not tailored for the specific uses of the EGRET package. The functionality described in section \ref{sec:EGRETdfs} is tailored specifically to obtaining input from the Web and structuring it for use in the EGRET package. The functionality described in section \ref{sec:userFiles} is for converting hydrologic data from user-supplied files and structuring it specifically for use in the EGRET package. +The dataRetrievaldemo package is designed to retrieve many of the major data types of U.S. Geological Survey (USGS) hydrologic data that are available on the Web. Users may also load data from other sources (text files, spreadsheets) using dataRetrievaldemo. Section \ref{sec:genRetrievals} provides examples of how one can obtain raw data from USGS sources on the Web and load them into dataframes within the R environment. The functionality described in section \ref{sec:genRetrievals} is for general use and is not tailored for the specific uses of the EGRETdemo package. The functionality described in section \ref{sec:EGRETdfs} is tailored specifically to obtaining input from the Web and structuring it for use in the EGRETdemo package. The functionality described in section \ref{sec:userFiles} is for converting hydrologic data from user-supplied files and structuring it specifically for use in the EGRETdemo package. For information on getting started in R and installing the package, see (\ref{sec:appendix1}): Getting Started. Any use of trade, firm, or product names is for descriptive purposes only and does not imply endorsement by the U.S. Government.