prepared to release 1.2.0

.Rbuildignore

@@ -8,3 +8,4 @@
 ^docs$
 ^pkgdown$
 ^\.github$
+^revdep$

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: AlphaSimR
 Type: Package
 Title: Breeding Program Simulations
-Version: 1.1.2.9990
-Date: 2022-5-20
+Version: 1.2
+Date: 2022-5-15
 Authors@R: c(person("Chris", "Gaynor", email = "[email protected]",
   role = c("aut", "cre"), comment = c(ORCID = "0000-0003-0558-6656")),
   person("Gregor", "Gorjanc", role = "ctb", 

NEWS

@@ -1,13 +1,16 @@
-Changes in version 1.1.2.9990
+Changes in version 1.2.0
 
   New features
     -added importGenMap to format genetic maps for AlphaSimR
     -added importInbredGeno and importHaplo to make it easier to create a simulation from external data
-    -added importSnpChip, importTraitA and importTraitAD to SimParam to make it easier to manually define traits
+    -added importSnpChip, importTrait to SimParam to make it easier to manually define traits
     -added pullMarkerGeno and pullMarkerHaplo to make it easier to extract genotypes and haplotypes of specific loci without defining a trait or SNP chip
 
   Bug fixes
     -reduceGenome, mergeGenome and doubleGenome should really now work with pedigree and recombination tracking
+
+  Known issues
+    -pedigreeCross fails without an appropriate warning for some incomplete pedigrees
 
 Changes in version 1.1.2
 

revdep/.gitignore

@@ -0,0 +1,7 @@
+checks
+library
+checks.noindex
+library.noindex
+cloud.noindex
+data.sqlite
+*.html

revdep/README.md

@@ -0,0 +1,28 @@
+# Platform
+
+|field    |value                                                   |
+|:--------|:-------------------------------------------------------|
+|version  |R version 4.2.0 (2022-04-22 ucrt)                       |
+|os       |Windows 10 x64 (build 19044)                            |
+|system   |x86_64, mingw32                                         |
+|ui       |RStudio                                                 |
+|language |(EN)                                                    |
+|collate  |English_United States.utf8                              |
+|ctype    |English_United States.utf8                              |
+|tz       |America/Chicago                                         |
+|date     |2022-06-15                                              |
+|rstudio  |2022.02.3+492 Prairie Trillium (desktop)                |
+|pandoc   |2.10.1 @ C:\Users\gayno\AppData\Local\Pandoc\pandoc.exe |
+
+# Dependencies
+
+|package       |old        |new        |Δ  |
+|:-------------|:----------|:----------|:--|
+|AlphaSimR     |1.1.2      |1.2        |*  |
+|BH            |1.78.0-0   |1.78.0-0   |   |
+|R6            |2.5.1      |2.5.1      |   |
+|Rcpp          |1.0.8.3    |1.0.8.3    |   |
+|RcppArmadillo |0.11.2.0.0 |0.11.2.0.0 |   |
+
+# Revdeps
+

revdep/cran.md

@@ -0,0 +1,7 @@
+## revdepcheck results
+
+We checked 1 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
+
+ * We saw 0 new problems
+ * We failed to check 0 packages
+

revdep/email.yml

@@ -0,0 +1,5 @@
+release_date: ???
+rel_release_date: ???
+my_news_url: ???
+release_version: ???
+release_details: ???

revdep/failures.md

@@ -0,0 +1 @@
+*Wow, no problems at all. :)*

revdep/problems.md

@@ -0,0 +1 @@
+*Wow, no problems at all. :)*

src/getHybridGv.cpp

@@ -42,7 +42,7 @@ arma::field<arma::vec> getHybridGvE(const Rcpp::S4& trait,
     output.set_size(1);
     output(0).set_size(nInd);
   }
-  arma::vec x(ploidy+1); // Genotype dossage
+  arma::vec x(ploidy+1); // Genotype dosage
   for(arma::uword i=0; i<x.n_elem; ++i)
     x(i) = double(i);
   arma::vec xa = (x-dP/2.0)*(2.0/dP);
@@ -141,7 +141,7 @@ arma::field<arma::vec> getHybridGv(const Rcpp::S4& trait,
     output.set_size(1);
     output(0).set_size(nInd);
   }
-  arma::vec x(ploidy+1); // Genotype dossage
+  arma::vec x(ploidy+1); // Genotype dosage
   for(arma::uword i=0; i<x.n_elem; ++i)
     x(i) = double(i);
   arma::vec xa = (x-dP/2.0)*(2.0/dP);