Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

I1215 missings in net recode #1217

Merged
merged 2 commits into from
Jan 30, 2019
Merged

I1215 missings in net recode #1217

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a882a9
option to take missings into account for recoded nets
nitsrek Jan 28, 2019
02a50d6
rename parameter
nitsrek Jan 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions quantipy/core/stack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2107,7 +2107,8 @@ def _add_checking_chain(self, dk, cluster, name, x, y, views):

@staticmethod
def recode_from_net_def(dataset, on_vars, net_map, expand, recode='auto',
text_prefix='Net:', verbose=True):
text_prefix='Net:', mis_in_rec=False,
verbose=True):
"""
Create variables from net definitions.
"""
Expand Down Expand Up @@ -2215,8 +2216,14 @@ def _dissect_defs(ds, var, net_map, recode, text_prefix):

# order, remove codes
if 'collect_codes' in recode:
other_logic = intersection(
[{var: not_count(0)}, {name: has_count(0)}])
if not mis_in_rec and dataset._get_missing_list(var):
other_logic = intersection([
{var: not_count(0)},
{name: has_count(0)},
{var: not_any(dataset._get_missing_list(var))}])
else:
other_logic = intersection(
[{var: not_count(0)}, {name: has_count(0)}])
if dataset._is_array_item(var) or dataset.take(other_logic).tolist():
cat_name = recode.split('@')[-1] if '@' in recode else 'Other'
code = len(mapper)+1
Expand Down Expand Up @@ -2273,8 +2280,9 @@ def _dissect_defs(ds, var, net_map, recode, text_prefix):


@modify(to_list=['on_vars', '_batches'])
def add_nets(self, on_vars, net_map, expand=None, calc=None, rebase=None, text_prefix='Net:',
checking_cluster=None, _batches='all', recode='auto', verbose=True):
def add_nets(self, on_vars, net_map, expand=None, calc=None, rebase=None,
text_prefix='Net:', checking_cluster=None, _batches='all',
recode='auto', mis_in_rec=False, verbose=True):
"""
Add a net-like view to a specified collection of x keys of the stack.

Expand Down Expand Up @@ -2308,7 +2316,7 @@ def add_nets(self, on_vars, net_map, expand=None, calc=None, rebase=None, text_p
... 'de-DE': 'DE CALC LAB'}}
rebase : str, default None
Use another variables margin's value vector for column percentage
computation.
computation.
text_prefix : str, default 'Net:'
By default each code grouping/net will have its ``text`` label prefixed
with 'Net: '. Toggle by passing None (or an empty str, '').
Expand All @@ -2326,6 +2334,9 @@ def add_nets(self, on_vars, net_map, expand=None, calc=None, rebase=None, text_p
the variable contains nets and another category that summarises all
codes which are not included in any net. If no cat_name is provided,
'Other' is taken as default
mis_in_rec: bool, default False
Skip or include codes that are defined as missing when recoding
from net definition.
Returns
-------
None
Expand Down Expand Up @@ -2419,7 +2430,8 @@ def _check_and_update_calc(calc_expression, text_key):
ds.from_stack(self, dk)
on_vars = [x for x in on_vars if x in self.describe('x').index.tolist()]
self.recode_from_net_def(ds, on_vars, net_map, expand, recode,
text_prefix, verbose)
text_prefix, mis_in_rec,
verbose)

if checking_cluster in [None, False] or only_recode: continue
if isinstance(checking_cluster, ChainManager):
Expand Down