2015-9-2

.Rproj.user/132DF987/pcs/files-pane.pper

@@ -1,5 +1,5 @@
 {
- "path" : "~/hyfo/vignettes",
+ "path" : "~/hyfo/R",
  "sortOrder" : [
  {
  "ascending" : false,

.Rproj.user/132DF987/pcs/source-pane.pper

@@ -1,3 +1,3 @@
 {
- "activeTab" : 0
+ "activeTab" : 2
 }

.Rproj.user/132DF987/pcs/windowlayoutstate.pper

@@ -1,14 +1,14 @@
 {
  "left" : {
- "panelheight" : 911,
- "splitterpos" : 364,
+ "panelheight" : 941,
+ "splitterpos" : 375,
  "topwindowstate" : "NORMAL",
- "windowheight" : 949
+ "windowheight" : 979
  },
  "right" : {
- "panelheight" : 911,
- "splitterpos" : 559,
+ "panelheight" : 941,
+ "splitterpos" : 577,
  "topwindowstate" : "NORMAL",
- "windowheight" : 949
+ "windowheight" : 979
  }
 }

.Rproj.user/132DF987/pcs/workbench-pane.pper

@@ -1,4 +1,4 @@
 {
  "TabSet1" : 0,
- "TabSet2" : 0
+ "TabSet2" : 1
 }

R/extractPeriod.R

@@ -1,4 +1,3 @@
-
 #' Extract period from list or dataframe.
 #' 
 #' Extract common period or certain period from a list of different dataframes of time series, or from a 

R/getSpatialMap.R

@@ -293,7 +293,7 @@ getSpatialMap_mat <- function(matrix, title_d = NULL, catchment = NULL, points =
  theme_set(theme_bw())
 
  if (is.null(colors)) colors <- c('yellow', 'orange', 'red')
-
+ # if (is.null(colors)) colors <- rev(rainbow(n = 20, end = 0.7))
 
  mainLayer <- with(data_ggplot, {
 

vignettes/hyfo.Rmd

@@ -187,7 +187,7 @@ a
 ```
 
 Mean annual precipitation is calculated, but as we can see in the figure before, it's not reliable, since there are a lot of missing values in AAA and CCC, especially in AAA, in 1993, there are more than 30 missing values in a year. So we have to decide which is the threshold for the valid record. the default is 355, which means in a year (355 or 365 days), if the valid records (not missing) exceeds 355, then this year is taken into consideration in the mean annual preicipitation calculation.
-```{r, fig.height=3, fig.width=3}
+```{r, fig.height=4, fig.width=7}
 getAnnual(testdl, output = 'mean', minRecords = 300)
 getAnnual(testdl, output = 'mean', minRecords = 365)
 ```
@@ -207,7 +207,8 @@ a <- getAnnual(dataframe = testdl[[1]])
 ```{r, fig.height=4, fig.width=7}
 a1 <- plotTS(TS = testdl[[1]])
 
-# You can also choose 'bar' as time series type, default is 'line'. But most of time, they are not # so different.
+# You can also choose 'bar' as time series type, default is 'line'. But most of time, 
+# they are not # so different.
 a2 <- plotTS(TS = testdl[[1]], type = 'bar')