X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/hpcc2014.git/blobdiff_plain/c3bfcd6a7a6c9b0dcb1bcdc52facec1fe257f658..7764012ccfac219ff16acf27ae1dda5619bbc9b7:/hpcc.tex?ds=sidebyside

diff --git a/hpcc.tex b/hpcc.tex
index c2f5a1b..ab350c8 100644
--- a/hpcc.tex
+++ b/hpcc.tex
@@ -447,7 +447,7 @@ containing 50 hosts each, totaling 100 hosts. Various combinations of the above
 factors have providing the results shown in Table~\ref{tab.cluster.2x50} with a
 matrix size ranging from $N_x = N_y = N_z = \text{62}$ to 171 elements or from
 $\text{62}^\text{3} = \text{\np{238328}}$ to $\text{171}^\text{3} =
-\text{\np{5211000}}$ entries.
+\text{\np{5000211}}$ entries.
 
 % use the same column width for the following three tables
 \newlength{\mytablew}\settowidth{\mytablew}{\footnotesize\np{E-11}}
@@ -538,7 +538,7 @@ relative gains greater than 1 with a matrix size from 62 to 100 elements.
     & \np{E-5} & \np{E-5} & \np{E-5} & \np{E-5} & \np{E-5} & \np{E-5} \\
     \hline
     Relative gain
-    & 1.003    & 1,01     & 1,08     & 0.19     & 1.28     & 1.01 \\
+    & 1.003    & 1.01     & 1.08     & 0.19     & 1.28     & 1.01 \\
     \hline
   \end{mytable}
 \end{table}
@@ -588,11 +588,8 @@ lat latency, \dots{}).
 	\item Maximum number of internal and external iterations;
 	\item Internal and external precisions;
 	\item Matrix size $N_x$, $N_y$ and $N_z$;
-%<<<<<<< HEAD
 	\item Matrix diagonal value: \np{6.0};
 	\item Matrix Off-diagonal value: \np{-1.0};
-%=======
-%>>>>>>> 5fb6769d88c1720b6480a28521119ef010462fa6
 	\item Execution Mode: synchronous or asynchronous.
 \end{itemize}
 
