|
@@ -57,7 +57,7 @@ presented in figure~\ref{class_flow}.
|
|
|
Experiments were conducted on two machines:
|
|
|
\begin{itemize}
|
|
|
\item 2.4 GHz Intel Dual Core i5 hyper-threaded to 2.8GHz, 8 Go 1600 MHz DDR3.
|
|
|
- \item 2.8 GHz Intel Quad Core i7 hyper-threaded to 3.1GHz, 8 Go 1600 MHz DDR3.
|
|
|
+ \item 2.7 GHz Intel Quad Core i74800MQ hyper-threaded to 3.7GHz, 16 Go 1600 MHz DDR3.
|
|
|
\end{itemize}
|
|
|
|
|
|
\begin{figure}
|
|
@@ -78,8 +78,8 @@ of the discrepancy}. The chosen algorithm and implantation of this
|
|
|
cost function is the DEM-algorithm~\cite{Dobkin} of
|
|
|
\emph{Magnus Wahlstr\o m}~\cite{Magnus}.\medskip
|
|
|
|
|
|
-All the experiments has been conducted on dimension 2,3,4
|
|
|
---- with a fixed Halton basis 7, 13, 29, 3 ---. Some minor tests have
|
|
|
+All the experiments has been conducted on dimension 2,3, and 4
|
|
|
+--- with a fixed Halton basis 7, 13, 29, and 3 ---. Some minor tests have
|
|
|
been made in order to discuss the dependency of the discrepancy and
|
|
|
efficiency of the heuristics with regards to the values chosen for the
|
|
|
prime base. The average results remains roughly identical when taking
|
|
@@ -347,6 +347,7 @@ permutations.
|
|
|
\begin{algorithm}[H]
|
|
|
\SetAlgoLined
|
|
|
\SetKwFunction{Rand}{Rand}
|
|
|
+ \SetKwFunction{Swap}{Swap}
|
|
|
\SetKwFunction{RPO}{a random permutation of }
|
|
|
\SetKwFunction{RVI}{a random value in }
|
|
|
\KwData{Two permutations A[1..n], B[1..n]}
|
|
@@ -368,14 +369,9 @@ permutations.
|
|
|
$v \leftarrow a$\;
|
|
|
}
|
|
|
\Else{
|
|
|
- \If{$\Rand(\{0,1\}) = 1$}{
|
|
|
- $v \leftarrow a$\;
|
|
|
- $available \leftarrow available \cup \{b\}$\;
|
|
|
- }
|
|
|
- \Else{
|
|
|
- $v \leftarrow b$\;
|
|
|
- $available \leftarrow available \cup \{a\}$\;
|
|
|
- }
|
|
|
+ $\Swap (A, B)$ with probability $1/2$\;
|
|
|
+ $v \leftarrow A_j$\;
|
|
|
+ $available \leftarrow available \cup \{B_j\}$\;
|
|
|
}
|
|
|
$C_j \leftarrow v$\;
|
|
|
$got \leftarrow got \cup \{v\}$\;
|