Skip to content

Commit 647da74

Browse files
authored
Merge branch 'MultPop' into devel
2 parents 52c0b87 + 94d9af6 commit 647da74

19 files changed

Lines changed: 1397 additions & 96 deletions

NAMESPACE

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export(ebv)
2424
export(editGenome)
2525
export(editGenomeTopQtl)
2626
export(fastRRBLUP)
27+
export(flattenMultiPop)
2728
export(genParam)
2829
export(genicVarA)
2930
export(genicVarAA)
@@ -55,9 +56,11 @@ export(meanG)
5556
export(meanP)
5657
export(mendelianSampling)
5758
export(mergeGenome)
59+
export(mergeMultiPops)
5860
export(mergePops)
5961
export(mutate)
6062
export(nInd)
63+
export(newEmptyMultiPop)
6164
export(newEmptyPop)
6265
export(newMapPop)
6366
export(newMultiPop)
@@ -89,6 +92,7 @@ export(selectCross)
8992
export(selectFam)
9093
export(selectInd)
9194
export(selectOP)
95+
export(selectPop)
9296
export(selectWithinFam)
9397
export(self)
9498
export(setEBV)

NEWS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# AlphaSimR 2.2.0
1+
# AlphaSimR 2.0.0.9001
22

33
* Added asLogNormal() function.
44

0 commit comments

Comments
 (0)