Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2024-12-25 21:59:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Search results with the same score are now sorted alphabetically

Browse source 
- Adapted test scenarii for the new order of results
This commit is contained in:
Olivier Teulière 2008-03-03 22:13:58 +00:00
parent 414baa8d7a
commit c7f85ce151
18 changed files with 1216 additions and 1253 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
game/results.cpp
View file

@ -28,6 +28,7 @@
#include <algorithm>
#include <functional>
#include <cwctype>
#include "tile.h"
#include "round.h"
@ -36,13 +37,30 @@
#include "debug.h"
struct less_points : public binary_function<const Round&,
const Round&, bool>
bool wcharCompare(wchar_t c1, wchar_t c2)
{
return towlower(c1) < towlower(c2);
}
struct less_points : public binary_function<const Round&, const Round&, bool>
{
bool operator()(const Round &r1, const Round &r2)
{
// We want higher scores first, so we use '>' instead of '<'
return r1.getPoints() > r2.getPoints();
if (r1.getPoints() > r2.getPoints())
return true;
else if (r1.getPoints() < r2.getPoints())
return false;
else
{
// If the scores are equal, sort alphabetically, ignoring
// the case
return std::lexicographical_compare(r1.getWord().begin(),
r1.getWord().end(),
r2.getWord().begin(),
r2.getWord().end(),
wcharCompare);
}
}
};

83
test/duplicate_2_ai.ref
View file

@ -3,14 +3,14 @@ commande> d 0 2
mode duplicate
[?] pour l'aide
commande> a S
Joueur 0: 931
Joueur 1: 931
Joueur 0: 929
Joueur 1: 929
commande> a T
Joueur 0: R
Joueur 1: R
Joueur 0: TTV
Joueur 1: TTV
commande> a l
A B C D E F G H I J K L M N O P Q R S T U V W X Y Z ?
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 1 0 2 0 1 0 0 0 0 0
commande> a p
Eliot 1.5
@ -23,48 +23,45 @@ Player 1: Computer
1 | ?EBAAEF | FABAcEE | H4 | 80 | 0 | *
2 | KEELIFE | KIEF | 10F | 36 | 0 |
3 | EEEL+IJX | FIXEE | 4H | 34 | 0 |
4 | EJL+RANS | JEANS | 11D | 49 | 0 |
5 | LR+OAHPU | LOPE | 9E | 29 | 0 |
6 | AHRU+OAE | HOUE | 12A | 40 | 0 |
7 | AAR+AVOC | HAVA | A12 | 30 | 0 |
8 | ACOR+WDN | WAX | J2 | 41 | 0 |
9 | -VNIALZO | OZONAI | B10 | 48 | 0 |
10 | LV+NDULU | VIN | I3 | 21 | 0 |
11 | DLLUU+NO | DUNE | K1 | 22 | 0 |
12 | LLOU+DAM | DOUMA | 1K | 24 | 0 |
13 | DLL+TOBI | MOLLIT | N1 | 18 | 0 |
14 | -ELTCUBE | CUBEBE | 6F | 31 | 0 |
15 | -PE?STIE | SEPTImE | L6 | 85 | 0 | *
16 | LNRSISE | SERINS | J10 | 29 | 0 |
17 | L+RGYAET | STYLER | 15J | 75 | 0 |
18 | AG+CURGI | CARGUE | N10 | 30 | 0 |
19 | GI+EDRSS | DEGRISAS | 7B | 79 | 0 | *
20 | TOEHLRT | PHOT | 8L | 27 | 0 |
21 | ELRT+NME | REMELENT | C2 | 70 | 0 | *
22 | QDRMUTI | MITAN | 5E | 20 | 0 |
23 | DQRU | QUID | 13H | 13 | 0 |
4 | EJL+RANS | JALES | J6 | 49 | 0 |
5 | NR+OAHPU | HURON | 5K | 28 | 0 |
6 | AP+MOEIA | LIPOME | 8J | 36 | 0 |
7 | AA+SMOND | ADONNAMES | O1 | 86 | 0 | *
8 | LEATCYL | CATLEYA | 5B | 36 | 0 |
9 | L+EARBHO | BROCHA | B2 | 42 | 0 |
10 | EL+OSULA | ALLOUES | A6 | 81 | 0 | *
11 | DSNIMEN | DEMIS | I1 | 28 | 0 |
12 | INN+NQUS | QUINTS | D1 | 42 | 0 |
13 | NN+IEUR? | MUNIRENt | N8 | 72 | 0 | *
14 | ISITTIE | EDITS | 1H | 21 | 0 |
15 | IIT+NEOP | POTINIER | 12G | 72 | 0 | *
16 | DVZEAET | DZETA | 15K | 72 | 0 |
17 | ETV+RWEV | EWE | F5 | 32 | 0 |
18 | ERTVV+TC | YET | G5 | 31 | 0 |
19 | CRTVV+UR | REVUE | M11 | 30 | 0 |
20 | CRTV+TUL | CRUEL | 2F | 21 | 0 |
Total: 931
Total: 929
Rack 0: R
Rack 1: R
Rack 0: TTV
Rack 1: TTV
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
A - - - - - - - - - - - H A V A
B - - - - - - D - - O Z O N A I
C - R E M E L E N T - - U - - -
D - - - - - - G - - - J E - - -
E - - - - M - R - L - E - - - -
F - - - - I C I - O K A - - - -
G - - - - T U S - P I N - - - -
H - - - F A B A c E E S - Q - -
I - - V I N E S - - F - - U - -
J - W A X - B - - - S E R I N S
K D U N E - E - - - - - - D - T
L O - - E - S E P T I m E - - Y
M U - - - - - - H - - - - - - L
N M O L L I T - O - C A R G U E
O A - - - - - - T - - - - - - R
A - - - - - A L L O U E S - - -
B - B R O C H A - - - - - - - -
C - - - - A - - - - - - - - - -
D Q U I N T S - - - - - - - - -
E - - - - L - - - - - - - - - -
F - C - - E W E - - K - - - - -
G - R - - Y E T - - I - P - - -
H E U - F A B A c E E - O - - -
I D E M I S - - - - F - T - - -
J I L - X - J A L E S - I - - -
K T - - E H - - I - - - N - - D
L S - - E U - - P - - - I - - Z
M - - - - R - - O - - R E V U E
N - - - - O - - M U N I R E N t
O A D O N N A M E S - - - - - A
commande> q
fin du mode duplicate
commande> q

8
test/duplicate_humans_ai.input
View file

@ -5,13 +5,13 @@ j DOSAIT h5
a S
a T
n 1
j DISAIENT 11A
j DISAIENT 7A
a S
j DESTINAI 11E
j DESTINAI 7E
a S
a t
j FRiPE 10K
j sERF M11
j BERYl 5E
j hYPER 5G
a S
a t
a g

62
test/duplicate_humans_ai.ref
View file

@ -17,40 +17,40 @@ Joueur 0: DIAEINS
Joueur 1: DIAEINS
Joueur 2: DIAEINS
commande> n 1
commande> j DISAIENT 11A
commande> j DISAIENT 7A
commande> a S
Joueur 0: 18
Joueur 1: 82
Joueur 1: 75
Joueur 2: 30
commande> j DESTINAI 11E
commande> j DESTINAI 7E
commande> a S
Joueur 0: 104
Joueur 1: 82
Joueur 2: 116
Joueur 0: 79
Joueur 1: 75
Joueur 2: 93
commande> a t
P?RBFEG
commande> j FRiPE 10K
commande> j sERF M11
commande> j BERYl 5E
commande> j hYPER 5G
commande> a S
Joueur 0: 126
Joueur 1: 103
Joueur 2: 145
Joueur 0: 122
Joueur 1: 116
Joueur 2: 136
commande> a t
BGEEMTB
FGPBEET
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
A - - - - - - - - - - - F - - -
B - - - - - - - - - - - R - - -
C - - - - - - - - - - - i - - -
D - - - - - - - - - - - P - - -
E - - - - - - - - - - D E - - -
F - - - - - - - - - - E - - - -
G - - - - - - - - - - S - - - -
H - - - - - - - O Y A T S - - -
I - - - - - - - - - - I - - - -
J - - - - - - - - - - N - - - -
K - - - - - - - - - - A - - - -
L - - - - - - - - - - I - - - -
A - - - - - - - - - - - - - - -
B - - - - - - - - - - - - - - -
C - - - - - - - - - - - - - - -
D - - - - - D - - - - - - - - -
E - - - - B E - - - - - - - - -
F - - - - E N - - - - - - - - -
G - - - - R I - - - - - - - - -
H - - - O Y A T S - - - - - - -
I - - - - l I - - - - - - - - -
J - - - - - S - - - - - - - - -
K - - - - - A - - - - - - - - -
L - - - - - - - - - - - - - - -
M - - - - - - - - - - - - - - -
N - - - - - - - - - - - - - - -
O - - - - - - - - - - - - - - -
@ -64,15 +64,15 @@ Player 2: Computer
N | RACK | SOLUTION | REF | PTS | P | BONUS
===|==========|=================|=====|=====|===|======
1 | ATOYDSI | OYATS | H8 | 30 | 2 |
2 | DI+AEINS | DESTINAI | 11E | 86 | 0 | *
3 | P?RBFEG | FRiPE | 12A | 29 | 2 |
1 | ATOYDSI | OYATS | H4 | 30 | 2 |
2 | DI+AEINS | DENIAISA | 6D | 63 | 2 | *
3 | P?RBFEG | BERYl | 5E | 43 | 0 |
Total: 145
Total: 136
Rack 0: BG+EEMTB
Rack 1: BG+EEMTB
Rack 2: BG+EEMTB
Rack 0: FGP+BEET
Rack 1: FGP+BEET
Rack 2: FGP+BEET
commande> q
fin du mode duplicate
commande> q

79
test/freegame_3_ai.ref
View file

@ -3,13 +3,13 @@ commande> l 0 3
mode partie libre
[?] pour l'aide
commande> a T
Joueur 0:
Joueur 1: ADLT
Joueur 2: AIU
Joueur 0: KSROCT
Joueur 1:
Joueur 2: DIUDGEA
commande> a S
Joueur 0: 319
Joueur 1: 286
Joueur 2: 303
Joueur 0: 296
Joueur 1: 362
Joueur 2: 263
commande> a p
Eliot 1.5
@ -23,48 +23,43 @@ Player 2: Computer
1 | RAHITRD | HARDI | H4 | 26 | 0 |
2 | ?TIEXFA | FAXAIEnT | 5E | 126 | 1 | *
3 | ATOSBUF | BOUTEFAS | J1 | 73 | 2 | *
4 | RT+AREEN | RENTERAI | 8A | 77 | 0 | *
4 | RT+AREEN | ENTERRAI | 8A | 77 | 0 | *
5 | RZUGNSS | AZURS | F5 | 34 | 1 |
6 | MIMLLOP | PLOMB | 1F | 30 | 2 |
7 | EEMNETV | VETEMENT | L3 | 76 | 0 | *
8 | GNRS+PEN | REPS | 11I | 25 | 1 |
9 | ILM+HSVI | VIZIR | 6D | 33 | 2 |
10 | AWELOUB | WEB | J10 | 34 | 0 |
11 | GNN+EELE | EGEENNE | B8 | 20 | 1 |
12 | HLMS+OJC | LOCHS | 13F | 30 | 2 |
13 | AELOU+TA | TAULE | A11 | 27 | 0 |
14 | L+ADSALY | LYS | M1 | 34 | 1 |
15 | JM+U?EKO | TOKaJ | D8 | 40 | 2 |
16 | AO+QRSED | COQ | H13 | 36 | 0 |
17 | AADL+INN | YIN | 2M | 24 | 1 |
18 | EMU+IGRO | GOUMIER | 2B | 82 | 2 | *
19 | ADERS+IC | ENCRAIS | O1 | 30 | 0 |
20 | AADLN+TE | ANE | E10 | 28 | 1 |
21 | EUIAU | TUEE | 4J | 18 | 2 |
22 | D | DU | D1 | 5 | 0 |
7 | EEMNETV | VETEMENT | C6 | 78 | 0 | *
8 | GNRS+PEN | PURGES | 3I | 24 | 1 |
9 | ILM+HSVI | VIS | 14A | 25 | 2 |
10 | AWELOUB | BAVE | A12 | 36 | 0 |
11 | NN+ELEEE | SELENE | 8J | 21 | 1 |
12 | HILM+?IC | aLCHIMIE | A1 | 101 | 2 | *
13 | LOUW+ULS | SLOW | N3 | 33 | 0 |
14 | EN+STAAI | NANTAISE | N8 | 70 | 1 | *
15 | DIJUUYO | JOYAU | 12K | 44 | 2 |
16 | LSUU+KAQ | AUQUEL | 15J | 63 | 0 |
17 | OENIREN | NERONIEN | 10G | 60 | 1 | *
Total: 908
Total: 921
Rack 0:
Rack 1: ADLT
Rack 2: AIU
Rack 0: KS+ROCT
Rack 1:
Rack 2: DIU+DGEA
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
A - - - - - - - R - - T A U L E
B - G - - - - - E G E E N N E -
C - O - - - - - N - - - - - - -
D D U - - - V - T O K a J - - -
E - M - - F I - E - A N E - - -
F P I - - A Z U R S - - - L - -
G L E - - X I - A - - - - O - -
H O R - H A R D I - - - - C O Q
I M - - - I - - - - - R - H - -
J B O U T E F A S - W E B S - -
K - - - U n - - - - - P - - - -
L - - V E T E M E N T S - - - -
M L Y S E - - - - - - - - - - -
N - I - - - - - - - - - - - - -
O E N C R A I S - - - - - - - -
A a L C H I M I E - - - B A V E
B - - - - - - - N - - - - - I -
C - - - - - V E T E M E N T S -
D - - - - - - - E - - - - - - -
E - - - - F - - R - - - - - - -
F P - - - A Z U R S - - - - - -
G L - - - X - - A - N - - - - -
H O - - H A R D I - E - - - - -
I M - P - I - - - - R - - - - -
J B O U T E F A S - O - - - - A
K - - R - n - - E - N - J - - U
L - - G - T - - L - I - O - - Q
M - - E - - - - E - E - Y - - U
N - - S L O W - N A N T A I S E
O - - - - - - - E - - - U - - L
commande> q
fin du mode partie libre
commande> q

52
test/freegame_passing.ref
View file

@ -35,7 +35,7 @@ commande> p
commande> p
commande> a S
Joueur 0: -11
Joueur 1: 777
Joueur 1: 788
commande> a T
Joueur 0: AGSSTUV
Joueur 1:
@ -49,55 +49,51 @@ Player 1: Computer
N | RACK | SOLUTION | REF | PTS | P | BONUS
===|==========|=================|=====|=====|===|======
1 | SEUTISG | (PASS) | - | 0 | 0 |
2 | LXCORNU | ROUX | H8 | 26 | 1 |
2 | LXCORNU | ROUX | H5 | 26 | 1 |
3 | EGISSTU | (PASS) | - | 0 | 0 |
4 | CLN+?BEC | CiNECLUB | 10B | 75 | 1 | *
4 | CLN+?BEC | CiNECLUB | 7B | 67 | 1 | *
5 | EGISSTU | (-UIET) | - | 0 | 0 |
6 | LLESYEO | YOLES | J6 | 52 | 1 |
6 | LLESYEO | LYSEE | J5 | 48 | 1 |
7 | GSS+TAUV | (PASS) | - | 0 | 0 |
8 | EL+AAOGT | GALETA | 11A | 29 | 1 |
8 | LO+AAOGT | GALA | 8A | 26 | 1 |
9 | AGSSTUV | (PASS) | - | 0 | 0 |
10 | O+RTEUMI | MORUTIER | 8A | 80 | 1 | *
10 | OOT+EMTU | EMOTTE | 8J | 24 | 1 |
11 | AGSSTUV | (PASS) | - | 0 | 0 |
12 | EUNPFUP | PFUT | E5 | 18 | 1 |
12 | OU+AOILU | AUX | 8F | 18 | 1 |
13 | AGSSTUV | (PASS) | - | 0 | 0 |
14 | ENPU+FTE | FETE | 12B | 33 | 1 |
14 | ILOOU+NF | FOULONNAI | D1 | 82 | 1 | *
15 | AGSSTUV | (PASS) | - | 0 | 0 |
16 | NPU+NSIM | LUPINS | 8J | 33 | 1 |
16 | UTEISEE | FETEES | 1D | 27 | 1 |
17 | AGSSTUV | (PASS) | - | 0 | 0 |
18 | MN+UEWOI | WON | N6 | 32 | 1 |
18 | IU+IURIO | MURI | K8 | 12 | 1 |
19 | AGSSTUV | (PASS) | - | 0 | 0 |
20 | EIMNU+MI | IMMUNS | O3 | 23 | 1 |
20 | IIOU+VDS | VISOU | 10B | 31 | 1 |
21 | AGSSTUV | (PASS) | - | 0 | 0 |
22 | EI+IDRED | BIRDIE | I10 | 22 | 1 |
22 | DI+IERNE | DENIER | 12J | 22 | 1 |
23 | AGSSTUV | (PASS) | - | 0 | 0 |
24 | DE+RJAAT | DEJETA | 15H | 45 | 1 |
24 | I+TBIADK | BATIK | N6 | 42 | 1 |
25 | AGSSTUV | (PASS) | - | 0 | 0 |
26 | AR+ENQEE | CAFRE | B10 | 20 | 1 |
26 | DIT+EHEQ | EQUIDE | 3B | 30 | 1 |
27 | AGSSTUV | (PASS) | - | 0 | 0 |
28 | AEENQ+BR | BADERNE | 13G | 26 | 1 |
28 | HT+EPARR | TEPHRA | O1 | 49 | 1 |
29 | AGSSTUV | (PASS) | - | 0 | 0 |
30 | Q+EAZAEL | ZEN | L11 | 24 | 1 |
30 | R+OE?NSF | FiERONS | 13H | 86 | 1 | *
31 | AGSSTUV | (PASS) | - | 0 | 0 |
32 | AAELQ+RA | ALEA | I3 | 16 | 1 |
32 | TMEAALP | APETALE | 2I | 32 | 1 |
33 | AGSSTUV | (PASS) | - | 0 | 0 |
34 | AQR+LDEH | ADHERAI | 3I | 22 | 1 |
34 | M+EAZWRD | FEZ | H13 | 45 | 1 |
35 | AGSSTUV | (PASS) | - | 0 | 0 |
36 | LQ+SI?AI | QuASI | N10 | 65 | 1 |
36 | ADMRW+NI | DAW | M1 | 26 | 1 |
37 | AGSSTUV | (PASS) | - | 0 | 0 |
38 | IL+TVHEO | OHE | 4K | 29 | 1 |
38 | AIMNR+JI | JAM | I9 | 37 | 1 |
39 | AGSSTUV | (PASS) | - | 0 | 0 |
40 | ILTV+ONK | KOHOL | K1 | 34 | 1 |
40 | IINR+NMH | HIE | E5 | 24 | 1 |
41 | AGSSTUV | (PASS) | - | 0 | 0 |
42 | INTV+SIN | NAYS | 6H | 31 | 1 |
42 | IMNNR | MINON | L5 | 17 | 1 |
43 | AGSSTUV | (PASS) | - | 0 | 0 |
44 | IINTV | TIKI | 1I | 14 | 1 |
45 | AGSSTUV | (PASS) | - | 0 | 0 |
46 | NV | VU | D7 | 10 | 1 |
47 | AGSSTUV | (PASS) | - | 0 | 0 |
48 | N | NI | M7 | 7 | 1 |
44 | R | DER | J12 | 6 | 1 |
Total: 766
Total: 777
Rack 0: AGSSTUV
Rack 1:

20
test/load_saved_game.input
View file

@ -1,28 +1,20 @@
e
t EA?AEBF
r
n 1
j FABAcEE H4
t LMUAEYE
r
a r
n 2
j YEBLE 6F
a g
n -1
r
n 1
j AY I6
t EELMUJE
r
a r
n 1
j JUMEL J2
a g
t EEIGLEH
r
a r
n 3
j EGAYEE 7F
a g
a p

50
test/load_saved_game.ref
View file

@ -3,22 +3,10 @@ commande> e
mode entraînement
[?] pour l'aide
commande> t EA?AEBF
commande> r
commande> n 1
commande> j FABAcEE H4
commande>
commande> t LMUAEYE
commande> r
commande> a r
1: AY 46 I6
2: YEBLE 38 6F
3: MAYE 36 I3
4: BAYLE 36 6H
5: AMYLE 35 10D
6: BAYE 35 6H
7: ELYME 35 10D
8: ELYME 35 10H
9: LAYE 34 I3
10: LAYEE 34 10D
commande> n 2
commande> j YEBLE 6F
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
A - - - - - - - - - - - - - - -
@ -38,24 +26,10 @@ commande> a g
O - - - - - - - - - - - - - - -
commande>
commande> n -1
commande>
commande> r
commande> n 1
commande> j AY I6
commande>
commande> t EELMUJE
commande> r
commande> a r
1: JUMEL 38 J2
2: JUMELEE 33 10B
3: JUMELA 28 5C
4: JUMELEE 25 9C
5: JUMELE 24 G10
6: JUMEL 23 G10
7: JUMELE 23 9C
8: JEU 19 9G
9: JEU 19 G10
10: JUMELEE 19 10E
commande> n 1
commande> j JUMEL J2
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
A - - - - - - - - - - - - - - -
@ -75,19 +49,7 @@ commande> a g
O - - - - - - - - - - - - - - -
commande>
commande> t EEIGLEH
commande> r
commande> a r
1: HELIEE 34 K5
2: HELEE 32 K5
3: EGAYEE 32 7F
4: EGAYE 31 7F
5: HELE 30 K5
6: LAYEE 29 7G
7: LAYE 28 7G
8: HUILEE 26 3I
9: HE 26 K5
10: HUILE 24 3I
commande> n 3
commande> j EGAYEE 7F
commande>
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15

14
test/training_back.ref
View file

@ -10,14 +10,14 @@ commande> r
commande> a r
1: AY 46 I6
2: YEBLE 38 6F
3: MAYE 36 I3
4: BAYLE 36 6H
3: BAYLE 36 6H
4: MAYE 36 I3
5: AMYLE 35 10D
6: BAYE 35 6H
7: ELYME 35 10D
8: ELYME 35 10H
9: LAYE 34 I3
10: LAYEE 34 10D
7: ELYME 35 10H
8: ELYME 35 10D
9: BEY 34 6H
10: LAYE 34 I3
commande> n 2
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@ -125,7 +125,7 @@ Player 0: Human
N | RACK | SOLUTION | REF | PTS | P | BONUS
===|==========|=================|=====|=====|===|======
1 | IEIEIEF | FIEE | H8 | 14 | 0 |
1 | IEIEIEF | FIEE | H6 | 14 | 0 |
Total: 14

214
test/training_cross.ref
View file

@ -7,15 +7,15 @@ commande> t EUOFMIE
commande> r
commande> a r
1: FUMEE 26 H4
2: FOUIE 24 H4
3: FOUEE 24 H4
2: FOUEE 24 H4
3: FOUIE 24 H4
4: MEFIE 22 H4
5: FUMEE 20 H8
6: MEFIE 20 H8
7: FOUIE 18 H8
8: FOUEE 18 H8
9: FUMEE 18 H6
10: FUMEE 18 H7
7: FOUEE 18 H8
8: FOUIE 18 H8
9: FUMEE 18 H7
10: FUMEE 18 H6
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@ -47,13 +47,13 @@ commande> r
commande> a r
1: KIMONO 38 6F
2: KEMIA 37 6F
3: MOKO 34 6H
4: AMOK 34 6G
5: MOKA 34 6H
6: MAKI 34 6H
7: KAMI 34 6F
8: KINE 33 I3
9: KINA 33 I3
3: AMOK 34 6G
4: KAMI 34 6F
5: MAKI 34 6H
6: MOKA 34 6H
7: MOKO 34 6H
8: KINA 33 I3
9: KINE 33 I3
10: KAN 29 I3
commande> n 1
commande> a g
@ -88,9 +88,9 @@ commande> a r
4: SWEAT 32 L6
5: ETAIES 31 L1
6: AISEE 29 L4
7: TAIES 27 L2
8: TAISE 27 L3
9: ETAIS 27 L2
7: ETAIS 27 L2
8: TAIES 27 L2
9: TAISE 27 L3
10: WESTIE 27 9F
commande> n 1
commande> a g
@ -124,8 +124,8 @@ commande> a r
3: LAVASSE * 78 10G
4: VASSALE * 75 K9
5: LAVASSE * 73 9C
6: LAVASSE * 72 K9
7: LAVASSE * 72 9D
6: LAVASSE * 72 9D
7: LAVASSE * 72 K9
8: VASSALE * 67 G8
9: LAVASSE * 64 G8
10: EVASAS 35 10I
@ -196,13 +196,13 @@ commande> a r
1: OMNIBUS * 94 O4
2: EMBUIONS * 84 14H
3: BITUMONS * 62 15F
4: NIMBUS 38 O5
5: SIMOUN 38 O10
6: BOUSIN 38 O7
7: IMBUS 35 O6
8: BISON 35 O8
9: BISOU 35 O8
10: BOUMS 35 O6
4: BOUSIN 38 O7
5: NIMBUS 38 O5
6: SIMOUN 38 O10
7: BISON 35 O8
8: BISOU 35 O8
9: BOUMS 35 O6
10: IMBUS 35 O6
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@ -235,11 +235,11 @@ commande> a r
3: AXIEZ 46 K10
4: AXEZ 44 K10
5: IXEE 33 14E
6: EXPIEZ 32 14D
7: GEX 32 5K
8: EXPIEZ 32 14H
9: EPIEZ 32 N10
10: EXPIE 32 N10
6: EPIEZ 32 N10
7: EXPIE 32 N10
8: EXPIEZ 32 14D
9: EXPIEZ 32 14H
10: GEX 32 5K
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@ -270,13 +270,13 @@ commande> a r
1: TOPAZE 60 15J
2: GAIZE 48 15K
3: GAZE 48 15L
4: PAGEOTE 24 14B
5: EPITOGE 24 14B
4: EPITOGE 24 14B
5: PAGEOTE 24 14B
6: EPIAIT 22 G2
7: GOPAK 21 F2
8: TAPAGE 20 K9
9: PETA 20 7C
10: PIGEA 20 7B
8: PETA 20 7C
9: PIGEA 20 7B
10: PITA 20 7C
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@ -305,15 +305,15 @@ commande> t GI+AVNCO
commande> r
commande> a r
1: VAINCU 28 13C
2: VAINC 25 K9
3: VACOA 25 K9
4: CONVOI 24 11D
5: CAVAI 24 K9
2: VACOA 25 K9
3: VAINC 25 K9
4: CAVAI 24 K9
5: CONVOI 24 11D
6: CONVIA 23 7A
7: VAGIN 23 K9
8: VINA 22 7C
9: CAVA 22 K9
10: CONVIA 22 13J
8: CAVA 22 K9
9: CONVIA 22 13J
10: VINA 22 7C
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@ -343,14 +343,14 @@ commande> r
commande> a r
1: ESSORAGE * 80 8A
2: GOSSA 23 11G
3: ROSES 21 11G
4: ROSSA 21 11G
5: ROSAS 21 11G
3: ROSAS 21 11G
4: ROSES 21 11G
5: ROSSA 21 11G
6: AGRESSA 20 D7
7: OSES 19 11H
8: OSAS 19 11H
9: AGES 18 5J
10: GOSSERA 18 D7
7: OSAS 19 11H
8: OSES 19 11H
9: AGEE 18 5J
10: AGES 18 5J
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@ -384,8 +384,8 @@ commande> a r
4: JARD 33 K9
5: JEU 31 M2
6: JEUDIS 30 C3
7: JUDD 29 N1
8: JAR 29 K9
7: JAR 29 K9
8: JUDD 29 N1
9: JARD 28 D12
10: JUPE 28 12L
commande> n 1
@ -420,10 +420,10 @@ commande> a r
3: LADY 48 D12
4: DEY 42 14B
5: DYADES 36 C3
6: DYADE 34 D11
7: LAYES 34 B4
8: YAWL 34 4J
9: DELAYA 34 D10
6: DELAYA 34 D10
7: DYADE 34 D11
8: LAYES 34 B4
9: YAWL 34 4J
10: ALYA 33 F8
commande> n 1
commande> a g
@ -453,15 +453,15 @@ commande> t D+IHUEEB
commande> r
commande> a r
1: HEU 32 10B
2: HE 31 10B
3: BEDE 31 10B
2: BEDE 31 10B
3: HE 31 10B
4: BEE 29 10B
5: BE 28 10B
6: DEB 28 10B
7: IDEE 27 10A
8: HIEE 27 10A
9: HUEE 27 10A
10: HIE 26 10A
7: HIEE 27 10A
8: HUEE 27 10A
9: IDEE 27 10A
10: BUEE 26 10A
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@ -490,14 +490,14 @@ commande> t BDEI+CIL
commande> r
commande> a r
1: CIEL 25 D1
2: CLE 22 12D
3: BLE 22 12D
2: BLE 22 12D
3: CLE 22 12D
4: BEY 20 7A
5: BLINDE 19 F10
6: BIPE 18 12L
7: CAID 18 D12
8: LAIC 18 D12
9: BLIND 18 F10
6: ALBEDO 18 K10
7: BIPE 18 12L
8: BLIND 18 F10
9: CAID 18 D12
10: CIBLE 18 4B
commande> n 1
commande> a g
@ -529,13 +529,13 @@ commande> a r
1: BRADeRIE * 86 A1
2: BRIARDEs * 61 A2
3: BAuDRIER * 60 A2
4: pARFUMEE 33 H1
4: BRoCARD 33 1A
5: CRoBARD 33 1D
6: BRoCARD 33 1A
6: pARFUMEE 33 H1
7: BICARRe 30 1B
8: CRABIeR 30 1D
9: CIBARe 27 1D
10: CRoBAR 27 1D
9: BAs 27 11A
10: BeRCAI 27 1A
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@ -564,15 +564,15 @@ commande> t EUGTDEA
commande> r
commande> a r
1: DUT 29 M3
2: EUT 27 M3
3: CAUDEE 27 1D
2: CAUDEE 27 1D
3: EUT 27 M3
4: DAW 25 4J
5: CETEAU 24 1D
6: CEDAT 24 1D
7: QUETE 24 12H
8: CAUDE 24 1D
9: CAGUE 24 1D
10: CAGET 24 1D
5: CADET 24 1D
6: CAGEE 24 1D
7: CAGET 24 1D
8: CAGUE 24 1D
9: CAUDE 24 1D
10: CEDAT 24 1D
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@ -601,14 +601,14 @@ commande> t AEEG+LR?
commande> r
commande> a r
1: CERcLAGE * 80 1D
2: REGELAnT * 77 15A
3: REGELAiT * 77 15A
4: REGALEnT * 77 15A
5: RELEGuAT * 77 15A
6: GELERAiT * 77 15A
7: dEREGLAT * 77 15A
8: AiGRELET * 77 15A
9: GALEREnT * 77 15A
2: AiGRELET * 77 15A
3: dEREGLAT * 77 15A
4: GALEREnT * 77 15A
5: GELERAiT * 77 15A
6: REGALEnT * 77 15A
7: REGELAiT * 77 15A
8: REGELAnT * 77 15A
9: RELEGuAT * 77 15A
10: GREnELAT * 74 15A
commande> n 1
commande> a g
@ -645,8 +645,8 @@ commande> a r
6: FLAN 21 14A
7: FAN 19 14B
8: FANON 18 11E
9: NAKFA 17 F4
10: FLA 17 14A
9: FLA 17 14A
10: NAKFA 17 F4
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@ -675,15 +675,15 @@ commande> t AFNTT+HM
commande> r
commande> a r
1: MATH 24 D12
2: HATIF 22 13K
2: FA 22 12D
3: HA 22 12D
4: FA 22 12D
4: HATIF 22 13K
5: KHANAT 20 F6
6: MATON 19 I3
6: AH 19 12D
7: FAN 19 14B
8: HAN 19 14B
9: AH 19 12D
10: MANIF 18 13K
9: MATON 19 I3
10: EH 18 7H
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@ -712,15 +712,15 @@ commande> t AFNT+NRE
commande> r
commande> a r
1: FANON 23 I3
2: KRAFT 19 F6
3: FRET 19 14A
4: REFAIT 18 13J
5: FANON 18 11E
6: FRETIN 18 13J
2: FRET 19 14A
3: KRAFT 19 F6
4: EN 18 I13
5: ET 18 I13
6: FANON 18 11E
7: FERAIT 18 13J
8: FREON 18 11E
9: REAI 18 E10
10: EN 18 I13
9: FRETIN 18 13J
10: REAI 18 E10
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@ -750,14 +750,14 @@ commande> r
commande> a r
1: ET 18 I13
2: RELAVASSES 15 10F
3: SE 13 M10
4: EX 13 11M
5: VAINCUE 13 13C
6: TREK 13 F3
3: EX 13 11M
4: SE 13 M10
5: TREK 13 F3
6: VAINCUE 13 13C
7: KEA 12 F6
8: TEK 12 F4
9: TET 11 14B
10: RE 11 E10
9: RE 11 E10
10: TES 11 M8
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15

24
test/training_cross2.ref
View file

@ -38,15 +38,15 @@ commande> t EUOFMIE
commande> r
commande> a r
1: FUMEE 26 H4
2: FOUIE 24 H4
3: FOUEE 24 H4
2: FOUEE 24 H4
3: FOUIE 24 H4
4: MEFIE 22 H4
5: FUMEE 20 H8
6: MEFIE 20 H8
7: FOUIE 18 H8
8: FOUEE 18 H8
9: FUMEE 18 H6
10: FUMEE 18 H7
7: FOUEE 18 H8
8: FOUIE 18 H8
9: FUMEE 18 H7
10: FUMEE 18 H6
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@ -157,15 +157,15 @@ commande> a gd
commande> r
commande> a r
1: FUMEE 26 H4
2: FOUIE 24 H4
3: FOUEE 24 H4
2: FOUEE 24 H4
3: FOUIE 24 H4
4: MEFIE 22 H4
5: FUMEE 20 H8
6: MEFIE 20 H8
7: FOUIE 18 H8
8: FOUEE 18 H8
9: FUMEE 18 H6
10: FUMEE 18 H7
7: FOUEE 18 H8
8: FOUIE 18 H8
9: FUMEE 18 H7
10: FUMEE 18 H6
commande> q
fin du mode entraînement
commande> q

8
test/training_cross3.ref
View file

@ -184,9 +184,9 @@ commande> a gd # c6
Br [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Cr [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Dr [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:13][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Er [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000: 4][010d714e: 1][00000000: 2][00000000:-1][00008000: 1][005c795e: 0][010d714e: 1][00200020: 1][ffffffff:-1][ffffffff:-1]
Fr [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][ffffffff:-1][ffffffff:-1]
Gr [ffffffff:-1][ffffffff:-1][ffffffff:-1][00000200: 4][00ddf036: 1][00000000: 6][01451010: 2][00200000: 3][00000000:-1][00200222: 1][02284302: 0][00005040: 1][00200022: 1][ffffffff:-1][ffffffff:-1]
Er [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000: 2][00000000:-1][00000000: 4][010d714e: 1][00008000: 1][005c795e: 0][010d714e: 1][00200020: 1]
Fr [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
Gr [ffffffff:-1][ffffffff:-1][ffffffff:-1][00000200: 4][00ddf036: 1][00000000: 2][005c751c: 1][00200000: 3][00000000:-1][00280022: 4][00005040: 1][00200222: 1][02284302: 0][00005040: 1][00200022: 1]
Hr [ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Ir [ffffffff:-1][ffffffff:-1][ffffffff:-1][00000202: 4][00184000: 1][00200222: 2][01384100: 1][01384100: 1][00000000:13][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Jr [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
@ -201,7 +201,7 @@ commande> a gd # c6
Cc [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Dc [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Ec [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00208222: 1][00000000:-1][00208222: 1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Fc [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000020:11][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:11][ffffffff:-1]
Fc [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:11][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
Gc [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:10][00000000:-1][00200000:10][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Hc [ffffffff:-1][ffffffff:-1][00000000:10][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:10][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Ic [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]

12
test/training_joker2.ref
View file

@ -74,15 +74,15 @@ commande> a gd # j1
commande> r
commande> a r
1: SaUGRENU * 82 E4
2: NUaGEUSe * 66 D1
3: eNjUGUES * 66 D8
4: GUEUSANt * 66 11C
5: GUeUSENt * 64 D6
6: ENjUGUeS * 64 D2
2: eNjUGUES * 66 D8
3: GUEUSANt * 66 11C
4: NUaGEUSe * 66 D1
5: ENjUGUeS * 64 D2
6: GUeUSENt * 64 D6
7: GUEUSeNt * 64 D3
8: NUaGeUSE * 64 D4
9: GUeUSENT * 62 F1
10: GUEUSeNT * 60 F1
10: GUEUSaNT * 60 F1
commande> q
fin du mode entraînement
commande> q

4
test/training_play.input
View file

@ -6,8 +6,9 @@ j MAUVAIS H5
j JEUDI 8E
j JEUDI A6
r
a r
n 0
n 6
n 8
a t
t DEEIPEG
j PIEGEE H4
@ -20,6 +21,7 @@ j SE G6
j PIEGEE 7C
j PIEGEES 7C
a t
a g
q
q

30
test/training_play.ref
View file

@ -14,8 +14,19 @@ Mot incorrect ou mal plac
commande> j JEUDI A6
Mot incorrect ou mal placé (11)
commande> r
commande> a r
1: JEUDI 42 H4
2: JEUDI 28 H8
3: JEUDI 26 H7
4: JEUDI 26 H6
5: JEUDI 26 H5
6: JEU 20 H8
7: JEU 20 H7
8: JEU 20 H6
9: JE 18 H7
10: JE 18 H8
commande> n 0
commande> n 6
commande> n 8
commande> a t
DEEI
commande> t DEEIPEG
@ -36,6 +47,23 @@ Mot incorrect ou mal plac
commande> j PIEGEES 7C
commande> a t
EEEGIP
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
A - - - - - - - - - - - - - - -
B - - - - - - - - - - - - - - -
C - - - - - - P - - - - - - - -
D - - - - - - I - - - - - - - -
E - - - - - - E - - - - - - - -
F - - - - - - G - - - - - - - -
G - - - - - - E - - - - - - - -
H - - - - - J E U - - - - - - -
I - - - - - - S - - - - - - - -
J - - - - - - - - - - - - - - -
K - - - - - - - - - - - - - - -
L - - - - - - - - - - - - - - -
M - - - - - - - - - - - - - - -
N - - - - - - - - - - - - - - -
O - - - - - - - - - - - - - - -
commande> q
fin du mode entraînement
commande> q

27
test/training_rosace.input
View file

@ -1,31 +1,22 @@
e
t WAEROSC
r
n 1
j ROSACE H8
t W+TSREIN
r
n 1
j WESTERN 13G
t I+RDTVI?
r
n 1
j DIVeRTIR 8A
t ELMOEAH
r
n 1
j AH I8
t EELMO+PI
r
n 1
j DIPLOMEE A8
t OHUMJUI
r
n 1
j JOUI 12K
t HMU+EAUA
r
n 1
j HUE 14F
t AAMU+UBS
r
n 1
j SAMBA 15H
t UU+NYTEP
r
n 1
j TYPE O12
a gd # r1
t NUU+S?GE
a P

52
test/training_rosace.ref
View file

@ -5,57 +5,39 @@ mode entra
commande>
commande> t WAEROSC
commande>
commande> r
commande>
commande> n 1
commande> j ROSACE H8
commande>
commande> t W+TSREIN
commande>
commande> r
commande>
commande> n 1
commande> j WESTERN 13G
commande>
commande> t I+RDTVI?
commande>
commande> r
commande>
commande> n 1
commande> j DIVeRTIR 8A
commande>
commande> t ELMOEAH
commande>
commande> r
commande>
commande> n 1
commande> j AH I8
commande>
commande> t EELMO+PI
commande>
commande> r
commande>
commande> n 1
commande> j DIPLOMEE A8
commande>
commande> t OHUMJUI
commande>
commande> r
commande>
commande> n 1
commande> j JOUI 12K
commande>
commande> t HMU+EAUA
commande>
commande> r
commande>
commande> n 1
commande> j HUE 14F
commande>
commande> t AAMU+UBS
commande>
commande> r
commande>
commande> n 1
commande> j SAMBA 15H
commande>
commande> t UU+NYTEP
commande>
commande> r
commande>
commande> n 1
commande> j TYPE O12
commande>
commande> a gd # r1
Ar [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
@ -169,15 +151,15 @@ commande> r
commande>
commande> a r
1: SaUGRENU * 82 E4
2: NUaGEUSE * 66 D1
3: ENjUGUES * 66 D8
4: GUEUSANt * 66 11C
5: GUEUSENt * 64 D6
6: ENjUGUES * 64 D2
7: GUEUSENt * 64 D3
8: NUaGEUSE * 64 D4
2: eNjUGUES * 66 D8
3: GUEUSANt * 66 11C
4: NUaGEUSe * 66 D1
5: ENjUGUeS * 64 D2
6: GUeUSENt * 64 D6
7: GUEUSeNt * 64 D3
8: NUaGeUSE * 64 D4
9: GUeUSENT * 62 F1
10: GUEUSeNT * 60 F1
10: GUEUSaNT * 60 F1
commande>
commande> a gd # r3
Ar [ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1]

1706
test/training_search.ref
View file

File diff suppressed because it is too large Load diff