diff --git a/latex/images/Makefile b/latex/images/Makefile index fdafdf45..76e2e1c2 100644 --- a/latex/images/Makefile +++ b/latex/images/Makefile @@ -3,9 +3,12 @@ pdfs=$(svgs:.svg=.pdf) epss=$(svgs:.svg=.eps) -all: $(pdfs) $(epss) bigoh.tex +all: $(pdfs) $(epss) bigoh-1.tex bigoh-2.tex -bigoh.tex : bigoh.gp +bigoh-1.tex : bigoh-1.gp + gnuplot $< + +bigoh-2.tex : bigoh-2.gp gnuplot $< %.pdf : %.svg diff --git a/latex/images/bigoh-1.gp b/latex/images/bigoh-1.gp new file mode 100644 index 00000000..c492cba9 --- /dev/null +++ b/latex/images/bigoh-1.gp @@ -0,0 +1,11 @@ +set term tikz color size 5in,3in +set output 'bigoh-1.tex' +set xlabel '{\color{var}\texttt{n}}' +set ylabel '$f({\color{var}\mathtt{n}})$' +set key right bottom +set xrange [1:100] +set style line 1 linecolor rgb '#0060ad' linetype 1 linewidth 2 +set style line 2 linecolor rgb '#dd181f' linetype 2 linewidth 2 +plot 15*x title '$15{\mathtt{n}}$' with lines linestyle 1, \ + 2*x*(log(x)/log(2)) title '$2{\mathtt{n}}\log{\mathtt{n}}$' with lines linestyle 2 + diff --git a/latex/images/bigoh-2.gp b/latex/images/bigoh-2.gp new file mode 100644 index 00000000..8557bf56 --- /dev/null +++ b/latex/images/bigoh-2.gp @@ -0,0 +1,11 @@ +set term tikz color size 5in,3in +set output 'bigoh-2.tex' +set xlabel '{\color{var}\texttt{n}}' +set ylabel '$f({\color{var}\mathtt{n}})$' +set key right bottom +set style line 1 linecolor rgb '#0060ad' linetype 1 linewidth 2 +set style line 2 linecolor rgb '#dd181f' linetype 2 linewidth 2 +set xrange [1:10000] +plot 15*x title '$15{\mathtt{n}}$' with lines linestyle 1, \ + 2*x*(log(x)/log(2)) title '$2{\mathtt{n}}\log{\mathtt{n}}$' with lines linestyle 2 + diff --git a/latex/images/bigoh.gp b/latex/images/bigoh.gp deleted file mode 100644 index 4d5fec39..00000000 --- a/latex/images/bigoh.gp +++ /dev/null @@ -1,14 +0,0 @@ -set term tikz color solid size 5in,3in -set output 'bigoh.tex' -set xlabel '{\color{var}\texttt{n}}' -set ylabel '$f({\color{var}\mathtt{n}})$' -set key right bottom -set xrange [1:100] -set style line 1 linecolor rgb '#0060ad' linetype 1 linewidth 2 -set style line 2 linecolor rgb '#dd181f' linetype 1 linewidth 2 -plot 15*x title '$15{\color{var}\mathtt{n}}$' with lines linestyle 1, \ - 2*x*(log(x)/log(2)) title '$2{\color{var}\mathtt{n}}\log{\color{var}\mathtt{n}}$' with lines linestyle 2 -set xrange [1:10000] -plot 15*x title '$15{\color{var}\mathtt{n}}$' with lines linestyle 1, \ - 2*x*(log(x)/log(2)) title '$2{\color{var}\mathtt{n}}\log{\color{var}\mathtt{n}}$' with lines linestyle 2 - diff --git a/latex/intro.tex b/latex/intro.tex index 28b91c48..b453744d 100644 --- a/latex/intro.tex +++ b/latex/intro.tex @@ -642,7 +642,10 @@ \subsection{Asymptotic Notation} \begin{figure} \begin{center} - \input{images/bigoh.tex} + \newlength{\tmpa}\setlength{\tmpa}{.98\linewidth} + \addtolength{\tmpa}{-4mm} + \resizebox{\tmpa}{!}{\input{images/bigoh-1.tex}}\\[4ex] + \resizebox{.98\linewidth}{!}{\input{images/bigoh-2.tex}} \end{center} \caption{Plots of $15#n#$ versus $2#n#\log#n#$.} \figlabel{intro-asymptotics} diff --git a/latex/ods-colors.sty b/latex/ods-colors.sty index 28c3bba3..ac24e183 100644 --- a/latex/ods-colors.sty +++ b/latex/ods-colors.sty @@ -13,6 +13,6 @@ %\definecolor{comment}{named}{Gray} %\definecolor{linkblue}{named}{Black} %\definecolor{fm}{named}{Black} - +%