Skip to content

Commit

Permalink
Merge pull request #17 from IDEMSInternational/sub_branch
Browse files Browse the repository at this point in the history
Adding from calculations.R
  • Loading branch information
lilyclements authored Nov 19, 2024
2 parents 58d6365 + 57e8c9c commit 8f13b02
Show file tree
Hide file tree
Showing 7 changed files with 1,795 additions and 10,279 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Description: This package provides tools for managing and manipulating data fram
License: LGPL (>= 3)
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
RoxygenNote: 7.3.2
Imports:
chillR,
clipr,
Expand All @@ -31,4 +31,4 @@ Imports:
stringr,
tibble,
tidyselect,
zoo
zoo
1 change: 0 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Generated by roxygen2: do not edit by hand

export("%>%")
export(DataBook)
export(DataSheet)
export(instat_comment)
export(link)
Expand Down
4 changes: 2 additions & 2 deletions R/DisplayDaily.R
Original file line number Diff line number Diff line change
Expand Up @@ -310,13 +310,13 @@ DisplayDaily <- function(Datain,Stations,Variables,option=1,Years,Misscode,Trace
cat(paste("VARIABLE : '",Variables[v],"'",sep=""),"\n",file=fileoutput,sep="")
cat(paste("YEAR :",Years[y]),"\n",file=fileoutput,sep="")
cat(paste(names(out)),"\n",file=fileoutput,sep="\t")
write.table(out,file=fileoutput,sep="\t",append=TRUE,quote=FALSE,col.names=FALSE,row.names=FALSE)
utils::write.table(out,file=fileoutput,sep="\t",append=TRUE,quote=FALSE,col.names=FALSE,row.names=FALSE)
}else{
cat("\n",paste("STATION : '",Stations[s],"'",sep=""),"\n",file=fileoutput,sep="")
cat(paste("VARIABLE : '",Variables[v],"'",sep=""),"\n",file=fileoutput,sep="")
cat(paste("YEAR :",Years[y]),"\n",file=fileoutput,sep="")
cat(paste(names(out)),"\n",file=fileoutput,sep="\t")
write.table(out,file=fileoutput,sep="\t",append=TRUE,quote=FALSE,col.names=FALSE,row.names=FALSE)
utils::write.table(out,file=fileoutput,sep="\t",append=TRUE,quote=FALSE,col.names=FALSE,row.names=FALSE)
}
}
rm(tmp2)
Expand Down
5,372 changes: 947 additions & 4,425 deletions R/data_book.R

Large diffs are not rendered by default.

141 changes: 85 additions & 56 deletions R/data_sheet.R

Large diffs are not rendered by default.

6,504 changes: 713 additions & 5,791 deletions man/DataBook.Rd

Large diffs are not rendered by default.

48 changes: 46 additions & 2 deletions man/DataSheet.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8f13b02

Please sign in to comment.