From a7f4c1ec9e3b4019cd02e9e08d79c8dcbfbb6b7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Heredero?= <remi@heredero.ch>
Date: Sat, 20 Nov 2021 21:28:40 +0100
Subject: [PATCH] master

---
 bin/lab6/WordManager.class | Bin 4812 -> 4815 bytes
 src/lab6/WordManager.java  |   9 +++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bin/lab6/WordManager.class b/bin/lab6/WordManager.class
index 21bb9e2c4677be7ea8499a60a31f0734a3748cac..fad637c2e44013da66dc03cb04eb43f1b367fcf7 100644
GIT binary patch
delta 1165
zcmYL|X>e0j6vuzJN#08y4;n+!2E<avOm$if_@O%GgLa@O(z1vSRH*uFVogaCOrqHF
zL&ja1irObGSZzgRalw{i3N5x&aRUTJ#RV7YhWoyLF`k5WoICUGz32S@|Fhil_6H6I
zjJ^N%4+3ZNPmi(PrDFDw>xv1XNMkAzk6DS<GgH^6?4Wk;az{Fw%^KXw?K-z9CNx{u
zS;43kYYNs`sjE%y;7)~>uwtQji^6f*>2tJdce5yihr762XRX5fKWj;AG8Jwyxrcl0
zJ=(Mqn{_((DJJG2k$7-XA`(k2NhQLTpzgOFdXuw5=P^5`PYFD(@QvZ-Mxx=1!d57p
zFxWtaK^GfM+-$P9>c#0TV~W?NBGF)VB4M@GMv^Im&6qjpGbYb6Md6k>q1s3+?B+Rz
znq^Q*kI6P}Qn-?<qLDmhyUFuhBIQ}3P>$VavV+Bf$gx{<qWvZV?2=9-^O@T<?&;c~
z$q>8k7I!f4B71aRQk;~}KA+QZU~sI`mwCk=cF$3-*_x+B+iNm|eRjF0H1LK(pSC)l
z2qhbGp%0q8iAO>=M&rq_!6Dw!dE36mQ>@<YUE?WL+E;w7bIk5B${gSDt$oBes=l;$
zjhkHdy@BE<lcS6jYW(PBL}AX0#lnf%Q7f4YCv|>T1Z->ERC}^%IR8|flDqWQn5_=w
zu!jmKjrZML>D+{42e%Zl#vUmw)!O{74DGhtTbZt=nc1{a!&>Ij&iSn4LLOv39n{jv
zLV2h~Y-BN8SVk}P^m8f0EN34}Ilu}I(?F4o&I%bG_<%{AD7!=K51>i*%eYbW>L?Ii
znun+o-(}pudO0~y<w{nwN`Nj&B+kPURulPR9uc=L0VnXNJ>o4<owhn*YPzd_fDQHK
zeLT^}lM4peT;Io2RZ?E@85y4TZOzbK<?=iIF2`9JdY6hZvp##w@652XpBG>!!v*Z7
zvu+!00|e@Qul7-1F___X-~J5qG6=0*SO+S)7s&RO>Xr&1N{hUjlk`NnR5D(^jd%&+
zC(OxQMHx-Zl=C@6q;<`5TPZ6?Yau2pA+_b2bb-_asnI6oPKWbNn$L9JliCYJwSo7g
zjSkVim=8H3VaqV&F*<N96e*35_*mSZh>$7S9fy4?uvua$!;zJYTslgZ|3arrmr<uE
zE8c=pqj(N^joeJxD}6I&ekQa6KIe;3!S6);2Y%)keie&Pe82Gre@URrrNY0@^Zy54
Cxh@p|

delta 1180
zcmXw&dr*{B7{-5x-Tl7Z&kx-J3^p1Q8-^NDq(7*E8KS~Q5-4XXr8HaF4cGQUyPKEk
z4@SC=Vd>E>Qj%7Z-2|aUp}3S~scCe-8kJ@Dvio1ryGZlRob$|k-sgGW_c`Y~R(Pb)
zI`nV<AaDWybX&bH)vSkHH+UOkkw`4Md`&DKNX%_atk!dkiz+Q{=T4J56jN9ESNluC
z{%BK4oj<wK<}U757;%3z5Q``r=bl$>RJ9I^EO@w=jV5h+k1^eGANT8n#!Sy<wwP!|
zwjMRI9X4CFVKzD2O&-%XoB3*|ZZmT;cTjB6!IL&_cIj?2ujMIWOq9MQ848zN9FP0g
z)rJyDi%#rx>N7UalCN;bgZ@BmC>nJ0yh2r26wqbUO{>C{Xby)aC_Og4TrKVT1A#O<
zWz)wZ$w;%;rA7DK^fMrnC6W@0=mqXs#!EJX4C!WfiD!gYOkP&x>Uwvs%jN*D>I3d-
zbx?aeXB%(W%;S)r>nW%_qA+Jpn7J%n=%~#xJW{AJ97_Z(MtR5N?f+++uyy|0#$a<Y
z6pPxt+tcPLP{!AsH2FsNT1Ad;`A#3V#?%QtH08{qA1o9<+kDR0G=rbKj4AAzXfznV
zH0)0#f(et~6@~hgRcM&}shA;fMo*2s)^Uzm={3rno#c82dD1A;YgKyfG;-|YwjA!!
zC#Dq`8+@)5oAeZKSxXhGxJ2%>nvKk7GncWI8Xn?u9$}#jSI<taU>8@io5l37L@aDz
zgljp>H5}zS-e)N}@-mjn+klUl&Ka^hB>n(~%(8^_JV+fG!f6rZayh%6TX|TJvxOC`
zp;;1L(nySLv<n^~Ps*2LO2Mf-D#%TRi00!QmtIX1Wm2G2dNtV&ZjVRw*V8KXEKrL?
z&JaR!fR2U%b~McH<MBS8s2`xSp^x3=Vo2Vc6i>HgJ(prnxy$GDxg6)G*t=MwFKin>
z>2s#o*UyWvpWzIK*<QDo4FeQ5WWCnM?Bc-`uV)=jQIkSwn}qddaaX-;Z>cV60>VV(
zB{<0zTt=p>EAY~Yj{s*8q=*|Sr6s_HtQ4n1G>HK>$rll7RMxnxX<rwJ4Km53uW9t&
zgs%&kB_6lS++LRP0UwI5KCY4*_*lvoi4V1M>Jk-$Pxw?$KNB5Wnme6!T(T-kB~*lC
zTv~FSc2%l%nDVobGcKNIOa_(7sMktAN*&FbSNes}GWe3OCKbOI^&k0#UpXa_EIIp)
PKln>3EtgUMuJZi{YrP&&

diff --git a/src/lab6/WordManager.java b/src/lab6/WordManager.java
index 7ad1c7f..1044691 100644
--- a/src/lab6/WordManager.java
+++ b/src/lab6/WordManager.java
@@ -61,11 +61,12 @@ public class WordManager {
         int nbrLettreMin = 4;
         int nbrLettreMax = 12;
         String s = "";
-        String[] word = loadList("C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S1fb/informatic/labo/vscode/Labo/src/lab6/french_common_words.csv");
+        //String[] word = loadList("C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S1fb/informatic/labo/vscode/Labo/src/lab6/french_common_words.csv");
+        String[] word = loadList("C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S1fb/informatic/labo/vscode/Labo/src/lab6/french_dictionary.txt");
 
         switch (level) {
             case 'e':
-                nbrLettreMin = 4;
+                nbrLettreMin = 0;
                 nbrLettreMax = 6;                
                 break;
 
@@ -76,7 +77,7 @@ public class WordManager {
                 
             case 'd':
                 nbrLettreMin = 10;
-                nbrLettreMax = 12;
+                nbrLettreMax = Integer.MAX_VALUE;
                 break;
 
             default:
@@ -84,7 +85,7 @@ public class WordManager {
         }
         int lg;
         do {
-            int nbr = (int)(Math.random()*600);
+            int nbr = (int)(Math.random()*200000);
             s = word[nbr];
             lg = s.length();
         } while (lg < nbrLettreMin || lg > nbrLettreMax);