Small fixes suggested by Peter
This commit is contained in:
parent
9c321fb273
commit
b3bfc58d0d
@ -8,5 +8,5 @@ predicate round_robin(array[int] of var bool: nbhs) =
|
||||
select = (last_val(select) + 1) mod N
|
||||
endif
|
||||
/\ forall(i in 1..N) (
|
||||
select = i-1 -> nbhs[i] % <-- Post Neighbourhood@\Vlabel{line:6:roundrobin:post}@
|
||||
(select = i-1) -> nbhs[i] % <-- Post Neighbourhood@\Vlabel{line:6:roundrobin:post}@
|
||||
);
|
||||
|
@ -596,7 +596,7 @@ Given two variables \mzninline{exposure} and \mzninline{shots}, once we have fou
|
||||
constraint exposure < e \/ (exposure = e /\ shots < s)
|
||||
\end{mzn}
|
||||
|
||||
expressing the lexicographic ordering, and continue the search.
|
||||
\noindent{}expressing the lexicographic ordering, and continue the search.
|
||||
Since each added lexicographic constraint is strictly stronger than the previous one, we never have to retract previous constraints.
|
||||
|
||||
\begin{figure}
|
||||
@ -605,7 +605,7 @@ Since each added lexicographic constraint is strictly stronger than the previous
|
||||
\caption{\label{fig:6-radiation}A run-time performance comparison between
|
||||
incremental processing (Incr.) and re-evaluation (Redo) of 9 Radiation
|
||||
\minizinc\ instances in the application of Lexicographic objectives on a 3.4
|
||||
GHz Quad-Core Intel Core i5 using the Gecode 6.1.2 solver. Each test was run
|
||||
GHz Quad-Core Intel Core i5 using the \gls{gecode} 6.1.2 solver. Each test was run
|
||||
to optimality and was conducted 20 times to provide an average.}
|
||||
\end{figure}
|
||||
|
||||
@ -614,7 +614,7 @@ The translation shows a 13x speedup on average, and even the time spent solving
|
||||
|
||||
\subsection{Compiling neighbourhoods}
|
||||
|
||||
% TODO: Decide what to do with these
|
||||
\todo{Decide what to do with these}
|
||||
% Table column headings
|
||||
\newcommand{\intobj}{\int}
|
||||
\newcommand{\minobj}{\min}
|
||||
|
Reference in New Issue
Block a user