Merge pull request #560 from gregorgorjanc/devel

Fixing SP stuff
HighlanderLab · Dec 20, 2023 · 7875bd9 · 7875bd9
2 parents 872be38 + 650d696
commit 7875bd9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/R/Functions_L0_auxilary.R b/R/Functions_L0_auxilary.R
@@ -2513,7 +2513,7 @@ getCsdGeno <- function(x, caste = NULL, nInd = NULL, dronesHaploid = TRUE,
                                              simParamBee$csdPosStart:simParamBee$csdPosStop,
                                              sep="_"), simParam = simParamBee)
     if (dronesHaploid && any(x@sex == "M")) {
-      ret <- reduceDroneGeno(geno = ret, pop = x, simParamBee = SP)
+      ret <- reduceDroneGeno(geno = ret, pop = x)
     }
   } else if (isColony(x)) {
     if (is.null(caste)) {
@@ -2539,8 +2539,7 @@ getCsdGeno <- function(x, caste = NULL, nInd = NULL, dronesHaploid = TRUE,
     } else {
       ret <- getCsdGeno(
         x = getCastePop(x, caste, simParamBee = simParamBee), nInd = nInd,
-        dronesHaploid = dronesHaploid,
-        simParamBee = simParamBee
+          dronesHaploid = dronesHaploid, simParamBee = simParamBee
       )
     }
   } else if (isMultiColony(x)) {

diff --git a/man/MultiColony-class.Rd b/man/MultiColony-class.Rd