From: Karine Deschinkel <kdeschin@grappa.iut-bm.univ-fcomte.fr>
Date: Fri, 4 Sep 2015 08:36:13 +0000 (+0200)
Subject: fixed conflict
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/JournalMultiPeriods.git/commitdiff_plain/6a0a093a654ceb1379ce0aa8439c1650c04f9929

fixed conflict
---

6a0a093a654ceb1379ce0aa8439c1650c04f9929
diff --cc article.tex
index fa3d153,af96820..0894ca4
--- a/article.tex
+++ b/article.tex
@@@ -1133,10 -1129,10 +1133,10 @@@ $W_{U}$ & $|P|^2$ \
  \label{table3}
  % is used to refer this table in the text
  \end{table}
--  
 -\textcolor{red}{Our first protocol based GLPK optimization solver is declined into  four versions: MuDiLCO-1,  MuDiLCO-3, MuDiLCO-5,
 -and  MuDiLCO-7, corresponding  respectively to  $T=1,3,5,7$ ($T$  the  number of rounds in one sensing period).
 -Table \ref{tl} shows time limit values for MuDiLCO protocol versions. After extensive experiments, we chose the values that explained in Table \ref{tl} because they gave the best results. In these experiments, we started with the average execution time of the corresponding MuDiLCO version and network size divided by 3 as a time limit. After that, we increase these values until reaching the best results. In fact, selecting the optimal values for the time limits can be investigated in future. In Table \ref{tl}, "NO" refers to apply the GLPK solver without time limit because we did not find improvement on the results of MuDiLCO protocol with the time limit.  }. 
++
 +\textcolor{green}{The MuDilLCO protocol is declined into  four versions: MuDiLCO-1,  MuDiLCO-3, MuDiLCO-5,
 +and  MuDiLCO-7, corresponding  respectively to  $T=1,3,5,7$ ($T$  the  number of rounds in one sensing period). Since the time resolution may be prohibitif when the size of the problem increases, a time limit treshold  has been fixed to solve large instances.  In these cases, the solver returns the best solution found, which is not necessary the optimal solution.
 + Table \ref{tl} shows time limit values. These time limit treshold have been set empirically. The basic idea consists in considering the average execution time to solve the integer programs  to optimality, then by dividing  this average time by three to set the threshold value. After that, this treshold value is increased if necessary such that the solver is able to deliver a feasible solution within the time limit. In fact, selecting the optimal values for the time limits will be investigated in future. In Table \ref{tl}, "NO" indicates that the problem has been solved to optimality without time limit. }. 
  
  \begin{table}[ht]
  \caption{Time limit values for MuDiLCO protocol versions }