summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Klemkow <j.klemkow@wemelug.de>2012-05-11 15:55:24 +0200
committerJan Klemkow <j.klemkow@wemelug.de>2012-05-11 15:56:17 +0200
commit32efd38738d746d0b765f107091fee9e8e153801 (patch)
tree83e2a7b1d81efb12c7d92aaea48b0b6c3f3a976f
parentebf0863a4ad6743d5973a3d85c797f89edf70788 (diff)
downloaddmc-32efd38738d746d0b765f107091fee9e8e153801.tar.gz
dmc-32efd38738d746d0b765f107091fee9e8e153801.tar.bz2
dmc-32efd38738d746d0b765f107091fee9e8e153801.zip
doc: add presentation
-rw-r--r--doc/Makefile56
-rw-r--r--doc/presentation.asciidoc37
2 files changed, 39 insertions, 54 deletions
diff --git a/doc/Makefile b/doc/Makefile
index 8fb882d..611de69 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,54 +1,2 @@
-SRC_DIA=$(wildcard image/*.dia)
-SRC_SVG=$(SRC_DIA:.dia=.svg)
-SRC_PDF=$(SRC_SVG:.svg=.pdf)
-CD_DIR="cdrom"
-PIC_DIR="$(CD_DIR)/Bilder"
-SRC_DIR="$(CD_DIR)/Quelltext"
-DOC_DIR="$(CD_DIR)/Dokumentquellen"
-
-document.pdf: document.tex $(SRC_PDF)
- @pdflatex document.tex
- @makeindex document.nlo -s nomencl.ist -o document.nls
- @bibtex document
- @pdflatex document.tex
- @pdflatex document.tex
-
-all: document.pdf presentation-genua.pdf presentation-hs.pdf cdrom
-
-cdrom: cdrom.img
-
-clean:
- @rm -f $(SRC_SVG) $(SRC_PDF)
- rm -f *.{aux,dvi,log,pdf,toc,nav,out,snm,lot,bbl,lof,blg,glo,ilg,ind,ist,lol,nlo,nls}
- @rm -rf $(CD_DIR)
- @rm -f cdrom.img
-
-presentation-genua.pdf: presentation-genua.tex $(SRC_PDF)
- @pdflatex presentation-genua.tex
-
-presentation-hs.pdf: presentation-hs.tex $(SRC_PDF)
- @pdflatex presentation-hs.tex
-
-presentation-nsmlab.pdf: presentation-nsmlab.tex $(SRC_PDF)
- @pdflatex presentation-nsmlab.tex
-
-image/%.svg: image/%.dia
- @dia --export=$@ -t svg $<
-
-image/%.pdf: image/%.svg
- @inkscape -z -f $< \
- --export-pdf=$@ \
- --export-area-drawing
-
-cdrom.img: document.pdf presentation-genua.pdf presentation-hs.pdf \
- $(SRC_PDF) $(SRC_SVG)
- @mkdir -p $(CD_DIR)
- @mkdir -p $(PIC_DIR) $(SRC_DIR) $(DOC_DIR)
- @cp document.pdf $(CD_DIR)/Praxisarbeit.pdf
- @cp $(SRC_DIA) $(SRC_PDF) $(SRC_SVG) $(PIC_DIR)
- @cp code/* $(SRC_DIR)
- @cp -R *.tex *.bib Makefile image $(DOC_DIR)
- @make -C $(DOC_DIR) clean
- @mkisofs -J -o cdrom.img $(CD_DIR)
-
-.PHONY: all clean cdrom
+presentation.html: presentation.asciidoc
+ asciidoc -b slidy presentation.asciidoc
diff --git a/doc/presentation.asciidoc b/doc/presentation.asciidoc
new file mode 100644
index 0000000..aefcc1e
--- /dev/null
+++ b/doc/presentation.asciidoc
@@ -0,0 +1,37 @@
+DMC 2012 Praesentation TeamFK
+=============================
+
+author: Jan Klemkow <j.klemkow@stud.hs-wismar.de>, Benjamin Franzke <benjamin.franzke@gmail.com>
+
+Intro
+-----
+
+Mittelwert
+----------
+
+ - von jedem Produkt wird der Mittelwert vorhergesagt
+
+Sevenday-Methode
+----------------
+
+image::image/sevenday_window.svg[Sevenday Window]
+
+ - Mittelwert pro Wochentag ermitteln
+
+Sevenday-Methode-Vorhersage
+---------------------------
+
+image::image/sevenday_pred.svg[Sevenday Window]
+
+ - Mittelwert pro Wochentag ermitteln
+
+Zufalls-Methode
+---------------
+
+ - von jedem Produkt wird Mittelwert und die Standardabweichung ermittelt
+ - Mit dieses Werten werden Zufallswerte fuer jedes Produkt erzeugt
+
+Zusammensetzung der Daten
+-------------------------
+
+image::image/opt_pred_pie.svg[Vorhersagedate]