Merge branch 'dev' of https://github.com/BioJulia/PopGenCore.jl into dev

BioJulia · Oct 29, 2021 · 151f98e · 151f98e · pdimens · Nov 1, 2021
2 parents 910be19 + edda414
commit 151f98e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/Iterators.jl b/src/Iterators.jl
@@ -1,4 +1,4 @@
-export skipinf, skipnan, skipinfnan, nonmissings
+export skipinf, skipnan, skipinfnan
 export partitionarray
 export pairwisepairs, simpairs
 
@@ -105,4 +105,4 @@ skipnan(itr) = Iterators.filter(!isnan, itr)
 Return an iterator over the elements in `itr` skipping `NaN`, `Inf` and `-Inf` values.
 See the docstrings of `skipinf` and `skipnan` more details.
 """
-skipinfnan(itr) = Iterators.filter(x -> (isfinite(x) & !isnan(x)), itr)
+skipinfnan(itr) = Iterators.filter(x -> (isfinite(x) & !isnan(x)), itr)
diff --git a/src/PopDataWrappers.jl b/src/PopDataWrappers.jl
@@ -64,8 +64,7 @@ end
 
 """
     genotypes(data::PopData, samplelocus::String)
-Return a vector of all the genotypes of a sample (or locus) in a `PopData` object. To return a
-single genotype at a locus, see `genotype`.
+Return a vector of all the genotypes of a sample (or locus) in a `PopData` object.
 ```
 cats = @nancycats
 genotypes(cats, "N115")
@@ -137,4 +136,4 @@ View unique population ID's and/or their counts in `PopData`.
         pops = countmap(data.sampleinfo.population)
         return DataFrame(:population => uniq_pops, :count => [pops[i] for i in uniq_pops])
     end
-end
+end