retest

renduTP2/perf.sh

@@ -8,8 +8,13 @@ for taille in 10000 20000 30000 40000
             do
                 for algo in 'i' 'r' 'f'
                     do
+<<<<<<< HEAD
                         res=`(/usr/bin/time -f "%U\t%M" ./main $taille $algo $typeTableau > /dev/null ) 2>&1`
                         echo "$taille\t$res\t$algo\t$typeTableau"
+=======
+                        res=`(/usr/bin/time -f "%Us,%MMhz" ./main $taille $typeTableau $algo > /dev/null ) 2>&1`
+                        echo -e "$taille\t$res\t$typeTableau\t$algo"
+>>>>>>> 87b3bd8204e90f4bc29c8ad70362d8b7016c553b
 
                     done
             done