From b938affa3fae4f4f6a22f0f3fa4d8f3ae2d4c97b Mon Sep 17 00:00:00 2001
From: Daniel Weschke <daniel.weschke@gmail.com>
Date: Sun, 7 Jun 2015 01:39:57 +0200
Subject: [PATCH] =?UTF-8?q?Modalanlyse:=20Tabelle=20zu=20Frequenzen=20verv?=
 =?UTF-8?q?ollst=C3=A4ndigt=20und=20in=20diesem=20Zuge=20Rechenfunktion=20?=
 =?UTF-8?q?f=C3=BCr=20Tabellen=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Preamble/Main.tex         |  2 ++
 sections/Untersuchung.tex | 47 +++++++++++++++++++++++----------------
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/Preamble/Main.tex b/Preamble/Main.tex
index 4c66971..dc91508 100755
--- a/Preamble/Main.tex
+++ b/Preamble/Main.tex
@@ -156,6 +156,8 @@
 %...
 %\end{tabular}}
 %\end{center}
+\usepackage[autolanguage]{numprint} % Zahlenformatierung
+\usepackage{spreadtab}  % Rechenmöglichkeit in Tabellen
 
 
 % -----------------------------------------
diff --git a/sections/Untersuchung.tex b/sections/Untersuchung.tex
index fe6cd77..b0a996c 100755
--- a/sections/Untersuchung.tex
+++ b/sections/Untersuchung.tex
@@ -28,27 +28,36 @@
 \(1\rightarrow1,~ 2\rightarrow2,~ 3\rightarrow4,~ 4\rightarrow3,~ 5\rightarrow5,~ 6\rightarrow6 ,,, 15\rightarrow12,~ 16\rightarrow13\)
 \begin{table}[H]
 \caption[Frequenzen]{Frequenzen}\label{tab:U:Modal}\centering
-\begin{tabular}{ccc|cllll}
+\STsetdecimalsep{{,}}
+\STautoround{4}
+\nprounddigits2
+\npthousandsep{}
+%\begin{spreadtab}{{tabular}{rn{1}{4}n{1}{4}|cln{1}{4}n{1}{4}}}
+\begin{spreadtab}{{tabular}{rll|cln{2}{1}n{2}{1}}}
+%\begin{tabular}{rcc|rllll}
 \toprule
-Freq. & FAST & ADAMS & Freq. \\ \midrule
- 1 & 0,3240 & 0,3195 &  1 \\
- 2 & 0,3120 & 0,3164 &  2 \\
- 3 & 0,6205 & 0,6094 &  4 \\
- 4 & 0,6664 & 0,6296 &  3 \\
- 5 & 0,6675 & 0,6686 &  5 \\
- 6 & 0,6993 & 0,7019 &  6 \\
- 7 & 1,0793 & 1,0740 &  \\
- 8 & 1,0898 & 1,0877 &  \\
- 9 & 1,9337 & 1,6507 &  \\
-10 & 1,9223 & 1,8558 &  \\
-11 & 2,0205 & 1,9601 &  \\
-12 & 2,9003 & 2,8590 & 15 \\
-13 & 2,9361 & 2,9408 & 16 \\
-\bottomrule\noalign{\vspace{-.15em}}
-\multicolumn{4}{l}{\small Werte in Hz} \\
-\noalign{\vspace{-.25em}}\bottomrule
-\end{tabular}
+& @ \multicolumn{2}{l|}{Frequenz in Hz} &  & @{Frequenz aus} & @\multicolumn{2}{l}{Verhältnis in \% zu}  \\
+ @ \#   & @{FAST}  & @{ADAMS}  &  @ \#   & @{Simulation in Hz} & @{FAST} & @{ADAMS} \\ \midrule
+  1   & 0.3240 & 0.3195 &   1   & 0.30571 & \STcopy{v}{(1-e3/b3)*100} & \STcopy{v}{(1-e3/c3)*100} \\
+  2   & 0.3120 & 0.3164 &   2   & 0.3114  & & \\
+  3   & 0.6205 & 0.6094 &   4   & 0.59009 & & \\
+  4   & 0.6664 & 0.6296 &   3   & 0.53168 & & \\
+  5   & 0.6675 & 0.6686 &   5   & 0.70143 & & \\
+  6   & 0.6993 & 0.7019 &   6   & 0.79566 & & \\%7+(12)=2. v. 3 -> 9
+  7   & 1.0793 & 1.0740 &   8   & 1.0102 & & \\
+  8   & 1.0898 & 1.0877 &   9   & 1.0756 & & \\
+  9   & 1.9337 & 1.6507 &   7   & 0.97752 & & \\[-.25em]%10=2. v. 5 -> 10
+      &        &        &  12   & 2.3304 & (1-e12/b11)*100 & (1-e12/c11)*100 \\[-.25em]
+      &        &        & 7+12  & $\frac{<<e11>>+<<e12>>}{2} =:={(e11+e12)/2} $ & (1-e13/b11)*100 & (1-e13/c11)*100 \\
+ 10   & 1.9223 & 1.8558 &  10   & 1.639 & & \\%11=2. v. 4 -> 11
+ 11   & 2.0205 & 1.9601 &  11   & 2.2585 & & \\%12=11?
+ 12   & 2.9003 & 2.8590 &  15   & 3.02 & & \\
+ 13   & 2.9361 & 2.9408 &  16   & 3.2099 & & \\
+\bottomrule
+%\end{tabular}
+\end{spreadtab}
 \end{table}\vspace{-1em}
 
 
+
 \subsection{Transiente Analyse}
\ No newline at end of file