diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e660fd9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +bin/ diff --git a/bin/lib/TextIO.class b/bin/lib/TextIO.class deleted file mode 100644 index b051ac0..0000000 Binary files a/bin/lib/TextIO.class and /dev/null differ diff --git a/bin/praktikum2/Grupeerija.class b/bin/praktikum2/Grupeerija.class deleted file mode 100644 index 01b52ea..0000000 Binary files a/bin/praktikum2/Grupeerija.class and /dev/null differ diff --git a/bin/praktikum2/Korrutaja.class b/bin/praktikum2/Korrutaja.class deleted file mode 100644 index 5e042ae..0000000 Binary files a/bin/praktikum2/Korrutaja.class and /dev/null differ diff --git a/bin/praktikum2/NimePikkus.class b/bin/praktikum2/NimePikkus.class deleted file mode 100644 index 4191786..0000000 Binary files a/bin/praktikum2/NimePikkus.class and /dev/null differ diff --git a/bin/praktikum2/Tere.class b/bin/praktikum2/Tere.class deleted file mode 100644 index 8039680..0000000 Binary files a/bin/praktikum2/Tere.class and /dev/null differ diff --git a/bin/praktikum3/CumLaude.class b/bin/praktikum3/CumLaude.class deleted file mode 100644 index 98b3612..0000000 Binary files a/bin/praktikum3/CumLaude.class and /dev/null differ diff --git a/bin/praktikum3/ParooliSisestus.class b/bin/praktikum3/ParooliSisestus.class deleted file mode 100644 index c45c7a9..0000000 Binary files a/bin/praktikum3/ParooliSisestus.class and /dev/null differ diff --git a/bin/praktikum3/Tehisintellekt.class b/bin/praktikum3/Tehisintellekt.class deleted file mode 100644 index 34b0a0d..0000000 Binary files a/bin/praktikum3/Tehisintellekt.class and /dev/null differ diff --git a/bin/praktikum4/numbrid0246.class b/bin/praktikum4/numbrid0246.class deleted file mode 100644 index c4c186a..0000000 Binary files a/bin/praktikum4/numbrid0246.class and /dev/null differ diff --git a/bin/praktikum4/numbrid110.class b/bin/praktikum4/numbrid110.class deleted file mode 100644 index 3cf5f1a..0000000 Binary files a/bin/praktikum4/numbrid110.class and /dev/null differ diff --git a/bin/praktikum4/numbrid302734.class b/bin/praktikum4/numbrid302734.class deleted file mode 100644 index b49e746..0000000 Binary files a/bin/praktikum4/numbrid302734.class and /dev/null differ diff --git a/bin/praktikum4/table1.class b/bin/praktikum4/table1.class deleted file mode 100644 index 03c8262..0000000 Binary files a/bin/praktikum4/table1.class and /dev/null differ diff --git a/bin/praktikum4/table2.class b/bin/praktikum4/table2.class deleted file mode 100644 index 923e244..0000000 Binary files a/bin/praktikum4/table2.class and /dev/null differ diff --git a/src/praktikum4/pangapass.java b/src/praktikum4/pangapass.java new file mode 100644 index 0000000..0737ea3 --- /dev/null +++ b/src/praktikum4/pangapass.java @@ -0,0 +1,11 @@ +package praktikum4; + +public class pangapass { + + public static void main(String[] args) { + for (int i = 0; i <= 9999; i++) { + System.out.printf("%04d%n", i); + } + } + +} diff --git a/src/praktikum4/table2.java b/src/praktikum4/table2.java index b5d0559..e7d60db 100644 --- a/src/praktikum4/table2.java +++ b/src/praktikum4/table2.java @@ -3,28 +3,35 @@ package praktikum4; public class table2 { public static void main(String[] args) { - System.out.printf("Tabeli X suurus: "); + System.out.printf("Tabeli suurus: "); int x_size = lib.TextIO.getlnInt(); // table size in x direction - System.out.printf("Tabeli Y suurus: "); - int y_size = lib.TextIO.getlnInt(); // table size in y direction + int y_size = x_size; // table size in y direction // Create the table + System.out.printf("--"); for (int x = 0; x <= x_size; x++) { System.out.printf("--"); } - System.out.printf("%n"); + System.out.printf("-%n"); for (int x = 0; x <= x_size; x++) { System.out.printf("| "); for (int y = 0; y <= y_size; y++) { - if (x == y) { - System.out.printf("1 "); + if (x==y) { + System.out.printf("x "); + } else if (y+x == x_size) { + System.out.printf("x "); } else { System.out.printf("0 "); } } //we are at the end of the line, start a new one - System.out.printf("%n"); + System.out.printf("|%n"); } + System.out.printf("--"); + for (int x = 0; x <= x_size; x++) { + System.out.printf("--"); + } + System.out.printf("-%n"); } } diff --git a/src/praktikum4/table3.java b/src/praktikum4/table3.java new file mode 100644 index 0000000..2f9655e --- /dev/null +++ b/src/praktikum4/table3.java @@ -0,0 +1,24 @@ +package praktikum4; + +public class table3 { + + public static void main(String[] args) { + int x_size = 9; + int y_size = x_size; // table size in y direction + + // Create the table + System.out.printf("%n"); + for (int x = 0; x <= x_size; x++) { + for (int y = 0; y <= y_size; y++) { + if (x+y > 9) { + System.out.printf("%d ", y+x-10); + } else { + System.out.printf("%d ", y+x); + } + + } + //we are at the end of the line, start a new one + System.out.printf("%n"); + } + } +}