Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
c7104af
rm extra files
sedv8808 Nov 14, 2022
37800fd
readme
sedv8808 Nov 15, 2022
1c16391
added binder link
sedv8808 Nov 15, 2022
d718b71
updated readme
sedv8808 Nov 15, 2022
f19fdb8
Updated readme with more text.
SimonGoring Nov 15, 2022
d569616
Merge remote-tracking branch 'origin/main' into main
SimonGoring Nov 15, 2022
dc59310
workshop agenda
sedv8808 Nov 15, 2022
714d6e5
changed cz to sa and uploaded a saDownload file
sedv8808 Nov 15, 2022
a9243b3
complex workflow - needs review
sedv8808 Nov 15, 2022
73350b7
Updating data files for the rmarkdown
SimonGoring Nov 16, 2022
8a31bfe
Updating the simple workflow. Re-rendering.
SimonGoring Nov 16, 2022
107f65c
Merge pull request #1 from NeotomaDB/sam_Dev
sedv8808 Nov 16, 2022
ceef7b5
epd complex
sedv8808 Nov 16, 2022
a518561
updated files
sedv8808 Nov 16, 2022
9c48509
Clearing up support files for PNW workshop turnover.
SimonGoring Feb 14, 2023
7ce91b4
Adding PNW specific data artefacts for Rmd loading
SimonGoring Feb 14, 2023
6726a62
Updating initital agenda file.
SimonGoring Feb 14, 2023
a5e9064
Largely modified content to reflect a PNW focus for the workshop.
SimonGoring Feb 14, 2023
f2efe49
Rendered the simple workflow.
SimonGoring Feb 14, 2023
220cb18
Update README.md
sedv8808 Feb 15, 2023
96b28f4
Update install.R
sedv8808 Feb 15, 2023
b4f5427
Update install.R
sedv8808 Feb 15, 2023
78196bf
Update install.R
sedv8808 Feb 15, 2023
92496c7
fixed install.R and tried to get the workflow to knit
sedv8808 Feb 15, 2023
593bd29
Updating the agenda
SimonGoring Feb 27, 2023
259f320
Merge remote-tracking branch 'origin/main' into main
SimonGoring Feb 27, 2023
59590ea
Adding new figures to the repository.
SimonGoring Mar 24, 2023
4476bac
Adding the new versions of complex and simple workflows.
SimonGoring Mar 24, 2023
04be69c
Updated workflows with some extra styling.
SimonGoring Mar 24, 2023
6bc5192
SitesAge error
sedv8808 Mar 25, 2023
b01d35a
Merge remote-tracking branch 'origin/main' into main
SimonGoring Mar 25, 2023
6eeba74
Minor updates.
SimonGoring Mar 25, 2023
22489f8
Updating the repo for the APD meeting.
SimonGoring Apr 5, 2023
a4abe55
Minor update to the data files.
SimonGoring Apr 5, 2023
d105a8f
Added Russian Translation and support for languages.
SimonGoring Apr 19, 2023
dc2bc2c
Updated URL link
SimonGoring Apr 19, 2023
4f00e9c
Added Spanish to the README files for the repo.
SimonGoring Apr 20, 2023
604d825
Added piping section
sedv8808 Apr 22, 2023
06cd6d0
Removed agenda edited languages.
SimonGoring Apr 23, 2023
29b7907
Changed text to reflect Quebec data
SimonGoring Apr 23, 2023
ee3cab4
Updated png plots
SimonGoring Apr 23, 2023
263ca61
Merge branch 'main' of https://github.com/NeotomaDB/Current_Workshop
SimonGoring Apr 23, 2023
a66c0cc
Rendered and updated files.
SimonGoring Apr 23, 2023
172c887
Updating with new text.
SimonGoring Apr 23, 2023
32f958f
Updates to complex and simple
SimonGoring Apr 23, 2023
28d6d3f
Added tabset where needed.
sedv8808 Apr 24, 2023
56537c8
Readme Updates
sedv8808 Jun 8, 2023
6233377
added badge
sedv8808 Jun 8, 2023
1acfc47
Japanese versions
sedv8808 Jun 18, 2023
0025f31
Japanese version proofread and finished
sedv8808 Jun 23, 2023
bf0c488
Japanese updated version
sedv8808 Jun 27, 2023
01b8f37
INQUA prep
sedv8808 Jun 27, 2023
c219275
complex wf
sedv8808 Jun 27, 2023
13696ab
settings
sedv8808 Jun 28, 2023
4cfb089
updated binder URL
sedv8808 Jun 28, 2023
6cb58ef
r binder folder
sedv8808 Jun 28, 2023
207366f
files
sedv8808 Jun 28, 2023
9f406fb
runtime
sedv8808 Jun 28, 2023
3f74670
trial commenting out some libraries
sedv8808 Jun 28, 2023
79220aa
added docker
sedv8808 Jun 28, 2023
ad0fd67
docker
sedv8808 Jun 28, 2023
fdcec92
start binder from 0
sedv8808 Jun 28, 2023
5d78b7e
binder1
sedv8808 Jun 28, 2023
552dc98
binder attempt to remove readme
sedv8808 Jun 28, 2023
61ba92f
readme
sedv8808 Jun 28, 2023
766d637
install.R
sedv8808 Jun 28, 2023
127648c
try to update for binder
sedv8808 Jun 29, 2023
1566886
binder
sedv8808 Jun 29, 2023
e8dc765
added pacman and DT
sedv8808 Jun 29, 2023
3736685
add bchron to the binder
sedv8808 Jun 30, 2023
a79076b
JLB edits to the 'simple workflow'
jessicablois Jul 6, 2023
fa7a2cd
simple wf
sedv8808 Jul 7, 2023
be33a8e
adding readmes back
sedv8808 Jul 7, 2023
67ca35a
Minor language tweaks for README & edits to simple_workflow
SimonGoring Jul 7, 2023
2b54c80
All the built files added in
SimonGoring Jul 7, 2023
f4eacd6
Merge remote-tracking branch 'origin/main' into UpdatesforItaly
SimonGoring Jul 7, 2023
abca87b
Merge branch 'UpdatesforItaly' into main
SimonGoring Jul 7, 2023
e92add8
removed extra files
sedv8808 Jul 7, 2023
a2642cc
added languages
sedv8808 Jul 7, 2023
8bbf769
modified readme and reverted prev commit
sedv8808 Jul 7, 2023
c5db3d6
reverted commit where i removed accidentaly the rmd files
sedv8808 Jul 7, 2023
c6753d4
added files
sedv8808 Jul 7, 2023
01ba708
reverted accidental deletion
sedv8808 Jul 7, 2023
7b2df6a
renamed files
sedv8808 Jul 7, 2023
e82022d
removed 1 analysis - use time to do exercise in classroom
sedv8808 Jul 7, 2023
b935547
Added Jessica's example with base R and maptools
sedv8808 Jul 10, 2023
19398ab
Bison information
sedv8808 Jul 11, 2023
d10245f
Bison example
sedv8808 Jul 11, 2023
0d38930
change loading of data
sedv8808 Jul 11, 2023
b452bb6
added tidyverse in pacman
sedv8808 Jul 11, 2023
efb0d7b
removed typo
sedv8808 Jul 12, 2023
c7a7a93
removed one line
sedv8808 Jul 12, 2023
00542b5
Strat Plot Only
sedv8808 Jul 13, 2023
33a7cac
edited goals
sedv8808 Jul 13, 2023
28a68ce
Simple Workflow Updates
noraschlenker May 21, 2024
8350e03
Started editing complex workflow
noraschlenker May 22, 2024
73ff460
Updated Complex Workflow
noraschlenker May 23, 2024
a5dd194
Generally small edits:
SimonGoring May 26, 2024
602de82
Updated the denmark RDS data
SimonGoring May 26, 2024
ba2d958
Complex Workflow updates
noraschlenker May 27, 2024
16fe3c7
Removing the bison examples from the INQUA workshop.
SimonGoring May 27, 2024
3d777a4
Text updates in the upper part of the `complex` document.
SimonGoring May 27, 2024
6b9db04
Removing Italian support data, adding image for pollen data.
SimonGoring May 27, 2024
0f7dabb
Minor comment in the Simple workflow.
SimonGoring May 27, 2024
22ce7a5
Updated the RDS files.
SimonGoring May 28, 2024
0f7f8ce
Complex workflow changes,
SimonGoring May 28, 2024
d2e983a
Update to complex workflow
noraschlenker May 28, 2024
25f0360
Table rows had extra commas that didn't render properly in the vignette.
SimonGoring May 28, 2024
db1b88e
Added new packages to the scripts.
SimonGoring May 28, 2024
e71fd7b
Added more detailed header metadata.
SimonGoring May 28, 2024
b1cc454
Updated the simple and complex workflows and re-rendered.
SimonGoring May 28, 2024
8ca21f8
Updated the rendered documents.
SimonGoring May 28, 2024
f35ffd5
Merge pull request #2 from NeotomaDB/AarhusWorkshop2024
SimonGoring May 28, 2024
3016857
Very small change to complex flow
noraschlenker May 29, 2024
79f5a5d
Add harmonization
noraschlenker May 31, 2024
24a25f1
Add Code of Conduct to Current_Workshop file
jessicablois Feb 18, 2025
fccab98
Merge pull request #4 from NeotomaDB/UpdateCoC_JLB_EZ
SimonGoring Feb 24, 2025
6aacd98
Badge-update-README
ErikZepeda59 Mar 25, 2025
5542c2e
Badge-link-update-README
ErikZepeda59 Apr 4, 2025
c38d7b0
Change Badge Color
ErikZepeda59 Apr 25, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ slides/.DS_Store
slides/.ipynb_checkpoints/slides1-checkpoint.ipynb

wc10/
complex_workflow_files/
simple_workflow_files/
Current_Workshop.Rproj
template_spreadsheet.xlsx
21 changes: 21 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
FROM rocker/binder:4.2.0

## Declares build arguments
ARG NB_USER
ARG NB_UID

COPY --chown=${NB_USER} . ${HOME}

ENV DEBIAN_FRONTEND=noninteractive
USER root
RUN echo "Checking for 'apt.txt'..." \
; if test -f "apt.txt" ; then \
apt-get update --fix-missing > /dev/null\
&& xargs -a apt.txt apt-get install --yes \
&& apt-get clean > /dev/null \
&& rm -rf /var/lib/apt/lists/* \
; fi
USER ${NB_USER}

## Run an install.R script, if it exists.
RUN if [ -f install.R ]; then R --quiet -f install.R; fi
249 changes: 0 additions & 249 deletions NeotomaWorkshopAgenda.md

This file was deleted.

38 changes: 38 additions & 0 deletions README.es.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
[![language-EN](https://img.shields.io/badge/language-EN-red)](README.md) [![language](https://img.shields.io/badge/language-ES-red)](README.es.md) [![language-RU](https://img.shields.io/badge/language-RU-red)](README.ru.md)
[![language-JP](https://img.shields.io/badge/language-JP-red)](README.jp.md)

[![lifecycle](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://www.tidyverse.org/lifecycle/#experimental)
[![NSF-1948926](https://img.shields.io/badge/NSF-1948926-blue.svg)](https://nsf.gov/awardsearch/showAward?AWD_ID=1948926)

# Neotoma Current R Workshop

Es un repositorio que albergar talleres interactivos de R. Este repositorio siempre estará configurado para el Neotoma Workshop más reciente/actual. Todos los talleras anteriores estarán almacenados en el repositorio[Neotoma Workshops](https://github.com/NeotomaDB/Workshops).

Este repositorio está construido de tal forma que permite que se trabaje en línea a través de la estructura necesaria para mostrar el contenido a través de RStudio usando Binder (y Docker). Cuando se haga click en el enlace Binder, RStudio se abrirá en el navegador del usuario.

**Actualmente, este repositorio contiene un taller que se llevará acabo en línea: UQAM GEOTOP.**

[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/NeotomaDB/Current_Workshop/main?urlpath=rstudio)

## Colaboradores

Es un proyecto abierto y, la o las contribuciones de cualquier persona son bienvenidas. Todos los colaboradores en este proyecto están sujetos a un código de conducta (CODE_OF_CONDUCT.md). Por favor, revise y siga este código de conducta como parte de su contribución.

* [![orcid](https://img.shields.io/badge/orcid-0000--0002--7926--4935-brightgreen.svg)](https://orcid.org/0000-0002-7926-4935) [Socorro Dominguez Vidana](https://sedv8808.github.io/)

* [![orcid](https://img.shields.io/badge/orcid-0000--0002--2700--4605-brightgreen.svg)](https://orcid.org/0000-0002-2700-4605) [Simon Goring](http://goring.org)

### Traducciones

* Ruso: [Arsenii Galimov](https://ipae.uran.ru/Galimov_AT)
* Español: [Deborah V. Espinosa-Martínez](https://orcid.org/0000-0002-3848-8094)
* Japonés: [Socorro Dominguez Vidana](https://ht-data.com/about.html)

## Como usar este repositorio

El repositorio contiene dos tipos diferentes de flujos de trabajo en R, un flujo de trabajo complejo que muestra cómo gestionar y modificar cronologías con el paquete en R, y un flujo de trabajo simple que muestra como acceder a los datos y realizar análisis relativamente simple. Estos flujos de trabajo pueden ser modificados para adaptar su contenido (por ejemplo, centrándose en los diferentes conjuntos de datos o contextos geoespaciales).

Los usuarios pueden clonar este taller y modificar el contenido, aunque se debe tener en cuenta que los enlaces Binder son específicos para este repositorio, por lo que tienen que ser modificados desde la configuración Binder de cada usuario.

* `runtime.txt` se utiliza para definir el ambiente R que se utilizará por Docker/Binder
* `apt.txt` define un conjunto de paquetes que son requeridos por Binder/Docker para habilitar las herramientas espaciales del paquete 'neotoma2' en R.
42 changes: 42 additions & 0 deletions README.jp.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
[![language-EN](https://img.shields.io/badge/language-EN-red)](README.md) [![language](https://img.shields.io/badge/language-ES-red)](README.es.md) [![language-RU](https://img.shields.io/badge/language-RU-red)](README.ru.md)
[![language-JP](https://img.shields.io/badge/language-JP-red)](README.jp.md)

[![lifecycle](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://www.tidyverse.org/lifecycle/#experimental)
[![NSF-1948926](https://img.shields.io/badge/NSF-1948926-blue.svg)](https://nsf.gov/awardsearch/showAward?AWD_ID=1948926)

# 二オトマのワークショップ

交流的なRワークショップをホストするためのリポジトリです。このリポジトリは最新のワークショップ用にセットアップされています。前のワークショップは[Neotoma Workshops](https://github.com/NeotomaDB/Workshops)のリポジトリにアーカイブされています。

このリポジトリは、BinderとDockerの技術を使って、ブラウザでRStudioを使うことができます。ワークショプのための必要なパッケージもすべて使えます。 [Binder]のリンクをクリックすると、ユーザーのブラウザでRStudioが開きます。

**今、このリポジトリはUQAM GEOTOPのワークショップのコンテンツを上げています。**

[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/NeotomaDB/Current_Workshop/main?urlpath=rstudio)

## 貢献者

これはオープンなプロジェクトであり、どの人からの貢献も歓迎しています。 プロジェクトに参加するために、貢献者は[行動規範](CODE_OF_CONDUCT.md)を確認して従ってください。

* [![orcid](https://img.shields.io/badge/orcid-0000--0002--7926--4935-brightgreen.svg)](https://orcid.org/0000-0002-7926-4935) [Socorro Dominguez Vidana](https://sedv8808.github.io/)

* [![orcid](https://img.shields.io/badge/orcid-0000--0002--2700--4605-brightgreen.svg)](https://orcid.org/0000-0002-2700-4605) [Simon Goring](http://goring.org)

### 翻訳

* ロシア語 ー [Arsenii Galimov](https://ipae.uran.ru/Galimov_AT)
* スペイン語 ー [Deborah V. Espinosa-Martínez](https://orcid.org/0000-0002-3848-8094)
* 日本語 ー [Socorro Dominguez Vidana](https://ht-data.com/about.html)

## リポジトリの使い方

このリポジトリには 2 つのR ワークフローをが含まれています。
Simple Workflowとはニオトマ2パッケージを使って、簡単な分析を行う方法を示すワークフローです。
Complex Workflowとはパッケージを使用して暦を管理および変更する方法を示すワークフローです。

ワークフローはコンテンツに合わせて変更ができます。 (例:さまざまなデータセット類や違う地理空間情報に焦点を当てる)

ユーザーはこのワークショップを複製してコンテンツを変更することができますが、Binderリンクはこのリポジトリに固有であり、ユーザーは自分の Binder セットアップをする必要があります。

* `runtime.txt` は、Docker/BinderのR環境を定義するために使っています。
* `apt.txt` は空間情報を使うためのパッケージをロードします。
Loading