From cb35260d56e531873ea1a0d5c053d846823861de Mon Sep 17 00:00:00 2001
From: HydroFlo <HydroGamer@outlook.fr>
Date: Fri, 22 Dec 2023 13:23:42 +0100
Subject: [PATCH] Tableau de Question depuis un csv

---
 S1.02/Jeu/classes/Labyrinthe.class | Bin 11508 -> 11907 bytes
 S1.02/Jeu/src/Labyrinthe.java      |  19 ++++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/S1.02/Jeu/classes/Labyrinthe.class b/S1.02/Jeu/classes/Labyrinthe.class
index b619a10814480788a7959e7cbc9a475539491a62..cdab49c79008e67e476e0067adfcfdae0d49fd6e 100644
GIT binary patch
delta 2836
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
Q=3-!EoWMAVaSDSZ0A(pP{Qv*}

delta 2422
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
JGj=ja0swUz*PZ|X

diff --git a/S1.02/Jeu/src/Labyrinthe.java b/S1.02/Jeu/src/Labyrinthe.java
index 0d741bc..37bd1e6 100644
--- a/S1.02/Jeu/src/Labyrinthe.java
+++ b/S1.02/Jeu/src/Labyrinthe.java
@@ -381,6 +381,23 @@ class Labyrinthe extends Program{
 
     }
 
+    Question[] listeQuestion(String cheminFichier){
+        String[][] lQuestion = load(cheminFichier);
+        Question[] res = new Question[length(lQuestion, 1)-1];
+        for(int i = 0; i < length(res); i ++){
+            res[i] = newQuestion(lQuestion[i+1][0], lQuestion[i+1][1]);
+        }
+        return res;
+    }
+
+    void testListeQuestion(){
+        Question test = newQuestion("Quelle est la capitale de la France","paris");
+        Question test2 = newQuestion("Convertir 10 cm en m.","0,1");
+        Question[] tabTest = listeQuestion("ressources/ListeQuestion.csv");
+        assertEquals(test.question, tabTest[0].question);
+        assertEquals(test2.question, tabTest[length(tabTest)-1].question);
+    }
+
     boolean questionCorrect(Question q){ //Vérifie si on donne la bonne réponse
         String res = readString();
         return equals(toLowerCase(res), toLowerCase(q.reponse));
@@ -418,7 +435,7 @@ class Labyrinthe extends Program{
         char[][] salle = genererSalle("ressources/Lab/Salle"+nbr);
         afficheLab(salle);
     }
-    void algorithm(){
+    void _algorithm(){
         Salle[][] lab = genererLab(5); //genere le Layrinthe
         String[][] lQuestion = load("ressources/ListeQuestion.csv");
         print("Voulez vous ajouter des question ? oui (o), non (autre) : ");
-- 
GitLab