diff --git a/S1.02/Jeu/classes/Labyrinthe.class b/S1.02/Jeu/classes/Labyrinthe.class index 29aa85b21757c0e0feca8c46d266f4e73015c800..3213c314115800597a45cd8414591322450880e8 100644 Binary files a/S1.02/Jeu/classes/Labyrinthe.class and b/S1.02/Jeu/classes/Labyrinthe.class differ diff --git a/S1.02/Jeu/src/Labyrinthe.java b/S1.02/Jeu/src/Labyrinthe.java index effadd1a93dd0dfc09ceaa099db8dcc7a2581034..52c51a02e691c86ebc71951af81d0e8a347d2609 100644 --- a/S1.02/Jeu/src/Labyrinthe.java +++ b/S1.02/Jeu/src/Labyrinthe.java @@ -567,6 +567,29 @@ class Labyrinthe extends Program{ assertFalse(equals(tab1, tab4)); } + boolean estInt(String verif){ + if(length(verif) == 0){ + return false; + } + for(int i = 0; i < length(verif); i ++){ + if(charAt(verif, i) < '0' || '9' < charAt(verif, i)){ + return false; + } + } + return true; + } + + void testEstInt(){ + String mot1 = "0t6"; + String mot2 = "54"; + String mot3 = "Lolilol"; + String mot4 = ""; + assertFalse(estInt(mot1)); + assertTrue(estInt(mot2)); + assertFalse(estInt(mot3)); + assertFalse(estInt(mot4)); + } + void algorithm(){ Salle[][] lab = genererLab(3); //genere le Layrinthe String[][] questionTemp = load("ressources/ListeQuestion.csv"); @@ -574,7 +597,19 @@ class Labyrinthe extends Program{ boolean ques = equals(toLowerCase(readString()), "o"); if(ques){ print("Combien voulez vous en ajouter ? : "); - int nbAjout = readInt(); + int nbAjout = 0; + while(nbAjout <= 0){ + String nb = readString(); + while(!estInt(nb)){ + print("Veuillez entrer un nombre valide : "); + nb = readString(); + } + nbAjout = stringToInt(nb); + if(nbAjout <= 0 ){ + print("Veuillez choisir un nombre positif non nul : "); + } + + } ajoutQuestion(questionTemp, nbAjout); questionTemp = load("ressources/ListeQuestion.csv"); afficheStringTab(questionTemp);