|
61 | 61 | # - dictionary-like with a NamedTuple |
62 | 62 |
|
63 | 63 | function categories_fusion_rule(cats1, cats2) |
64 | | - diff_cat = CategoryProduct(find_diff(cats1, cats2)) |
65 | | - shared1, shared2 = find_common(cats1, cats2) |
| 64 | + diff_cat = CategoryProduct(categories_diff(cats1, cats2)) |
| 65 | + shared1, shared2 = categories_common(cats1, cats2) |
66 | 66 | fused = map(fusion_rule, values(shared1), values(shared2)) |
67 | 67 | return recover_key(typeof(shared1), fused) × diff_cat |
68 | 68 | end |
@@ -172,12 +172,12 @@ categories_product(l1::Tuple, l2::Tuple) = (l1..., l2...) |
172 | 172 |
|
173 | 173 | categories_trivial(type::Type{<:Tuple}) = trivial.(fieldtypes(type)) |
174 | 174 |
|
175 | | -function find_common(t1::Tuple, t2::Tuple) |
| 175 | +function categories_common(t1::Tuple, t2::Tuple) |
176 | 176 | n = min(length(t1), length(t2)) |
177 | 177 | return t1[begin:n], t2[begin:n] |
178 | 178 | end |
179 | 179 |
|
180 | | -function find_diff(t1::Tuple, t2::Tuple) |
| 180 | +function categories_diff(t1::Tuple, t2::Tuple) |
181 | 181 | n1 = length(t1) |
182 | 182 | n2 = length(t2) |
183 | 183 | return n1 < n2 ? t2[(n1 + 1):end] : t1[(n2 + 1):end] |
@@ -243,8 +243,8 @@ function categories_trivial(type::Type{<:NamedTuple{Keys}}) where {Keys} |
243 | 243 | return NamedTuple{Keys}(trivial.(fieldtypes(type))) |
244 | 244 | end |
245 | 245 |
|
246 | | -function find_common(nt1::NamedTuple, nt2::NamedTuple) |
| 246 | +function categories_common(nt1::NamedTuple, nt2::NamedTuple) |
247 | 247 | return intersect_keys(nt1, nt2), intersect_keys(nt2, nt1) |
248 | 248 | end |
249 | 249 |
|
250 | | -find_diff(nt1::NamedTuple, nt2::NamedTuple) = symdiff_keys(nt1, nt2) |
| 250 | +categories_diff(nt1::NamedTuple, nt2::NamedTuple) = symdiff_keys(nt1, nt2) |
0 commit comments