From 1f6fc27d105e3d84fd7fc76af142f9f95858b1cc Mon Sep 17 00:00:00 2001 From: Vincent Danjean <Vincent.Danjean@ens-lyon.org> Date: Wed, 31 Oct 2012 15:46:27 +0000 Subject: [PATCH] Merge CleanCaseControl, CleanChi2 and CleanQuanti into CleanStats git-svn-id: svn+ssh://imag/users/huron/danjean/svnroot/claire/altree/trunk@448 cf695345-040a-0410-a956-b889e835fe2e --- progs/altree | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/progs/altree b/progs/altree index 8611018..cf4ed8a 100755 --- a/progs/altree +++ b/progs/altree @@ -505,34 +505,18 @@ sub FusionBrNulles ################### CLEAN FUNCTION ###################### ########################################################## -sub CleanCaseControl +sub CleanStats { my($tree)=shift; foreach my $node ($tree->GetNodesList()) { $node->EraseCase(); $node->EraseControl(); - } -} - -sub CleanChi2 -{ - my($tree)=shift; - - foreach my $node ($tree->GetNodesList()) { + $node->EraseQuanti(); delete $node->{"res_test"}; } } -sub CleanQuanti -{ - my($tree)=shift; - - foreach my $node ($tree->GetNodesList()) { - $node->EraseQuanti(); - } -} - ########################################################## ########### FUNCTIONS FOR ASSOCIATION TEST ############### ########################################################## @@ -659,12 +643,7 @@ sub RepeatAssociation my($i, $j); for ($i=0; $i<$nb_permutation; $i++) { - if ($dataqual == DataQual::QUALI) { - CleanCaseControl($tree); - } else { - CleanQuanti($tree); - } - CleanChi2($tree); #marche aussi pour le F + CleanStats($tree); if ($dataqual == DataQual::QUALI) { Association($racine, $correspondance, $prolonge, $sign_util); } else { -- GitLab