Skip to content

Commit

Permalink
update r version time stamp
Browse files Browse the repository at this point in the history
  • Loading branch information
nick-gauthier committed Aug 24, 2019
1 parent 71ecd72 commit 383b67d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .binder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ COPY . ${HOME}
RUN chown -R ${NB_USER} ${HOME}
USER ${NB_USER}

RUN wget https://github.com/nick-gauthier/ArchaeoGLOBE/raw/master/DESCRIPTION && R -e "options(repos = list(CRAN = 'http://mran.revolutionanalytics.com/snapshot/2019-08-24/')); devtools::install_deps()"
RUN wget https://github.com/nick-gauthier/ArchaeoGLOBE/raw/master/DESCRIPTION && R -e "options(repos = list(CRAN = 'http://mran.revolutionanalytics.com/snapshot/2019-05-02/')); devtools::install_deps()"
RUN R -e "devtools::install_github(c('thomasp85/patchwork', 'centerforopenscience/osfr')) "
RUN rm DESCRIPTION.1
10 changes: 9 additions & 1 deletion analysis/archaeoglobe.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,8 @@ Here we compare the onset times for intensive agriculture derived from the Archa
Download and import HYDE 3.2 and KK10 land-use reconstructions. Refer to the source .rmd document for the code to download the respective .zip and .nc files from their ftp servers. By default, we pull pre-computed results from our local repository rather than running the time consuming download. If you would like a fresh download of the data, refer to the .rmd source file for the necessary code, which will download about 500mb and 18gb to your computer for each dataset, respectively.

```{r echo = FALSE}
rerun_time_consuming_download <- FALSE # FALSE means do not run the download code when knitting
# FALSE means do not run the download code when knitting
rerun_time_consuming_download <- FALSE
```

```{r hyde-download, echo = FALSE, eval = rerun_time_consuming_download}
Expand Down Expand Up @@ -979,6 +980,13 @@ saveRDS(hyde_crop_prop, 'data/derived-data/hyde_crop_prop.RDS')
saveRDS(kk_anthro_prop, 'data/derived-data/kk_anthro_prop.RDS')
```

```{r}
# load saved files
hyde_crop_prop <- readRDS('data/derived-data/hyde_crop_prop.RDS')
kk_anthro_prop <- readRDS('data/derived-data/kk_anthro_prop.RDS')
```


Next calculate the earliest onset time for intensive agriculture at common and widespread thresholds for the HYDE and KK10 data. Note that HYDE and KK10 are estimating different quantities (cropland vs anthropogenic land use), so the results won't be entirely consistent.

```{r onsets-hyde}
Expand Down

0 comments on commit 383b67d

Please sign in to comment.