Compare commits

..

3 commits

Author SHA1 Message Date
59746b6076 Merge pull request 'Chapter 6 figure refinements' (#1) from chapter-update into main
All checks were successful
Build and deploy the book / book (push) Successful in 6s
Reviewed-on: #1
2026-08-20 10:07:14 +00:00
Simon
5de4591f64 Run CI for feature branches
All checks were successful
Build and deploy the book / book (pull_request) Successful in 5s
Build and deploy the book / book (push) Successful in 5s
2026-08-20 11:03:54 +01:00
Simon
6613da3b6e minor esthetics change on chapter 6 figures 2026-08-20 10:59:04 +01:00
2 changed files with 6 additions and 8 deletions

View file

@ -2,8 +2,6 @@ name: Build and deploy the book
on: on:
push: push:
branches:
- main
pull_request: pull_request:
workflow_dispatch: workflow_dispatch:
@ -25,7 +23,7 @@ jobs:
test -f _book/index.html test -f _book/index.html
- name: Deploy successful main build - name: Deploy successful main build
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }} if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main' }}
env: env:
DEPLOY_KEY: ${{ secrets.EACOMPANION_DEPLOY_KEY }} DEPLOY_KEY: ${{ secrets.EACOMPANION_DEPLOY_KEY }}
run: | run: |

View file

@ -30,7 +30,7 @@ rownames(dt) <-
"Kyakki W", "Kyakki W",
"Shoptlu", "Shoptlu",
"Hawwik B", "Hawwik B",
"Te\\'alla", "Te\'alla",
"Site X", "Site X",
"Tetlnat" "Tetlnat"
) )
@ -51,7 +51,7 @@ for (s in seq_len(series_col)) {
ylim = c(0.5, n_phase + 0.5), ylim = c(0.5, n_phase + 0.5),
axes = FALSE, axes = FALSE,
xlab = "Width = relative frequency (%)", xlab = "Width = relative frequency (%)",
ylab = ifelse(s == 1, "Phase", ""), ylab = "",
main = colnames(dt)[s] main = colnames(dt)[s]
) )
@ -71,15 +71,15 @@ for (s in seq_len(series_col)) {
} }
if(s==1) if(s==1)
text(-(max(dt_pct[,s]/2)),seq((0.55+1.45)/2, (0.55+1.45)/2*n_phase ,length.out=n_phase),phase_labels,pos=2,font=2,,cex=2) text(-(max(dt_pct[,s]/2)),seq((0.55+1.45)/2, (0.55+1.45)/2*n_phase ,length.out=n_phase),phase_labels,pos=2,font=2,cex=1.2)
} }
``` ```
A more common wa to represent tht would be to plot the freuecny through time, using A more common wa to represent tht would be to plot the freuecny through time, using
```{r} ```{r}
matplot(cbind(1:nrow(dt) ,1:nrow(dt) ,1:nrow(dt)) ,dt,type="l",lwd=3,col=ship_cols,lty=1) matplot(cbind(1:nrow(dt) ,1:nrow(dt) ,1:nrow(dt)) ,dt,type="l",lwd=3,col=ship_cols,lty=1,ylab="frequency",xlab="time")
``` ```
This should remind you of the plot about chnges in allele frquency seen in Chapter 3, we will see later how we cna use these describption of the dt to test hypothese about the cultural transmission process This should remind you of the plot about changes in allele frequency seen in Chapter 3, we will see later how we can use these describption of the data to test hypothese about the cultural transmission process.