genealogy 2.5.0 → 2.5.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/genealogy/ineligible_methods.rb +3 -3
- data/lib/genealogy/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d858d2fc87619a42668203041a43ea391b052550cf88e0a57693c1d294452635
|
4
|
+
data.tar.gz: 98550f9bd2a67d5e0952b238a1aa7fd505e857db69e32b149011428fd057eb71
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: bd940397fd970b02cd958e60af9bd64ee01c2ea3787bf6e1f44693fdb9217e14d2661b2b4faecc58a20cceda64fbbdab60f11b3090d8df0ae1a322dd5d79e928
|
7
|
+
data.tar.gz: 99641b731bc5f637684513dd9400cc712a9b6a550b80fb046d7634079985faa3264a9572ea2196a0d345737920d710d8cd74ce0a168a6856f50c554ec1da26fd
|
@@ -111,7 +111,7 @@ module Genealogy
|
|
111
111
|
# @!macro [attach] generate_method_ineligibles_half_siblings_with_docs
|
112
112
|
# @method ineligible_$1_half_siblings
|
113
113
|
# list of individual who cannot be $1 half_sibling according to the ineligibility level in use.
|
114
|
-
# At `:pedigree` level it returns
|
114
|
+
# At `:pedigree` level it returns $2 ineligible children, other lineage halfsiblings and all individuals with $2 set
|
115
115
|
# At `:pedigree_and_dates` level it also includes all individuals who cannot be siblings for age reasons. If $2 is known it includes $2's ineligible children,
|
116
116
|
# otherwise it tries to estimate $2's fertility period: if it's possible it includes all individuals whose estimated birth period doesn't overlap $2's fertility period.
|
117
117
|
# @return [Array]
|
@@ -121,9 +121,9 @@ module Genealogy
|
|
121
121
|
parent = LINEAGE2PARENT[lineage]
|
122
122
|
p = send(parent)
|
123
123
|
if gclass.ineligibility_level >= PEDIGREE
|
124
|
-
ineligibles |=
|
124
|
+
ineligibles |= p.ineligible_children
|
125
125
|
ineligibles |= send("#{OPPOSITELINEAGE[lineage]}_half_siblings") # other lineage half siblings would become full siblings so they cannot be current lineage half sibling
|
126
|
-
ineligibles |= gclass.all_with(parent)
|
126
|
+
ineligibles |= gclass.all_with(parent)
|
127
127
|
end
|
128
128
|
if gclass.ineligibility_level >= PEDIGREE_AND_DATES
|
129
129
|
if p
|
data/lib/genealogy/version.rb
CHANGED