version 1.1.7

cran · Feb 23, 2020 · edf6d9e · edf6d9e
1 parent 10bed95
commit edf6d9e
Show file tree

Hide file tree

Showing 24 changed files with 229 additions and 245 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,10 +1,11 @@
 Package: genepop
 Type: Package
 Title: Population Genetic Data Analysis Using Genepop
-Version: 1.1.4
-Date: 2019-12-06
+Version: 1.1.7
+Date: 2020-02-23
 Authors@R: c(person("François", "Rousset", role = c("aut", "cre", "cph"),
-                     email = "francois.rousset@umontpellier.fr"),
+                     email = "francois.rousset@umontpellier.fr",
+                     comment = c(ORCID = "0000-0003-4670-0371")),
                      person("Jimmy","Lopez", role="ctb"),
                      person("Khalid","Belkhir", role="ctb"))
 Maintainer: François Rousset <francois.rousset@umontpellier.fr>
@@ -20,9 +21,10 @@ ByteCompile: true
 URL: https://www.r-project.org,
         http://kimura.univ-montp2.fr/~rousset/Genepop.htm
 NeedsCompilation: yes
-Packaged: 2019-12-06 16:59:06 UTC; Francois.rousset
-Author: François Rousset [aut, cre, cph],
+Packaged: 2020-02-23 20:08:35 UTC; Francois.rousset
+Author: François Rousset [aut, cre, cph]
+    (<https://orcid.org/0000-0003-4670-0371>),
   Jimmy Lopez [ctb],
   Khalid Belkhir [ctb]
 Repository: CRAN
-Date/Publication: 2019-12-06 23:40:05 UTC
+Date/Publication: 2020-02-23 22:50:03 UTC
diff --git a/MD5 b/MD5
@@ -1,25 +1,25 @@
-f600ad09fbfa95908c05690f127cc543 *DESCRIPTION
+ecf14cee0484bad760fc1035988f1b1c *DESCRIPTION
 e1784692db036c3c9068cc567c1db510 *NAMESPACE
 cc04f3138e31a554d432abfaefc43632 *R/Genepop.R
 5330eabc516ef4fea97fa8048b15ee0f *R/RcppExports.R
 e80867b9fb03e0225900fb449fa36d5f *R/genepop_internals.R
 9d36d74b67e70fed657e2717c70beb01 *R/summary.R
 b44fde58f2badb92ad7d63309b0b9c21 *inst/CITATION
 6f9b53b9d5c096ed3130c6d8dbf11263 *inst/Dockerfile
-d655e4ec2b9dcc566a8cac25095fa827 *inst/NEWS.Rd
+921ce68ab7b5c83f53c3452c5eee73c0 *inst/NEWS.Rd
 33583556927235775a36422489bb53c6 *inst/Rprofile.site
 7b76a7a5546c7ce705daac525eae8e67 *inst/application.yml
-c018dbce9160ee56178da0ec438c0f7b *inst/doc/GenepopS.Rmd
-85400e25a42c14837b2d455042d13032 *inst/doc/GenepopS.pdf
-017f54520178801d34915be1bfba3f21 *inst/doc/GenepopS.tex
-12ad606b5a32934591de8efaf8d81816 *inst/doc/all-menu-options.html
-8652ef04a2b21c684b8beddddd56fa9f *inst/doc/bibliography.html
-3066b345e0bfd7f3dd340870d87c1386 *inst/doc/code-maintenance-credits-contact-etc-.html
-530261ebce829b90cfe12e82a2207679 *inst/doc/copyright.html
-261b28129a73cc8f1c3b346fe5a7e020 *inst/doc/evaluating-the-performance-of-inferences-for-isolation-by-distance.html
+0f986746d14d7b0c9492bfe518952503 *inst/doc/GenepopS.Rmd
+39c45c311af78c60380ffd879d2d81a0 *inst/doc/GenepopS.pdf
+f651d0ffa93b2663ce6ec7f3bca6e897 *inst/doc/GenepopS.tex
+a2814d83c8c97dc21bd1c4608247288f *inst/doc/all-menu-options.html
+0788f8a161647732078109cc0204e575 *inst/doc/bibliography.html
+a61a0d1b3442c338d5fc3648d6f075bb *inst/doc/code-maintenance-credits-contact-etc-.html
+a49704c4f06ef268ade1bea9f4b9f5e4 *inst/doc/copyright.html
+e2cfb81af8dc3d3d1e61835c35308dc3 *inst/doc/evaluating-the-performance-of-inferences-for-isolation-by-distance.html
 140e32d0251acc1174753007b94fbf3f *inst/doc/genepop.bib
-62b68e62ae46d4b3a2816a40d5f6cfb9 *inst/doc/installing-genepop-and-session-examples.html
-0d6045a4a0fcb6ef9b1313ead08b3b5c *inst/doc/introduction.html
+aa429584169d0d45db543726c05bbdc7 *inst/doc/installing-genepop-and-session-examples.html
+08fa554900f8f496c3cda672ca7a5c3c *inst/doc/introduction.html
 b06871f281fee6b241d60582ae9369b9 *inst/doc/libs/gitbook-2.6.7/css/fontawesome/fontawesome-webfont.ttf
 47d2ab46c435be24b407aa0c92b4d610 *inst/doc/libs/gitbook-2.6.7/css/plugin-bookdown.css
 76af8c23a8138a4b66aa6959ca5c3a8e *inst/doc/libs/gitbook-2.6.7/css/plugin-fontsettings.css
@@ -35,7 +35,7 @@ c69e5565f16ccb8560ee353e6ba4b927 *inst/doc/libs/gitbook-2.6.7/js/plugin-fontsett
 2d4c4d47ba34946b8ebcbe41aa522756 *inst/doc/libs/gitbook-2.6.7/js/plugin-search.js
 723416fb0154ce96e35ce1ec56992afa *inst/doc/libs/gitbook-2.6.7/js/plugin-sharing.js
 33cabfa15c1060aaa3d207c653afb1ee *inst/doc/libs/jquery-2.2.3/jquery.min.js
-5403af305f916f964a1e1936107a7a80 *inst/doc/methods.html
+5cf4a9c364938b7ecd2d524dad4ff0c4 *inst/doc/methods.html
 8ff7cabd707dfbd365119f0899a03214 *inst/doc/opt11-13.md
 7cb47e92dd1caba5cfd29b7709ceb10c *inst/doc/opt14-15.md
 08e4e79edae5e5d5bdb3fbc5916bd247 *inst/doc/opt21.md
@@ -58,8 +58,8 @@ cf39f3d80100ed8cee782eabfedf2532 *inst/doc/opt74.md
 1370c7374924cba5a89985a75f8d7368 *inst/doc/opt84-85.md
 4f6d0bd88a62038e15d472bb4dd4339f *inst/doc/opt86.md
 cfda70a228d8435104e19deba90c93aa *inst/doc/rp.sh
-4a4bee7f4600bf762ff3bfe7ece01dbd *inst/doc/sec-settings.html
-15c231e23f7ccd44a778549b168ef4de *inst/doc/the-input-file.html
+34596d355425c28df405ece78d405bcd *inst/doc/sec-settings.html
+f988780e9c0ae66bd4b6cee13f602685 *inst/doc/the-input-file.html
 dbddea57e1aabf328635a8e0858bc145 *inst/extdata/Fmulti.txt
 edd84c2662dd334f68cd93ea508ba9fd *inst/extdata/LouisD87.txt
 b259b4bb0d554cf66b0e8e2ec33421e7 *inst/extdata/MOAO.txt
@@ -177,11 +177,11 @@ e441cc66e832b196a80b3ae7f7727718 *man/manipulation.Rd
 4d658a6025d087cdd81650ad991c026e *man/setRandomSeed.Rd
 776e65e1c98384df12d5add36646161d *src/CT_tests.cpp
 fae3345a21dd6e88780389f905d0bb45 *src/CT_tests.h
-1e327e0647317a80d29c618c0f826a4f *src/F_est.cpp
+cb35bdee16f8aaf0e8901fa3195c2a8b *src/F_est.cpp
 41af0713654eb278a06c446d4bf22a1b *src/F_est.h
-54d924c26269fbe2e4c3c529cf16496b *src/GenepopS.cpp
-2fd7363ba8a37532c6179323b2eeccf9 *src/GenepopS.h
-125872f0f47d03b8720497b414634738 *src/HW_tests.cpp
+f815045fba1e25c35570fb79f6286fbe *src/GenepopS.cpp
+1205d3925eec0e17e29603a6e58e0dee *src/GenepopS.h
+79f1e4620bdba036cb2dfb6574024cd0 *src/HW_tests.cpp
 0d26263c4c82967ab34aa82893533218 *src/HW_tests.h
 02a5d15cb1118d632465ec4821de653c *src/Makevars
 04941e62ea7556222dec4ebc90afad56 *src/Makevars.win
@@ -193,12 +193,12 @@ ac3b1e14b57af96b7a961630875a825e *src/bootstrap.cpp
 7e61ab1bc45381b38af3cc680097ec15 *src/bootstrap.h
 a1fec572fbc92088c4c26865ddcb6591 *src/conversions.cpp
 4bae432594ff7afb69667e9263c68dea *src/conversions.h
-8978991d1d5dd9afbdfc756a28ca60c8 *src/genepop.cpp
+77f2200c15244fcc7691667552773a19 *src/genepop.cpp
 519ad22fd058b0aa4d1d5bada3f58765 *src/genepop.h
 3b02033da814e5dd7fb696de8a70d7f3 *src/multimig.cpp
 3106c5a91dbbef6ac0c225219cc7048f *src/multimig.h
 274a134dfe9ee168c47302da9c98cb36 *src/myutils.h
-ceeed72d99a33d73c57c70c6e21994a6 *src/proba.cpp
+e69107d5020aed6074f0ba464fd71882 *src/proba.cpp
 034fbb3c9c3f43a8bdf758c579ece93e *src/proba.h
 73beea2dadd7c4f7a566891339213d79 *src/settings.cpp
 4a4b67355b20063145ac2d0bde1fc239 *src/settings.h
@@ -208,9 +208,9 @@ e7c1cbf9bb51858865ffe406c5800ebc *src/tools.h
 55212cf9812ec86ae360afe10c8221f5 *tests/testthat/test_Fis.R
 e31cbfce1248c37d47ec5d123e18811b *tests/testthat/test_Fst.R
 ded099d061ab9a3906962b3cae0fad4f *tests/testthat/test_IBD.R
-bbb9294e6077a6b2dbeba399849fc91f *tests/testthat/tests_HW.R
+0409289234591743702e2d921397a40c *tests/testthat/tests_HW.R
 d8a7f7a02c3fbaf66fbf55bd23294cff *tests/testthat/tests_contingency.R
 e44087264972e27c1aba7de9a9c46dc3 *tests/testthat/tests_conversions.R
-bab375611c2d25415e4120e171189d93 *tests/testthat/tests_diff.R
+56c4de9c57392c7db267af7bec0e27b9 *tests/testthat/tests_diff.R
 11842cc8e96c7276ff673f5f23eb8111 *tests/testthat/tests_linkage.R
 4ea8cbad86d15ed865d5b362f09f9ec4 *tests/testthat/tests_private_all.R
diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
@@ -3,6 +3,13 @@
 \encoding{UTF-8}
 % cf ?news for the format and usage of this file
 %
+\section{CHANGES UP TO VERSION 1.1.7}{
+\subsection{CORRECTED BUGS}{
+\itemize{
+\item Incorrect tables of multi-locus and multi 'pop' tests of Hardy-Weinberg [test_HW() which default which="Proba"] when some individual tests had p-value estimates equal to 0, similar to the problem fixed in version 1.1.4 for differentiation tests. Per-locus per-pair-of-'pop' tests were correctly reported. More display glitches fixed in this and other options.
+}
+}
+}
 \section{CHANGES UP TO VERSION 1.1.4}{
 \subsection{CORRECTED BUGS}{
 \itemize{

diff --git a/inst/doc/GenepopS.Rmd b/inst/doc/GenepopS.Rmd
@@ -969,7 +969,7 @@ Following @Slatkin95, statistics based on allele size have been widely used. The
 
 ### Robertson and Hill’s estimator of $F_\mathrm{IS}$
 
-This estimator, reported in options 1 and 5, was designed to have lower variance than the ANOVA estimator and no small-sample bias when $F_\mathrm{IS}$ is low, assuming that devaitions from Hardy-Weinberg proportions are characterized by the same $F_\mathrm{IS}$ for all pairs of alleles  [@RobertsonH84].\index{\Fis!@Robertson \&\ Hill's estimator of \Fis} The score test computed in heterozygote excess and deficiency sub-options of option 1 is equivalent to this estimator for testing purposes.
+This estimator, reported in options 1 and 5, was designed to have lower variance than the ANOVA estimator and no small-sample bias when $F_\mathrm{IS}$ is low, assuming that deviations from Hardy-Weinberg proportions are characterized by the same $F_\mathrm{IS}$ for all pairs of alleles  [@RobertsonH84].\index{\Fis!@Robertson \&\ Hill's estimator of \Fis} The score test computed in heterozygote excess and deficiency sub-options of option 1 is equivalent to this estimator for testing purposes.
 
 Bootstraps
 ----------

diff --git a/inst/doc/GenepopS.pdf b/inst/doc/GenepopS.pdf
diff --git a/inst/doc/GenepopS.tex b/inst/doc/GenepopS.tex
@@ -24,7 +24,7 @@
 \usepackage[margin=1in]{geometry}
 \usepackage{hyperref}
 \hypersetup{unicode=true,
-            pdftitle={Genepop version 4.7.3},
+            pdftitle={Genepop version 4.7.5},
             pdfauthor={F. Rousset},
             pdfborder={0 0 0},
             breaklinks=true}
@@ -75,15 +75,15 @@
 
 \setlength{\droptitle}{-2em}
 
-  \title{Genepop version 4.7.3}
+  \title{Genepop version 4.7.5}
     \pretitle{\vspace{\droptitle}\centering\huge}
   \posttitle{\par}
     \author{F. Rousset}
     \preauthor{\centering\large\emph}
   \postauthor{\par}
       \predate{\centering\large\emph}
   \postdate{\par}
-    \date{This documentation: 06 December 2019}
+    \date{This documentation: 23 February 2020}
 
 \usepackage{makeidx}
 \usepackage[utf8]{luainputenc}
@@ -2668,7 +2668,7 @@ \subsection{\texorpdfstring{Robertson and Hill's estimator of
 
 This estimator, reported in options 1 and 5, was designed to have lower
 variance than the ANOVA estimator and no small-sample bias when
-\(F_\mathrm{IS}\) is low, assuming that devaitions from Hardy-Weinberg
+\(F_\mathrm{IS}\) is low, assuming that deviations from Hardy-Weinberg
 proportions are characterized by the same \(F_\mathrm{IS}\) for all
 pairs of alleles (Robertson and Hill
 1984).\index{\Fis!@Robertson \&\ Hill's estimator of \Fis} The score

diff --git a/inst/doc/all-menu-options.html b/inst/doc/all-menu-options.html
@@ -4,19 +4,19 @@
 
   <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-  <title>5 All menu options | Genepop version 4.7.3</title>
-  <meta name="description" content="5 All menu options | Genepop version 4.7.3" />
+  <title>5 All menu options | Genepop version 4.7.5</title>
+  <meta name="description" content="5 All menu options | Genepop version 4.7.5" />
   <meta name="generator" content="bookdown 0.10 and GitBook 2.6.7" />
 
-  <meta property="og:title" content="5 All menu options | Genepop version 4.7.3" />
+  <meta property="og:title" content="5 All menu options | Genepop version 4.7.5" />
   <meta property="og:type" content="book" />
 
 
 
 
 
   <meta name="twitter:card" content="summary" />
-  <meta name="twitter:title" content="5 All menu options | Genepop version 4.7.3" />
+  <meta name="twitter:title" content="5 All menu options | Genepop version 4.7.5" />
 
 
 
@@ -165,7 +165,7 @@
       <div class="body-inner">
         <div class="book-header" role="navigation">
           <h1>
-            <i class="fa fa-circle-o-notch fa-spin"></i><a href="./">Genepop version 4.7.3</a>
+            <i class="fa fa-circle-o-notch fa-spin"></i><a href="./">Genepop version 4.7.5</a>
           </h1>
         </div>
 

diff --git a/inst/doc/bibliography.html b/inst/doc/bibliography.html
@@ -4,19 +4,19 @@
 
   <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-  <title>Bibliography | Genepop version 4.7.3</title>
-  <meta name="description" content="Bibliography | Genepop version 4.7.3" />
+  <title>Bibliography | Genepop version 4.7.5</title>
+  <meta name="description" content="Bibliography | Genepop version 4.7.5" />
   <meta name="generator" content="bookdown 0.10 and GitBook 2.6.7" />
 
-  <meta property="og:title" content="Bibliography | Genepop version 4.7.3" />
+  <meta property="og:title" content="Bibliography | Genepop version 4.7.5" />
   <meta property="og:type" content="book" />
 
 
 
 
 
   <meta name="twitter:card" content="summary" />
-  <meta name="twitter:title" content="Bibliography | Genepop version 4.7.3" />
+  <meta name="twitter:title" content="Bibliography | Genepop version 4.7.5" />
 
 
 
@@ -165,7 +165,7 @@
       <div class="body-inner">
         <div class="book-header" role="navigation">
           <h1>
-            <i class="fa fa-circle-o-notch fa-spin"></i><a href="./">Genepop version 4.7.3</a>
+            <i class="fa fa-circle-o-notch fa-spin"></i><a href="./">Genepop version 4.7.5</a>
           </h1>
         </div>
 

diff --git a/inst/doc/code-maintenance-credits-contact-etc-.html b/inst/doc/code-maintenance-credits-contact-etc-.html
@@ -4,19 +4,19 @@
 
   <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-  <title>8 Code maintenance, credits, contact, etc. | Genepop version 4.7.3</title>
-  <meta name="description" content="8 Code maintenance, credits, contact, etc. | Genepop version 4.7.3" />
+  <title>8 Code maintenance, credits, contact, etc. | Genepop version 4.7.5</title>
+  <meta name="description" content="8 Code maintenance, credits, contact, etc. | Genepop version 4.7.5" />
   <meta name="generator" content="bookdown 0.10 and GitBook 2.6.7" />
 
-  <meta property="og:title" content="8 Code maintenance, credits, contact, etc. | Genepop version 4.7.3" />
+  <meta property="og:title" content="8 Code maintenance, credits, contact, etc. | Genepop version 4.7.5" />
   <meta property="og:type" content="book" />
 
 
 
 
 
   <meta name="twitter:card" content="summary" />
-  <meta name="twitter:title" content="8 Code maintenance, credits, contact, etc. | Genepop version 4.7.3" />
+  <meta name="twitter:title" content="8 Code maintenance, credits, contact, etc. | Genepop version 4.7.5" />
 
 
 
@@ -165,7 +165,7 @@
       <div class="body-inner">
         <div class="book-header" role="navigation">
           <h1>
-            <i class="fa fa-circle-o-notch fa-spin"></i><a href="./">Genepop version 4.7.3</a>
+            <i class="fa fa-circle-o-notch fa-spin"></i><a href="./">Genepop version 4.7.5</a>
           </h1>
         </div>
 

diff --git a/inst/doc/copyright.html b/inst/doc/copyright.html
@@ -4,19 +4,19 @@
 
   <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-  <title>9 Copyright | Genepop version 4.7.3</title>
-  <meta name="description" content="9 Copyright | Genepop version 4.7.3" />
+  <title>9 Copyright | Genepop version 4.7.5</title>
+  <meta name="description" content="9 Copyright | Genepop version 4.7.5" />
   <meta name="generator" content="bookdown 0.10 and GitBook 2.6.7" />
 
-  <meta property="og:title" content="9 Copyright | Genepop version 4.7.3" />
+  <meta property="og:title" content="9 Copyright | Genepop version 4.7.5" />
   <meta property="og:type" content="book" />
 
 
 
 
 
   <meta name="twitter:card" content="summary" />
-  <meta name="twitter:title" content="9 Copyright | Genepop version 4.7.3" />
+  <meta name="twitter:title" content="9 Copyright | Genepop version 4.7.5" />
 
 
 
@@ -165,7 +165,7 @@
       <div class="body-inner">
         <div class="book-header" role="navigation">
           <h1>
-            <i class="fa fa-circle-o-notch fa-spin"></i><a href="./">Genepop version 4.7.3</a>
+            <i class="fa fa-circle-o-notch fa-spin"></i><a href="./">Genepop version 4.7.5</a>
           </h1>
         </div>
 

diff --git a/inst/doc/evaluating-the-performance-of-inferences-for-isolation-by-distance.html b/inst/doc/evaluating-the-performance-of-inferences-for-isolation-by-distance.html
@@ -4,19 +4,19 @@
 
   <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-  <title>6 Evaluating the performance of inferences for Isolation by distance | Genepop version 4.7.3</title>
-  <meta name="description" content="6 Evaluating the performance of inferences for Isolation by distance | Genepop version 4.7.3" />
+  <title>6 Evaluating the performance of inferences for Isolation by distance | Genepop version 4.7.5</title>
+  <meta name="description" content="6 Evaluating the performance of inferences for Isolation by distance | Genepop version 4.7.5" />
   <meta name="generator" content="bookdown 0.10 and GitBook 2.6.7" />
 
-  <meta property="og:title" content="6 Evaluating the performance of inferences for Isolation by distance | Genepop version 4.7.3" />
+  <meta property="og:title" content="6 Evaluating the performance of inferences for Isolation by distance | Genepop version 4.7.5" />
   <meta property="og:type" content="book" />
 
 
 
 
 
   <meta name="twitter:card" content="summary" />
-  <meta name="twitter:title" content="6 Evaluating the performance of inferences for Isolation by distance | Genepop version 4.7.3" />
+  <meta name="twitter:title" content="6 Evaluating the performance of inferences for Isolation by distance | Genepop version 4.7.5" />
 
 
 
@@ -165,7 +165,7 @@
       <div class="body-inner">
         <div class="book-header" role="navigation">
           <h1>
-            <i class="fa fa-circle-o-notch fa-spin"></i><a href="./">Genepop version 4.7.3</a>
+            <i class="fa fa-circle-o-notch fa-spin"></i><a href="./">Genepop version 4.7.5</a>
           </h1>
         </div>
 

diff --git a/inst/doc/installing-genepop-and-session-examples.html b/inst/doc/installing-genepop-and-session-examples.html
@@ -4,19 +4,19 @@
 
   <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-  <title>2 Installing Genepop and session examples | Genepop version 4.7.3</title>
-  <meta name="description" content="2 Installing Genepop and session examples | Genepop version 4.7.3" />
+  <title>2 Installing Genepop and session examples | Genepop version 4.7.5</title>
+  <meta name="description" content="2 Installing Genepop and session examples | Genepop version 4.7.5" />
   <meta name="generator" content="bookdown 0.10 and GitBook 2.6.7" />
 
-  <meta property="og:title" content="2 Installing Genepop and session examples | Genepop version 4.7.3" />
+  <meta property="og:title" content="2 Installing Genepop and session examples | Genepop version 4.7.5" />
   <meta property="og:type" content="book" />
 
 
 
 
 
   <meta name="twitter:card" content="summary" />
-  <meta name="twitter:title" content="2 Installing Genepop and session examples | Genepop version 4.7.3" />
+  <meta name="twitter:title" content="2 Installing Genepop and session examples | Genepop version 4.7.5" />
 
 
 
@@ -165,7 +165,7 @@
       <div class="body-inner">
         <div class="book-header" role="navigation">
           <h1>
-            <i class="fa fa-circle-o-notch fa-spin"></i><a href="./">Genepop version 4.7.3</a>
+            <i class="fa fa-circle-o-notch fa-spin"></i><a href="./">Genepop version 4.7.5</a>
           </h1>
         </div>