Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
dataRetrieval
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Water
dataRetrieval
Commits
25e144f4
Commit
25e144f4
authored
12 years ago
by
Laura A DeCicco
Browse files
Options
Downloads
Patches
Plain Diff
Added some examples.
parent
e1b43dbf
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
DESCRIPTION
+1
-1
1 addition, 1 deletion
DESCRIPTION
NEWS
+8
-10
8 additions, 10 deletions
NEWS
R/getDailyDataFromFile.r
+2
-2
2 additions, 2 deletions
R/getDailyDataFromFile.r
R/getPreLoadedData.r
+3
-1
3 additions, 1 deletion
R/getPreLoadedData.r
with
14 additions
and
14 deletions
DESCRIPTION
+
1
−
1
View file @
25e144f4
...
...
@@ -57,7 +57,7 @@ Depends:
Imports:
zoo
Suggests:
xtable
xtable
,
EGRET
LazyLoad: yes
LazyData: yes
This diff is collapsed.
Click to expand it.
NEWS
+
8
−
10
View file @
25e144f4
dataRetrieval 1.2.2
===========
* Added getDataAvailability function to find measured parameters and period of record information for a requested station
* Added constructNWISURL function to get the URL that is used to retrieve the data
dataRetrieval 1.2.1
===========
...
...
@@ -8,13 +16,3 @@ dataRetrieval 1.2.1
* Expanded the capabilities to retrieve raw data from the web services.
* Added Storet data retrievals in getWQPData function
EGRET 1.0.5
===========
* Fixed several bugs
EGRET 1.0.0
===========
* Initial release.
\ No newline at end of file
This diff is collapsed.
Click to expand it.
R/getDailyDataFromFile.r
+
2
−
2
View file @
25e144f4
...
...
@@ -15,9 +15,9 @@
#' @examples
#' # Examples of how to use getDailyDataFromFile:
#' # Change the file path and file name to something meaningful:
#'
#
filePath <- '~/RData/' # Sample format
#' filePath <- '~/RData/' # Sample format
#' fileName <- 'ChoptankRiverFlow.txt'
#'
#
getDailyDataFromFile(filePath,fileName,separator="\t")
#'
\dontrun{
getDailyDataFromFile(filePath,fileName,separator="\t")
}
getDailyDataFromFile
<-
function
(
filePath
,
fileName
,
hasHeader
=
TRUE
,
separator
=
","
,
qUnit
=
1
,
interactive
=
TRUE
){
data
<-
getDataFromFile
(
filePath
,
fileName
,
hasHeader
=
hasHeader
,
separator
=
separator
)
convertQ
<-
c
(
35.314667
,
1
,
0.035314667
,
0.001
)
...
...
This diff is collapsed.
Click to expand it.
R/getPreLoadedData.r
+
3
−
1
View file @
25e144f4
...
...
@@ -9,13 +9,15 @@
#' @return retval dataframe with dateTime, value, and code columns
#' @export
#' @examples
#' ChoptankRiverFlow <- ChoptankRiverFlow
#' rawData <- getPreLoadedData(ChoptankRiverFlow)
#' rawDataSample <- getPreLoadedData(ChoptankRiverNitrate)
getPreLoadedData
<-
function
(
rawData
){
retval
<-
as.data.frame
(
rawData
,
stringsAsFactors
=
FALSE
)
if
(
ncol
(
retval
)
==
2
){
names
(
retval
)
<-
c
(
'dateTime'
,
'value'
)
}
else
if
(
ncol
(
retval
)
==
3
){
names
(
retval
)
<-
c
(
'dateTime'
,
'
valu
e'
,
'
cod
e'
)
names
(
retval
)
<-
c
(
'dateTime'
,
'
cod
e'
,
'
valu
e'
)
}
retval
$
dateTime
<-
as.character
(
retval
$
dateTime
)
if
(
dateFormatCheck
(
retval
$
dateTime
)){
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment