eliot-dev
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Eliot-dev] eliot game/results.cpp test/duplicate_2_ai.ref ...


From: eliot-dev
Subject: [Eliot-dev] eliot game/results.cpp test/duplicate_2_ai.ref ...
Date: Mon, 03 Mar 2008 22:14:00 +0000

CVSROOT:        /cvsroot/eliot
Module name:    eliot
Changes by:     Olivier Teulière <ipkiss>      08/03/03 22:14:00

Modified files:
        game           : results.cpp 
        test           : duplicate_2_ai.ref duplicate_humans_ai.input 
                         duplicate_humans_ai.ref freegame_3_ai.ref 
                         freegame_passing.ref load_saved_game.input 
                         load_saved_game.ref training_back.ref 
                         training_cross.ref training_cross2.ref 
                         training_cross3.ref training_joker2.ref 
                         training_play.input training_play.ref 
                         training_rosace.input training_rosace.ref 
                         training_search.ref 

Log message:
         - Search results with the same score are now sorted alphabetically
         - Adapted test scenarii for the new order of results

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/game/results.cpp?cvsroot=eliot&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/eliot/test/duplicate_2_ai.ref?cvsroot=eliot&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/eliot/test/duplicate_humans_ai.input?cvsroot=eliot&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/eliot/test/duplicate_humans_ai.ref?cvsroot=eliot&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/eliot/test/freegame_3_ai.ref?cvsroot=eliot&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/eliot/test/freegame_passing.ref?cvsroot=eliot&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/eliot/test/load_saved_game.input?cvsroot=eliot&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/eliot/test/load_saved_game.ref?cvsroot=eliot&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/eliot/test/training_back.ref?cvsroot=eliot&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/eliot/test/training_cross.ref?cvsroot=eliot&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/eliot/test/training_cross2.ref?cvsroot=eliot&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/eliot/test/training_cross3.ref?cvsroot=eliot&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/eliot/test/training_joker2.ref?cvsroot=eliot&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/eliot/test/training_play.input?cvsroot=eliot&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/eliot/test/training_play.ref?cvsroot=eliot&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/eliot/test/training_rosace.input?cvsroot=eliot&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/eliot/test/training_rosace.ref?cvsroot=eliot&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/eliot/test/training_search.ref?cvsroot=eliot&r1=1.5&r2=1.6

Patches:
Index: game/results.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/game/results.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- game/results.cpp    8 Jan 2008 13:52:39 -0000       1.11
+++ game/results.cpp    3 Mar 2008 22:13:58 -0000       1.12
@@ -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);
+        }
     }
 };
 

Index: test/duplicate_2_ai.ref
===================================================================
RCS file: /cvsroot/eliot/eliot/test/duplicate_2_ai.ref,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/duplicate_2_ai.ref     10 Jan 2008 10:23:36 -0000      1.5
+++ test/duplicate_2_ai.ref     3 Mar 2008 22:13:59 -0000       1.6
@@ -3,14 +3,14 @@
 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 @@
     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

Index: test/duplicate_humans_ai.input
===================================================================
RCS file: /cvsroot/eliot/eliot/test/duplicate_humans_ai.input,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/duplicate_humans_ai.input      8 Jan 2008 13:52:41 -0000       1.2
+++ test/duplicate_humans_ai.input      3 Mar 2008 22:13:59 -0000       1.3
@@ -5,13 +5,13 @@
 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

Index: test/duplicate_humans_ai.ref
===================================================================
RCS file: /cvsroot/eliot/eliot/test/duplicate_humans_ai.ref,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/duplicate_humans_ai.ref        8 Jan 2008 13:52:41 -0000       1.2
+++ test/duplicate_humans_ai.ref        3 Mar 2008 22:13:59 -0000       1.3
@@ -17,40 +17,40 @@
 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 @@
 
     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

Index: test/freegame_3_ai.ref
===================================================================
RCS file: /cvsroot/eliot/eliot/test/freegame_3_ai.ref,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/freegame_3_ai.ref      8 Jan 2008 13:52:41 -0000       1.4
+++ test/freegame_3_ai.ref      3 Mar 2008 22:13:59 -0000       1.5
@@ -3,13 +3,13 @@
 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 @@
     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

Index: test/freegame_passing.ref
===================================================================
RCS file: /cvsroot/eliot/eliot/test/freegame_passing.ref,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/freegame_passing.ref   8 Jan 2008 13:52:41 -0000       1.4
+++ test/freegame_passing.ref   3 Mar 2008 22:13:59 -0000       1.5
@@ -35,7 +35,7 @@
 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 @@
     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: 

Index: test/load_saved_game.input
===================================================================
RCS file: /cvsroot/eliot/eliot/test/load_saved_game.input,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/load_saved_game.input  15 Jan 2008 14:56:38 -0000      1.2
+++ test/load_saved_game.input  3 Mar 2008 22:13:59 -0000       1.3
@@ -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

Index: test/load_saved_game.ref
===================================================================
RCS file: /cvsroot/eliot/eliot/test/load_saved_game.ref,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/load_saved_game.ref    15 Jan 2008 14:56:38 -0000      1.3
+++ test/load_saved_game.ref    3 Mar 2008 22:13:59 -0000       1.4
@@ -3,22 +3,10 @@
 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 @@
  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 @@
  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

Index: test/training_back.ref
===================================================================
RCS file: /cvsroot/eliot/eliot/test/training_back.ref,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/training_back.ref      15 Jan 2008 14:56:38 -0000      1.4
+++ test/training_back.ref      3 Mar 2008 22:13:59 -0000       1.5
@@ -10,14 +10,14 @@
 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 @@
 
     N |   RACK   |    SOLUTION     | REF | PTS | P | BONUS
    ===|==========|=================|=====|=====|===|======
-    1 |  IEIEIEF | FIEE            |  H8 |  14 | 0 |  
+    1 |  IEIEIEF | FIEE            |  H6 |  14 | 0 |  
 
    Total: 14
 

Index: test/training_cross.ref
===================================================================
RCS file: /cvsroot/eliot/eliot/test/training_cross.ref,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/training_cross.ref     8 Jan 2008 13:52:42 -0000       1.2
+++ test/training_cross.ref     3 Mar 2008 22:13:59 -0000       1.3
@@ -7,15 +7,15 @@
 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> 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 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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> 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> 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 @@
   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 @@
   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> 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> 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 @@
   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> 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> 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 @@
   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> 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> 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> 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

Index: test/training_cross2.ref
===================================================================
RCS file: /cvsroot/eliot/eliot/test/training_cross2.ref,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/training_cross2.ref    8 Jan 2008 13:52:42 -0000       1.2
+++ test/training_cross2.ref    3 Mar 2008 22:13:59 -0000       1.3
@@ -38,15 +38,15 @@
 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> 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

Index: test/training_cross3.ref
===================================================================
RCS file: /cvsroot/eliot/eliot/test/training_cross3.ref,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/training_cross3.ref    8 Jan 2008 13:52:42 -0000       1.2
+++ test/training_cross3.ref    3 Mar 2008 22:13:59 -0000       1.3
@@ -184,9 +184,9 @@
  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 @@
  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]

Index: test/training_joker2.ref
===================================================================
RCS file: /cvsroot/eliot/eliot/test/training_joker2.ref,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/training_joker2.ref    8 Jan 2008 13:52:42 -0000       1.3
+++ test/training_joker2.ref    3 Mar 2008 22:14:00 -0000       1.4
@@ -74,15 +74,15 @@
 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

Index: test/training_play.input
===================================================================
RCS file: /cvsroot/eliot/eliot/test/training_play.input,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/training_play.input    15 Jan 2008 14:56:38 -0000      1.2
+++ test/training_play.input    3 Mar 2008 22:14:00 -0000       1.3
@@ -6,8 +6,9 @@
 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 PIEGEE 7C
 j PIEGEES 7C
 a t
+a g
 q
 q
 

Index: test/training_play.ref
===================================================================
RCS file: /cvsroot/eliot/eliot/test/training_play.ref,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/training_play.ref      15 Jan 2008 14:56:38 -0000      1.4
+++ test/training_play.ref      3 Mar 2008 22:14:00 -0000       1.5
@@ -14,8 +14,19 @@
 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 @@
 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

Index: test/training_rosace.input
===================================================================
RCS file: /cvsroot/eliot/eliot/test/training_rosace.input,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/training_rosace.input  5 Nov 2006 17:24:32 -0000       1.2
+++ test/training_rosace.input  3 Mar 2008 22:14:00 -0000       1.3
@@ -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

Index: test/training_rosace.ref
===================================================================
RCS file: /cvsroot/eliot/eliot/test/training_rosace.ref,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/training_rosace.ref    8 Jan 2008 13:52:42 -0000       1.3
+++ test/training_rosace.ref    3 Mar 2008 22:14:00 -0000       1.4
@@ -5,57 +5,39 @@
 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> 
 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]

Index: test/training_search.ref
===================================================================
RCS file: /cvsroot/eliot/eliot/test/training_search.ref,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/training_search.ref    8 Jan 2008 13:52:42 -0000       1.5
+++ test/training_search.ref    3 Mar 2008 22:14:00 -0000       1.6
@@ -8,892 +8,892 @@
 commande> r
 commande> a r 1000
   1: SPItZ              50 H8
-  2: ZaNIS              46 H4
-  3: ZaINS              46 H4
+  2: ZaINS              46 H4
+  3: ZaNIS              46 H4
   4: ZINcS              46 H4
-  5: QuIZ               38 H7
-  6: QuIZ               38 H8
+  5: QINgS              38 H4
+  6: QuIZ               38 H6
   7: QuIZ               38 H5
-  8: QuIZ               38 H6
-  9: QINgS              38 H4
+  8: QuIZ               38 H8
+  9: QuIZ               38 H7
  10: SPItZ              32 H4
  11: SPItZ              30 H6
- 12: ZIPS               30 H6
- 13: ZIPS               30 H8
- 14: SPItZ              30 H5
- 15: ZIPS               30 H5
- 16: ZIPS               30 H7
- 17: SPItZ              30 H7
- 18: ZIPs               28 H7
- 19: ZiPS               28 H7
- 20: ZuPS               28 H7
- 21: ZaINS              28 H8
- 22: ZIP                28 H7
- 23: ZiPS               28 H8
- 24: NaZIS              28 H8
- 25: ZaNIS              28 H8
- 26: ZIPs               28 H8
- 27: ZuPS               28 H8
- 28: ZiPS               28 H6
- 29: ZiPS               28 H5
+ 12: SPItZ              30 H7
+ 13: SPItZ              30 H5
+ 14: ZIPS               30 H7
+ 15: ZIPS               30 H6
+ 16: ZIPS               30 H5
+ 17: ZIPS               30 H8
+ 18: NaZIS              28 H4
+ 19: NaZIS              28 H8
+ 20: ZaINS              28 H8
+ 21: ZaNIS              28 H8
+ 22: ZINcS              28 H8
+ 23: ZIP                28 H6
+ 24: ZIP                28 H7
+ 25: ZIP                28 H8
+ 26: ZiPS               28 H5
+ 27: ZiPS               28 H6
+ 28: ZIPs               28 H8
+ 29: ZiPS               28 H8
  30: ZIPs               28 H5
- 31: ZuPS               28 H6
- 32: NaZIS              28 H4
- 33: ZIP                28 H8
- 34: ZuPS               28 H5
- 35: ZIPs               28 H6
- 36: ZINcS              28 H8
- 37: ZIP                28 H6
- 38: ZiP                26 H6
- 39: ZiP                26 H8
- 40: ZaINS              26 H7
- 41: ZINcS              26 H7
- 42: ZaNIS              26 H7
- 43: NaZIS              26 H6
- 44: ZuP                26 H6
- 45: NaZIS              26 H7
- 46: ZINcS              26 H5
- 47: ZiP                26 H7
- 48: ZINcS              26 H6
- 49: ZuP                26 H7
- 50: ZuP                26 H8
- 51: ZaINS              26 H6
- 52: ZaNIS              26 H6
- 53: ZaNIS              26 H5
- 54: ZaINS              26 H5
- 55: NaZIS              26 H5
- 56: bINZ               24 H7
- 57: NIeZ               24 H8
- 58: ZaIN               24 H8
- 59: NaZI               24 H7
- 60: NIeZ               24 H5
- 61: ZISt               24 H8
- 62: ZINc               24 H8
- 63: NIeZ               24 H6
- 64: ZIpS               24 H8
- 65: ZIgS               24 H8
- 66: ZeNS               24 H8
- 67: ZaNI               24 H8
- 68: NIeZ               24 H7
- 69: NaZI               24 H6
- 70: NaZI               24 H5
- 71: ZIgS               24 H5
- 72: ZISt               24 H6
- 73: ZIpS               24 H6
- 74: QINgS              24 H8
- 75: ZINc               24 H6
- 76: ZIgS               24 H6
- 77: ZINc               24 H5
- 78: ZeNS               24 H5
- 79: ZeNS               24 H6
- 80: ZaNI               24 H5
- 81: ZaIN               24 H5
- 82: ZaNI               24 H6
- 83: ZaIN               24 H6
- 84: ZISt               24 H7
- 85: ZIpS               24 H7
- 86: bINZ               24 H8
- 87: ZINc               24 H7
- 88: ZIgS               24 H7
- 89: ZeNS               24 H7
- 90: ZaNI               24 H7
- 91: ZaIN               24 H7
- 92: NaZI               24 H8
- 93: ZIpS               24 H5
- 94: ZISt               24 H5
- 95: bINZ               24 H5
- 96: bINZ               24 H6
- 97: QINS               22 H8
- 98: ZIg                22 H8
- 99: QINgS              22 H6
-100: ZeN                22 H8
-101: QINS               22 H6
-102: QINgS              22 H5
-103: QINS               22 H5
-104: rIZ                22 H7
-105: rIZ                22 H6
-106: rIZ                22 H8
-107: NeZ                22 H8
-108: NeZ                22 H6
-109: ZeN                22 H6
-110: QINS               22 H7
-111: QINgS              22 H7
-112: ZIp                22 H8
-113: ZIp                22 H7
-114: NeZ                22 H7
-115: ZIp                22 H6
-116: ZIg                22 H7
-117: ZIg                22 H6
-118: ZeN                22 H7
-119: QIN                20 H8
-120: QIN                20 H6
-121: QINs               20 H6
-122: QiNS               20 H5
-123: QiNS               20 H6
-124: QInS               20 H6
-125: QInS               20 H5
-126: QINs               20 H5
+ 31: ZiPS               28 H7
+ 32: ZIPs               28 H6
+ 33: ZIPs               28 H7
+ 34: ZuPS               28 H8
+ 35: ZuPS               28 H5
+ 36: ZuPS               28 H6
+ 37: ZuPS               28 H7
+ 38: NaZIS              26 H6
+ 39: NaZIS              26 H5
+ 40: NaZIS              26 H7
+ 41: ZaINS              26 H7
+ 42: ZaINS              26 H5
+ 43: ZaINS              26 H6
+ 44: ZaNIS              26 H6
+ 45: ZaNIS              26 H7
+ 46: ZaNIS              26 H5
+ 47: ZINcS              26 H7
+ 48: ZINcS              26 H5
+ 49: ZINcS              26 H6
+ 50: ZiP                26 H6
+ 51: ZiP                26 H8
+ 52: ZiP                26 H7
+ 53: ZuP                26 H6
+ 54: ZuP                26 H8
+ 55: ZuP                26 H7
+ 56: bINZ               24 H8
+ 57: bINZ               24 H5
+ 58: bINZ               24 H6
+ 59: bINZ               24 H7
+ 60: NaZI               24 H8
+ 61: NaZI               24 H6
+ 62: NaZI               24 H5
+ 63: NaZI               24 H7
+ 64: NIeZ               24 H8
+ 65: NIeZ               24 H5
+ 66: NIeZ               24 H7
+ 67: NIeZ               24 H6
+ 68: QINgS              24 H8
+ 69: ZaIN               24 H6
+ 70: ZaIN               24 H7
+ 71: ZaIN               24 H8
+ 72: ZaIN               24 H5
+ 73: ZaNI               24 H6
+ 74: ZaNI               24 H8
+ 75: ZaNI               24 H7
+ 76: ZaNI               24 H5
+ 77: ZeNS               24 H6
+ 78: ZeNS               24 H7
+ 79: ZeNS               24 H8
+ 80: ZeNS               24 H5
+ 81: ZIgS               24 H5
+ 82: ZIgS               24 H6
+ 83: ZIgS               24 H7
+ 84: ZIgS               24 H8
+ 85: ZINc               24 H6
+ 86: ZINc               24 H5
+ 87: ZINc               24 H8
+ 88: ZINc               24 H7
+ 89: ZIpS               24 H8
+ 90: ZIpS               24 H6
+ 91: ZIpS               24 H5
+ 92: ZIpS               24 H7
+ 93: ZISt               24 H8
+ 94: ZISt               24 H6
+ 95: ZISt               24 H7
+ 96: ZISt               24 H5
+ 97: NeZ                22 H8
+ 98: NeZ                22 H7
+ 99: NeZ                22 H6
+100: QINgS              22 H5
+101: QINgS              22 H6
+102: QINgS              22 H7
+103: QINS               22 H6
+104: QINS               22 H5
+105: QINS               22 H7
+106: QINS               22 H8
+107: rIZ                22 H8
+108: rIZ                22 H6
+109: rIZ                22 H7
+110: ZeN                22 H7
+111: ZeN                22 H8
+112: ZeN                22 H6
+113: ZIg                22 H7
+114: ZIg                22 H6
+115: ZIg                22 H8
+116: ZIp                22 H8
+117: ZIp                22 H7
+118: ZIp                22 H6
+119: cINQ               20 H5
+120: cINQ               20 H6
+121: cINQ               20 H7
+122: cINQ               20 H8
+123: QIN                20 H6
+124: QIN                20 H7
+125: QIN                20 H8
+126: QINg               20 H5
 127: QINg               20 H6
-128: QINg               20 H5
-129: cINQ               20 H5
-130: QINs               20 H7
-131: QInS               20 H7
-132: QINg               20 H7
-133: QIN                20 H7
+128: QINg               20 H8
+129: QINg               20 H7
+130: QiNS               20 H6
+131: QiNS               20 H7
+132: QInS               20 H7
+133: QInS               20 H5
 134: QiNS               20 H8
-135: QiNS               20 H7
-136: QInS               20 H8
-137: QINs               20 H8
-138: cINQ               20 H7
-139: cINQ               20 H8
-140: cINQ               20 H6
-141: QINg               20 H8
-142: QIn                18 H6
-143: QiN                18 H8
-144: QIn                18 H8
-145: QuI                18 H8
-146: QiN                18 H6
-147: QuI                18 H6
-148: PeINS              18 H4
-149: PISaN              18 H4
-150: PeNIS              18 H4
-151: PIaNS              18 H4
-152: PaINS              18 H4
-153: PINeS              18 H4
-154: PuNIS              18 H4
-155: QuI                18 H7
-156: PoINS              18 H4
-157: QiN                18 H7
-158: PIoNS              18 H4
-159: QIn                18 H7
-160: SaPIN              14 H8
-161: sPINS              14 H8
-162: SuPIN              14 H4
-163: SPINs              14 H4
-164: PaINS              14 H8
-165: PeINS              14 H8
-166: PeNIS              14 H8
-167: PIaNS              14 H8
-168: SaPIN              14 H4
-169: PINeS              14 H8
-170: PIoNS              14 H8
-171: PISaN              14 H8
-172: SuPIN              14 H8
-173: PoINS              14 H8
-174: PuNIS              14 H8
-175: PIoNS              12 H5
-176: PoINS              12 H7
-177: PISaN              12 H5
-178: SPINs              12 H8
-179: PINS               12 H5
-180: PINeS              12 H5
-181: PIaNS              12 H5
-182: PISaN              12 H6
-183: PuNIS              12 H7
-184: PIoNS              12 H6
-185: PaINS              12 H6
-186: PINS               12 H6
-187: PINeS              12 H6
-188: PaINS              12 H5
-189: PIaNS              12 H6
-190: PeNIS              12 H5
-191: PeINS              12 H5
-192: PeNIS              12 H6
-193: PeINS              12 H6
-194: PIaNS              12 H7
-195: SPIN               12 H7
-196: SPINs              12 H7
-197: PeNIS              12 H7
-198: PeINS              12 H7
-199: PINS               12 H8
-200: SuPIN              12 H7
-201: SaPIN              12 H6
-202: SaPIN              12 H5
-203: PaINS              12 H7
-204: SPIN               12 H6
-205: SPINs              12 H6
-206: SPIN               12 H5
-207: SPINs              12 H5
-208: SuPIN              12 H6
-209: SuPIN              12 H5
-210: sPINS              12 H7
-211: sPINS              12 H6
-212: sPINS              12 H5
-213: sPINS              12 H4
-214: PoINS              12 H6
-215: PoINS              12 H5
-216: PIoNS              12 H7
-217: PISaN              12 H7
-218: SPIN               12 H8
-219: SaPIN              12 H7
-220: PuNIS              12 H5
-221: PINS               12 H7
-222: PINeS              12 H7
-223: PuNIS              12 H6
-224: PiNS               10 H7
-225: mIPS               10 H5
-226: mIPS               10 H6
-227: mIPS               10 H7
-228: lISP               10 H5
-229: PaIS               10 H6
-230: PaNS               10 H6
-231: PaIN               10 H5
-232: PISe               10 H7
-233: PaIS               10 H5
-234: lISP               10 H6
-235: PaNS               10 H5
-236: lISP               10 H7
-237: kIPS               10 H5
-238: kIPS               10 H6
-239: kIPS               10 H7
+135: QINs               20 H7
+136: QINs               20 H6
+137: QInS               20 H8
+138: QiNS               20 H5
+139: QINs               20 H5
+140: QINs               20 H8
+141: QInS               20 H6
+142: PaINS              18 H4
+143: PeINS              18 H4
+144: PeNIS              18 H4
+145: PIaNS              18 H4
+146: PINeS              18 H4
+147: PIoNS              18 H4
+148: PISaN              18 H4
+149: PoINS              18 H4
+150: PuNIS              18 H4
+151: QIn                18 H7
+152: QIn                18 H8
+153: QiN                18 H8
+154: QiN                18 H6
+155: QIn                18 H6
+156: QiN                18 H7
+157: QuI                18 H6
+158: QuI                18 H8
+159: QuI                18 H7
+160: PaINS              14 H8
+161: PeINS              14 H8
+162: PeNIS              14 H8
+163: PIaNS              14 H8
+164: PINeS              14 H8
+165: PIoNS              14 H8
+166: PISaN              14 H8
+167: PoINS              14 H8
+168: PuNIS              14 H8
+169: SaPIN              14 H8
+170: SaPIN              14 H4
+171: sPINS              14 H8
+172: SPINs              14 H4
+173: SuPIN              14 H8
+174: SuPIN              14 H4
+175: PaINS              12 H6
+176: PaINS              12 H5
+177: PaINS              12 H7
+178: PeINS              12 H5
+179: PeINS              12 H6
+180: PeINS              12 H7
+181: PeNIS              12 H5
+182: PeNIS              12 H6
+183: PeNIS              12 H7
+184: PIaNS              12 H5
+185: PIaNS              12 H6
+186: PIaNS              12 H7
+187: PINeS              12 H7
+188: PINeS              12 H5
+189: PINeS              12 H6
+190: PINS               12 H7
+191: PINS               12 H6
+192: PINS               12 H8
+193: PINS               12 H5
+194: PIoNS              12 H7
+195: PIoNS              12 H6
+196: PIoNS              12 H5
+197: PISaN              12 H6
+198: PISaN              12 H7
+199: PISaN              12 H5
+200: PoINS              12 H7
+201: PoINS              12 H6
+202: PoINS              12 H5
+203: PuNIS              12 H7
+204: PuNIS              12 H5
+205: PuNIS              12 H6
+206: SaPIN              12 H6
+207: SaPIN              12 H7
+208: SaPIN              12 H5
+209: SPIN               12 H6
+210: SPIN               12 H7
+211: SPIN               12 H5
+212: SPIN               12 H8
+213: sPINS              12 H7
+214: sPINS              12 H4
+215: SPINs              12 H5
+216: SPINs              12 H8
+217: sPINS              12 H6
+218: SPINs              12 H6
+219: SPINs              12 H7
+220: sPINS              12 H5
+221: SuPIN              12 H7
+222: SuPIN              12 H5
+223: SuPIN              12 H6
+224: aPIS               10 H8
+225: aPIS               10 H6
+226: aPIS               10 H5
+227: aPIS               10 H7
+228: aSPI               10 H6
+229: aSPI               10 H8
+230: aSPI               10 H7
+231: aSPI               10 H5
+232: bIPS               10 H8
+233: bIPS               10 H5
+234: bIPS               10 H6
+235: bIPS               10 H7
+236: ePIS               10 H8
+237: ePIS               10 H7
+238: ePIS               10 H6
+239: ePIS               10 H5
 240: IPeS               10 H5
 241: IPeS               10 H6
-242: PrIS               10 H7
-243: PSI                10 H7
-244: PuIS               10 H7
-245: PIlS               10 H7
-246: PIfS               10 H7
-247: PIeS               10 H7
-248: PuNI               10 H7
-249: PIcS               10 H7
-250: PoIS               10 H7
-251: PaIN               10 H6
-252: PIaN               10 H7
-253: PIN                10 H7
-254: PINe               10 H7
-255: PlIS               10 H7
-256: PaNS               10 H7
-257: PaIS               10 H7
-258: PINs               10 H7
-259: PaIN               10 H7
-260: PInS               10 H7
-261: PIoN               10 H7
-262: PIS                10 H7
-263: SPIn               10 H6
-264: SPIc               10 H6
-265: SPI                10 H6
-266: SlIP               10 H5
-267: SlIP               10 H6
-268: SkIP               10 H5
-269: SkIP               10 H6
-270: SIPo               10 H5
-271: SIPo               10 H6
-272: SPiN               10 H7
-273: SPIs               10 H7
-274: SPIn               10 H7
-275: SPIc               10 H7
-276: SPI                10 H7
-277: SlIP               10 H7
-278: SkIP               10 H7
-279: SIPo               10 H7
-280: zIPS               10 H5
-281: zIPS               10 H6
-282: zIPS               10 H7
-283: tIPS               10 H5
-284: tIPS               10 H6
-285: tIPS               10 H7
-286: sPIS               10 H5
-287: sPIN               10 H5
-288: sPIS               10 H6
-289: sPIN               10 H6
-290: sPIS               10 H7
-291: sPIN               10 H7
-292: SPiN               10 H5
-293: SPIs               10 H5
-294: SPIn               10 H5
-295: SPIc               10 H5
-296: SPiN               10 H6
-297: SPIs               10 H6
-298: PIlS               10 H5
-299: PIfS               10 H5
-300: PIeS               10 H5
-301: PIcS               10 H5
-302: PIaN               10 H5
-303: PISe               10 H6
-304: PIS                10 H6
-305: PIoN               10 H6
-306: PInS               10 H6
-307: PINs               10 H6
-308: PINe               10 H6
-309: PIN                10 H6
-310: PIlS               10 H6
-311: PIfS               10 H6
-312: PIeS               10 H6
-313: PIcS               10 H6
-314: PIaN               10 H6
-315: PuNI               10 H5
-316: PuIS               10 H5
-317: PuNI               10 H6
-318: PuIS               10 H6
-319: PSI                10 H6
-320: PrIS               10 H5
-321: PrIS               10 H6
-322: PoIS               10 H5
+242: IPeS               10 H8
+243: IPeS               10 H7
+244: kIPS               10 H5
+245: kIPS               10 H6
+246: kIPS               10 H7
+247: kIPS               10 H8
+248: lISP               10 H6
+249: lISP               10 H5
+250: lISP               10 H7
+251: lISP               10 H8
+252: mIPS               10 H8
+253: mIPS               10 H6
+254: mIPS               10 H5
+255: mIPS               10 H7
+256: PaIN               10 H7
+257: PaIN               10 H5
+258: PaIN               10 H6
+259: PaIN               10 H8
+260: PaIS               10 H5
+261: PaIS               10 H6
+262: PaIS               10 H8
+263: PaIS               10 H7
+264: PaNS               10 H5
+265: PaNS               10 H8
+266: PaNS               10 H6
+267: PaNS               10 H7
+268: PIaN               10 H6
+269: PIaN               10 H5
+270: PIaN               10 H8
+271: PIaN               10 H7
+272: PIcS               10 H6
+273: PIcS               10 H8
+274: PIcS               10 H7
+275: PIcS               10 H5
+276: PIeS               10 H5
+277: PIeS               10 H7
+278: PIeS               10 H6
+279: PIeS               10 H8
+280: PIfS               10 H6
+281: PIfS               10 H5
+282: PIfS               10 H7
+283: PIfS               10 H8
+284: PIlS               10 H7
+285: PIlS               10 H8
+286: PIlS               10 H5
+287: PIlS               10 H6
+288: PIN                10 H8
+289: PIN                10 H7
+290: PIN                10 H6
+291: PINe               10 H5
+292: PINe               10 H6
+293: PINe               10 H8
+294: PINe               10 H7
+295: PiNS               10 H6
+296: PINs               10 H8
+297: PiNS               10 H5
+298: PInS               10 H8
+299: PiNS               10 H8
+300: PINs               10 H5
+301: PInS               10 H6
+302: PINs               10 H6
+303: PINs               10 H7
+304: PInS               10 H7
+305: PInS               10 H5
+306: PiNS               10 H7
+307: PIoN               10 H6
+308: PIoN               10 H5
+309: PIoN               10 H8
+310: PIoN               10 H7
+311: PIS                10 H8
+312: PIS                10 H6
+313: PIS                10 H7
+314: PISe               10 H5
+315: PISe               10 H6
+316: PISe               10 H8
+317: PISe               10 H7
+318: PlIS               10 H7
+319: PlIS               10 H6
+320: PlIS               10 H5
+321: PlIS               10 H8
+322: PoIS               10 H8
 323: PoIS               10 H6
-324: PlIS               10 H5
-325: PlIS               10 H6
-326: PiNS               10 H5
-327: PiNS               10 H6
-328: PISe               10 H5
-329: PIoN               10 H5
-330: PInS               10 H5
-331: PINs               10 H5
-332: PINe               10 H5
-333: SPiN               10 H8
-334: SPIs               10 H8
-335: lISP               10 H8
-336: SPIn               10 H8
-337: SPIc               10 H8
-338: SPI                10 H8
-339: kIPS               10 H8
-340: PaIN               10 H8
-341: PaIS               10 H8
-342: SlIP               10 H8
-343: IPeS               10 H8
-344: SkIP               10 H8
-345: PaNS               10 H8
-346: SIPo               10 H8
-347: PIaN               10 H8
-348: PIcS               10 H8
-349: PIeS               10 H8
-350: ePIS               10 H5
-351: ePIS               10 H6
-352: ePIS               10 H7
-353: bIPS               10 H5
-354: bIPS               10 H6
-355: bIPS               10 H7
-356: aSPI               10 H5
-357: aSPI               10 H6
-358: aPIS               10 H5
-359: aPIS               10 H6
-360: aSPI               10 H7
-361: aPIS               10 H7
-362: zIPS               10 H8
-363: tIPS               10 H8
-364: sPIS               10 H8
-365: mIPS               10 H8
+324: PoIS               10 H5
+325: PoIS               10 H7
+326: PrIS               10 H5
+327: PrIS               10 H8
+328: PrIS               10 H7
+329: PrIS               10 H6
+330: PSI                10 H8
+331: PSI                10 H7
+332: PSI                10 H6
+333: PuIS               10 H8
+334: PuIS               10 H6
+335: PuIS               10 H7
+336: PuIS               10 H5
+337: PuNI               10 H7
+338: PuNI               10 H8
+339: PuNI               10 H6
+340: PuNI               10 H5
+341: SIPo               10 H8
+342: SIPo               10 H7
+343: SIPo               10 H5
+344: SIPo               10 H6
+345: SkIP               10 H5
+346: SkIP               10 H7
+347: SkIP               10 H6
+348: SkIP               10 H8
+349: SlIP               10 H5
+350: SlIP               10 H7
+351: SlIP               10 H6
+352: SlIP               10 H8
+353: SPI                10 H6
+354: SPI                10 H7
+355: SPI                10 H8
+356: SPIc               10 H7
+357: SPIc               10 H5
+358: SPIc               10 H6
+359: SPIc               10 H8
+360: SPiN               10 H7
+361: SPIn               10 H7
+362: SPIn               10 H5
+363: SPiN               10 H8
+364: SPiN               10 H6
+365: SPIn               10 H8
 366: sPIN               10 H8
-367: PSI                10 H8
-368: PrIS               10 H8
-369: PoIS               10 H8
-370: PlIS               10 H8
-371: PIfS               10 H8
-372: bIPS               10 H8
-373: aSPI               10 H8
-374: IPeS               10 H7
-375: PIlS               10 H8
-376: aPIS               10 H8
-377: PIN                10 H8
-378: PiNS               10 H8
-379: PINe               10 H8
-380: PINs               10 H8
-381: PInS               10 H8
-382: PISe               10 H8
-383: PIS                10 H8
-384: PIoN               10 H8
-385: PuNI               10 H8
-386: PuIS               10 H8
-387: ePIS               10 H8
-388: bIP                 8 H6
-389: SPa                 8 H7
-390: PuS                 8 H7
-391: bIP                 8 H7
-392: PaN                 8 H6
-393: PaS                 8 H6
-394: PIn                 8 H8
-395: PiN                 8 H8
-396: SPi                 8 H7
-397: aPI                 8 H6
-398: PIe                 8 H8
-399: PhI                 8 H6
-400: SeP                 8 H8
-401: PIc                 8 H6
-402: aPI                 8 H7
-403: PuS                 8 H8
-404: ePI                 8 H6
-405: PIf                 8 H8
-406: PIn                 8 H7
-407: ePI                 8 H7
-408: tIP                 8 H6
-409: tIP                 8 H7
-410: PIs                 8 H7
-411: PIu                 8 H7
-412: PiN                 8 H7
-413: PiS                 8 H7
-414: PlI                 8 H7
-415: PIs                 8 H8
-416: PIu                 8 H8
-417: PSi                 8 H7
-418: PSt                 8 H7
-419: PSy                 8 H7
-420: PsI                 8 H7
-421: PI                  8 H8
-422: PiS                 8 H8
-423: PiS                 8 H6
-424: PhI                 8 H8
-425: PlI                 8 H6
-426: PuS                 8 H6
-427: PlI                 8 H8
-428: PaS                 8 H8
-429: SPa                 8 H8
-430: SeP                 8 H6
-431: PSt                 8 H8
-432: PaN                 8 H8
-433: PsI                 8 H6
-434: PSi                 8 H8
-435: PSi                 8 H6
-436: PSt                 8 H6
-437: PSy                 8 H6
-438: PIe                 8 H6
-439: sPI                 8 H6
-440: PIf                 8 H6
-441: PsI                 8 H8
-442: zIP                 8 H8
-443: PIn                 8 H6
-444: sPI                 8 H7
-445: PIs                 8 H6
-446: PIu                 8 H6
-447: PIc                 8 H8
-448: tIP                 8 H8
-449: SeP                 8 H7
-450: SPa                 8 H6
-451: sPI                 8 H8
-452: SPi                 8 H6
-453: PSy                 8 H8
-454: SPi                 8 H8
-455: PiN                 8 H6
-456: kIP                 8 H6
-457: aPI                 8 H8
-458: hIP                 8 H7
-459: hIP                 8 H6
-460: bIP                 8 H8
-461: kIP                 8 H7
-462: kIP                 8 H8
-463: IPe                 8 H8
-464: IPe                 8 H7
-465: hIP                 8 H8
-466: IPe                 8 H6
-467: PaN                 8 H7
-468: PaS                 8 H7
-469: zIP                 8 H7
-470: PIc                 8 H7
-471: zIP                 8 H6
-472: ePI                 8 H8
-473: PIe                 8 H7
-474: PIf                 8 H7
-475: PhI                 8 H7
-476: PI                  8 H7
-477: SkIN                6 H8
-478: NIeS                6 H7
-479: SNIf                6 H8
-480: NIfS                6 H7
-481: SoIN                6 H8
-482: mINS                6 H6
-483: NItS                6 H7
-484: SeIN                6 H6
-485: lINS                6 H7
-486: lINS                6 H8
-487: SaIN                6 H7
-488: NuIS                6 H7
-489: NaIS                6 H6
-490: Pu                  6 H8
-491: IbNS                6 H7
-492: mINS                6 H7
-493: NaIS                6 H5
-494: fINS                6 H8
-495: SpIN                6 H8
-496: oINS                6 H8
-497: aSIN                6 H8
-498: NuIS                6 H8
-499: NIaS                6 H6
-500: mINS                6 H8
-501: gINS                6 H5
-502: SeIN                6 H7
-503: tINS                6 H8
-504: SaIN                6 H5
-505: SIeN                6 H5
-506: INSu                6 H7
+367: sPIN               10 H5
+368: SPiN               10 H5
+369: sPIN               10 H7
+370: SPIn               10 H6
+371: sPIN               10 H6
+372: SPIs               10 H7
+373: SPIs               10 H6
+374: SPIs               10 H5
+375: sPIS               10 H8
+376: sPIS               10 H6
+377: sPIS               10 H5
+378: sPIS               10 H7
+379: SPIs               10 H8
+380: tIPS               10 H7
+381: tIPS               10 H6
+382: tIPS               10 H5
+383: tIPS               10 H8
+384: zIPS               10 H6
+385: zIPS               10 H7
+386: zIPS               10 H8
+387: zIPS               10 H5
+388: aPI                 8 H7
+389: aPI                 8 H8
+390: aPI                 8 H6
+391: bIP                 8 H6
+392: bIP                 8 H7
+393: bIP                 8 H8
+394: ePI                 8 H8
+395: ePI                 8 H6
+396: ePI                 8 H7
+397: hIP                 8 H7
+398: hIP                 8 H6
+399: hIP                 8 H8
+400: IPe                 8 H8
+401: IPe                 8 H7
+402: IPe                 8 H6
+403: kIP                 8 H6
+404: kIP                 8 H7
+405: kIP                 8 H8
+406: PaN                 8 H8
+407: PaN                 8 H7
+408: PaN                 8 H6
+409: PaS                 8 H8
+410: PaS                 8 H7
+411: PaS                 8 H6
+412: PhI                 8 H8
+413: PhI                 8 H7
+414: PhI                 8 H6
+415: PI                  8 H7
+416: PI                  8 H8
+417: PIc                 8 H7
+418: PIc                 8 H8
+419: PIc                 8 H6
+420: PIe                 8 H8
+421: PIe                 8 H7
+422: PIe                 8 H6
+423: PIf                 8 H8
+424: PIf                 8 H7
+425: PIf                 8 H6
+426: PIn                 8 H8
+427: PiN                 8 H8
+428: PIn                 8 H6
+429: PiN                 8 H7
+430: PiN                 8 H6
+431: PIn                 8 H7
+432: PiS                 8 H8
+433: PIs                 8 H6
+434: PiS                 8 H7
+435: PiS                 8 H6
+436: PIs                 8 H8
+437: PIs                 8 H7
+438: PIu                 8 H6
+439: PIu                 8 H8
+440: PIu                 8 H7
+441: PlI                 8 H6
+442: PlI                 8 H7
+443: PlI                 8 H8
+444: PsI                 8 H7
+445: PSi                 8 H7
+446: PSi                 8 H6
+447: PSi                 8 H8
+448: PsI                 8 H6
+449: PsI                 8 H8
+450: PSt                 8 H6
+451: PSt                 8 H7
+452: PSt                 8 H8
+453: PSy                 8 H6
+454: PSy                 8 H7
+455: PSy                 8 H8
+456: PuS                 8 H7
+457: PuS                 8 H6
+458: PuS                 8 H8
+459: SeP                 8 H8
+460: SeP                 8 H7
+461: SeP                 8 H6
+462: SPa                 8 H8
+463: SPa                 8 H7
+464: SPa                 8 H6
+465: sPI                 8 H6
+466: sPI                 8 H7
+467: SPi                 8 H7
+468: SPi                 8 H8
+469: sPI                 8 H8
+470: SPi                 8 H6
+471: tIP                 8 H6
+472: tIP                 8 H7
+473: tIP                 8 H8
+474: zIP                 8 H6
+475: zIP                 8 H8
+476: zIP                 8 H7
+477: aNIS                6 H8
+478: aNIS                6 H5
+479: aNIS                6 H7
+480: aNIS                6 H6
+481: aSIN                6 H5
+482: aSIN                6 H8
+483: aSIN                6 H6
+484: aSIN                6 H7
+485: fINS                6 H7
+486: fINS                6 H6
+487: fINS                6 H8
+488: fINS                6 H5
+489: gINS                6 H7
+490: gINS                6 H8
+491: gINS                6 H6
+492: gINS                6 H5
+493: IbNS                6 H7
+494: IbNS                6 H5
+495: IbNS                6 H8
+496: IbNS                6 H6
+497: INSu                6 H6
+498: INSu                6 H7
+499: INSu                6 H5
+500: INSu                6 H8
+501: IoNS                6 H7
+502: IoNS                6 H6
+503: IoNS                6 H5
+504: IoNS                6 H8
+505: lINS                6 H8
+506: lINS                6 H7
 507: lINS                6 H6
-508: qINS                6 H8
-509: SkIN                6 H6
-510: SaIN                6 H8
-511: SIeN                6 H6
-512: IoNS                6 H7
-513: SeIN                6 H8
-514: SkIN                6 H5
-515: lINS                6 H5
-516: mINS                6 H5
-517: gINS                6 H8
-518: qINS                6 H7
-519: SIeN                6 H8
-520: NaIS                6 H7
-521: pINS                6 H5
-522: SNIf                6 H6
-523: pINS                6 H6
-524: SNIf                6 H5
-525: SoIN                6 H6
-526: pINS                6 H7
-527: qINS                6 H6
-528: SoIN                6 H5
-529: pINS                6 H8
-530: qINS                6 H5
-531: IbNS                6 H8
-532: SeIN                6 H5
-533: INSu                6 H8
-534: NIaS                6 H7
-535: IoNS                6 H8
-536: NIdS                6 H7
-537: oINS                6 H5
-538: oINS                6 H6
-539: Pu                  6 H7
-540: SNIf                6 H7
-541: NIaS                6 H8
-542: vINS                6 H7
-543: oINS                6 H7
-544: Pi                  6 H8
-545: IbNS                6 H5
-546: NuIS                6 H5
-547: SkIN                6 H7
-548: aSIN                6 H5
-549: NuIS                6 H6
-550: vINS                6 H6
-551: aSIN                6 H6
-552: IbNS                6 H6
-553: NItS                6 H5
-554: NaIS                6 H8
-555: fINS                6 H7
-556: tINS                6 H5
-557: uNIS                6 H7
-558: fINS                6 H6
-559: tINS                6 H6
-560: INSu                6 H6
-561: INSu                6 H5
-562: Pi                  6 H7
-563: fINS                6 H5
-564: tINS                6 H7
-565: uNIS                6 H6
-566: IoNS                6 H6
-567: IoNS                6 H5
-568: SoIN                6 H7
-569: gINS                6 H7
-570: uNIS                6 H5
-571: vINS                6 H8
-572: NItS                6 H8
-573: SaIN                6 H6
-574: SIeN                6 H7
-575: NIdS                6 H6
-576: NIfS                6 H8
-577: yINS                6 H6
-578: yINS                6 H8
-579: NIeS                6 H6
-580: yINS                6 H7
-581: NIeS                6 H8
-582: yINS                6 H5
-583: aNIS                6 H7
-584: SpIN                6 H7
-585: NIfS                6 H6
-586: vINS                6 H5
-587: NItS                6 H6
-588: NIaS                6 H5
-589: NIdS                6 H5
-590: SpIN                6 H5
-591: NIeS                6 H5
-592: SpIN                6 H6
-593: aSIN                6 H7
-594: gINS                6 H6
-595: NIdS                6 H8
-596: aNIS                6 H6
-597: aNIS                6 H8
-598: uNIS                6 H8
-599: aNIS                6 H5
-600: NIfS                6 H5
-601: dIS                 4 H8
+508: lINS                6 H5
+509: mINS                6 H8
+510: mINS                6 H5
+511: mINS                6 H7
+512: mINS                6 H6
+513: NaIS                6 H5
+514: NaIS                6 H6
+515: NaIS                6 H7
+516: NaIS                6 H8
+517: NIaS                6 H7
+518: NIaS                6 H8
+519: NIaS                6 H6
+520: NIaS                6 H5
+521: NIdS                6 H6
+522: NIdS                6 H5
+523: NIdS                6 H8
+524: NIdS                6 H7
+525: NIeS                6 H8
+526: NIeS                6 H5
+527: NIeS                6 H7
+528: NIeS                6 H6
+529: NIfS                6 H8
+530: NIfS                6 H7
+531: NIfS                6 H5
+532: NIfS                6 H6
+533: NItS                6 H6
+534: NItS                6 H8
+535: NItS                6 H5
+536: NItS                6 H7
+537: NuIS                6 H8
+538: NuIS                6 H7
+539: NuIS                6 H5
+540: NuIS                6 H6
+541: oINS                6 H7
+542: oINS                6 H6
+543: oINS                6 H5
+544: oINS                6 H8
+545: Pi                  6 H8
+546: Pi                  6 H7
+547: pINS                6 H6
+548: pINS                6 H5
+549: pINS                6 H8
+550: pINS                6 H7
+551: Pu                  6 H8
+552: Pu                  6 H7
+553: qINS                6 H8
+554: qINS                6 H7
+555: qINS                6 H6
+556: qINS                6 H5
+557: SaIN                6 H5
+558: SaIN                6 H8
+559: SaIN                6 H6
+560: SaIN                6 H7
+561: SeIN                6 H6
+562: SeIN                6 H5
+563: SeIN                6 H8
+564: SeIN                6 H7
+565: SIeN                6 H7
+566: SIeN                6 H5
+567: SIeN                6 H8
+568: SIeN                6 H6
+569: SkIN                6 H6
+570: SkIN                6 H5
+571: SkIN                6 H7
+572: SkIN                6 H8
+573: SNIf                6 H8
+574: SNIf                6 H5
+575: SNIf                6 H6
+576: SNIf                6 H7
+577: SoIN                6 H7
+578: SoIN                6 H6
+579: SoIN                6 H8
+580: SoIN                6 H5
+581: SpIN                6 H5
+582: SpIN                6 H8
+583: SpIN                6 H7
+584: SpIN                6 H6
+585: tINS                6 H6
+586: tINS                6 H5
+587: tINS                6 H8
+588: tINS                6 H7
+589: uNIS                6 H7
+590: uNIS                6 H6
+591: uNIS                6 H5
+592: uNIS                6 H8
+593: vINS                6 H8
+594: vINS                6 H5
+595: vINS                6 H7
+596: vINS                6 H6
+597: yINS                6 H5
+598: yINS                6 H6
+599: yINS                6 H7
+600: yINS                6 H8
+601: aIS                 4 H7
 602: aIS                 4 H8
-603: dIN                 4 H8
-604: SaI                 4 H6
-605: aNS                 4 H8
-606: SpI                 4 H7
-607: SIc                 4 H6
-608: bIS                 4 H8
-609: SeN                 4 H6
-610: cIS                 4 H8
-611: NoS                 4 H8
-612: SpI                 4 H6
-613: NIt                 4 H8
-614: sIS                 4 H7
-615: yIN                 4 H6
-616: NIf                 4 H8
-617: sIS                 4 H6
-618: yIN                 4 H7
-619: NIe                 4 H8
-620: NId                 4 H8
-621: vIS                 4 H6
-622: vIN                 4 H6
-623: NIb                 4 H8
-624: vIS                 4 H7
-625: vIN                 4 H7
-626: uNS                 4 H6
-627: NIa                 4 H8
-628: NI                  4 H8
-629: tIN                 4 H7
-630: uNI                 4 H6
-631: NeS                 4 H8
-632: tIN                 4 H6
-633: uNS                 4 H7
-634: uNI                 4 H7
-635: fIN                 4 H8
-636: fIS                 4 H8
-637: SIl                 4 H6
-638: SIr                 4 H6
-639: SIs                 4 H6
-640: SIx                 4 H6
-641: SkI                 4 H6
-642: gIN                 4 H8
-643: gIS                 4 H8
-644: SoI                 4 H6
-645: SoN                 4 H6
-646: IbN                 4 H8
-647: IfS                 4 H8
-648: IlS                 4 H8
-649: IN                  4 H8
-650: IoN                 4 H8
-651: ISo                 4 H8
-652: kSI                 4 H8
+603: aIS                 4 H6
+604: aNS                 4 H6
+605: aNS                 4 H7
+606: aNS                 4 H8
+607: bIS                 4 H8
+608: bIS                 4 H6
+609: bIS                 4 H7
+610: cIS                 4 H6
+611: cIS                 4 H7
+612: cIS                 4 H8
+613: dIN                 4 H8
+614: dIN                 4 H6
+615: dIN                 4 H7
+616: dIS                 4 H8
+617: dIS                 4 H7
+618: dIS                 4 H6
+619: fIN                 4 H6
+620: fIN                 4 H7
+621: fIN                 4 H8
+622: fIS                 4 H8
+623: fIS                 4 H7
+624: fIS                 4 H6
+625: gIN                 4 H6
+626: gIN                 4 H7
+627: gIN                 4 H8
+628: gIS                 4 H8
+629: gIS                 4 H6
+630: gIS                 4 H7
+631: IbN                 4 H7
+632: IbN                 4 H6
+633: IbN                 4 H8
+634: IfS                 4 H6
+635: IfS                 4 H7
+636: IfS                 4 H8
+637: IlS                 4 H8
+638: IlS                 4 H6
+639: IlS                 4 H7
+640: IN                  4 H8
+641: IN                  4 H7
+642: IoN                 4 H8
+643: IoN                 4 H6
+644: IoN                 4 H7
+645: ISo                 4 H8
+646: ISo                 4 H7
+647: ISo                 4 H6
+648: kSI                 4 H7
+649: kSI                 4 H8
+650: kSI                 4 H6
+651: lIN                 4 H6
+652: lIN                 4 H7
 653: lIN                 4 H8
-654: lIS                 4 H8
-655: mIN                 4 H8
-656: NuS                 4 H8
-657: NuI                 4 H8
-658: mIS                 4 H8
-659: fIS                 4 H7
-660: fIN                 4 H7
-661: IlS                 4 H7
-662: IN                  4 H7
-663: dIS                 4 H6
-664: dIN                 4 H6
-665: dIS                 4 H7
-666: dIN                 4 H7
-667: cIS                 4 H6
-668: cIS                 4 H7
-669: mIS                 4 H6
-670: bIS                 4 H6
-671: bIS                 4 H7
-672: mIN                 4 H6
-673: aNS                 4 H6
-674: aIS                 4 H6
-675: mIS                 4 H7
-676: aNS                 4 H7
-677: aIS                 4 H7
-678: yIN                 4 H8
-679: mIN                 4 H7
-680: vIS                 4 H8
-681: vIN                 4 H8
-682: IoN                 4 H7
-683: uNS                 4 H8
-684: uNI                 4 H8
-685: lIS                 4 H6
-686: lIN                 4 H6
-687: NIt                 4 H7
-688: NIf                 4 H7
-689: NIe                 4 H7
-690: NoS                 4 H7
-691: NId                 4 H7
-692: NuI                 4 H7
-693: NuS                 4 H7
-694: NIb                 4 H7
-695: IbN                 4 H7
-696: NeS                 4 H6
-697: NIa                 4 H6
-698: NIa                 4 H7
-699: NIb                 4 H6
-700: NId                 4 H6
-701: NIe                 4 H6
-702: gIS                 4 H6
-703: NIf                 4 H6
-704: NI                  4 H7
-705: NIt                 4 H6
-706: NoS                 4 H6
-707: NuI                 4 H6
-708: NuS                 4 H6
-709: IfS                 4 H7
-710: NeS                 4 H7
-711: gIN                 4 H6
-712: gIS                 4 H7
-713: gIN                 4 H7
-714: fIS                 4 H6
-715: fIN                 4 H6
+654: lIS                 4 H6
+655: lIS                 4 H8
+656: lIS                 4 H7
+657: mIN                 4 H7
+658: mIN                 4 H8
+659: mIN                 4 H6
+660: mIS                 4 H6
+661: mIS                 4 H8
+662: mIS                 4 H7
+663: NeS                 4 H8
+664: NeS                 4 H7
+665: NeS                 4 H6
+666: NI                  4 H7
+667: NI                  4 H8
+668: NIa                 4 H6
+669: NIa                 4 H8
+670: NIa                 4 H7
+671: NIb                 4 H6
+672: NIb                 4 H7
+673: NIb                 4 H8
+674: NId                 4 H6
+675: NId                 4 H8
+676: NId                 4 H7
+677: NIe                 4 H6
+678: NIe                 4 H8
+679: NIe                 4 H7
+680: NIf                 4 H6
+681: NIf                 4 H8
+682: NIf                 4 H7
+683: NIt                 4 H8
+684: NIt                 4 H6
+685: NIt                 4 H7
+686: NoS                 4 H6
+687: NoS                 4 H8
+688: NoS                 4 H7
+689: NuI                 4 H6
+690: NuI                 4 H8
+691: NuI                 4 H7
+692: NuS                 4 H8
+693: NuS                 4 H6
+694: NuS                 4 H7
+695: pIN                 4 H6
+696: pIN                 4 H8
+697: pIN                 4 H7
+698: pIS                 4 H8
+699: pIS                 4 H7
+700: pIS                 4 H6
+701: pSI                 4 H8
+702: pSI                 4 H6
+703: pSI                 4 H7
+704: qIN                 4 H6
+705: qIN                 4 H7
+706: qIN                 4 H8
+707: rIS                 4 H6
+708: rIS                 4 H7
+709: rIS                 4 H8
+710: SaI                 4 H6
+711: SaI                 4 H7
+712: SaI                 4 H8
+713: SeN                 4 H7
+714: SeN                 4 H8
+715: SeN                 4 H6
 716: SI                  4 H8
-717: SeN                 4 H8
-718: kSI                 4 H7
-719: SaI                 4 H8
-720: IbN                 4 H6
-721: rIS                 4 H8
-722: qIN                 4 H8
-723: pSI                 4 H8
-724: pIS                 4 H8
-725: pIN                 4 H8
-726: ISo                 4 H6
-727: qIN                 4 H7
-728: qIN                 4 H6
-729: IoN                 4 H6
-730: rIS                 4 H7
-731: rIS                 4 H6
-732: SaI                 4 H7
-733: IlS                 4 H6
-734: SeN                 4 H7
-735: SI                  4 H7
-736: SIc                 4 H7
-737: SIl                 4 H7
-738: SIr                 4 H7
-739: IfS                 4 H6
-740: SIs                 4 H7
-741: SIx                 4 H7
-742: SkI                 4 H7
-743: SoI                 4 H7
-744: SoN                 4 H7
-745: tIN                 4 H8
-746: sIS                 4 H8
-747: lIS                 4 H7
-748: lIN                 4 H7
-749: kSI                 4 H6
-750: SpI                 4 H8
-751: SoN                 4 H8
-752: SoI                 4 H8
-753: SkI                 4 H8
-754: ISo                 4 H7
-755: SIx                 4 H8
-756: SIs                 4 H8
-757: SIr                 4 H8
-758: SIl                 4 H8
-759: SIc                 4 H8
-760: pIN                 4 H7
-761: pIS                 4 H7
-762: pSI                 4 H7
-763: pIN                 4 H6
-764: pSI                 4 H6
-765: pIS                 4 H6
-766: cI                  2 H8
-767: If                  2 H7
-768: Na                  2 H7
-769: aI                  2 H8
-770: hI                  2 H8
-771: eN                  2 H8
-772: lI                  2 H7
+717: SI                  4 H7
+718: SIc                 4 H8
+719: SIc                 4 H7
+720: SIc                 4 H6
+721: SIl                 4 H7
+722: SIl                 4 H8
+723: SIl                 4 H6
+724: SIr                 4 H8
+725: SIr                 4 H7
+726: SIr                 4 H6
+727: sIS                 4 H6
+728: sIS                 4 H8
+729: sIS                 4 H7
+730: SIs                 4 H8
+731: SIs                 4 H6
+732: SIs                 4 H7
+733: SIx                 4 H8
+734: SIx                 4 H7
+735: SIx                 4 H6
+736: SkI                 4 H8
+737: SkI                 4 H6
+738: SkI                 4 H7
+739: SoI                 4 H8
+740: SoI                 4 H7
+741: SoI                 4 H6
+742: SoN                 4 H7
+743: SoN                 4 H8
+744: SoN                 4 H6
+745: SpI                 4 H8
+746: SpI                 4 H6
+747: SpI                 4 H7
+748: tIN                 4 H6
+749: tIN                 4 H8
+750: tIN                 4 H7
+751: uNI                 4 H8
+752: uNI                 4 H6
+753: uNI                 4 H7
+754: uNS                 4 H8
+755: uNS                 4 H6
+756: uNS                 4 H7
+757: vIN                 4 H6
+758: vIN                 4 H7
+759: vIN                 4 H8
+760: vIS                 4 H7
+761: vIS                 4 H6
+762: vIS                 4 H8
+763: yIN                 4 H8
+764: yIN                 4 H6
+765: yIN                 4 H7
+766: aI                  2 H8
+767: aI                  2 H7
+768: aN                  2 H8
+769: aN                  2 H7
+770: aS                  2 H8
+771: aS                  2 H7
+772: bI                  2 H7
 773: bI                  2 H8
-774: In                  2 H8
-775: mI                  2 H7
-776: Il                  2 H7
-777: eS                  2 H8
-778: fI                  2 H8
-779: aN                  2 H8
-780: In                  2 H7
-781: Ne                  2 H7
-782: iN                  2 H7
-783: aS                  2 H8
-784: Il                  2 H8
+774: cI                  2 H7
+775: cI                  2 H8
+776: eN                  2 H7
+777: eN                  2 H8
+778: eS                  2 H7
+779: eS                  2 H8
+780: fI                  2 H7
+781: fI                  2 H8
+782: hI                  2 H7
+783: hI                  2 H8
+784: If                  2 H7
 785: If                  2 H8
-786: xI                  2 H8
-787: vS                  2 H8
-788: sI                  2 H7
-789: Ni                  2 H8
-790: uS                  2 H8
-791: No                  2 H8
-792: uN                  2 H8
-793: Nu                  2 H8
-794: sI                  2 H8
-795: nI                  2 H8
-796: Su                  2 H8
-797: oN                  2 H8
-798: oS                  2 H8
-799: Si                  2 H8
-800: pI                  2 H7
-801: Se                  2 H8
-802: Sa                  2 H8
-803: rI                  2 H8
-804: pI                  2 H8
-805: rI                  2 H7
-806: Sa                  2 H7
-807: Se                  2 H7
-808: Su                  2 H7
-809: Si                  2 H7
-810: iN                  2 H8
-811: Ni                  2 H7
-812: No                  2 H7
-813: lI                  2 H8
-814: Nu                  2 H7
-815: mI                  2 H8
-816: hI                  2 H7
-817: Na                  2 H8
-818: xI                  2 H7
-819: vS                  2 H7
-820: nI                  2 H7
-821: oN                  2 H7
-822: oS                  2 H7
-823: uS                  2 H7
-824: uN                  2 H7
-825: fI                  2 H7
-826: eS                  2 H7
-827: Ne                  2 H8
-828: eN                  2 H7
-829: cI                  2 H7
-830: bI                  2 H7
-831: aS                  2 H7
-832: aN                  2 H7
-833: aI                  2 H7
+786: Il                  2 H8
+787: Il                  2 H7
+788: In                  2 H8
+789: iN                  2 H7
+790: iN                  2 H8
+791: In                  2 H7
+792: lI                  2 H7
+793: lI                  2 H8
+794: mI                  2 H7
+795: mI                  2 H8
+796: Na                  2 H7
+797: Na                  2 H8
+798: Ne                  2 H8
+799: Ne                  2 H7
+800: Ni                  2 H8
+801: nI                  2 H8
+802: nI                  2 H7
+803: Ni                  2 H7
+804: No                  2 H8
+805: No                  2 H7
+806: Nu                  2 H8
+807: Nu                  2 H7
+808: oN                  2 H7
+809: oN                  2 H8
+810: oS                  2 H8
+811: oS                  2 H7
+812: pI                  2 H8
+813: pI                  2 H7
+814: rI                  2 H8
+815: rI                  2 H7
+816: Sa                  2 H7
+817: Sa                  2 H8
+818: Se                  2 H8
+819: Se                  2 H7
+820: Si                  2 H8
+821: sI                  2 H8
+822: Si                  2 H7
+823: sI                  2 H7
+824: Su                  2 H8
+825: Su                  2 H7
+826: uN                  2 H8
+827: uN                  2 H7
+828: uS                  2 H8
+829: uS                  2 H7
+830: vS                  2 H7
+831: vS                  2 H8
+832: xI                  2 H7
+833: xI                  2 H8
 commande> j QuIZ H6
 commande> t E?
 commande> r
 commande> a r 50
-  1: ZEn                12 9H
-  2: ZEk                12 9H
-  3: ZEf                12 9H
-  4: ZEe                12 9H
+  1: fEZ                12 9F
+  2: lEZ                12 9F
+  3: nEZ                12 9F
+  4: rEZ                12 9F
   5: ZEc                12 9H
-  6: rEZ                12 9F
-  7: nEZ                12 9F
-  8: lEZ                12 9F
-  9: fEZ                12 9F
- 10: ZoE                11 9H
+  6: ZEe                12 9H
+  7: ZEf                12 9H
+  8: ZEk                12 9H
+  9: ZEn                12 9H
+ 10: QuE                11 6H
  11: ZeE                11 9H
- 12: QuE                11 6H
+ 12: ZoE                11 9H
  13: Eh                  5 G7
  14: En                  5 G7
  15: Es                  5 G7
  16: Ex                  5 G7
- 17: pIE                 2 8G
- 18: oIE                 2 8G
- 19: nIE                 2 8G
- 20: mIE                 2 8G
- 21: lIE                 2 8G
- 22: hIE                 2 8G
- 23: fIE                 2 8G
- 24: aIE                 2 8G
- 25: pEu                 2 7F
- 26: lEu                 2 7F
- 27: jEu                 2 7F
- 28: hEu                 2 7F
- 29: fEu                 2 7F
- 30: rIE                 2 8G
- 31: vIE                 2 8G
- 32: EpI                 2 8F
- 33: lEI                 2 8F
+ 17: aIE                 2 8G
+ 18: buE                 2 7G
+ 19: duE                 2 7G
+ 20: EpI                 2 8F
+ 21: Eu                  2 7G
+ 22: Eue                 2 7G
+ 23: euE                 2 7G
+ 24: Euh                 2 7G
+ 25: Eus                 2 7G
+ 26: Eut                 2 7G
+ 27: Eux                 2 7G
+ 28: fEu                 2 7F
+ 29: fIE                 2 8G
+ 30: guE                 2 7G
+ 31: hEu                 2 7F
+ 32: hIE                 2 8G
+ 33: huE                 2 7G
  34: IdE                 2 8H
  35: IlE                 2 8H
  36: IpE                 2 8H
  37: IrE                 2 8H
  38: IvE                 2 8H
  39: IxE                 2 8H
- 40: Eue                 2 7G
- 41: Eu                  2 7G
- 42: duE                 2 7G
- 43: buE                 2 7G
- 44: suE                 2 7G
- 45: ruE                 2 7G
- 46: tuE                 2 7G
- 47: quE                 2 7G
- 48: puE                 2 7G
- 49: vuE                 2 7G
- 50: nuE                 2 7G
+ 40: jEu                 2 7F
+ 41: lEI                 2 8F
+ 42: lEu                 2 7F
+ 43: lIE                 2 8G
+ 44: luE                 2 7G
+ 45: mIE                 2 8G
+ 46: muE                 2 7G
+ 47: nIE                 2 8G
+ 48: nuE                 2 7G
+ 49: oIE                 2 8G
+ 50: pEu                 2 7F
 commande> q
 fin du mode entraînement
 commande> q




reply via email to

[Prev in Thread] Current Thread [Next in Thread]