@@ -534,20 +534,20 @@ def _expand_shorthand(model_formula, variables):
534534 nss = _get_matches_from_data ('non_steady_state_outlier[0-9]+' , variables )
535535 spikes = _get_matches_from_data ('motion_outlier[0-9]+' , variables )
536536
537- model_formula = re . sub ( r 'wm' , wm , model_formula )
538- model_formula = re . sub ( r 'gsr' , gsr , model_formula )
539- model_formula = re . sub ( r 'rps' , rps , model_formula )
540- model_formula = re . sub ( r 'fd' , fd , model_formula )
541- model_formula = re . sub ( r 'acc' , acc , model_formula )
542- model_formula = re . sub ( r 'tcc' , tcc , model_formula )
543- model_formula = re . sub ( r 'dv' , dv , model_formula )
544- model_formula = re . sub ( r 'dvall' , dvall , model_formula )
545- model_formula = re . sub ( r 'nss' , nss , model_formula )
546- model_formula = re . sub ( r 'spikes' , spikes , model_formula )
537+ model_formula = model_formula . replace ( 'wm' , wm )
538+ model_formula = model_formula . replace ( 'gsr' , gsr )
539+ model_formula = model_formula . replace ( 'rps' , rps )
540+ model_formula = model_formula . replace ( 'fd' , fd )
541+ model_formula = model_formula . replace ( 'acc' , acc )
542+ model_formula = model_formula . replace ( 'tcc' , tcc )
543+ model_formula = model_formula . replace ( 'dv' , dv )
544+ model_formula = model_formula . replace ( 'dvall' , dvall )
545+ model_formula = model_formula . replace ( 'nss' , nss )
546+ model_formula = model_formula . replace ( 'spikes' , spikes )
547547
548548 formula_variables = _get_variables_from_formula (model_formula )
549549 others = ' + ' .join (set (variables ) - set (formula_variables ))
550- model_formula = re . sub ( r 'others' , others , model_formula )
550+ model_formula = model_formula . replace ( 'others' , others )
551551 return model_formula
552552
553553
0 commit comments