Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/kahina_paper1

Conflicts:
	paper.tex

diff --cc figures/sparse_full_explog.pdf
index 45e7cb69a48930cbe9f4dc1c4cdbca859cecda07,3c7c22e82a723dcff8a7fa856da4e6c1f23cc8cb..0000000000000000000000000000000000000000
deleted file mode 100644,100644
Binary files differ

diff --cc figures/sparse_full_explog.plot
index d84818a819befbd88fbd28a113439ce3c6c45044,1d86c556545847147c265d5d0065bd06357adc2c..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/figures/sparse_full_explog.plot
--- 2/figures/sparse_full_explog.plot
+++ /dev/null
@@@ -1,23 -1,25 +1,0 @@@
--# Analysis description 
--set encoding iso_8859_1
--set terminal x11
--set size 1,0.5
--set term postscript enhanced portrait "Helvetica" 12
--
--set ylabel "execution times (in s)" 
--set xlabel "Sparse and full polynomial's degrees" 
--set logscale x
--set logscale y
 -#'#dd181f
 -#'#dd181f'
--
--#set key on outside left bmargin
- set style line 1 lc rgb '#0060ad' lt 1 lw 2 pt 1 ps 1.5   # --- blue
- set style line 2 lc rgb '#dd181f' lt 1 lw 2 pt 5 ps 1.5   # --- red
- set style line 4 lc rgb '#dd181f' lt 1 lw 2 pt 9 ps 1.5   # --- red
- set style line 3 lc rgb '#0060ad' lt 1 lw 2 pt 6 ps 1.5   # --- red
 -set style line 1 lc rgb '#000c16' lt 1 lw 2 pt 1 ps 1.5   # --- blue
 -set style line 2 lc rgb '#000c16' lt 1 lw 2 pt 5 ps 1.5   # --- red
 -set style line 4 lc rgb '#000c16' lt 1 lw 2 pt 9 ps 1.5   # --- red
 -set style line 3 lc rgb '#000c16' lt 1 lw 2 pt 6 ps 1.5   # --- red
--
--  plot'log_exp_Sparse.txt' index 0 using 1:4 t "Sparse polynomial No exp.log"       with linespoints ls 4,\
-- 'log_exp_Sparse.txt' index 0 using 1:2 t "Sparse polynomial with exp.log"      with linespoints ls 1,\
-- 'log_exp_Sparse.txt' index 1 using 1:2 t "Sparse polynomial with exp.log"      with linespoints ls 1,\
--'log_exp.txt' index 0 using 1:4 t "Full polynomial No exp.log"       with linespoints ls 2,\
-- 'log_exp.txt' index 0 using 1:2 t "Full polynomial with exp.log"                with linespoints ls 3,\
-- 'log_exp.txt'index 1 using 1:2 t "Full polynomail with exp.log"                 with linespoints ls 3

diff --cc paper.tex
index 448aa4fe345d3bd96af44e694ee7b91246bcb042,e3dde6e9caa09e9e64e50476180d0bdb7dd8f12c..7ef63458a6462d561214345c3ed15b6de3810c3a
--- 1/paper.tex
--- 2/paper.tex
+++ b/paper.tex
@@@ -760,17 -729,11 +729,15 @@@ For that, we notice that the maximum nu
  \label{fig:02}
  \end{figure}
  
- Figure~\ref{fig:02} shows that, the best execution time for both
- sparse and full polynomial are given when the threads number varies
- between 64 and 256 threads per block. We notice that with small
- polynomials the best number of threads per block is 64, whereas the
- large polynomials the best number of threads per block is
- 256. However, in the following experiments we specify that the number
- of threads per block is 256.
+ The figure 2 show that, the best execution time for both sparse and full polynomial are given when the threads number varies between 64 and 256 threads per bloc. We notice that with small polynomials the best number of threads per block is 64, Whereas, the large polynomials the best number of threads per block is 256. However,In the following experiments we specify that the number of thread by block is 256.
  
- \subsection{Influence of exponential-logarithm solution to compute very high degrees polynomials}
+ \subsection{The impact of exp-log solution to compute very high degrees of  polynomial}
  
++<<<<<<< HEAD
 +In this experiment we report the performance of exp-log solution described in Section~\ref{sec2} to compute very high degrees polynomials.   
++=======
+ In this experiment we report the performance of log.exp solution describe in ~\ref{sec2} to compute very high degrees polynomials.   
++>>>>>>> 7f2978c0d220516decb65faf2b8ba2da34df8db2
  \begin{figure}[htbp]
  \centering
    \includegraphics[width=0.8\textwidth]{figures/sparse_full_explog}