Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
c018375
Merge pull request #583 from HighlanderLab/devel
janaobsteter Aug 29, 2024
01a56ee
Merge pull request #587 from HighlanderLab/devel
janaobsteter Sep 19, 2024
d1939bf
Parallelising functions, keeping both options
janaobsteter Apr 8, 2025
004065f
Parallelisation
janaobsteter Apr 9, 2025
d0c561c
Adding export to cross_parallel
janaobsteter Apr 9, 2025
da5b0de
renaming to enable switching from parallel (p) to non-parallel (np)
janaobsteter Apr 11, 2025
377f499
renaming to enable switching from parallel (p) to non-parallel (np)
janaobsteter Apr 11, 2025
24a3ea0
Merge branch 'Parallelisation' into Parallelisation
janaobsteter Apr 11, 2025
647aa3f
Merge pull request #599 from janaobsteter/Parallelisation
janaobsteter Apr 11, 2025
04d4d0d
Adding correct NAMESPACE
janaobsteter Apr 11, 2025
24453c7
Correcting namesapce
janaobsteter Apr 11, 2025
5c668a3
Correcting L2
janaobsteter Apr 11, 2025
6403cd0
Correcting L2
janaobsteter Apr 11, 2025
d7dc74f
Merge pull request #600 from janaobsteter/Parallelisation
janaobsteter Apr 11, 2025
7176b74
Correcting L2
janaobsteter Apr 11, 2025
fabda90
Merge pull request #601 from janaobsteter/Parallelisation
janaobsteter Apr 11, 2025
842d98d
Changing removeQueen to not include nTHreads
janaobsteter Apr 14, 2025
cdeacf8
Merge pull request #602 from janaobsteter/Parallelisation
janaobsteter Apr 14, 2025
aa2fc6b
Removing non-parallel versions
janaobsteter Apr 15, 2025
c3574aa
Merge pull request #603 from janaobsteter/Parallelisation
janaobsteter Apr 15, 2025
b501b19
Addding nThreads
janaobsteter Apr 15, 2025
2ba4ae8
Merge pull request #604 from janaobsteter/Parallelisation
janaobsteter Apr 15, 2025
997449f
Solving nThreads inconsistencies
janaobsteter Apr 15, 2025
eacb499
Merge pull request #605 from janaobsteter/Parallelisation
janaobsteter Apr 15, 2025
510b7ca
Setting nThreads = 1 before creating individuals
janaobsteter Apr 22, 2025
851d007
Merge pull request #606 from janaobsteter/Parallelisation
janaobsteter Apr 22, 2025
1830879
Removing print statements
janaobsteter Apr 22, 2025
79641ff
Merge pull request #607 from janaobsteter/Parallelisation
janaobsteter Apr 22, 2025
f35401a
Solving the issue of spatial mating in cross
janaobsteter Apr 25, 2025
cfe9d38
Addded collecting recHist and fixed isCsdHeterozygous
janaobsteter May 28, 2025
e863ff9
Merge pull request #610 from janaobsteter/Parallelisation
janaobsteter May 28, 2025
4f69148
Minor edits for my OCD
gregorgorjanc May 28, 2025
8b0a130
Adding docs
janaobsteter May 28, 2025
108b651
Merge branch 'Parallelisation' of https://github.com/janaobsteter/SIM…
janaobsteter May 28, 2025
d6b0637
Merge pull request #612 from janaobsteter/Parallelisation
janaobsteter May 28, 2025
691017b
Polishing code
gregorgorjanc May 28, 2025
42be86b
Adding docs and correcting the cross
janaobsteter May 29, 2025
322e1fa
Merge conflicts
janaobsteter May 29, 2025
5968402
Amending previous push
janaobsteter May 29, 2025
ffd4106
Merge pull request #613 from janaobsteter/Parallelisation
janaobsteter May 29, 2025
e566f55
Rd files update
gregorgorjanc May 29, 2025
e3cf5d6
Add imports
gregorgorjanc May 29, 2025
a069ddd
.gitignore change
gregorgorjanc May 29, 2025
cafc142
Removing nThreads, renaming updateLastBeeId
janaobsteter May 30, 2025
ca6e717
Merge branch 'Parallelisation' into Parallelisation
janaobsteter May 30, 2025
220fb1f
Merge pull request #619 from janaobsteter/Parallelisation
janaobsteter May 30, 2025
481377a
Fixing error to make examples and tests run
janaobsteter Jun 3, 2025
fea7113
Resolving conflicts
janaobsteter Jun 3, 2025
0cbac1f
Merge branch 'HighlanderLab:Parallelisation' into Parallelisation
janaobsteter Jun 3, 2025
b51c879
Fixing errors in the cross function
janaobsteter Jun 8, 2025
73f004f
Merge branch 'Parallelisation' of https://github.com/janaobsteter/SIM…
janaobsteter Jun 8, 2025
6fc7d0d
Fixing errors in cross()
janaobsteter Jun 23, 2025
03b17c9
Adding print message into cross
janaobsteter Jun 26, 2025
12353f7
Removed adding a virgin queen to splits, edited to handle inbreeding …
janaobsteter Oct 20, 2025
e2e5282
Changing split warning to message
janaobsteter Oct 20, 2025
a2ea0c5
Running tests and checks
janaobsteter Oct 20, 2025
4a4764f
Update NEWS.md
gregorgorjanc Oct 21, 2025
bf1384f
Removed "year" argument from functions (that is year of queen birth),…
janaobsteter Nov 19, 2025
a744340
Merge branch 'Parallelisation' of https://github.com/janaobsteter/SIM…
janaobsteter Nov 19, 2025
48609f6
Apply suggestion from @gregorgorjanc
gregorgorjanc Nov 20, 2025
e307261
Updating documentation
janaobsteter Nov 20, 2025
68d2267
Merge branch 'Parallelisation' of https://github.com/janaobsteter/SIM…
janaobsteter Nov 20, 2025
6ba1ec6
Implementing PSOCK parallelisation, instead of forking (mcapply). Sin…
janaobsteter Nov 26, 2025
1bb0363
Reversing back to the original foreach loop in cross
janaobsteter Nov 26, 2025
87ed4ba
Resolving merge conflicts
janaobsteter Nov 27, 2025
3834a4e
Resolving merge conflicts
janaobsteter Nov 27, 2025
7c677c2
Merge branch 'Parallelisation' of https://github.com/janaobsteter/SIM…
janaobsteter Nov 27, 2025
224dfb4
Removing the creation of the clusters from within the functions
janaobsteter Nov 28, 2025
efbf77a
Resolving high-priority issues, adding a parallelisation vignette, an…
janaobsteter Dec 8, 2025
f567df9
Last edits regarding sampling functions --> I've squished them all in…
janaobsteter Dec 17, 2025
ed15b9a
Switching to future_lapply from foreach
janaobsteter Dec 18, 2025
5d68ec2
Updating variance calculation scripts on Gregor's visit to SLO
janaobsteter May 12, 2026
67c6e81
Add AGENT plan
gregorgorjanc May 12, 2026
6b43d92
Adding AGENTS.md
gregorgorjanc May 13, 2026
393b398
Adding document.yaml GitHub Action
gregorgorjanc May 13, 2026
43872ff
Adding test-coverage.yaml GitHub Action
gregorgorjanc May 13, 2026
a470e85
Updating R CMD check GitHub Action
gregorgorjanc May 13, 2026
ff15974
air and jarl specs
gregorgorjanc May 13, 2026
d557e6c
Mapping individual to colony variances
janaobsteter May 15, 2026
ce3fe67
Merge branch 'Future' of https://github.com/janaobsteter/SIMplyBee_fo…
janaobsteter May 15, 2026
0fad5da
Update documentation
janaobsteter May 15, 2026
d342130
Resolving
janaobsteter May 15, 2026
69739a5
Sup files changed
janaobsteter May 15, 2026
3471d59
Merge branch 'Future' of https://github.com/janaobsteter/SIMplyBee_fo…
janaobsteter May 15, 2026
7d6a3a4
Adding back the F2 vignetet
janaobsteter May 15, 2026
1a49e17
Cleaning up variance vignetets
janaobsteter May 15, 2026
cdbc58b
Adding variance component calculations functions and vignette
janaobsteter Aug 31, 2026
24e9676
Update documentation
janaobsteter Aug 31, 2026
c97c73a
Filename changes
gregorgorjanc Sep 29, 2026
30bf6eb
Merge pull request #1 from gregorgorjanc/review/pr-634
janaobsteter Sep 29, 2026
bd08866
Correcting errors from Gregor's agent check
janaobsteter Sep 29, 2026
1be1b39
Adding docs to pull
janaobsteter Sep 29, 2026
5a0fe7f
Resolving conflicts
janaobsteter Sep 29, 2026
49d5c5e
Update documentation
janaobsteter Sep 29, 2026
4b73960
Merge branch 'devel' into Future
janaobsteter Sep 29, 2026
6ab9367
Update documentation
janaobsteter Sep 29, 2026
cbe04aa
Updating NEWS.md
janaobsteter Sep 29, 2026
b4d8646
Adding .gitignore
janaobsteter Sep 29, 2026
6451940
Recolving issues in gitignore
janaobsteter Sep 29, 2026
159cb0e
Recolving issues in gitignore
janaobsteter Sep 29, 2026
d13898e
Merge branch 'Future' of github.com:janaobsteter/SIMplyBee_fork into …
janaobsteter Sep 29, 2026
c1a9b82
WIP
gregorgorjanc Sep 30, 2026
662047d
Update documentation
gregorgorjanc Sep 30, 2026
c7ba958
Exclude AGENTS.md from R package builds
gregorgorjanc Sep 30, 2026
6c4d9df
Added h2 to mapping output
gregorgorjanc Sep 30, 2026
946a8f0
Docs
gregorgorjanc Sep 30, 2026
8d83dd5
Document heritability outputs in release notes
gregorgorjanc Sep 30, 2026
69aa910
Update documentation
gregorgorjanc Sep 30, 2026
605301d
Polish of various things (pHomBrood, etc.)
gregorgorjanc Sep 30, 2026
ebb8e8a
Update documentation
gregorgorjanc Sep 30, 2026
72b4311
Ignore local IDE state and generated build artifacts
gregorgorjanc Sep 30, 2026
dd323de
Fortifying the pHomBrood test
gregorgorjanc Sep 30, 2026
1d6010b
more testing
gregorgorjanc Oct 1, 2026
348249d
Polish indexing, character IDs, colony vs queen ID, and AGENTS.md
gregorgorjanc Oct 3, 2026
59a15c4
Merging different worktrees
gregorgorjanc Oct 3, 2026
90873c1
Update documentation
gregorgorjanc Oct 3, 2026
25f3b38
Apply suggestion from @gregorgorjanc
gregorgorjanc Oct 6, 2026
ecc27d2
Update documentation
gregorgorjanc Oct 6, 2026
5cfaa2c
Fix empty else block in Functions_L3_Colonies.R
gregorgorjanc Oct 6, 2026
98aaa9b
Apply batched suggestions from code review
gregorgorjanc Oct 6, 2026
e00f9d3
Fix colony callback dispatch and clarify parallelisation
gregorgorjanc Oct 7, 2026
ab45fc8
Update documentation
gregorgorjanc Oct 7, 2026
299b231
Merge pull request #2 from gregorgorjanc/review/jana-variance-updates
janaobsteter Oct 26, 2026
5013370
Update documentation
janaobsteter Oct 26, 2026
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
28 changes: 20 additions & 8 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,19 +1,31 @@
^\.Rhistory
^\.Rproj\.user
^\.git
^\.github
^.*\.Rproj$
^\.Rproj\.user$
^\.Rhistory$
^\.git$
^\.github$
^\.gitignore
^[.]?air[.]toml$
^[.]?jarl[.]toml$
^AGENTS\.md$
^_pkgdown\.yml
^SIMplyBee\.Rproj
^cran-comments\.html$
^cran-comments\.md$
^cran-comments_files$
^covr$
^docs
^notes_pkg_dev\.Rmd$
^vignettes/*_files$
^vignettes/\.quarto$
^vignettes/*R
^vignettes/*RData
^vignettes/*pdf
^vignettes/F2\_Variance\_calculations*
^vignettes/SIMplyBee\_logo\_hex\.R
^vignettes/SIMplyBee\_logo\_hex\.png
^vignettes/SIMplyBee\_logo\_small\.png
^.*\.Rproj$
^\.Rproj\.user$
^doc$
^Meta$
^SIMplyBee\.Rproj

^literature$
^dev$
^TestingVarianceComponents\.R$
32 changes: 27 additions & 5 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,42 @@
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [devel, master]
branches: [main, devel]
pull_request:
branches: [devel, master]

name: R-CMD-check
name: R-CMD-check.yaml

permissions: read-all

jobs:
R-CMD-check:
runs-on: ubuntu-latest
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: false
matrix:
config:
- { os: macos-latest, r: "release" }
- { os: windows-latest, r: "release" }
- { os: ubuntu-latest, r: "devel", http-user-agent: "release" }
- { os: ubuntu-latest, r: "release" }
- { os: ubuntu-latest, r: "oldrel-1" }

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
Expand All @@ -27,3 +46,6 @@ jobs:
needs: check

- uses: r-lib/actions/check-r-package@v2
with:
upload-snapshots: true
build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'
46 changes: 46 additions & 0 deletions .github/workflows/document.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
paths: ["R/**"]

name: document.yaml

permissions: read-all

jobs:
document:
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
permissions:
contents: write
steps:
- name: Checkout repo
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup R
uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- name: Install dependencies
uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::roxygen2
needs: roxygen2

- name: Document
run: roxygen2::roxygenise()
shell: Rscript {0}

- name: Commit and push changes
run: |
git config --local user.name "$GITHUB_ACTOR"
git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com"
git add man/\* NAMESPACE DESCRIPTION
git commit -m "Update documentation" || echo "No changes to commit"
git pull --ff-only
git push origin
75 changes: 75 additions & 0 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, devel]
pull_request:

name: test-coverage.yaml

permissions: read-all

jobs:
test-coverage:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: false
matrix:
config:
- { os: ubuntu-latest, r: "release" }
# - { os: macos-latest, r: "release" }

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::covr, any::xml2
needs: coverage

- name: Test coverage
run: |
cov <- covr::package_coverage(
quiet = FALSE,
clean = FALSE,
install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
)
print(cov)
covr::to_cobertura(cov)
shell: Rscript {0}

- uses: codecov/codecov-action@v5
with:
# Fail if error if not on PR, or if on PR and token is given
# fail_ci_if_error: ${{ github.event_name != 'pull_request' || secrets.CODECOV_TOKEN }}
fail_ci_if_error: false
files: cobertura.xml # generated during the process
plugins: noop
disable_search: true
token: ${{ secrets.CODECOV_TOKEN }}

- name: Show testthat output
if: always()
run: |
## --------------------------------------------------------------------
find '${{ runner.temp }}/package' -name 'testthat.Rout*' -exec cat '{}' \; || true
shell: bash

- name: Upload test results
if: failure()
uses: actions/upload-artifact@v4
with:
name: coverage-test-failures
path: ${{ runner.temp }}/package
35 changes: 32 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,56 @@

# User-specific files
.Ruserdata
Rplots.pdf

# Example code in package build process
*-Ex.R

# Output files from R CMD build
/*.tar.gz
src/*.o
src/*.so

# Output files from R CMD check
/*.Rcheck/

# RStudio files
# Local IDE state
.Rproj.user/
.idea/
.vscode/

# Compiled code and coverage output
/src/**/*.o
/src/**/*.so
/src/**/*.dll
/src/**/*.dylib
/src/**/*.gcda
/src/**/*.gcno
/covr/

# Binary package builds
/SIMplyBee_*.tgz
/SIMplyBee_*.zip

# Installed documentation and rendered development documents
/inst/doc/
/README.html
/README_files/
/cran-comments.html
/cran-comments_files/

# produced vignettes
vignettes/*.html
vignettes/*.pdf
vignettes/*_files/

# OAuth2 token, see https://github.com/hadley/httr/releases/tag/v0.3
.httr-oauth

# knitr and R markdown default cache directories
*_cache/
/cache/
.quarto/

# Temporary files created by R markdown
*.utf8.md
Expand All @@ -40,5 +67,7 @@ vignettes/*.pdf

# Other
.DS_Store
src/*.o
src/*.so
/doc/
/Meta/

literature/*.pdf
Loading