diff --git a/lab3/zad3/gnuplot/comp.gp b/lab3/zad3/gnuplot/k1/comp.gp similarity index 92% rename from lab3/zad3/gnuplot/comp.gp rename to lab3/zad3/gnuplot/k1/comp.gp index 105e89b..7187a92 100644 --- a/lab3/zad3/gnuplot/comp.gp +++ b/lab3/zad3/gnuplot/k1/comp.gp @@ -5,7 +5,7 @@ set xlabel "n" set ylabel "Average comparisons" set term pdfcairo font "JetBrainsMono-NF,12" -plot "./results/result" \ +plot "./results/k1" \ using 1:2 t "Select 3", \ "" using 1:5 t "Select 5", \ "" using 1:8 t "Select 7", \ diff --git a/lab3/zad3/gnuplot/comp_n.gp b/lab3/zad3/gnuplot/k1/comp_n.gp similarity index 92% rename from lab3/zad3/gnuplot/comp_n.gp rename to lab3/zad3/gnuplot/k1/comp_n.gp index 9031226..eb3a70e 100644 --- a/lab3/zad3/gnuplot/comp_n.gp +++ b/lab3/zad3/gnuplot/k1/comp_n.gp @@ -5,7 +5,7 @@ set xlabel "n" set ylabel "Average comparisons / n" set term pdfcairo font "JetBrainsMono-NF,12" -plot "./results/result" \ +plot "./results/k1" \ using 1:14 t "Select 3", \ "" using 1:17 t "Select 5", \ "" using 1:20 t "Select 7", \ diff --git a/lab3/zad3/gnuplot/swap.gp b/lab3/zad3/gnuplot/k1/swap.gp similarity index 91% rename from lab3/zad3/gnuplot/swap.gp rename to lab3/zad3/gnuplot/k1/swap.gp index 41491e4..c81f749 100644 --- a/lab3/zad3/gnuplot/swap.gp +++ b/lab3/zad3/gnuplot/k1/swap.gp @@ -5,7 +5,7 @@ set xlabel "n" set ylabel "Average swaps" set term pdfcairo font "JetBrainsMono-NF,12" -plot "./results/result" \ +plot "./results/k1" \ using 1:3 t "Select 3", \ "" using 1:6 t "Select 5", \ "" using 1:9 t "Select 7", \ diff --git a/lab3/zad3/gnuplot/swap_n.gp b/lab3/zad3/gnuplot/k1/swap_n.gp similarity index 92% rename from lab3/zad3/gnuplot/swap_n.gp rename to lab3/zad3/gnuplot/k1/swap_n.gp index 2931d1c..a968d2e 100644 --- a/lab3/zad3/gnuplot/swap_n.gp +++ b/lab3/zad3/gnuplot/k1/swap_n.gp @@ -5,7 +5,7 @@ set xlabel "n" set ylabel "Average swaps / n" set term pdfcairo font "JetBrainsMono-NF,12" -plot "./results/result" \ +plot "./results/k1" \ using 1:15 t "Select 3", \ "" using 1:18 t "Select 5", \ "" using 1:21 t "Select 7", \ diff --git a/lab3/zad3/gnuplot/time.gp b/lab3/zad3/gnuplot/k1/time.gp similarity index 91% rename from lab3/zad3/gnuplot/time.gp rename to lab3/zad3/gnuplot/k1/time.gp index 85e9d30..770569a 100644 --- a/lab3/zad3/gnuplot/time.gp +++ b/lab3/zad3/gnuplot/k1/time.gp @@ -5,7 +5,7 @@ set xlabel "n" set ylabel "Average time" set term pdfcairo font "JetBrainsMono-NF,12" -plot "./results/result" \ +plot "./results/k1" \ using 1:4 t "Select 3", \ "" using 1:7 t "Select 5", \ "" using 1:10 t "Select 7", \ diff --git a/lab3/zad3/gnuplot/time_n.gp b/lab3/zad3/gnuplot/k1/time_n.gp similarity index 92% rename from lab3/zad3/gnuplot/time_n.gp rename to lab3/zad3/gnuplot/k1/time_n.gp index beb3c49..c3ce3dd 100644 --- a/lab3/zad3/gnuplot/time_n.gp +++ b/lab3/zad3/gnuplot/k1/time_n.gp @@ -5,7 +5,7 @@ set xlabel "n" set ylabel "Average time / n" set term pdfcairo font "JetBrainsMono-NF,12" -plot "./results/result" \ +plot "./results/k1" \ using 1:16 t "Select 3", \ "" using 1:19 t "Select 5", \ "" using 1:22 t "Select 7", \ diff --git a/lab3/zad3/gnuplot/kn/comp.gp b/lab3/zad3/gnuplot/kn/comp.gp new file mode 100644 index 0000000..6a79672 --- /dev/null +++ b/lab3/zad3/gnuplot/kn/comp.gp @@ -0,0 +1,14 @@ +set title "Average comparisons, n ∈ {100, 200, ..., 50000}" +set style data lines + +set xlabel "n" +set ylabel "Average comparisons" +set term pdfcairo font "JetBrainsMono-NF,12" + +plot "./results/kn" \ +using 1:2 t "Select 3", \ +"" using 1:5 t "Select 5", \ +"" using 1:8 t "Select 7", \ +"" using 1:11 t "Select 9" + +# vim: ft=gnuplot diff --git a/lab3/zad3/gnuplot/kn/comp_n.gp b/lab3/zad3/gnuplot/kn/comp_n.gp new file mode 100644 index 0000000..fc6a16a --- /dev/null +++ b/lab3/zad3/gnuplot/kn/comp_n.gp @@ -0,0 +1,14 @@ +set title "Average comparisons / n, n ∈ {100, 200, ..., 50000}" +set style data lines + +set xlabel "n" +set ylabel "Average comparisons / n" +set term pdfcairo font "JetBrainsMono-NF,12" + +plot "./results/kn" \ +using 1:14 t "Select 3", \ +"" using 1:17 t "Select 5", \ +"" using 1:20 t "Select 7", \ +"" using 1:23 t "Select 9" + +# vim: ft=gnuplot diff --git a/lab3/zad3/gnuplot/kn/swap.gp b/lab3/zad3/gnuplot/kn/swap.gp new file mode 100644 index 0000000..676f3a2 --- /dev/null +++ b/lab3/zad3/gnuplot/kn/swap.gp @@ -0,0 +1,14 @@ +set title "Average swaps, n ∈ {100, 200, ..., 50000}" +set style data lines + +set xlabel "n" +set ylabel "Average swaps" +set term pdfcairo font "JetBrainsMono-NF,12" + +plot "./results/kn" \ +using 1:3 t "Select 3", \ +"" using 1:6 t "Select 5", \ +"" using 1:9 t "Select 7", \ +"" using 1:12 t "Select 9" + +# vim: ft=gnuplot diff --git a/lab3/zad3/gnuplot/kn/swap_n.gp b/lab3/zad3/gnuplot/kn/swap_n.gp new file mode 100644 index 0000000..e9de787 --- /dev/null +++ b/lab3/zad3/gnuplot/kn/swap_n.gp @@ -0,0 +1,14 @@ +set title "Average swaps / n, n ∈ {100, 200, ..., 50000}" +set style data lines + +set xlabel "n" +set ylabel "Average swaps / n" +set term pdfcairo font "JetBrainsMono-NF,12" + +plot "./results/kn" \ +using 1:15 t "Select 3", \ +"" using 1:18 t "Select 5", \ +"" using 1:21 t "Select 7", \ +"" using 1:24 t "Select 9" + +# vim: ft=gnuplot diff --git a/lab3/zad3/gnuplot/kn/time.gp b/lab3/zad3/gnuplot/kn/time.gp new file mode 100644 index 0000000..b66f944 --- /dev/null +++ b/lab3/zad3/gnuplot/kn/time.gp @@ -0,0 +1,14 @@ +set title "Average time, n ∈ {100, 200, ..., 50000}" +set style data lines + +set xlabel "n" +set ylabel "Average time" +set term pdfcairo font "JetBrainsMono-NF,12" + +plot "./results/kn" \ +using 1:4 t "Select 3", \ +"" using 1:7 t "Select 5", \ +"" using 1:10 t "Select 7", \ +"" using 1:13 t "Select 9" + +# vim: ft=gnuplot diff --git a/lab3/zad3/gnuplot/kn/time_n.gp b/lab3/zad3/gnuplot/kn/time_n.gp new file mode 100644 index 0000000..4e0715e --- /dev/null +++ b/lab3/zad3/gnuplot/kn/time_n.gp @@ -0,0 +1,14 @@ +set title "Average time / n, n ∈ {100, 200, ..., 50000}" +set style data lines + +set xlabel "n" +set ylabel "Average time / n" +set term pdfcairo font "JetBrainsMono-NF,12" + +plot "./results/kn" \ +using 1:16 t "Select 3", \ +"" using 1:19 t "Select 5", \ +"" using 1:22 t "Select 7", \ +"" using 1:25 t "Select 9" + +# vim: ft=gnuplot diff --git a/lab3/zad3/gnuplot/kn2/comp.gp b/lab3/zad3/gnuplot/kn2/comp.gp new file mode 100644 index 0000000..8a0af81 --- /dev/null +++ b/lab3/zad3/gnuplot/kn2/comp.gp @@ -0,0 +1,14 @@ +set title "Average comparisons, n ∈ {100, 200, ..., 50000}" +set style data lines + +set xlabel "n" +set ylabel "Average comparisons" +set term pdfcairo font "JetBrainsMono-NF,12" + +plot "./results/kn2" \ +using 1:2 t "Select 3", \ +"" using 1:5 t "Select 5", \ +"" using 1:8 t "Select 7", \ +"" using 1:11 t "Select 9" + +# vim: ft=gnuplot diff --git a/lab3/zad3/gnuplot/kn2/comp_n.gp b/lab3/zad3/gnuplot/kn2/comp_n.gp new file mode 100644 index 0000000..b0d27f9 --- /dev/null +++ b/lab3/zad3/gnuplot/kn2/comp_n.gp @@ -0,0 +1,14 @@ +set title "Average comparisons / n, n ∈ {100, 200, ..., 50000}" +set style data lines + +set xlabel "n" +set ylabel "Average comparisons / n" +set term pdfcairo font "JetBrainsMono-NF,12" + +plot "./results/kn2" \ +using 1:14 t "Select 3", \ +"" using 1:17 t "Select 5", \ +"" using 1:20 t "Select 7", \ +"" using 1:23 t "Select 9" + +# vim: ft=gnuplot diff --git a/lab3/zad3/gnuplot/kn2/swap.gp b/lab3/zad3/gnuplot/kn2/swap.gp new file mode 100644 index 0000000..7a7beeb --- /dev/null +++ b/lab3/zad3/gnuplot/kn2/swap.gp @@ -0,0 +1,14 @@ +set title "Average swaps, n ∈ {100, 200, ..., 50000}" +set style data lines + +set xlabel "n" +set ylabel "Average swaps" +set term pdfcairo font "JetBrainsMono-NF,12" + +plot "./results/kn2" \ +using 1:3 t "Select 3", \ +"" using 1:6 t "Select 5", \ +"" using 1:9 t "Select 7", \ +"" using 1:12 t "Select 9" + +# vim: ft=gnuplot diff --git a/lab3/zad3/gnuplot/kn2/swap_n.gp b/lab3/zad3/gnuplot/kn2/swap_n.gp new file mode 100644 index 0000000..d3c03f8 --- /dev/null +++ b/lab3/zad3/gnuplot/kn2/swap_n.gp @@ -0,0 +1,14 @@ +set title "Average swaps / n, n ∈ {100, 200, ..., 50000}" +set style data lines + +set xlabel "n" +set ylabel "Average swaps / n" +set term pdfcairo font "JetBrainsMono-NF,12" + +plot "./results/kn2" \ +using 1:15 t "Select 3", \ +"" using 1:18 t "Select 5", \ +"" using 1:21 t "Select 7", \ +"" using 1:24 t "Select 9" + +# vim: ft=gnuplot diff --git a/lab3/zad3/gnuplot/kn2/time.gp b/lab3/zad3/gnuplot/kn2/time.gp new file mode 100644 index 0000000..aa3a919 --- /dev/null +++ b/lab3/zad3/gnuplot/kn2/time.gp @@ -0,0 +1,14 @@ +set title "Average time, n ∈ {100, 200, ..., 50000}" +set style data lines + +set xlabel "n" +set ylabel "Average time" +set term pdfcairo font "JetBrainsMono-NF,12" + +plot "./results/kn2" \ +using 1:4 t "Select 3", \ +"" using 1:7 t "Select 5", \ +"" using 1:10 t "Select 7", \ +"" using 1:13 t "Select 9" + +# vim: ft=gnuplot diff --git a/lab3/zad3/gnuplot/kn2/time_n.gp b/lab3/zad3/gnuplot/kn2/time_n.gp new file mode 100644 index 0000000..d489227 --- /dev/null +++ b/lab3/zad3/gnuplot/kn2/time_n.gp @@ -0,0 +1,14 @@ +set title "Average time / n, n ∈ {100, 200, ..., 50000}" +set style data lines + +set xlabel "n" +set ylabel "Average time / n" +set term pdfcairo font "JetBrainsMono-NF,12" + +plot "./results/kn2" \ +using 1:16 t "Select 3", \ +"" using 1:19 t "Select 5", \ +"" using 1:22 t "Select 7", \ +"" using 1:25 t "Select 9" + +# vim: ft=gnuplot diff --git a/lab3/zad3/plots/comp.pdf b/lab3/zad3/plots/comp.pdf deleted file mode 100644 index a784926..0000000 Binary files a/lab3/zad3/plots/comp.pdf and /dev/null differ diff --git a/lab3/zad3/plots/comp_n.pdf b/lab3/zad3/plots/comp_n.pdf deleted file mode 100644 index c744ead..0000000 Binary files a/lab3/zad3/plots/comp_n.pdf and /dev/null differ diff --git a/lab3/zad3/plots/k1/comp.pdf b/lab3/zad3/plots/k1/comp.pdf new file mode 100644 index 0000000..8b42dbd Binary files /dev/null and b/lab3/zad3/plots/k1/comp.pdf differ diff --git a/lab3/zad3/plots/k1/comp_n.pdf b/lab3/zad3/plots/k1/comp_n.pdf new file mode 100644 index 0000000..15bb0df Binary files /dev/null and b/lab3/zad3/plots/k1/comp_n.pdf differ diff --git a/lab3/zad3/plots/k1/swap.pdf b/lab3/zad3/plots/k1/swap.pdf new file mode 100644 index 0000000..9b2ff0f Binary files /dev/null and b/lab3/zad3/plots/k1/swap.pdf differ diff --git a/lab3/zad3/plots/k1/swap_n.pdf b/lab3/zad3/plots/k1/swap_n.pdf new file mode 100644 index 0000000..e668d62 Binary files /dev/null and b/lab3/zad3/plots/k1/swap_n.pdf differ diff --git a/lab3/zad3/plots/k1/time.pdf b/lab3/zad3/plots/k1/time.pdf new file mode 100644 index 0000000..9923b1a Binary files /dev/null and b/lab3/zad3/plots/k1/time.pdf differ diff --git a/lab3/zad3/plots/k1/time_n.pdf b/lab3/zad3/plots/k1/time_n.pdf new file mode 100644 index 0000000..8adcc76 Binary files /dev/null and b/lab3/zad3/plots/k1/time_n.pdf differ diff --git a/lab3/zad3/plots/kn/comp.pdf b/lab3/zad3/plots/kn/comp.pdf new file mode 100644 index 0000000..c6d2468 Binary files /dev/null and b/lab3/zad3/plots/kn/comp.pdf differ diff --git a/lab3/zad3/plots/kn/comp_n.pdf b/lab3/zad3/plots/kn/comp_n.pdf new file mode 100644 index 0000000..29d1f4c Binary files /dev/null and b/lab3/zad3/plots/kn/comp_n.pdf differ diff --git a/lab3/zad3/plots/kn/swap.pdf b/lab3/zad3/plots/kn/swap.pdf new file mode 100644 index 0000000..9b7c556 Binary files /dev/null and b/lab3/zad3/plots/kn/swap.pdf differ diff --git a/lab3/zad3/plots/kn/swap_n.pdf b/lab3/zad3/plots/kn/swap_n.pdf new file mode 100644 index 0000000..651517a Binary files /dev/null and b/lab3/zad3/plots/kn/swap_n.pdf differ diff --git a/lab3/zad3/plots/kn/time.pdf b/lab3/zad3/plots/kn/time.pdf new file mode 100644 index 0000000..d2dd79c Binary files /dev/null and b/lab3/zad3/plots/kn/time.pdf differ diff --git a/lab3/zad3/plots/kn/time_n.pdf b/lab3/zad3/plots/kn/time_n.pdf new file mode 100644 index 0000000..7859b83 Binary files /dev/null and b/lab3/zad3/plots/kn/time_n.pdf differ diff --git a/lab3/zad3/plots/kn2/comp.pdf b/lab3/zad3/plots/kn2/comp.pdf new file mode 100644 index 0000000..0fac47b Binary files /dev/null and b/lab3/zad3/plots/kn2/comp.pdf differ diff --git a/lab3/zad3/plots/kn2/comp_n.pdf b/lab3/zad3/plots/kn2/comp_n.pdf new file mode 100644 index 0000000..5797b49 Binary files /dev/null and b/lab3/zad3/plots/kn2/comp_n.pdf differ diff --git a/lab3/zad3/plots/kn2/swap.pdf b/lab3/zad3/plots/kn2/swap.pdf new file mode 100644 index 0000000..86149b5 Binary files /dev/null and b/lab3/zad3/plots/kn2/swap.pdf differ diff --git a/lab3/zad3/plots/kn2/swap_n.pdf b/lab3/zad3/plots/kn2/swap_n.pdf new file mode 100644 index 0000000..e03ff08 Binary files /dev/null and b/lab3/zad3/plots/kn2/swap_n.pdf differ diff --git a/lab3/zad3/plots/kn2/time.pdf b/lab3/zad3/plots/kn2/time.pdf new file mode 100644 index 0000000..9758050 Binary files /dev/null and b/lab3/zad3/plots/kn2/time.pdf differ diff --git a/lab3/zad3/plots/kn2/time_n.pdf b/lab3/zad3/plots/kn2/time_n.pdf new file mode 100644 index 0000000..846fc7f Binary files /dev/null and b/lab3/zad3/plots/kn2/time_n.pdf differ diff --git a/lab3/zad3/plots/swap.pdf b/lab3/zad3/plots/swap.pdf deleted file mode 100644 index 8b32c89..0000000 Binary files a/lab3/zad3/plots/swap.pdf and /dev/null differ diff --git a/lab3/zad3/plots/swap_n.pdf b/lab3/zad3/plots/swap_n.pdf deleted file mode 100644 index 680cb0b..0000000 Binary files a/lab3/zad3/plots/swap_n.pdf and /dev/null differ diff --git a/lab3/zad3/plots/time.pdf b/lab3/zad3/plots/time.pdf deleted file mode 100644 index f25e9b2..0000000 Binary files a/lab3/zad3/plots/time.pdf and /dev/null differ diff --git a/lab3/zad3/plots/time_n.pdf b/lab3/zad3/plots/time_n.pdf deleted file mode 100644 index cb190e2..0000000 Binary files a/lab3/zad3/plots/time_n.pdf and /dev/null differ diff --git a/lab3/zad3/src/main.rs b/lab3/zad3/src/main.rs index 2dff42c..c26d95e 100644 --- a/lab3/zad3/src/main.rs +++ b/lab3/zad3/src/main.rs @@ -129,7 +129,7 @@ fn main() -> io::Result<()> { .create(true) .write(true) .truncate(true) - .open(format!("./results/result"))?; + .open(format!("./results/kn2"))?; for n in (100..=50000).step_by(100) { writeln!(results_file, "{n} {} {} {} {} {} {} {} {} {} {} {} {} {} {} {} {} {} {} {} {} {} {} {} {}",