Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge devel to main #568

Merged
merged 158 commits into from
Dec 21, 2023
Merged

Merge devel to main #568

merged 158 commits into from
Dec 21, 2023

Conversation

LStrachan
Copy link
Collaborator

No description provided.

janaobsteter and others added 30 commits December 12, 2022 21:47
@janaobsteter
Editing simulateHoneybeeGenome examepl
a36246c
@gregorgorjanc
Polishing README & CITATION and some warnings
7682e55
@gregorgorjanc
Work on F2_Variance_calculations
fa6113b
@janaobsteter
Merge pull request #498 from gregorgorjanc/devel
22e8af8 
Work on individual- and colony-level variance calculations #49
@janaobsteter
Adding collapse to the getLocation function
f4e629c
@janaobsteter
Merge branch 'HighlanderLab:devel' into devel
5f5586a
@gregorgorjanc
Use numeric, list, or data.frame in createColonies() & setLocation()
8354594
@gregorgorjanc
Merge branch 'devel' of https://github.com/gregorgorjanc/SIMplyBee in…
3522dc4 
…to devel
@gregorgorjanc
Removing location from create*Colony() for simplicity and closing #8
4ac2107
@gregorgorjanc
Added test for set/GetLocation() and pushed sdLocation to SimParamBee
e9e23d0
@gregorgorjanc
No need to have RData file in the git repo
063d109
@gregorgorjanc
Adding NEWS items and fixing annoyances in vignettes
f11b6b9
@gregorgorjanc
Addressing PR comments
b86c6d0
@janaobsteter
Merge pull request #500 from gregorgorjanc/devel
344c793 
Use numeric, list, or data.frame in createColonies() & setLocation()
@gregorgorjanc
Added rcircle() to sample random point within a circle #9
4bf26bb
@gregorgorjanc
Added rcircle() to sample random point within a circle #9
b15367e
@gregorgorjanc
Merge branch 'devel' of https://github.com/gregorgorjanc/SIMplyBee in…
ec7c168 
…to devel

# Conflicts:
#	NEWS.md
@gregorgorjanc
Docu tweak
f9f80cc
@janaobsteter
Adding spatial functions
ef119ab
@janaobsteter
Editing spatial mate functions
847545f
@janaobsteter
Merge pull request #502 from gregorgorjanc/devel
469b95b 
Added rcircle() to sample random point within a circle #9
@janaobsteter
Merge branch 'devel' into devel
9e16c3f
@janaobsteter
Bug fix - getHaplo functions were returning diploid drones when input…
a2c501c 
… was a Pop
@janaobsteter
Merged cross plans into one functions, added argument spatial to the …
12f0c94 
…cross
@janaobsteter
Merge branch 'devel' of https://github.com/janaobsteter/SIMplyBee_fork …
07fe8f4 
…into devel
@janaobsteter
Making functional examples for the new cross behaviour
55b6b8c
@janaobsteter
Adding functionality to cover all types of mating into createCrossPla…
b2d2cf4 
…n() and cross()
@janaobsteter
Adding functionality to cover all types of mating into createCrossPla…
0d655da 
…n() and cross()
@janaobsteter
Solving merge conflicts
162dfac 
Merge branch 'devel' of https://github.com/janaobsteter/SIMplyBee_fork into devel

# Conflicts:
#	R/Functions_L1_Pop.R
@janaobsteter
Adding the vignette for the new crossing
c9576aa
janaobsteter and others added 29 commits December 20, 2023 15:54
@janaobsteter
Dealing with the tests
bb9d767
@janaobsteter
Merge pull request #558 from janaobsteter/devel
fc79ee3 
Dealing with the tests
adding images
84b3d64
@LStrachan
Merge pull request #559 from LStrachan/devel
872be38 
adding images
@gregorgorjanc
Fixing SP stuff
650d696
@gregorgorjanc
Merge pull request #560 from gregorgorjanc/devel
7875bd9 
Fixing SP stuff
changes to SP
98edd1a
Merge sorting
b8f4f2e
All failed tests fixed
541bd3d
@janaobsteter
Merge pull request #561 from LStrachan/devel
57db47e 
Something funky happened with merging
@janaobsteter
My changes to the test
18db4a9
@janaobsteter
Conflict
a372539
@janaobsteter
Changing the tests with nWorkers since they don't always return the s…
b7d3337 
…ame number of workers
@janaobsteter
Merge pull request #562 from janaobsteter/devel
27b200c 
Fixing examples, changing the nWorkers in the tests
@JerBub
csd turned off
e5ac7e9
added getCaste() tests, all working, ran a devtools::check too
e354bb2
@gregorgorjanc
Update test-L0_auxiliary_functions.R
84d4087
@gregorgorjanc
Merge pull request #563 from JerBub/devel
da44136 
csd turned off in some of the tests to make them more deterministic
@LStrachan
Merge branch 'HighlanderLab:devel' into devel
8ef1cf4
extended getCaste() tests to check if matings are happening correctly
47cca09
Merge branch 'devel' of https://github.com/LStrachan/SIMplyBee_fork i…
fb126a0 
…nto devel
@LStrachan
Update pkgdown.yaml
015741f 
Changes to match the main pkgdown workflow file to reduce conflicts when merging branches
@gregorgorjanc
Merge pull request #564 from LStrachan/devel
5d54669 
added getCaste() tests to close  #100
moved man/figures/ file to /vignettes
f28d262
@LStrachan
Merge pull request #566 from LStrachan/devel
325dbc1 
moved man/figures/ file to /vignettes
Changes to include_graphics to vignettes instead of man/figures/
6d0c8d7
@LStrachan
Merge pull request #567 from LStrachan/devel
2cd3d93 
Changes to include_graphics to vignettes instead of man/figures/
ammendments to conflicts due to merge
6b35727
@gregorgorjanc
Merge pull request #569 from LStrachan/devel
2e0dc2d 
Merge conflicts resolved
@gregorgorjanc gregorgorjanc merged commit 0a9d39b into main Dec 21, 2023
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@LStrachan @gregorgorjanc @janaobsteter @JerBub