12 files changed, 109 insertions, 533 deletions

diff --git a/fiz/vaje/1/makefile b/fiz/vaje/1/makefile
new file mode 100644
index 0000000..7ba5330
--- /dev/null
+++ b/fiz/vaje/1/makefile
@@ -0,0 +1,9 @@
+default: dokument.pdf
+
+dokument.pdf: dokument.lyx
+	lyx -e pdf dokument.lyx
+
+clean:
+	rm -f dokument.pdf
+
+.PHONY: default clean
diff --git a/fiz/vaje/10/makefile b/fiz/vaje/10/makefile
new file mode 100644
index 0000000..d1a8011
--- /dev/null
+++ b/fiz/vaje/10/makefile
@@ -0,0 +1,12 @@
+default: dokument.pdf
+
+dokument.pdf: graf.tex dokument.lyx
+	lyx -e pdf dokument.lyx
+
+graf.tex: podatki.tsv tab.py
+	./tab.py > $@
+
+clean:
+	rm -fr dokument.lyx~ fit.log graf.tex dokument.pdf podatki.csv podatki.lyx p.tsv __pycache__
+
+.PHONY: clean default
diff --git a/fiz/vaje/2/makefile b/fiz/vaje/2/makefile
new file mode 100644
index 0000000..7d57eb9
--- /dev/null
+++ b/fiz/vaje/2/makefile
@@ -0,0 +1,12 @@
+default: dokument.pdf
+
+dokument.pdf: dokument.lyx vsi.tsv
+	lyx -e pdf dokument.lyx
+
+vsi.tsv:
+	./podatki.sh
+
+clean:
+	rm -f dokument.pdf vsi.tsv
+
+.PHONY: default clean
diff --git a/fiz/vaje/3/makefile b/fiz/vaje/3/makefile
new file mode 100644
index 0000000..7ba5330
--- /dev/null
+++ b/fiz/vaje/3/makefile
@@ -0,0 +1,9 @@
+default: dokument.pdf
+
+dokument.pdf: dokument.lyx
+	lyx -e pdf dokument.lyx
+
+clean:
+	rm -f dokument.pdf
+
+.PHONY: default clean
diff --git a/fiz/vaje/4/makefile b/fiz/vaje/4/makefile
new file mode 100644
index 0000000..1def3b5
--- /dev/null
+++ b/fiz/vaje/4/makefile
@@ -0,0 +1,12 @@
+default: dokument.pdf
+
+dokument.pdf: dokument.lyx v_od_x.tsv
+	lyx -e pdf dokument.lyx
+
+v_od_x.tsv: nihanje.tsv preseki.py
+	./preseki.py > $@
+
+clean:
+	rm -f v_od_x.tsv dokument.pdf
+
+.PHONY: default clean
diff --git a/fiz/vaje/4/preseki.py b/fiz/vaje/4/preseki.py
index 7a35c66..bafcec7 100755
--- a/fiz/vaje/4/preseki.py
+++ b/fiz/vaje/4/preseki.py
@@ -22,4 +22,4 @@ zero_crossings_v = numpy.where(numpy.diff(numpy.sign(v)))[0]
 print("v\tx\tt\tabsx\tln")
 for i in range(len(zero_crossings_x)-1):
 	print(f"{v[zero_crossings_x[i]]}\t{x[zero_crossings_v[i]]}\t{t[zero_crossings_v[i]]}\t{abs(x[zero_crossings_v[i]])}\t{log(abs(x[zero_crossings_v[i]])/0.0943867)}")
-print(f"za {len(zero_crossings_x/2)} nihajev je preteklo {t[zero_crossings_x[len(zero_crossings_x)-1]]-t[zero_crossings_x[0]]} sekund, zato je nihajni čas {(t[zero_crossings_x[len(zero_crossings_x)-1]]-t[zero_crossings_x[0]])/(len(zero_crossings_x)/2)}", file=stderr)
+print(f"za {len(zero_crossings_x/2)} nihajev je preteklo {t[zero_crossings_x[len(zero_crossings_x)-1]]-t[zero_crossings_x[0]]} sekund, zato je nihajni cas {(t[zero_crossings_x[len(zero_crossings_x)-1]]-t[zero_crossings_x[0]])/(len(zero_crossings_x)/2)}", file=stderr)
diff --git a/fiz/vaje/5/makefile b/fiz/vaje/5/makefile
new file mode 100644
index 0000000..11079a9
--- /dev/null
+++ b/fiz/vaje/5/makefile
@@ -0,0 +1,12 @@
+default: dokument.pdf
+
+dokument.pdf: dokument.lyx podatki.tsv 
+	lyx -e pdf dokument.lyx
+
+podatki.tsv: meritev.tsv meritev.py
+	./meritev.py > $@
+
+clean:
+	rm -f podatki.tsv dokument.pdf
+
+.PHONY: default clean
diff --git a/fiz/vaje/6/makefile b/fiz/vaje/6/makefile
new file mode 100644
index 0000000..33f02ac
--- /dev/null
+++ b/fiz/vaje/6/makefile
@@ -0,0 +1,12 @@
+default: dokument.pdf
+
+dokument.pdf: dokument.lyx boylov.tsv absolutna.tsv
+	lyx -e pdf dokument.lyx
+
+boylov.tsv: boy.tsv boy.py
+	./boy.py < boy.tsv > $@
+
+clean:
+	rm -f boylov.tsv dokument.pdf
+
+.PHONY: default clean
diff --git a/fiz/vaje/7/makefile b/fiz/vaje/7/makefile
index 7628c99..9ea0e54 100644
--- a/fiz/vaje/7/makefile
+++ b/fiz/vaje/7/makefile
@@ -1,6 +1,12 @@
-default: tanka.csv debela.csv
+default: dokument.pdf
+
+dokument.pdf: dokument.lyx tanka.csv debela.csv
+	lyx -e pdf dokument.lyx
+
 %.csv: %.tsv tab.py
 	./tab.py , < $< > $@
+
 clean:
-	rm *.csv
-.PHONY: default
+	rm -f *.csv dokument.lyx~ fit.log dokument.pdf
+
+.PHONY: default clean
diff --git a/fiz/vaje/8/makefile b/fiz/vaje/8/makefile
index 5da4d97..fed7d10 100644
--- a/fiz/vaje/8/makefile
+++ b/fiz/vaje/8/makefile
@@ -1,6 +1,12 @@
-default: 1d.csv 1t.csv 2.csv 3.csv
+default: dokument.pdf
+
+dokument.pdf: dokument.lyx 1d.csv 1t.csv 2.csv 3.csv
+	lyx -e pdf dokument.lyx
+
 %.csv: %.tsv tab.py
 	./tab.py , < $< > $@
+
 clean:
-	rm *.csv
-.PHONY: default
+	rm -f *.csv dokument.lyx~ 1*.lyx 2.lyx 3.lyx fit.log dokument.pdf
+
+.PHONY: default clean
diff --git a/fiz/vaje/9/makefile b/fiz/vaje/9/makefile
new file mode 100644
index 0000000..a5bddc8
--- /dev/null
+++ b/fiz/vaje/9/makefile
@@ -0,0 +1,12 @@
+default: dokument.pdf
+
+dokument.pdf: dokument.lyx podatki.csv
+	lyx -e pdf dokument.lyx
+
+podatki.csv: podatki.tsv tab.py
+	./tab.py , < podatki.tsv > $@
+
+clean:
+	rm -fr dokument.lyx~ podatki.csv podatki.lyx q.log
+
+.PHONY: clean default
diff --git a/fiz/vaje/9/podatki.lyx b/fiz/vaje/9/podatki.lyx
deleted file mode 100644
index 5114483..0000000
--- a/fiz/vaje/9/podatki.lyx
+++ /dev/null
@@ -1,526 +0,0 @@
-#csv2lyx created this file. For more info see http://www.lyx.org/
-\lyxformat 413
-\begin_document
-\begin_header
-\textclass article
-\use_default_options true
-\maintain_unincluded_children false
-\language english
-\language_package default
-\inputencoding auto
-\fontencoding global
-\font_roman default
-\font_sans default
-\font_typewriter default
-\font_default_family default
-\use_non_tex_fonts false
-\font_sc false
-\font_osf false
-\font_sf_scale 100
-\font_tt_scale 100
-
-\graphics default
-\default_output_format default
-\output_sync 0
-\bibtex_command default
-\index_command default
-\paperfontsize default
-\use_hyperref false
-\papersize default
-\use_geometry false
-\use_amsmath 1
-\use_esint 1
-\use_mhchem 1
-\use_mathdots 1
-\cite_engine basic
-\use_bibtopic false
-\use_indices false
-\paperorientation portrait
-\suppress_date false
-\use_refstyle 1
-\index Index
-\shortcut idx
-\color #008000
-\end_index
-\secnumdepth 3
-\tocdepth 3
-\paragraph_separation indent
-\paragraph_indentation default
-\quotes_language english
-\papercolumns 1
-\papersides 1
-\paperpagestyle default
-\tracking_changes false
-\output_changes false
-\html_math_output 0
-\html_css_as_file 0
-\html_be_strict false
-\end_header
-
-\begin_body
-
-\begin_layout Standard
-\begin_inset Tabular
-<lyxtabular version="3" rows="6" columns="8">
-<features tabularvalignment="middle">
-<column alignment="left" valignment="top" width="0pt">
-<column alignment="left" valignment="top" width="0pt">
-<column alignment="left" valignment="top" width="0pt">
-<column alignment="left" valignment="top" width="0pt">
-<column alignment="left" valignment="top" width="0pt">
-<column alignment="left" valignment="top" width="0pt">
-<column alignment="left" valignment="top" width="0pt">
-<column alignment="left" valignment="top" width="0pt">
-<row>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-idx
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-a+b
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-b
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-a
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-1/a
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-1/b
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-f
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-fodst
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.23
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.075
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.155
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-6.451613
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-13.333333
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.050543
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.0006
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-1
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.25
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.075
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.175
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-5.714286
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-13.333333
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.0525
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.001356
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-2
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.27
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.068
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.202
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-4.950495
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-14.705882
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.050874
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.00027
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-3
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.29
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.065
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.225
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-4.444444
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-15.384615
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.050431
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.000713
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-4
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.31
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.065
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.245
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-4.081633
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-15.384615
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.051371
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-0.000227
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
-
-\end_layout
-
-\end_body
-\end_document