diff --git a/ea/project/EaVolleyballProject/Statistics.ser b/ea/project/EaVolleyballProject/Statistics.ser index b929201..cbca9eb 100644 --- a/ea/project/EaVolleyballProject/Statistics.ser +++ b/ea/project/EaVolleyballProject/Statistics.ser Binary files differ diff --git a/ea/project/EaVolleyballProject/bin/eva2/problems/simple/HyperVolleyballProblem$Player.class b/ea/project/EaVolleyballProject/bin/eva2/problems/simple/HyperVolleyballProblem$Player.class index 47b8269..18b0110 100644 --- a/ea/project/EaVolleyballProject/bin/eva2/problems/simple/HyperVolleyballProblem$Player.class +++ b/ea/project/EaVolleyballProject/bin/eva2/problems/simple/HyperVolleyballProblem$Player.class Binary files differ diff --git a/ea/project/EaVolleyballProject/bin/eva2/problems/simple/HyperVolleyballProblem.class b/ea/project/EaVolleyballProject/bin/eva2/problems/simple/HyperVolleyballProblem.class index f50fb06..a5edc56 100644 --- a/ea/project/EaVolleyballProject/bin/eva2/problems/simple/HyperVolleyballProblem.class +++ b/ea/project/EaVolleyballProject/bin/eva2/problems/simple/HyperVolleyballProblem.class Binary files differ diff --git a/ea/project/EaVolleyballProject/src/eva2/problems/simple/HyperVolleyballProblem.java b/ea/project/EaVolleyballProject/src/eva2/problems/simple/HyperVolleyballProblem.java index 27a6b10..66ada92 100644 --- a/ea/project/EaVolleyballProject/src/eva2/problems/simple/HyperVolleyballProblem.java +++ b/ea/project/EaVolleyballProject/src/eva2/problems/simple/HyperVolleyballProblem.java @@ -13,7 +13,10 @@ * */ -@Description("Getting an Ass in Hypervolleyball.") +@Description("Finding the best position and force (~ precision) " + + "to get an ace. For n dimensions there are 2^n+1 PLayers " + + "in the court. One player's chance to touch the ball is " + + "represented by a gaussian with std 'player sigma'.") public class HyperVolleyballProblem extends SimpleProblemDouble { private static final long serialVersionUID = 2796213693976730881L; /** diff --git a/ea/project/differentOptimizers.png b/ea/project/differentOptimizers.png index a4aa1da..e9d9bd1 100644 --- a/ea/project/differentOptimizers.png +++ b/ea/project/differentOptimizers.png Binary files differ diff --git a/ea/project/improveDiff.png b/ea/project/improveDiff.png index 8fd5688..933bf2f 100644 --- a/ea/project/improveDiff.png +++ b/ea/project/improveDiff.png Binary files differ diff --git a/ea/project/improveES.png b/ea/project/improveES.png new file mode 100644 index 0000000..23bb3ff --- /dev/null +++ b/ea/project/improveES.png Binary files differ diff --git a/ea/project/optimizer.png b/ea/project/optimizer.png new file mode 100644 index 0000000..69aadc4 --- /dev/null +++ b/ea/project/optimizer.png Binary files differ diff --git a/ea/project/optimizer.png.png b/ea/project/optimizer.png.png deleted file mode 100644 index e8efcae..0000000 --- a/ea/project/optimizer.png.png +++ /dev/null Binary files differ diff --git a/ea/project/project.pdf b/ea/project/project.pdf new file mode 100644 index 0000000..0688fc9 --- /dev/null +++ b/ea/project/project.pdf Binary files differ diff --git a/ea/project/project.tex b/ea/project/project.tex new file mode 100644 index 0000000..97d9d34 --- /dev/null +++ b/ea/project/project.tex @@ -0,0 +1,97 @@ +\documentclass[a4paper,12pt]{scrartcl} +\usepackage[ngerman]{babel} +\usepackage{graphicx} %BIlder einbinden +\usepackage{amsmath} %erweiterte Mathe-Zeichen +\usepackage{amsfonts} %weitere fonts +\usepackage[utf8]{inputenc} %Umlaute & Co +\usepackage{hyperref} %Links +\usepackage{ifthen} %ifthenelse +\usepackage{enumerate} +\usepackage{listings} +\lstset{language=Python} +\usepackage{pgffor} +\usepackage{algpseudocode} %Pseudocode +\usepackage{dsfont} % schöne Zahlenräumezeichen +\usepackage{amssymb, amsthm} %noch stärker erweiterte Mathe-Zeichen +\usepackage{tikz} %TikZ ist kein Zeichenprogramm +\usetikzlibrary{trees,automata,arrows,shapes} + +\pagestyle{empty} + + +\topmargin-50pt + +\newcounter{aufgabe} +\def\tand{&} + + +\newcommand{\makeTableLine}[2][0]{% + \setcounter{aufgabe}{30}%TODO update + \whiledo{\value{aufgabe} < 31}%TODO update + {% + #2\tand\stepcounter{aufgabe}% + } +} + +\newcommand{\aufgTable}[1]{ + \def\spalten{\numexpr #1 + 1 \relax} + \begin{tabular}{|*{\spalten}{p{1cm}|}} + \makeTableLine[\spalten]{A\theaufgabe}$\Sigma$~~\\ \hline + \rule{0pt}{15pt}\makeTableLine[\spalten]{}\\ + \end{tabular} +} + +\def\header#1#2#3#4#5#6#7{\pagestyle{empty} +\begin{minipage}[t]{0.47\textwidth} +\begin{flushleft} +{\bf #4}\\ +#5 +\end{flushleft} +\end{minipage} +\begin{minipage}[t]{0.5\textwidth} +\begin{flushright} +#6 \vspace{0.5cm}\\ +% Number of Columns Definition of Columns second empty line +% \begin{tabular}{|*{5}{C{1cm}|}}\hline A1&A2&A3&A4&$\Sigma$\\\hline&&&&\\\hline\end{tabular}\\\vspace*{0.1cm} +\aufgTable{#7} +\end{flushright} +\end{minipage} +\vspace{1cm} +\begin{center} +{\Large\bf Übungsblatt #1} + +{(Abgabe #3)} +\end{center} +} + + + +%counts the exercisenumber +\newcounter{n} +\setcounter{n}{29} %TODO update + +%Kommando für Aufgaben +%\Aufgabe{AufgTitel}{Punktezahl} +\newcommand{\Aufgabe}[2]{\stepcounter{n} +\textbf{Aufgabe \arabic{n}: #1} (#2 Punkte)} + + +\begin{document} + %\header{BlattNr}{Tutor}{Abgabedatum}{Vorlesungsname}{Namen}{Semester}{Anzahl Aufgaben} + \header{11}{}{2015-07-14}{Evolutionäre Algorithmen}{ + \textit{Jan-Peter Hohloch}\\ \textit{Maximus Mutschler} + }{SS 15}{1}%TODO update + \vspace{0.5cm} + \Aufgabe{Projekt}{max. 30} + \begin{enumerate}[(a)] + \item siehe Code + \item siehe Code + \item \includegraphics[width=\textwidth]{screenshot.png} + \item siehe Code + \item \includegraphics[width=0.9\textwidth]{differentOptimizers.png}\\ + \includegraphics[width=0.9\textwidth]{improveES.png}\\ + \includegraphics[width=0.9\textwidth]{improveDiff.png} + \item $\{5.477, 8.041, 6.928, 10\}$ + \end{enumerate} +\end{document} + diff --git a/ea/project/screenshot.png b/ea/project/screenshot.png new file mode 100644 index 0000000..fe6bab5 --- /dev/null +++ b/ea/project/screenshot.png Binary files differ diff --git a/ea/project/screenshot.png.png b/ea/project/screenshot.png.png deleted file mode 100644 index 50e52ff..0000000 --- a/ea/project/screenshot.png.png +++ /dev/null Binary files differ