@@ -535,20 +535,20 @@ def _expand_shorthand(model_formula, variables):
535
535
nss = _get_matches_from_data ('non_steady_state_outlier[0-9]+' , variables )
536
536
spikes = _get_matches_from_data ('motion_outlier[0-9]+' , variables )
537
537
538
- model_formula = re .sub ('wm' , wm , model_formula )
539
- model_formula = re .sub ('gsr' , gsr , model_formula )
540
- model_formula = re .sub ('rps' , rps , model_formula )
541
- model_formula = re .sub ('fd' , fd , model_formula )
542
- model_formula = re .sub ('acc' , acc , model_formula )
543
- model_formula = re .sub ('tcc' , tcc , model_formula )
544
- model_formula = re .sub ('dv' , dv , model_formula )
545
- model_formula = re .sub ('dvall' , dvall , model_formula )
546
- model_formula = re .sub ('nss' , nss , model_formula )
547
- model_formula = re .sub ('spikes' , spikes , model_formula )
538
+ model_formula = re .sub (r 'wm' , wm , model_formula )
539
+ model_formula = re .sub (r 'gsr' , gsr , model_formula )
540
+ model_formula = re .sub (r 'rps' , rps , model_formula )
541
+ model_formula = re .sub (r 'fd' , fd , model_formula )
542
+ model_formula = re .sub (r 'acc' , acc , model_formula )
543
+ model_formula = re .sub (r 'tcc' , tcc , model_formula )
544
+ model_formula = re .sub (r 'dv' , dv , model_formula )
545
+ model_formula = re .sub (r 'dvall' , dvall , model_formula )
546
+ model_formula = re .sub (r 'nss' , nss , model_formula )
547
+ model_formula = re .sub (r 'spikes' , spikes , model_formula )
548
548
549
549
formula_variables = _get_variables_from_formula (model_formula )
550
550
others = ' + ' .join (set (variables ) - set (formula_variables ))
551
- model_formula = re .sub ('others' , others , model_formula )
551
+ model_formula = re .sub (r 'others' , others , model_formula )
552
552
return model_formula
553
553
554
554
0 commit comments