Fix error in CANAPE hash keys

PE_alt and RPE were the wrong order when the process was generalised in b73e661
shawnlaffan · May 22, 2024 · d9debd1 · d9debd1
1 parent 8b98e4e
commit d9debd1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/lib/Biodiverse/Spatial.pm b/lib/Biodiverse/Spatial.pm
@@ -232,25 +232,25 @@ sub calculate_canape {
         $valid_canape_types->{normal} ? (
             "${result_list_pfx}>>CANAPE>>" => {
                 PE_obs => 'PE_WE',
-                PE_alt => 'PHYLO_RPE2',
-                RPE    => 'PHYLO_RPE_NULL2',
+                PE_alt => 'PHYLO_RPE_NULL2',
+                RPE    => 'PHYLO_RPE2',
             },
             "${result_list_pfx}>>CANAPE_DIFF>>" => {
                 PE_obs => 'PE_WE',
-                PE_alt => 'PHYLO_RPE2',
-                RPE    => 'PHYLO_RPE_DIFF2',
+                PE_alt => 'PHYLO_RPE_DIFF2',
+                RPE    => 'PHYLO_RPE2',
             }
         ) : (),
         $valid_canape_types->{central} ? (
             "${result_list_pfx}>>CANAPE_CENTRAL>>" => {
                 PE_obs => 'PEC_WE',
-                PE_alt => 'PHYLO_RPEC',
-                RPE    => 'PHYLO_RPE_NULLC',
+                PE_alt => 'PHYLO_RPE_NULLC',
+                RPE    => 'PHYLO_RPEC',
             },
             "${result_list_pfx}>>CANAPE_DIFF_CENTRAL>>" => {
                 PE_obs => 'PEC_WE',
-                PE_alt => 'PHYLO_RPEC',
-                RPE    => 'PHYLO_RPE_DIFFC',
+                PE_alt => 'PHYLO_RPE_DIFFC',
+                RPE    => 'PHYLO_RPEC',
             },
         ) : (),
     );

diff --git a/lib/Biodiverse/Tree.pm b/lib/Biodiverse/Tree.pm
@@ -2348,25 +2348,25 @@ sub calculate_canape {
         $valid_canape_types->{normal} ? (
             "${result_list_pfx}>>CANAPE>>" => {
                 PE_obs => 'PE_WE',
-                PE_alt => 'PHYLO_RPE2',
-                RPE    => 'PHYLO_RPE_NULL2',
+                PE_alt => 'PHYLO_RPE_NULL2',
+                RPE    => 'PHYLO_RPE2',
             },
             "${result_list_pfx}>>CANAPE_DIFF>>" => {
                 PE_obs => 'PE_WE',
-                PE_alt => 'PHYLO_RPE2',
-                RPE    => 'PHYLO_RPE_DIFF2',
+                PE_alt => 'PHYLO_RPE_DIFF2',
+                RPE    => 'PHYLO_RPE2',
             }
         ) : (),
         $valid_canape_types->{central} ? (
             "${result_list_pfx}>>CANAPE_CENTRAL>>" => {
                 PE_obs => 'PEC_WE',
-                PE_alt => 'PHYLO_RPEC',
-                RPE    => 'PHYLO_RPE_NULLC',
+                PE_alt => 'PHYLO_RPE_NULLC',
+                RPE    => 'PHYLO_RPEC',
             },
             "${result_list_pfx}>>CANAPE_DIFF_CENTRAL>>" => {
                 PE_obs => 'PEC_WE',
-                PE_alt => 'PHYLO_RPEC',
-                RPE    => 'PHYLO_RPE_DIFFC',
+                PE_alt => 'PHYLO_RPE_DIFFC',
+                RPE    => 'PHYLO_RPEC',
             },
         ) : (),
     );