1 files changed, 66 insertions, 31 deletions

diff --git a/fiz/vaje/2/dokument.lyx b/fiz/vaje/2/dokument.lyx
index 3cc5ffb..f204b97 100644
--- a/fiz/vaje/2/dokument.lyx
+++ b/fiz/vaje/2/dokument.lyx
@@ -174,6 +174,13 @@ Potek dela
 
 \begin_layout Subsection
 Spreminjanje lege po klancu kotaleče se kroglice s časom
+\begin_inset CommandInset label
+LatexCommand label
+name "subsec:Spreminjanje-lege-po"
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Enumerate
@@ -206,7 +213,7 @@ Kroglico spusti po klancu in izmeri, koliko časa kroglica potuje prvih
 
 
 \begin_inset Float table
-placement h
+placement H
 wide false
 sideways false
 status open
@@ -720,10 +727,6 @@ status open
 
 \end_inset
 
-
-\begin_inset Newline newline
-\end_inset
-
 Gre za enakomerno pospešeno gibanje, kar je razvidno iz dejstva, da 
 \begin_inset Formula $d$
 \end_inset
@@ -771,12 +774,12 @@ begin{lstlisting}
 
 \begin_layout Plain Layout
 
-fit sqrt(x*a) "podatki.tsv" using 1:6 via a
+fit sqrt(x*q) "podatki.tsv" using 1:6 via q
 \end_layout
 
 \begin_layout Plain Layout
 
-fit (x*b) 
+fit (x*p) 
 \begin_inset Quotes gld
 \end_inset
 
@@ -784,7 +787,7 @@ podatki.tsv
 \begin_inset Quotes grd
 \end_inset
 
- using 1:7 via b
+ using 1:7 via p
 \end_layout
 
 \begin_layout Plain Layout
@@ -797,10 +800,28 @@ end{lstlisting}
 \end_inset
 
 in dobimo vrednosti parametrov 
-\begin_inset Formula $a=12,9273$
+\begin_inset Formula $q=12,9273$
 \end_inset
 
- s standardno napako 
+ s standardno napako
+\begin_inset Foot
+status open
+
+\begin_layout Plain Layout
+Standardni odklon se izračuna po enačbi
+\begin_inset Formula 
+\[
+\sigma_{\overline{{x}}}=\sqrt{{\frac{{\mathop{\sum_{i=0}^{n}\left(x_{i}-\overline{{x}}\right)^{2}}}}{{n}}}}\text{{.}}
+\]
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+ 
 \begin_inset Formula $\pm0,6204$
 \end_inset
 
@@ -809,7 +830,7 @@ in dobimo vrednosti parametrov
 \end_inset
 
  in 
-\begin_inset Formula $b=\SI{13,3468}{\meter\per\second\squared}$
+\begin_inset Formula $p=\SI{13,3468}{\second\squared\per\meter}$
 \end_inset
 
  s standardno napako 
@@ -822,7 +843,7 @@ in dobimo vrednosti parametrov
 
 .
  
-\begin_inset Formula $b$
+\begin_inset Formula $p$
 \end_inset
 
  je koeficient premice na grafu 
@@ -835,39 +856,26 @@ noprefix "false"
 
 \end_inset
 
-, torej iskani pospešek.
-\begin_inset Newline newline
-\end_inset
-
-Standardna napaka
-\begin_inset Foot
-status open
-
-\begin_layout Plain Layout
-Standardni odklon se izračuna po enačbi
+, torej obratna vrednost iskanega pospeška.
+ Pospešek je tedaj
 \begin_inset Formula 
 \[
-\sigma_{\overline{{x}}}=\sqrt{{\frac{{\mathop{\sum_{i=0}^{n}\left(x_{i}-\overline{{x}}\right)^{2}}}}{{n}}}}\text{{.}}
+a=p^{-1}=\SI{0,0749243264}{\meter\per\second\squared}
 \]
 
 \end_inset
 
-
-\end_layout
-
-\end_inset
-
- pospeška je
+Standardna napaka pospeška je
 \begin_inset Formula 
 \[
-\sigma_{\overline{{t^{2}}}}=\SI{0,2407}{\meter\per\second\squared}\text{{.}}
+\pm0,01803a=\pm\SI{0,0013508856}{\meter\per\second\squared}
 \]
 
 \end_inset
 
 
 \begin_inset Float figure
-placement h
+placement H
 wide false
 sideways false
 status open
@@ -1069,6 +1077,7 @@ sideways false
 status open
 
 \begin_layout Plain Layout
+\align center
 \begin_inset Tabular
 <lyxtabular version="3" rows="2" columns="11">
 <features tabularvalignment="middle">
@@ -1348,6 +1357,22 @@ status open
 \end_layout
 
 \begin_layout Enumerate
+Izmeri dolžino klanca in oceni napako meritve!
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Formula 
+\[
+l=\SI{1}{\meter}\pm\left(<\SI{1}{\milli\meter}\right)
+\]
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Enumerate
 Izračunaj povprečno hitrost ter zapiši rezultat z absolutno in relativno
  napako.
 \begin_inset Formula 
@@ -1377,7 +1402,17 @@ v_{\text{{max}}}=2\overline{{v}}
 
 \end_inset
 
+Ta pospešek se ujema z izmerjenim pospeškom iz naloge 
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "subsec:Spreminjanje-lege-po"
+plural "false"
+caps "false"
+noprefix "false"
+
+\end_inset
 
+.
 \end_layout
 
 \begin_layout Subsection