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

Merge fix in restrSegSites #166

Merged
merged 3 commits into from
Nov 30, 2023
Merged

Merge fix in restrSegSites #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b597187
Merge pull request #161 from gaynorr/devel
gaynorr Nov 1, 2023
e7b4eea
fixed bug in `SimParam$restrSegSites` with excluding sites at end of …
gaynorr Nov 30, 2023
8768c72
Merge branch 'devel' into staging
gaynorr Nov 30, 2023
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
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: AlphaSimR
Type: Package
Title: Breeding Program Simulations
Version: 1.5.2.9990
Date: 2023-10-31
Version: 1.5.3.9990
Date: 2023-11-30
Authors@R: c(person("Chris", "Gaynor", email = "gaynor.robert@hotmail.com",
role = c("aut", "cre"), comment = c(ORCID = "0000-0003-0558-6656")),
person("Gregor", "Gorjanc", role = "ctb",
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# AlphaSimR 1.5.3

*fixed bug in `SimParam$restrSegSites` with excluding sites at end of chromosome

# AlphaSimR 1.5.2

*fix SimParam examples for CRAN
Expand Down
2 changes: 1 addition & 1 deletion R/Class-SimParam.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2235,7 +2235,7 @@ SimParam = R6Class(
cumSumSegSite = cumsum(private$.segSites)
for(i in take){
# Identify chromosome
chr = findInterval(i, cumSumSegSite) + 1L
chr = findInterval(i, cumSumSegSite, left.open = TRUE) + 1L

# Identify position
if(chr>1L){
Expand Down