HighlanderLab / SIMplyBee

SIMplyBee R package extends AlphaSimR for simulating honeybee populations and breeding programmes
http://www.simplybee.info/
Other
0 stars 5 forks source link

Adding spatial mating functions #505

Closed janaobsteter closed 1 year ago

janaobsteter commented 1 year ago

Added:

janaobsteter commented 1 year ago

This is intermediate step!!! Once this works, I will incorporate the spatial into the cross function.

gregorgorjanc commented 1 year ago

@janaobsteter the above states (below actually - check on GitHub PR page) there are merge conflicts in this PR - is this due to the mine rcircle PR? Can you resolve this before I review?

janaobsteter commented 1 year ago

@gregorgorjanc , conflict resolved (we did throw the location out of createColony(), right?

janaobsteter commented 1 year ago

@gg, I think this is now ready to review.

janaobsteter commented 1 year ago

@gregorgorjanc , I've addressed your comments and also solved some issues with using a sampling function in createCrossPlan().