conflicts solved

Yuanchao-Xu · Nov 8, 2015 · dedbd3a · dedbd3a
1 parent 90b9ca5
commit dedbd3a
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/.Rhistory b/.Rhistory
@@ -1,6 +1,3 @@
-if (!is.null(message_out)) {
-if (grepl('Version', message_out)) {
-packageStartupMessage(message_out)
 }
 }
 }
@@ -510,3 +507,6 @@ devtools::document()
 devtools::install_github('Yuanchao-Xu/hyfo')
 library(hyfo)
 devtools::document()
+devtools::document
+devtools::document()
+devtools::check()
diff --git a/.Rproj.user/D53FD3E6/pcs/source-pane.pper b/.Rproj.user/D53FD3E6/pcs/source-pane.pper
@@ -1,3 +1,3 @@
 {
- "activeTab" : 5
+ "activeTab" : 3
 }
diff --git a/.Rproj.user/D53FD3E6/sdb/per/t/222F1822 b/.Rproj.user/D53FD3E6/sdb/per/t/222F1822
@@ -1,12 +1,12 @@
 {
- "contents" : "hyfo 1.3.1\n==========\nDate: 2015.11.3\n\n- new generic function biasCorrect, extractPeriod, resample, getAnnual, getPreciBar added. No need to designate input type any more, R will detect automatically.\n- coordinates conversion function extracted.\n- new user manual about real time bias correction and resample added.\n\n\n\nhyfo 1.2.9\n==========\nDate: 2015.10.30\n\n- new biasFactor S4 class added, to avoid set the input type every time.\n- operational bias correction has been changed to generic function.\n- news file added.\n\n\n\nhyfo 1.2.8\n==========\nDate: 2015.10.10\n\n- operational bias correction added, in normal function.",
+ "contents" : "hyfo 1.3.2\n==========\nDate: 2015.11.7\n\n- bug fixed about getPreciBar, signature('data.frame')\n- vignettes updated about bug and hided the warning information.\n- Add how to debug in the documentation for the generic functions.\n\n\n\nhyfo 1.3.1\n==========\nDate: 2015.11.3\n\n- new generic function biasCorrect, extractPeriod, resample, getAnnual, getPreciBar added. No need to designate input type any more, R will detect automatically.\n- coordinates conversion function extracted.\n- new user manual about real time bias correction and resample added.\n\n\n\nhyfo 1.2.9\n==========\nDate: 2015.10.30\n\n- new biasFactor S4 class added, to avoid set the input type every time.\n- operational bias correction has been changed to generic function.\n- news file added.\n\n\n\nhyfo 1.2.8\n==========\nDate: 2015.10.10\n\n- operational bias correction added, in normal function.",
  "created" : 1446423165783.000,
  "dirty" : false,
  "encoding" : "ASCII",
  "folds" : "",
- "hash" : "3917817092",
+ "hash" : "1093548842",
  "id" : "222F1822",
- "lastKnownWriteTime" : 1446991911,
+ "lastKnownWriteTime" : 1446982013,
  "path" : "E:/1/R/hyfo/NEWS",
  "project_path" : "NEWS",
  "properties" : {

diff --git a/.Rproj.user/D53FD3E6/sdb/per/t/44AE41D2 b/.Rproj.user/D53FD3E6/sdb/per/t/44AE41D2
@@ -6,7 +6,7 @@
  "folds" : "",
  "hash" : "3174204225",
  "id" : "44AE41D2",
- "lastKnownWriteTime" : 1446992073,
+ "lastKnownWriteTime" : 1446992629,
  "path" : "E:/1/R/hyfo/NAMESPACE",
  "project_path" : "NAMESPACE",
  "properties" : {

diff --git a/.Rproj.user/D53FD3E6/sdb/per/t/45B3271 b/.Rproj.user/D53FD3E6/sdb/per/t/45B3271
@@ -1,12 +1,12 @@
 {
- "contents" : "\n# Introduction\n\n**Official Website is [http:https://yuanchao-xu.github.io/hyfo](http:https://yuanchao-xu.github.io/hyfo)**\n\nhyfo is an R package, initially designed for the European Project EUPORIAS, and cooperated with DHI Denmark, which was then extended to other uses in hydrology, hydraulics and climate.\n\nThis package mainly focuses on data process and visulization in hydrology and climate forecasting. Main function includes NetCDF file processing, data extraction, data downscaling, data resampling, gap filler of precipitation, bias correction of forecasting data, flexible time series plot, and spatial map generation. It is a good pre-processing and post-processing tool for hydrological and hydraulic modellers.\n\n**If you feel hyfo is of a little help, please cite it as following:**\n\nXu, Yuanchao(2015). hyfo: Hydrology and Climate Forecasting R Package for Data Analysis and Visualization. Retrieved from http:https://yuanchao-xu.github.io/hyfo/\n\n[Author's profile](https://dk.linkedin.com/in/xuyuanchao37)\n\n\n\n",
+ "contents" : "\n# Introduction\n\n**Official Website is [http:https://yuanchao-xu.github.io/hyfo](http:https://yuanchao-xu.github.io/hyfo)**\n\nhyfo is an R package, initially designed for the European Project EUPORIAS, and cooperated with DHI Denmark, which was then extended to other uses in hydrology, hydraulics and climate.\n\nThis package mainly focuses on data process and visulization in hydrology and climate forecasting. Main function includes NetCDF file processing, data extraction, data downscaling, data resampling, gap filler of precipitation, bias correction of forecasting data, flexible time series plot, and spatial map generation. It is a good pre-processing and post-processing tool for hydrological and hydraulic modellers.\n\n**If you feel hyfo is of a little help, please cite it as following:**\n\nXu, Yuanchao(2015). hyfo: Hydrology and Climate Forecasting R Package for Data Analysis and Visualization. Retrieved from http:https://yuanchao-xu.github.io/hyfo/\n\n[Author in this corner](https://dk.linkedin.com/in/xuyuanchao37)\n\n\n\n",
  "created" : 1446992088666.000,
  "dirty" : false,
  "encoding" : "ASCII",
  "folds" : "",
- "hash" : "2534831972",
+ "hash" : "3163745448",
  "id" : "45B3271",
- "lastKnownWriteTime" : 1446991911,
+ "lastKnownWriteTime" : 1446992921,
  "path" : "E:/1/R/hyfo/README.md",
  "project_path" : "README.md",
  "properties" : {

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ This package mainly focuses on data process and visulization in hydrology and cl
 
 Xu, Yuanchao(2015). hyfo: Hydrology and Climate Forecasting R Package for Data Analysis and Visualization. Retrieved from http:https://yuanchao-xu.github.io/hyfo/
 
-[Author's profile](https://dk.linkedin.com/in/xuyuanchao37)
+[Author in this corner](https://dk.linkedin.com/in/xuyuanchao37)
 
 
 
diff --git a/man/getSpatialMap_comb.Rd b/man/getSpatialMap_comb.Rd
@@ -39,8 +39,8 @@ data(tgridData)# the result of \\code{loadGridData{ecomsUDG.Raccess}}
 #The output should be 'ggplot'
 a1 <- getSpatialMap(tgridData, method = 'summer', output = 'ggplot', name = 'a1')
 a2 <- getSpatialMap(tgridData, method = 'winter', output = 'ggplot', name = 'a2')
-# a3 <- getSpatialMap(tgridData, method = 'mean', output = 'ggplot', name = 'a3')
-# a4 <- getSpatialMap(tgridData, method = 'max', output = 'ggplot', name = 'a4')
+a3 <- getSpatialMap(tgridData, method = 'mean', output = 'ggplot', name = 'a3')
+a4 <- getSpatialMap(tgridData, method = 'max', output = 'ggplot', name = 'a4')
 getSpatialMap_comb(a1, a2)
 
 # or you can put them into a list.