From 1eb38b39f2be289ea79f13ce288d4afad725dfd5 Mon Sep 17 00:00:00 2001
From: Thomas  OBADIA <tobadia@pasteur.fr>
Date: Sun, 30 May 2021 08:55:56 +0200
Subject: [PATCH] Fix an issue where column in the clasified outputs would not
 be in the correct order and report mixed-up RAU values

---
 FUNCTIONS.R | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/FUNCTIONS.R b/FUNCTIONS.R
index 33c5bb1..8c4a358 100644
--- a/FUNCTIONS.R
+++ b/FUNCTIONS.R
@@ -752,7 +752,7 @@ getSeropositiveResults_RF = function(PATHWAY_1,
     RFOREST_MODEL_VOTES = rowSums(RFOREST_MODEL_PREDICTION$individual=="old")/N_tree
     
     # Merge results back to RAU
-    colnames(RAU_Dilution_Subset) = RAU_RFOREST_NAMES
+    colnames(RAU_Dilution_Subset) = RAU_RFOREST_NAMES[match(colnames(RAU_Dilution_Subset), substr(RAU_RFOREST_NAMES, 1, 3))]
   }
   
   # Select model chosen: W47
@@ -780,7 +780,7 @@ getSeropositiveResults_RF = function(PATHWAY_1,
     RFOREST_MODEL_VOTES = rowSums(RFOREST_MODEL_PREDICTION$individual=="old")/N_tree
     
     # Merge results back to RAU
-    colnames(RAU_Dilution_Subset) = RAU_RFOREST_NAMES
+    colnames(RAU_Dilution_Subset) = RAU_RFOREST_NAMES[match(colnames(RAU_Dilution_Subset), substr(RAU_RFOREST_NAMES, 1, 3))]
   }
   
   ##################################################################
@@ -1288,7 +1288,7 @@ getSeropositiveResults_SVM = function(PATHWAY_1,
     SVM_MODEL_VOTES = attr(SVM_MODEL_PREDICTION, "decision.values")[,1]
     
     # Merge results back to RAU
-    colnames(RAU_Dilution_Subset) = RAU_RFOREST_NAMES
+    colnames(RAU_Dilution_Subset) = RAU_RFOREST_NAMES[match(colnames(RAU_Dilution_Subset), substr(RAU_RFOREST_NAMES, 1, 3))]
   }
   
   # Select model chosen: W47
@@ -1316,7 +1316,7 @@ getSeropositiveResults_SVM = function(PATHWAY_1,
     SVM_MODEL_VOTES = attr(SVM_MODEL_PREDICTION, "decision.values")[,1]
     
     # Merge results back to RAU
-    colnames(RAU_Dilution_Subset) = RAU_RFOREST_NAMES
+    colnames(RAU_Dilution_Subset) = RAU_RFOREST_NAMES[match(colnames(RAU_Dilution_Subset), substr(RAU_RFOREST_NAMES, 1, 3))]
   }
   
   ##################################################################
-- 
GitLab