Merge branch 'informe' of UBB/sort into master

This commit is contained in:
Chris Cromer 2018-11-06 14:38:15 -03:00 committed by Gitea
commit dc7ee11dcc
5 changed files with 102 additions and 5 deletions

3
.gitignore vendored
View File

@ -1,6 +1,7 @@
doc/Informe.pdf Informe.pdf
doc/*.aux doc/*.aux
doc/*.log doc/*.log
doc/*.synctex.gz doc/*.synctex.gz
doc/*.toc
*.o *.o
sort sort

View File

@ -2,14 +2,27 @@ CC=gcc
CFLAGS=-Wall -Werror CFLAGS=-Wall -Werror
CPPFLAGS+=-Isrc/include CPPFLAGS+=-Isrc/include
#LDFLAGS=-lm #LDFLAGS=-lm
ODIR=obj
SRC=src/sort.c SRC=src/sort.c
OBJ=$(SRC:.c=.o) OBJ=$(SRC:.c=.o)
all: sort informe
sort: $(OBJ) sort: $(OBJ)
$(CC) -o $@ $^ $(LDFLAGS) $(CC) -o $@ $^ $(LDFLAGS)
clean: informe:
rm -f src/*.o sort # if pdflatex is installed create the informe
ifneq (, $(shell which pdflatex))
make -C doc
mv doc/Informe.pdf Informe.pdf
endif
.PHONY: sort clean clean: cleansort cleaninforme
cleansort:
rm -f src/*.o sort Informe.pdf
cleaninforme:
make -C doc clean
.PHONY: all sort informe clean cleansort cleaninforme

View File

@ -0,0 +1,74 @@
\title{Tarea 1: Ordenamiento}
\author{}
\date{\today}
\documentclass[12pt]{article}
\usepackage[utf8]{inputenc} %\ This allows spanish tildes
\usepackage[spanish]{babel}
\usepackage{array}
\usepackage{adjustbox}
\usepackage{titling}
\usepackage[left=2cm,right=2cm,top=2cm,bottom=2cm,a4paper]{geometry}
\usepackage{amsmath}
\pretitle{%
\begin{center}
\LARGE
\includegraphics[width=4cm]{ubblogo.png}\\[\bigskipamount]
\Large
\textbf{Análisis y Diseño de Algoritmos}\\[\smallskipamount]
}
\posttitle{\end{center}}
\begin{document}
\clearpage\maketitle
\thispagestyle{empty}
\begin{flushright}
\textbf{Integrantes:}\\
Christopher Cromer\\
Rodolfo Cuevas
\end{flushright}
\begin{flushright}
\textbf{Profesor:}\\
Pedro Rodríguez
\end{flushright}
\begin{flushright}
\textbf{Ayudantes:}\\
Carlos Faúndez\\
Xavier Canales
\end{flushright}
\newpage
\clearpage
\thispagestyle{empty}
\tableofcontents
\newpage
\pagenumbering{arabic}
\section{Psuedo código}
\subsection{Merge Sort}
\subsection{Quick Sort}
\subsection{Bubble Sort}
\subsection{Bitonic Sort}
\subsection{Ordenamiento por conteo}
\subsection{Ordenamiento por selección}
\section{Análisis temporal}
\section{Conclusiones}
\end{document}

9
doc/Makefile Normal file
View File

@ -0,0 +1,9 @@
informe:
# we do this twice to make sure the toc is updated
pdflatex -synctex=1 -interaction=nonstopmode "Informe.tex"
pdflatex -synctex=1 -interaction=nonstopmode "Informe.tex"
clean:
rm -f *.log *.toc *.gz *.aux Informe.pdf
.PHONY: informe clean

BIN
doc/ubblogo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 185 KiB