From 6613da3b6eb55d77e9573d879afe2cad99fa3a0f Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 20 Aug 2026 10:59:04 +0100 Subject: [PATCH 1/2] minor esthetics change on chapter 6 figures --- Chapter_6.Rmd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Chapter_6.Rmd b/Chapter_6.Rmd index be9fdcb..6c09af4 100644 --- a/Chapter_6.Rmd +++ b/Chapter_6.Rmd @@ -30,7 +30,7 @@ rownames(dt) <- "Kyakki W", "Shoptlu", "Hawwik B", -"Te\\'alla", +"Te\'alla", "Site X", "Tetlnat" ) @@ -51,7 +51,7 @@ for (s in seq_len(series_col)) { ylim = c(0.5, n_phase + 0.5), axes = FALSE, xlab = "Width = relative frequency (%)", - ylab = ifelse(s == 1, "Phase", ""), + ylab = "", main = colnames(dt)[s] ) @@ -71,15 +71,15 @@ for (s in seq_len(series_col)) { } 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 ```{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. -- 2.45.2 From 5de4591f64e24b1300f7744b95146f7f3cc5cdcf Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 20 Aug 2026 11:03:54 +0100 Subject: [PATCH 2/2] Run CI for feature branches --- .forgejo/workflows/book.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.forgejo/workflows/book.yml b/.forgejo/workflows/book.yml index e4f73fe..730503e 100644 --- a/.forgejo/workflows/book.yml +++ b/.forgejo/workflows/book.yml @@ -2,8 +2,6 @@ name: Build and deploy the book on: push: - branches: - - main pull_request: workflow_dispatch: @@ -25,7 +23,7 @@ jobs: test -f _book/index.html - 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: DEPLOY_KEY: ${{ secrets.EACOMPANION_DEPLOY_KEY }} run: | -- 2.45.2