1 files changed, 26 insertions, 7 deletions

diff --git a/fiz/naloga/predstavitev/dokument.tex b/fiz/naloga/predstavitev/dokument.tex
index 265a6a9..b55f26e 100644
--- a/fiz/naloga/predstavitev/dokument.tex
+++ b/fiz/naloga/predstavitev/dokument.tex
@@ -181,9 +181,9 @@
 			\item \textit{masa plastenke}, \textit{kalibracijski delitelj vage}
 			\item \textbf{čas, ko je $F_\alpha > F_g$}, \textbf{maksimalna $F_m$ $\rightarrow$ maksimalna $F_\alpha$}, \textbf{povprečna $F_m$/$F_\alpha$}
 			\item \texttt{začetna količina vode v plastenki ($V_0$): \SI{0,3}{\liter}, \SI{0,6}{\liter} in \SI{0,9}{\liter}}, \texttt{začetni tlak v plastenki ($P_0$): \SI{10}{\kilo\pascal}, \SI{20}{\kilo\pascal}, \SI{30}{\kilo\pascal} in \SI{40}{\kilo\pascal}}
-			\item Grafi, s katerimi bodo prikazane meritve: $F_\alpha(t)$, $F_\alpha(P_0)$, $F_\alpha(V_0)$, $\tavg(V_0)$, $\tavg(P_0)$, $š_{max}(V_0, P_0)$ -- predv. viš.
+			\item Grafi, s katerimi bodo prikazane meritve: $F_\alpha(t)$, $F_\alpha(P_0)$, $F_\alpha(V_0)$, $\tavg(V_0)$, $\tavg(P_0)$, $v_{k}(V_0, P_0)$ -- končna hitrost
 			\item Za vsako kombinacijo volumna in pritiska so bile izvedene tri meritve, katerih povprečje se upošteva
-			\item Videoanaliza bo uporabljena za $t_0$ in za $h_\alpha \rightarrow V_\alpha \rightarrow m_\alpha$
+			\item Videoanaliza bo uporabljena za $t_0$ in za $h_\alpha \rightarrow V_\alpha \rightarrow m_\alpha \rightarrow F_{g_\alpha}$
 		\end{itemize}
 		\vfill\null\columnbreak
 		\vspace*{-4cm}
@@ -202,24 +202,25 @@
 	\begin{multicols}{2}
 		\begin{itemize}
 			\item CSV datoteki: $F_m(t)$ in $h_\alpha(t)$
-			\item Natančnost: $F_m$: \SI{1}{\centi\newton}, $h_\alpha$: \SI{1}{\milli\meter}
+			\item Natanč.: $F_m$: \SI{1}{\centi\newton}, $h_\alpha$: \SI{1}{\milli\meter}, $t$: \SI[parse-numbers=false]{\frac{1}{11}}{\second}
 			\item $h_\alpha \rightarrow V_\alpha$:
 		\end{itemize}
 			$$
-				g(x) = \SI{106}{\milli\liter}+(x-\SI{5,5}{\centi\meter})\cdot\pii(\SI{38,197}{\milli\meter})^2
+				g(x) = \SI{106}{\milli\liter}+(x-\SI{5,5}{\centi\meter})\cdot\pi\cdot(\SI{38,197}{\milli\meter})^2
 			$$
 			\[
 				f(x) =
 				\begin{dcases}
 					g(x); & \SI{5,5}{\centi\meter} \leq x \leq \SI{24,5}{\centi\meter} \\
 					x < \SI{106}{\milli\liter}; & x < \SI{5,5}{\centi\meter} \\
-					\SI{947}{\milli\liter} > & \\
+					%\SI{947}{\milli\liter} > & \\
+					\SI{1}{\liter} > & \\
 					x > \SI{871}{\milli\liter}; & x > \SI{24,5}{\centi\meter}
 				\end{dcases}
 			\]
 		\begin{itemize}
 			\item $\tavg$: čas, ko je $F_m > \SI{0,5}{\newton}$
-			\item Po obdelavi: \{$F_\alpha$, $V_\alpha$\}($t$) in \{$\tavg$, $\overline{F_\alpha}$, $š_{max}$\}(\{$P_0$, $V_0$\})
+			\item Po obdelavi s programom \texttt{obdelaj.c}: \{$F_\alpha$, $V_\alpha$\}($t$) in \{$\tavg$, $\overline{F_\alpha}$, $v_{k}$\}(\{$P_0$, $V_0$\})
 		\end{itemize}
 		\vfill\null\columnbreak
 		\vspace*{-4cm}
@@ -249,10 +250,28 @@
 \subsection{Rezultati in komentarji nanje ter ugotovitve}
 \begin{frame}
 	\frametitle{\secname}
+	\framesubtitle{\subsecname}
 	\begin{multicols}{2}
 		\begin{itemize}
-			\item Obstajajo kombinacije $P_0$ in $V_0$, kjer voda ne bo v celoti izrinjena, ker bo prej $P_\alpha = 0$
+			\item Obstajajo kombinacije $P_0$ in $V_0$, kjer voda ne bo v celoti izrinjena, ker bo prej $P_\alpha = 0$. Bojlov zakon:
+				$$
+					P_1V_1=P_2V_2 \rightarrow
+				$$
+				$$	
+					\text{izlito} = P_0\cdot(\SI{1}{\liter}-V_0)-(\SI{1}{\liter}-V_0)
+				$$
+			\item 2. njutnov zakon:
+				\[
+					a=\frac{R}{m} \rightarrow
+					\int_{F_m > \SI{0}{\newton}}^{F_m < \SI{0}{\newton}} \frac{R_\alpha}{m_\alpha} d\alpha = a_k
+				\]
 		\end{itemize}
+		\vfill\null\columnbreak
+		\vspace*{-4cm}
+		\begin{figure}[H]
+			\centering
+			\includegraphics[width=0.5\textwidth]{kompresor.jpg}
+		\end{figure}
 	\end{multicols}
 \end{frame}