test

jfriedt
2 parents bad78fb7c7 de0f544773
Showing 1 changed file Side-by-side Diff
ifcs2018_poster.tex
@@ -104,7 +104,7 @@
   \begin{enumerate}
     \setcounter{enumi}{1}
     \item \textbf{Alternative way (our focus):}\\
-    Chain of little filters
+    Chain of small filters
     \begin{itemize}[label=$\Rightarrow$, noitemsep, nolistsep]
       {\color{Green}\item Great rejection}
       {\color{Green}\item Consume less resources on FPGA}
  
@@ -167,11 +167,16 @@
     \includegraphics[width=0.95\textwidth]{images/fir-mono-vs-fir-series-noise-fixe-jmf.pdf}
     \captionof{figure}{Custom criterion}
   \end{minipage}
+<<<<<<< HEAD
   \item {\bf Rejection}: the last configuration is better than the first but worse 
 than the monolithic filter
   \item Resources {\bf consumption}: last filter is better than the single monolithic filter
 (monolithic does not fit in available resources)
 \vspace{-.33cm}
+=======
+  \item For the rejection: the last configuration is better than the first one but it's worst than monolithic filter
+  \item For the resources consumption: the last one is better than the single filter
+>>>>>>> de0f544773b03c4215f07cea693fc7eb145ff20a
   \begin{center}
     \begin{tabular}{|c|ccccc|}\hline
     FIR & BlockRAM36 & BlockRAM18 & LookUpTables & DSP & rejection (dB)\\\hline\hline
...	...	@@ -104,7 +104,7 @@
104	104	\begin{enumerate}
105	105	\setcounter{enumi}{1}
106	106	\item \textbf{Alternative way (our focus):}\\
107		- Chain of little filters
	107	+ Chain of small filters
108	108	\begin{itemize}[label=$\Rightarrow$, noitemsep, nolistsep]
109	109	{\color{Green}\item Great rejection}
110	110	{\color{Green}\item Consume less resources on FPGA}
111	111
...	...	@@ -167,11 +167,16 @@
167	167	\includegraphics[width=0.95\textwidth]{images/fir-mono-vs-fir-series-noise-fixe-jmf.pdf}
168	168	\captionof{figure}{Custom criterion}
169	169	\end{minipage}
	170	+<<<<<<< HEAD
170	171	\item {\bf Rejection}: the last configuration is better than the first but worse
171	172	than the monolithic filter
172	173	\item Resources {\bf consumption}: last filter is better than the single monolithic filter
173	174	(monolithic does not fit in available resources)
174	175	\vspace{-.33cm}
	176	+=======
	177	+ \item For the rejection: the last configuration is better than the first one but it's worst than monolithic filter
	178	+ \item For the resources consumption: the last one is better than the single filter
	179	+>>>>>>> de0f544773b03c4215f07cea693fc7eb145ff20a
175	180	\begin{center}
176	181	\begin{tabular}{\|c\|ccccc\|}\hline
177	182	FIR & BlockRAM36 & BlockRAM18 & LookUpTables & DSP & rejection (dB)\\\hline\hline