diff --git a/.gitignore b/.gitignore index 27c1c3fb7f597867db1bb65905c21731a159a57e..4213df5fcdd0f67a102c62fa4b1bc866bc6681ef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ output output_cluster ignore -data/raw +data/raw* figs *.xls *.xlsx diff --git a/R/format.data/Makefile b/R/format.data/Makefile index 61a7603f6b16a8ca74efafc05fd250ac66edc2a1..487cc9ec96d61e0bc30c7c84f1abb0345ea2af5b 100644 --- a/R/format.data/Makefile +++ b/R/format.data/Makefile @@ -5,7 +5,9 @@ D2 := $(ROOT)/output/formatted all: TRY Canada France NVS Spain Sweden Swiss US # BCI Fushan NSW Paracou -TRY: $(D2)/TRY/data.TRY.std.rds TRY.R +TRY: $(D2)/TRY/data.TRY.std.rds + +$(D2)/TRY/data.TRY.std.rds: TRY.R Rscript TRY.R BCI: $(D2)/BCI/traits.csv diff --git a/R/format.data/TRY.R b/R/format.data/TRY.R index af9c8a872d90299aba5aee4714e56e79badc7401..7a995ae1a4d2af923554a0cdf182824783c10643 100644 --- a/R/format.data/TRY.R +++ b/R/format.data/TRY.R @@ -153,14 +153,14 @@ saveRDS(sd.vec.sp, file = file.path(out.dir, "sd.vec.sp.rds")) saveRDS(sd.vec.genus, file = file.path(out.dir, "sd.vec.genus.rds")) -### plot sd to show mark -pdf(file.path(out.dir, "sd.traits.pdf")) -r <- barplot(sd.vec.sp, names.arg = c("Leaf.N", "SM", "SLA", "WD", "Vessel", "LL"), - las = 2, ylim = c(0, 0.9), ylab = "sd log10") -points(r[, 1], sd.vec.genus, col = "red", pch = 16, cex = 2) -## for (i in 1:length(nobs.names)){ ## sd.obs <- -## data.TRY.sd.update[[sd.names[i]]][!data.TRY.sd.update[[genus.names[i]]]] ## -## points(rep(r[i,1],length(sd.obs)),sd.obs) ## sd.obs <- -## data.TRY.sd.update[[sd.names[i]]][data.TRY.sd.update[[genus.names[i]]]] ## -## points(rep(r[i,1],length(sd.obs)),sd.obs,col='red',pch=4) print(sd.obs) } -dev.off() +# ### plot sd to show mark +# pdf(file.path(out.dir, "sd.traits.pdf")) +# r <- barplot(sd.vec.sp, names.arg = c("Leaf.N", "SM", "SLA", "WD", "Vessel", "LL"), +# las = 2, ylim = c(0, 0.9), ylab = "sd log10") +# points(r[, 1], sd.vec.genus, col = "red", pch = 16, cex = 2) +# ## for (i in 1:length(nobs.names)){ ## sd.obs <- +# ## data.TRY.sd.update[[sd.names[i]]][!data.TRY.sd.update[[genus.names[i]]]] ## +# ## points(rep(r[i,1],length(sd.obs)),sd.obs) ## sd.obs <- +# ## data.TRY.sd.update[[sd.names[i]]][data.TRY.sd.update[[genus.names[i]]]] ## +# ## points(rep(r[i,1],length(sd.obs)),sd.obs,col='red',pch=4) print(sd.obs) } +# dev.off() diff --git a/R/lib.csv b/R/lib.csv deleted file mode 100644 index 636cae5f7108e4b72579e1f52dac0ffcb69a252e..0000000000000000000000000000000000000000 --- a/R/lib.csv +++ /dev/null @@ -1,18 +0,0 @@ -x -data.table -dismo -doParallel -foreign -knitr -maptools -markdown -MASS -mvoutlier -pander -quantreg -RColorBrewer -reshape -rgdal -rjson -rworldmap -sp