From 553c2a88d773122f86f3c5ca032b6793cd597d18 Mon Sep 17 00:00:00 2001
From: unknown <ldecicco@usgs.gov>
Date: Tue, 28 Oct 2014 11:22:04 -0500
Subject: [PATCH] Changed EGRET to EGRET demo
---
.travis.yml | 2 +-
DESCRIPTION | 2 +-
README.md | 4 ++--
appveyor.yml | 2 +-
inst/doc/dataRetrieval.Rnw | 6 +++---
inst/doc/dataRetrieval.pdf | Bin 234675 -> 234679 bytes
vignettes/dataRetrieval.Rnw | 6 +++---
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8d623207..46f01ff3 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 73570bad..7ad57cc8 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 8ad02cc7..b202a70f 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 2129c268..18271661 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 de316036..edf969f1 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
GIT binary patch
delta 31
lcmdnIl5hJ;z72IoEGenE`OS4k?R7?sK+Lqg&WPDG2>{EX3x@yz
delta 26
gcmdnKl5g`$z72Io%}qw_O-77B%(T79h}kp=0G8(o?f?J)
diff --git a/vignettes/dataRetrieval.Rnw b/vignettes/dataRetrieval.Rnw
index de316036..edf969f1 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.
--
GitLab