@@ -529,58 +529,52 @@ dominance_analysis <- function(model, sets = NULL, all = NULL,
529529 datawizard :: data_relocate(da_df_res , " subset" , after = " ranks" )
530530
531531 if (conditional ) {
532- da_df_cdl <-
533- .data_frame(Subset = names(domir_res $ General_Dominance ))
534-
535- da_df_cdl <-
536- datawizard :: data_merge(
537- da_df_cdl ,
538- .data_frame(
539- Subset = names(domir_res $ General_Dominance ),
540- domir_res $ Conditional_Dominance
541- )
542- )
532+ da_df_cdl <- .data_frame(Subset = names(domir_res $ General_Dominance ))
543533
544- da_df_cdl <-
545- datawizard :: data_rename(
546- da_df_cdl ,
547- names(da_df_cdl )[ 2 : length( da_df_cdl )] ,
548- colnames( domir_res $ Conditional_Dominance )
534+ da_df_cdl <- datawizard :: data_merge(
535+ da_df_cdl ,
536+ .data_frame(
537+ Subset = names(domir_res $ General_Dominance ) ,
538+ domir_res $ Conditional_Dominance
549539 )
540+ )
541+
542+ da_df_cdl <- datawizard :: data_rename(
543+ da_df_cdl ,
544+ select = names(da_df_cdl )[2 : length(da_df_cdl )],
545+ replacement = colnames(domir_res $ Conditional_Dominance )
546+ )
550547 } else {
551548 da_df_cdl <- NULL
552549 }
553550
554551 if (complete ) {
555- da_df_cpt <-
556- .data_frame(Subset = names(domir_res $ General_Dominance ))
557-
558- da_df_cpt <-
559- datawizard :: data_merge(
560- da_df_cpt ,
561- .data_frame(
562- Subset = names(domir_res $ General_Dominance ),
563- domir_res $ Complete_Dominance
564- )
565- )
552+ da_df_cpt <- .data_frame(Subset = names(domir_res $ General_Dominance ))
566553
567- da_df_cpt <-
568- datawizard :: data_rename(
569- da_df_cpt ,
570- names(da_df_cpt )[ 2 : length( da_df_cpt )] ,
571- colnames( domir_res $ Complete_Dominance )
554+ da_df_cpt <- datawizard :: data_merge(
555+ da_df_cpt ,
556+ .data_frame(
557+ Subset = names(domir_res $ General_Dominance ) ,
558+ domir_res $ Complete_Dominance
572559 )
560+ )
561+
562+ da_df_cpt <- datawizard :: data_rename(
563+ da_df_cpt ,
564+ select = names(da_df_cpt )[2 : length(da_df_cpt )],
565+ replacement = colnames(domir_res $ Complete_Dominance )
566+ )
573567 } else {
574568 da_df_cpt <- NULL
575569 }
576570
577- da_df_res <-
578- datawizard :: data_rename(da_df_res ,
579- replacement = c(
580- " Parameter" , " General_Dominance" ,
581- " Percent" , " Ranks" , " Subset"
582- )
571+ da_df_res <- datawizard :: data_rename(
572+ da_df_res ,
573+ replacement = c(
574+ " Parameter" , " General_Dominance" ,
575+ " Percent" , " Ranks" , " Subset"
583576 )
577+ )
584578
585579 da_list <- list (
586580 General = da_df_res ,
0 commit comments