diff --git a/DEV/jeu b/DEV/jeu index c37535f..56f2431 100755 Binary files a/DEV/jeu and b/DEV/jeu differ diff --git a/DEV/jeu_principal.c b/DEV/jeu_principal.c index a6231ce..f3f49cf 100644 --- a/DEV/jeu_principal.c +++ b/DEV/jeu_principal.c @@ -196,8 +196,8 @@ void mettre_a_jour_grille(int tab_image[8][8], int nb_de_lignes, int nb_de_colon int main(void) { - int nb_de_lignes = 3; - int nb_de_colonnes = 3; + int nb_de_lignes = 8; + int nb_de_colonnes = 8; int decalage = 10; int largeur_image = 1710; int hauteur_image = 900; @@ -224,6 +224,8 @@ int main(void) { while (rand_1_1 + rand_1_2 == 0) { rand_1_1 = (rand() % nb_de_lignes); rand_1_2 = (rand() % nb_de_colonnes); + + i--; } int rand_2_1 = (rand() % nb_de_lignes); @@ -232,7 +234,9 @@ int main(void) { while (rand_2_1 + rand_2_2 == 0) { rand_2_1 = (rand() % nb_de_lignes); rand_2_2 = (rand() % nb_de_colonnes); - } + + i--; + } int temp = tab_image[rand_1_1][rand_1_2]; tab_image[rand_1_1][rand_1_2] = tab_image[rand_2_1][rand_2_2]; diff --git a/DEV3.2/TP06/03_Hachage/Dictionnaire.java b/DEV3.2/TP06/03_Hachage/Dictionnaire.java new file mode 100644 index 0000000..e69de29 diff --git a/DEV3.2/TP07/01_Repertoires/RACINE/fichier1.txt b/DEV3.2/TP07/01_Repertoires/RACINE/fichier1.txt new file mode 100644 index 0000000..e69de29 diff --git a/DEV3.2/TP07/01_Repertoires/Repertoires.class b/DEV3.2/TP07/01_Repertoires/Repertoires.class new file mode 100644 index 0000000..e4ee2fa Binary files /dev/null and b/DEV3.2/TP07/01_Repertoires/Repertoires.class differ diff --git a/DEV3.2/TP07/01_Repertoires/Repertoires.java b/DEV3.2/TP07/01_Repertoires/Repertoires.java new file mode 100644 index 0000000..558647b --- /dev/null +++ b/DEV3.2/TP07/01_Repertoires/Repertoires.java @@ -0,0 +1,43 @@ +import java.awt.*; +import java.io.File; +import java.util.Arrays; +import java.util.ArrayList; + +public class Repertoires { + + private File valeur; + private ArrayList fils; + + public Repertoires(File racine) { + if (!racine.isDirectory()) { + this.valeur = racine; + this.fils = null; + } else { + this.fils = new ArrayList<>(); + this.valeur = racine; + for (File fichier : racine.listFiles()) { + this.fils.add(new Repertoires(fichier)); + } + } + } + + public String toString(int nbRecursions) { + String aRenvoyer = ""; + for (int i = 0; i != nbRecursions; i++) { + aRenvoyer += " "; + } + aRenvoyer += this.valeur.getName() + "\n"; + if (this.fils != null) { + for (Repertoires fichier : this.fils) { + aRenvoyer += fichier.toString(nbRecursions + 1); + } + } + return aRenvoyer; + } + + public static void main(String[] args) { + Repertoires racine = new Repertoires(new File(args[0])); + System.out.println(racine.toString(0)); + } + +} diff --git a/DEV3.2/TP07/02_Prefixe/Main.java b/DEV3.2/TP07/02_Prefixe/Main.java new file mode 100644 index 0000000..fd96efc --- /dev/null +++ b/DEV3.2/TP07/02_Prefixe/Main.java @@ -0,0 +1,38 @@ +import java.awt.*; +import java.util.ArrayDeque; + +public class Main { + public static void main(String[] args) { + ArrayDeque pile = new ArrayDeque<>(args.length); + + for (int i = 0; i != args.length; i++) { + try { + Integer.parseInt(args[i]); + pile.addFirst(args[i]); + } catch (NumberFormatException e) { + int n2 = Integer.parseInt(pile.removeFirst()); + int n1 = Integer.parseInt(pile.removeFirst()); + System.out.println(n2); + System.out.println(n1); + + switch (args[i]) { + case "+": + pile.addFirst(n1 + n2 + ""); + break; + case "-": + pile.addFirst(n1 - n2 + ""); + break; + case "x": + pile.addFirst(n1 * n2 + ""); + break; + case "/": + pile.addFirst(n1 / n2 + ""); + } + } + } + + System.out.println("= " + pile.removeFirst()); + + + } +} \ No newline at end of file diff --git a/DEV3.2/TP07/02_Prefixe/Prefixe.java b/DEV3.2/TP07/02_Prefixe/Prefixe.java new file mode 100644 index 0000000..fd96efc --- /dev/null +++ b/DEV3.2/TP07/02_Prefixe/Prefixe.java @@ -0,0 +1,38 @@ +import java.awt.*; +import java.util.ArrayDeque; + +public class Main { + public static void main(String[] args) { + ArrayDeque pile = new ArrayDeque<>(args.length); + + for (int i = 0; i != args.length; i++) { + try { + Integer.parseInt(args[i]); + pile.addFirst(args[i]); + } catch (NumberFormatException e) { + int n2 = Integer.parseInt(pile.removeFirst()); + int n1 = Integer.parseInt(pile.removeFirst()); + System.out.println(n2); + System.out.println(n1); + + switch (args[i]) { + case "+": + pile.addFirst(n1 + n2 + ""); + break; + case "-": + pile.addFirst(n1 - n2 + ""); + break; + case "x": + pile.addFirst(n1 * n2 + ""); + break; + case "/": + pile.addFirst(n1 / n2 + ""); + } + } + } + + System.out.println("= " + pile.removeFirst()); + + + } +} \ No newline at end of file diff --git a/SAE11_2025/jeu b/SAE11_2025/jeu index 8017b75..608b591 100755 Binary files a/SAE11_2025/jeu and b/SAE11_2025/jeu differ diff --git a/SAE11_2025/jeu_principal.c b/SAE11_2025/jeu_principal.c index a1a25ee..a19baf6 100644 --- a/SAE11_2025/jeu_principal.c +++ b/SAE11_2025/jeu_principal.c @@ -21,7 +21,7 @@ int verifie_si_taquin_complet(int grille[8][8], int nb_de_lignes, int nb_de_colo for (i = 0; i < nb_de_lignes; i++) { for (j = 0; j < nb_de_colonnes; j++) { if (grille[i][j] != compteur) { - return 0; /* Pas complelt */ + return 0; /* Pas complet */ } compteur++; } @@ -196,8 +196,8 @@ void mettre_a_jour_grille(int tab_image[8][8], int nb_de_lignes, int nb_de_colon int main(void) { - int nb_de_lignes = 4; - int nb_de_colonnes = 4; + int nb_de_lignes = 5; + int nb_de_colonnes = 5; int decalage = 10; int largeur_image = 1710; int hauteur_image = 900;