[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Eliot-dev] eliot dic/automaton.cpp dic/compdic.cpp dic/dic... [cppdic]
|
From: |
eliot-dev |
|
Subject: |
[Eliot-dev] eliot dic/automaton.cpp dic/compdic.cpp dic/dic... [cppdic] |
|
Date: |
Tue, 08 Jan 2008 12:32:14 +0000 |
CVSROOT: /cvsroot/eliot
Module name: eliot
Branch: cppdic
Changes by: Olivier Teulière <ipkiss> 08/01/08 12:32:13
Modified files:
dic : automaton.cpp compdic.cpp dic.cpp
dic_search.cpp encoding.cpp ery.ypp hashtable.i
header.cpp listdic.cpp regexp.cpp regexp.h
regexpmain.cpp
game : settings.cpp
test : duplicate_2_ai.ref duplicate_humans_ai.ref
freegame_3_ai.ref freegame_passing.ref
load_saved_game.ref regexp.ref regression.pl
training_back.ref training_cross.ref
training_cross2.ref training_cross3.ref
training_joker2.ref training_rosace.ref
training_search.ref
utils : game_io.cpp
wxwin : mainframe.cc
Log message:
- utils/game_io.cpp: Slightly simplified
- wxwin/mainframe.cc: Disabled the main controls at the beginning,
to make it more clear that a new game has to be started
- test/*: Adapted the regression scenarii to use ODS 5 instead of ODS 4
- dic/header.cpp: Fixed 2 compilation warnings on 64 bits machines
- dic/*: Use #include <cfoo> instead of #include <foo.h> for standard
C header files
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/automaton.cpp?cvsroot=eliot&only_with_tag=cppdic&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/compdic.cpp?cvsroot=eliot&only_with_tag=cppdic&r1=1.1.2.18&r2=1.1.2.19
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/dic.cpp?cvsroot=eliot&only_with_tag=cppdic&r1=1.1.2.14&r2=1.1.2.15
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/dic_search.cpp?cvsroot=eliot&only_with_tag=cppdic&r1=1.1.2.10&r2=1.1.2.11
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/encoding.cpp?cvsroot=eliot&only_with_tag=cppdic&r1=1.1.2.13&r2=1.1.2.14
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/ery.ypp?cvsroot=eliot&only_with_tag=cppdic&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/hashtable.i?cvsroot=eliot&only_with_tag=cppdic&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/header.cpp?cvsroot=eliot&only_with_tag=cppdic&r1=1.1.2.18&r2=1.1.2.19
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/listdic.cpp?cvsroot=eliot&only_with_tag=cppdic&r1=1.1.2.11&r2=1.1.2.12
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/regexp.cpp?cvsroot=eliot&only_with_tag=cppdic&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/regexp.h?cvsroot=eliot&only_with_tag=cppdic&r1=1.12.2.3&r2=1.12.2.4
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/regexpmain.cpp?cvsroot=eliot&only_with_tag=cppdic&r1=1.1.2.6&r2=1.1.2.7
http://cvs.savannah.gnu.org/viewcvs/eliot/game/settings.cpp?cvsroot=eliot&only_with_tag=cppdic&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/eliot/test/duplicate_2_ai.ref?cvsroot=eliot&only_with_tag=cppdic&r1=1.3.2.1&r2=1.3.2.2
http://cvs.savannah.gnu.org/viewcvs/eliot/test/duplicate_humans_ai.ref?cvsroot=eliot&only_with_tag=cppdic&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/eliot/test/freegame_3_ai.ref?cvsroot=eliot&only_with_tag=cppdic&r1=1.3.2.1&r2=1.3.2.2
http://cvs.savannah.gnu.org/viewcvs/eliot/test/freegame_passing.ref?cvsroot=eliot&only_with_tag=cppdic&r1=1.3.2.3&r2=1.3.2.4
http://cvs.savannah.gnu.org/viewcvs/eliot/test/load_saved_game.ref?cvsroot=eliot&only_with_tag=cppdic&r1=1.1&r2=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/eliot/test/regexp.ref?cvsroot=eliot&only_with_tag=cppdic&r1=1.1&r2=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/eliot/test/regression.pl?cvsroot=eliot&only_with_tag=cppdic&r1=1.1.6.2&r2=1.1.6.3
http://cvs.savannah.gnu.org/viewcvs/eliot/test/training_back.ref?cvsroot=eliot&only_with_tag=cppdic&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/eliot/test/training_cross.ref?cvsroot=eliot&only_with_tag=cppdic&r1=1.1&r2=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/eliot/test/training_cross2.ref?cvsroot=eliot&only_with_tag=cppdic&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/eliot/test/training_cross3.ref?cvsroot=eliot&only_with_tag=cppdic&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/eliot/test/training_joker2.ref?cvsroot=eliot&only_with_tag=cppdic&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/eliot/test/training_rosace.ref?cvsroot=eliot&only_with_tag=cppdic&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/eliot/test/training_search.ref?cvsroot=eliot&only_with_tag=cppdic&r1=1.3.2.1&r2=1.3.2.2
http://cvs.savannah.gnu.org/viewcvs/eliot/utils/game_io.cpp?cvsroot=eliot&only_with_tag=cppdic&r1=1.9.2.5&r2=1.9.2.6
http://cvs.savannah.gnu.org/viewcvs/eliot/wxwin/mainframe.cc?cvsroot=eliot&only_with_tag=cppdic&r1=1.21.2.11&r2=1.21.2.12
Patches:
Index: dic/automaton.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/Attic/automaton.cpp,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- dic/automaton.cpp 25 Dec 2007 12:39:12 -0000 1.1.2.4
+++ dic/automaton.cpp 8 Jan 2008 12:32:10 -0000 1.1.2.5
@@ -26,10 +26,13 @@
*/
#include "config.h"
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
+
+#include <set>
+#include <list>
+#include <cassert>
+#include <cstring>
+#include <cstdlib>
+#include <cstdio>
#include <sys/types.h>
#ifdef HAVE_SYS_WAIT_H
# include <sys/wait.h>
@@ -39,8 +42,6 @@
#include "dic.h"
#include "regexp.h"
#include "automaton.h"
-#include <set>
-#include <list>
using namespace std;
Index: dic/compdic.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/Attic/compdic.cpp,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -b -r1.1.2.18 -r1.1.2.19
--- dic/compdic.cpp 25 Dec 2007 12:39:12 -0000 1.1.2.18
+++ dic/compdic.cpp 8 Jan 2008 12:32:10 -0000 1.1.2.19
@@ -35,15 +35,15 @@
#include <map>
#include <boost/tokenizer.hpp>
#include <getopt.h>
-#include <time.h>
+#include <ctime>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <wctype.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
+#include <cwctype>
+#include <cstdlib>
+#include <cstdio>
+#include <cerrno>
+#include <cstring>
// For ntohl & Co.
#ifdef WIN32
Index: dic/dic.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/Attic/dic.cpp,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -b -r1.1.2.14 -r1.1.2.15
--- dic/dic.cpp 25 Dec 2007 12:39:13 -0000 1.1.2.14
+++ dic/dic.cpp 8 Jan 2008 12:32:11 -0000 1.1.2.15
@@ -30,10 +30,10 @@
#include <fstream>
#include <algorithm>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
+#include <cstdlib>
+#include <cstring>
+#include <cerrno>
+#include <cctype>
// For ntohl & Co.
#ifdef WIN32
Index: dic/dic_search.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/Attic/dic_search.cpp,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -b -r1.1.2.10 -r1.1.2.11
--- dic/dic_search.cpp 25 Dec 2007 12:39:13 -0000 1.1.2.10
+++ dic/dic_search.cpp 8 Jan 2008 12:32:11 -0000 1.1.2.11
@@ -25,10 +25,10 @@
* \date 2002
*/
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include <wctype.h>
+#include <cstdlib>
+#include <cstring>
+#include <cwchar>
+#include <cwctype>
#include "dic_internals.h"
#include "dic.h"
Index: dic/encoding.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/Attic/encoding.cpp,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -b -r1.1.2.13 -r1.1.2.14
--- dic/encoding.cpp 25 Dec 2007 12:39:13 -0000 1.1.2.13
+++ dic/encoding.cpp 8 Jan 2008 12:32:11 -0000 1.1.2.14
@@ -29,12 +29,12 @@
#include <iostream>
#include <sstream>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <wchar.h>
-#include <wctype.h>
-#include <errno.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdarg>
+#include <cstring>
+#include <cwchar>
+#include <cwctype>
+#include <cerrno>
#include <iconv.h>
#ifdef WIN32
Index: dic/ery.ypp
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/Attic/ery.ypp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- dic/ery.ypp 25 Dec 2007 12:39:13 -0000 1.1.2.2
+++ dic/ery.ypp 8 Jan 2008 12:32:11 -0000 1.1.2.3
@@ -19,10 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*****************************************************************************/
-#include <stdio.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
#include <malloc.h>
-#include <stdlib.h>
-#include <string.h>
#include "dic.h"
#include "regexp.h"
Index: dic/hashtable.i
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/Attic/hashtable.i,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- dic/hashtable.i 25 Dec 2007 12:39:14 -0000 1.1.2.2
+++ dic/hashtable.i 8 Jan 2008 12:32:11 -0000 1.1.2.3
@@ -19,9 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+
#include "hashtable.h"
Index: dic/header.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/Attic/header.cpp,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -b -r1.1.2.18 -r1.1.2.19
--- dic/header.cpp 25 Dec 2007 12:39:14 -0000 1.1.2.18
+++ dic/header.cpp 8 Jan 2008 12:32:11 -0000 1.1.2.19
@@ -504,10 +504,11 @@
printf(_("compressed using a binary compiled by: %s\n"),
convertToMb(m_userHost).c_str());
printf(_("dictionary type: %s\n"), m_type == kDAWG ? "DAWG" : "GADDAG");
printf(_("letters: %s\n"), convertToMb(m_letters).c_str());
- printf(_("number of letters: %d\n"), m_letters.size());
+ printf(_("number of letters: %lu\n"), (long unsigned int)m_letters.size());
printf(_("number of words: %d\n"), m_nbWords);
- printf(_("header size: %u bytes\n"), sizeof(Dict_header_old) +
- (m_version ? sizeof(Dict_header_ext) : 0));
+ long unsigned int size =
+ sizeof(Dict_header_old) + (m_version ? sizeof(Dict_header_ext) : 0);
+ printf(_("header size: %lu bytes\n"), size);
printf(_("root: %d (edge)\n"), m_root);
printf(_("nodes: %d used + %d saved\n"), m_nodesUsed, m_nodesSaved);
printf(_("edges: %d used + %d saved\n"), m_edgesUsed, m_edgesSaved);
Index: dic/listdic.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/Attic/listdic.cpp,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -b -r1.1.2.11 -r1.1.2.12
--- dic/listdic.cpp 25 Dec 2007 12:39:14 -0000 1.1.2.11
+++ dic/listdic.cpp 8 Jan 2008 12:32:11 -0000 1.1.2.12
@@ -30,10 +30,10 @@
#include <fstream>
#include <iostream>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stddef.h>
+#include <cstring>
+#include <cstdlib>
+#include <cstdio>
+#include <cstddef>
#if ENABLE_NLS
# include <libintl.h>
Index: dic/regexp.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/Attic/regexp.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- dic/regexp.cpp 25 Dec 2007 12:39:14 -0000 1.1.2.2
+++ dic/regexp.cpp 8 Jan 2008 12:32:11 -0000 1.1.2.3
@@ -26,9 +26,10 @@
*/
#include "config.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
#ifdef HAVE_SYS_WAIT_H
# include <sys/wait.h>
#endif
Index: dic/regexp.h
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/regexp.h,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.4
diff -u -b -r1.12.2.3 -r1.12.2.4
--- dic/regexp.h 25 Dec 2007 12:39:14 -0000 1.12.2.3
+++ dic/regexp.h 8 Jan 2008 12:32:11 -0000 1.12.2.4
@@ -143,7 +143,7 @@
char msg[MAX_REGEXP_ERROR_LENGTH];
};
-#include <stdio.h>
+#include <cstdio>
void regexp_print_letter(FILE* f, char l);
void regexp_print_letter2(FILE* f, char l);
Index: dic/regexpmain.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/Attic/regexpmain.cpp,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -b -r1.1.2.6 -r1.1.2.7
--- dic/regexpmain.cpp 25 Dec 2007 12:39:14 -0000 1.1.2.6
+++ dic/regexpmain.cpp 8 Jan 2008 12:32:11 -0000 1.1.2.7
@@ -1,6 +1,6 @@
/*****************************************************************************
* Eliot
- * Copyright (C) 1999-2007 Antoine Fraboulet
+ * Copyright (C) 2005-2007 Antoine Fraboulet
* Authors: Antoine Fraboulet <antoine.fraboulet @@ free.fr>
*
* This program is free software; you can redistribute it and/or modify
@@ -29,8 +29,8 @@
#include <exception>
#include <iostream>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
#if ENABLE_NLS
# include <libintl.h>
Index: game/settings.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/game/Attic/settings.cpp,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- game/settings.cpp 25 Dec 2007 12:39:18 -0000 1.1.2.3
+++ game/settings.cpp 8 Jan 2008 12:32:12 -0000 1.1.2.4
@@ -18,8 +18,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*****************************************************************************/
+#include <cstdlib>
+
#include "settings.h"
-#include <stdlib.h>
Settings *Settings::m_instance = NULL;
Index: test/duplicate_2_ai.ref
===================================================================
RCS file: /cvsroot/eliot/eliot/test/duplicate_2_ai.ref,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -b -r1.3.2.1 -r1.3.2.2
--- test/duplicate_2_ai.ref 31 Dec 2007 16:32:24 -0000 1.3.2.1
+++ test/duplicate_2_ai.ref 8 Jan 2008 12:32:12 -0000 1.3.2.2
@@ -3,14 +3,14 @@
mode duplicate
[?] pour l'aide
commande> a S
-Joueur 0: 835
-Joueur 1: 835
+Joueur 0: 918
+Joueur 1: 918
commande> a T
-Joueur 0: NNRT
-Joueur 1: NNRT
+Joueur 0: DQRU
+Joueur 1: DQRU
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 1 0 0 2 0 0 0 0 1 0 2 0 0 0 1 1 1 0 0 0 0 0 0 0
+ 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 1 0 0 0 0 0 0
commande> a p
Eliot 1.5
@@ -23,45 +23,47 @@
1 | ?EBAAEF | FABAcEE | H4 | 80 | 0 | *
2 | KEELIFE | KIEF | 10F | 36 | 0 |
3 | EEEL+IJX | FIXEE | 4H | 34 | 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 | MAYE | N8 | 36 | 0 |
- 9 | CLLT+EAB | COBALT | M7 | 37 | 0 |
- 10 | EL+OSEAH | HELES | 13I | 46 | 0 |
- 11 | AO+NUCSR | CORANS | 11C | 41 | 0 |
- 12 | U+DEZONU | NOUEZ | L10 | 47 | 0 |
- 13 | DEU+MTOR | DOTEZ | 14H | 28 | 0 |
- 14 | MRU+Q?IU | QUIpU | 15D | 66 | 0 |
- 15 | MR+WILUT | KAWI | F10 | 22 | 0 |
- 16 | LMRTU+RS | MULOTS | D8 | 18 | 0 |
- 17 | RR+TERPI | PELER | K11 | 29 | 0 |
- 18 | IRRT+EII | TRIMER | 8A | 21 | 0 |
- 19 | II+ETEVA | EVITERAI | B3 | 65 | 0 | *
- 20 | NUERTNV | CUVE | C11 | 30 | 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 |
- Total: 835
+ Total: 918
-Rack 0: NNRT
-Rack 1: NNRT
+Rack 0: DQRU
+Rack 1: DQRU
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
- A - - - - - - - T - - - - - - -
- B - - E V I T E R A I - - - - -
- C - - - - - - - I - - C U V E -
- D - - - - - - - M U L O T S - Q
- E - - - - - - - E - - R - - - U
- F - - - - - - - R - K A W I - I
- G - - - - - - - - - I N - - - p
- H - - - F A B A c E E S - - D U
- I - - - I - - - - - F - - H O -
- J - - - X - J A L E S - - E T -
- K - - - E H - - I - - P E L E R
- L - - - E U - - P - N O U E Z -
- M - - - - R - C O B A L T S - -
- N - - - - O - - M A Y E - - - -
- O A D O N N A M E S - - - - - -
+ 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 - - - -
+ I - - V I N E S - - F - - - - -
+ J - W A X - B - - - S E R I N S
+ K D U N E - E - - - - - - - - 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
commande> q
fin du mode duplicate
commande> q
Index: test/duplicate_humans_ai.ref
===================================================================
RCS file: /cvsroot/eliot/eliot/test/Attic/duplicate_humans_ai.ref,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- test/duplicate_humans_ai.ref 31 Dec 2007 16:32:24 -0000 1.1.2.2
+++ test/duplicate_humans_ai.ref 8 Jan 2008 12:32:12 -0000 1.1.2.3
@@ -36,13 +36,13 @@
Joueur 1: 103
Joueur 2: 145
commande> a t
-GPEEMTB
+BGEEMTB
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
A - - - - - - - - - - - F - - -
- B - - - - - - - - - - - i - - -
- C - - - - - - - - - - - B - - -
- D - - - - - - - - - - - R - - -
+ B - - - - - - - - - - - R - - -
+ C - - - - - - - - - - - i - - -
+ D - - - - - - - - - - - P - - -
E - - - - - - - - - - D E - - -
F - - - - - - - - - - E - - - -
G - - - - - - - - - - S - - - -
@@ -66,13 +66,13 @@
===|==========|=================|=====|=====|===|======
1 | ATOYDSI | OYATS | H8 | 30 | 2 |
2 | DI+AEINS | DESTINAI | 11E | 86 | 0 | *
- 3 | P?RBFEG | FiBRE | 12A | 29 | 2 |
+ 3 | P?RBFEG | FRiPE | 12A | 29 | 2 |
Total: 145
-Rack 0: GP+EEMTB
-Rack 1: GP+EEMTB
-Rack 2: GP+EEMTB
+Rack 0: BG+EEMTB
+Rack 1: BG+EEMTB
+Rack 2: BG+EEMTB
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.3.2.1
retrieving revision 1.3.2.2
diff -u -b -r1.3.2.1 -r1.3.2.2
--- test/freegame_3_ai.ref 31 Dec 2007 16:32:24 -0000 1.3.2.1
+++ test/freegame_3_ai.ref 8 Jan 2008 12:32:12 -0000 1.3.2.2
@@ -4,12 +4,12 @@
[?] pour l'aide
commande> a T
Joueur 0:
-Joueur 1: IN
-Joueur 2: GO
+Joueur 1: ADLT
+Joueur 2: AIU
commande> a S
-Joueur 0: 395
-Joueur 1: 291
-Joueur 2: 343
+Joueur 0: 319
+Joueur 1: 286
+Joueur 2: 303
commande> a p
Eliot 1.5
@@ -23,48 +23,48 @@
1 | RAHITRD | HARDI | H4 | 26 | 0 |
2 | ?TIEXFA | FAXAIEnT | 5E | 126 | 1 | *
3 | ATOSBUF | BOUTEFAS | J1 | 73 | 2 | *
- 4 | RT+AREEN | ENTERRAI | 8A | 77 | 0 | *
+ 4 | RT+AREEN | RENTERAI | 8A | 77 | 0 | *
5 | RZUGNSS | AZURS | F5 | 34 | 1 |
6 | MIMLLOP | PLOMB | 1F | 30 | 2 |
- 7 | EEMNETV | VETEMENT | C6 | 78 | 0 | *
- 8 | GNRS+PEN | PURGES | 3I | 24 | 1 |
- 9 | ILM+HSVI | VIS | 14A | 25 | 2 |
- 10 | AWELOUB | WAX | G3 | 36 | 0 |
- 11 | NN+ELEEE | ENLEVE | A10 | 30 | 1 |
- 12 | HILM+?IC | aLCHIMIE | A1 | 101 | 2 | *
- 13 | BELOU+LS | SOLUBLES | N3 | 64 | 0 | *
- 14 | EN+ACTAA | ATACA | O8 | 34 | 1 |
- 15 | UEJNRYO | JURON | M9 | 61 | 2 |
- 16 | UANSKIQ | QUASI | 14J | 69 | 0 |
- 17 | EN+DERIO | RESOLUBLES | N1 | 24 | 1 |
- 18 | EY+GOUID | YUE | B1 | 42 | 2 |
- 19 | KN+ET | KOTA | 12L | 26 | 0 |
- 20 | DEINO | DORE | 1L | 21 | 1 |
- 21 | DGIO | CEDI | 3A | 14 | 2 |
- 22 | EN | NE | L8 | 14 | 0 |
+ 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 |
- Total: 1029
+ Total: 908
Rack 0:
-Rack 1: IN
-Rack 2: GO
+Rack 1: ADLT
+Rack 2: AIU
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
- A a L C H I M I E - E N L E V E
- B Y U E - - - - N - - - - - I -
- C - - D - - V E T E M E N T S -
- D - - I - - - - E - - - - - - -
- E - - - - F - - R - - - - - - -
- F P - - - A Z U R S - - - - - -
- G L - W A X - - A - - - - - - -
- H O - - H A R D I - - - - - - -
- I M - P - I - - - - - - - - - -
- J B O U T E F A S - - - - - Q -
- K - - R - n - - - - - - - - U -
- L D - G - T - - N E - - K - A -
- M O - E - - - - - J U R O N S -
- N R E S O L U B L E S - T - I -
- O E - - - - - - A T A C A - - -
+ 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 - - - - - - - -
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.3.2.3
retrieving revision 1.3.2.4
diff -u -b -r1.3.2.3 -r1.3.2.4
--- test/freegame_passing.ref 31 Dec 2007 16:32:25 -0000 1.3.2.3
+++ test/freegame_passing.ref 8 Jan 2008 12:32:12 -0000 1.3.2.4
@@ -35,7 +35,7 @@
commande> p
commande> a S
Joueur 0: -11
-Joueur 1: 778
+Joueur 1: 777
commande> a T
Joueur 0: AGSSTUV
Joueur 1:
@@ -79,25 +79,25 @@
29 | AGSSTUV | (PASS) | - | 0 | 0 |
30 | Q+EAZAEL | ZEN | L11 | 24 | 1 |
31 | AGSSTUV | (PASS) | - | 0 | 0 |
- 32 | AAELQ+RA | RALA | I3 | 16 | 1 |
+ 32 | AAELQ+RA | ALEA | I3 | 16 | 1 |
33 | AGSSTUV | (PASS) | - | 0 | 0 |
- 34 | AEQ+LDEH | HADALE | 4H | 28 | 1 |
+ 34 | AQR+LDEH | ADHERAI | 3I | 22 | 1 |
35 | AGSSTUV | (PASS) | - | 0 | 0 |
- 36 | EQ+SI?AI | QuASI | N10 | 65 | 1 |
+ 36 | LQ+SI?AI | QuASI | N10 | 65 | 1 |
37 | AGSSTUV | (PASS) | - | 0 | 0 |
- 38 | EI+TVHEO | HIT | 5K | 26 | 1 |
+ 38 | IL+TVHEO | OHE | 4K | 29 | 1 |
39 | AGSSTUV | (PASS) | - | 0 | 0 |
- 40 | EEOV+ONK | OVE | A13 | 25 | 1 |
+ 40 | ILTV+ONK | KOHOL | K1 | 34 | 1 |
41 | AGSSTUV | (PASS) | - | 0 | 0 |
- 42 | EKNO+SIN | KIEFS | 6B | 39 | 1 |
+ 42 | INTV+SIN | NAYS | 6H | 31 | 1 |
43 | AGSSTUV | (PASS) | - | 0 | 0 |
- 44 | NNO | NAY | 6H | 12 | 1 |
+ 44 | IINTV | TIKI | 1I | 14 | 1 |
45 | AGSSTUV | (PASS) | - | 0 | 0 |
- 46 | NO | ZOU | 11L | 11 | 1 |
+ 46 | NV | VU | D7 | 10 | 1 |
47 | AGSSTUV | (PASS) | - | 0 | 0 |
48 | N | NI | M7 | 7 | 1 |
- Total: 767
+ Total: 766
Rack 0: AGSSTUV
Rack 1:
Index: test/load_saved_game.ref
===================================================================
RCS file: /cvsroot/eliot/eliot/test/load_saved_game.ref,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -b -r1.1 -r1.1.4.1
--- test/load_saved_game.ref 1 Jan 2006 19:25:10 -0000 1.1
+++ test/load_saved_game.ref 8 Jan 2008 12:32:12 -0000 1.1.4.1
@@ -12,16 +12,16 @@
LMUAEYE
commande> r
commande> a r
- 1: YEBLE 38 6F
- 2: BAYLE 36 6H
- 3: AMYLE 35 10D
- 4: ELYME 35 10D
- 5: ELYME 35 10H
+ 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: BEY 34 6H
- 8: LAYEE 34 10D
- 9: YUE 32 10F
- 10: AMYLE 30 5H
+ 7: ELYME 35 10D
+ 8: ELYME 35 10H
+ 9: LAYE 34 I3
+ 10: LAYEE 34 10D
commande> n 2
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@@ -30,13 +30,13 @@
C - - - - - - - - - - - - - - -
D - - - - - - - - - - - - - - -
E - - - - - - - - - - - - - - -
- F - - - - - - - - - - - - - - -
- G - - - - - - - - - - - - - - -
+ F - - - - - Y - - - - - - - - -
+ G - - - - - E - - - - - - - - -
H - - - F A B A c E E - - - - -
- I - - - - - A - - - - - - - - -
- J - - - - - Y - - - - - - - - -
- K - - - - - L - - - - - - - - -
- L - - - - - E - - - - - - - - -
+ I - - - - - L - - - - - - - - -
+ J - - - - - E - - - - - - - - -
+ K - - - - - - - - - - - - - - -
+ L - - - - - - - - - - - - - - -
M - - - - - - - - - - - - - - -
N - - - - - - - - - - - - - - -
O - - - - - - - - - - - - - - -
@@ -48,19 +48,19 @@
commande>
commande> +
commande> a t
-AMUJEIG
+EELMUJE
commande> r
commande> a r
- 1: MEJUGEAI * 78 9G
- 2: MEJUGEAI * 72 9C
- 3: MEJUGEAI * 71 10G
- 4: MEJUGEAI * 71 10C
- 5: MEJUGEAI * 69 J5
- 6: MEJUGEAI * 69 J1
- 7: JUGEA 37 5B
- 8: JUGEAI 37 5J
- 9: JAUGE 35 5J
- 10: JUGEA 35 5J
+ 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> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@@ -69,50 +69,50 @@
C - - - - - - - - - - - - - - -
D - - - - - - - - - - - - - - -
E - - - - - - - - - - - - - - -
- F - - - - - Y - - - - - - - - -
- G - - - - - E - - M - - - - - -
+ F - - - - - - - - - - - - - - -
+ G - - - - - - - - - - - - - - -
H - - - F A B A c E E - - - - -
- I - - - - - L - - J - - - - - -
- J - - - - - E - - U - - - - - -
- K - - - - - - - - G - - - - - -
- L - - - - - - - - E - - - - - -
- M - - - - - - - - A - - - - - -
- N - - - - - - - - I - - - - - -
+ I - - - - - A Y - - - - - - - -
+ J - J U M E L - - - - - - - - -
+ K - - - - - - - - - - - - - - -
+ L - - - - - - - - - - - - - - -
+ M - - - - - - - - - - - - - - -
+ N - - - - - - - - - - - - - - -
O - - - - - - - - - - - - - - -
commande>
commande> +
commande> a t
-LEHNMGA
+EEIGLEH
commande> r
commande> a r
- 1: HALE 46 8L
- 2: MALE 30 8L
- 3: ENGAMA 30 5C
- 4: HALA 27 5E
- 5: LAME 26 8L
- 6: HAN 25 8M
- 7: HELA 25 5C
- 8: GLANA 25 5D
- 9: EMANA 25 5D
- 10: EGALA 25 5D
+ 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>
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
A - - - - - - - - - - - - - - -
B - - - - - - - - - - - - - - -
- C - - - - E - - - - - - - - - -
- D - - - - N - - - - - - - - - -
- E - - - - G - - - - - - - - - -
- F - - - - A Y - - - - - - - - -
- G - - - - M E - - M - - - - - -
+ C - - - - - - - - - - - - - - -
+ D - - - - - - - - - - - - - - -
+ E - - - - - - - - - - - - - - -
+ F - - - - - - E - - - - - - - -
+ G - - - - - - G - - - - - - - -
H - - - F A B A c E E - - - - -
- I - - - - - L - - J - - - - - -
- J - - - - - E - - U - - - - - -
- K - - - - - - - - G - - - - - -
- L - - - - - - - - E - - - - - -
- M - - - - - - - - A - - - - - -
- N - - - - - - - - I - - - - - -
+ I - - - - - A Y - - - - - - - -
+ J - J U M E L E - - - - - - - -
+ K - - - - - - E - - - - - - - -
+ L - - - - - - - - - - - - - - -
+ M - - - - - - - - - - - - - - -
+ N - - - - - - - - - - - - - - -
O - - - - - - - - - - - - - - -
commande> a p
Eliot 1.5
@@ -123,16 +123,16 @@
N | RACK | SOLUTION | REF | PTS | P | BONUS
===|==========|=================|=====|=====|===|======
1 | EA?AEBF | FABAcEE | H4 | 80 | 0 | *
- 2 | LMUAEYE | YEBLE | 6F | 38 | 0 |
- 3 | AMU+JEIG | MEJUGEAI | 9G | 78 | 0 | *
- 4 | LEHNMGA | ENGAMA | 5C | 30 | 0 |
+ 2 | LMUAEYE | AY | I6 | 46 | 0 |
+ 3 | EELMU+JE | JUMEL | J2 | 38 | 0 |
+ 4 | EE+IGLEH | EGAYEE | 7F | 32 | 0 |
- Total: 226
+ Total: 196
-Rack 0: HL
+Rack 0: HIL
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 ?
- 5 1 2 3 9 1 0 2 7 0 1 4 1 5 6 2 1 6 6 6 5 2 1 1 0 1 1
+ 6 1 2 3 9 1 1 2 8 0 1 4 2 6 6 2 1 6 6 6 5 2 1 1 0 1 1
commande>
commande> s load_saved_game.elt
commande> q
@@ -145,18 +145,18 @@
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
A - - - - - - - - - - - - - - -
B - - - - - - - - - - - - - - -
- C - - - - E - - - - - - - - - -
- D - - - - N - - - - - - - - - -
- E - - - - G - - - - - - - - - -
- F - - - - A Y - - - - - - - - -
- G - - - - M E - - M - - - - - -
+ C - - - - - - - - - - - - - - -
+ D - - - - - - - - - - - - - - -
+ E - - - - - - - - - - - - - - -
+ F - - - - - - E - - - - - - - -
+ G - - - - - - G - - - - - - - -
H - - - F A B A c E E - - - - -
- I - - - - - L - - J - - - - - -
- J - - - - - E - - U - - - - - -
- K - - - - - - - - G - - - - - -
- L - - - - - - - - E - - - - - -
- M - - - - - - - - A - - - - - -
- N - - - - - - - - I - - - - - -
+ I - - - - - A Y - - - - - - - -
+ J - J U M E L E - - - - - - - -
+ K - - - - - - E - - - - - - - -
+ L - - - - - - - - - - - - - - -
+ M - - - - - - - - - - - - - - -
+ N - - - - - - - - - - - - - - -
O - - - - - - - - - - - - - - -
commande> a p
Eliot 1.5
@@ -167,16 +167,16 @@
N | RACK | SOLUTION | REF | PTS | P | BONUS
===|==========|=================|=====|=====|===|======
1 | EA?AEBF | FABAcEE | H4 | 80 | 0 | *
- 2 | LMUAEYE | YEBLE | 6F | 38 | 0 |
- 3 | AMU+JEIG | MEJUGEAI | 9G | 78 | 0 | *
- 4 | LEHNMGA | ENGAMA | 5C | 30 | 0 |
+ 2 | LMUAEYE | AY | I6 | 46 | 0 |
+ 3 | EELMU+JE | JUMEL | J2 | 38 | 0 |
+ 4 | EE+IGLEH | EGAYEE | 7F | 32 | 0 |
- Total: 226
+ Total: 196
-Rack 0: HL
+Rack 0: HIL
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 ?
- 5 1 2 3 9 1 0 2 7 0 1 4 1 5 6 2 1 6 6 6 5 2 1 1 0 1 1
+ 6 1 2 3 9 1 1 2 8 0 1 4 2 6 6 2 1 6 6 6 5 2 1 1 0 1 1
commande>
commande> q
fin du mode entraînement
Index: test/regexp.ref
===================================================================
RCS file: /cvsroot/eliot/eliot/test/regexp.ref,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -b -r1.1 -r1.1.4.1
--- test/regexp.ref 1 Jan 2006 19:25:10 -0000 1.1
+++ test/regexp.ref 8 Jan 2008 12:32:12 -0000 1.1.4.1
@@ -2,6 +2,10 @@
commande> x a.* 50
search for a.* (50,1,15)
aa
+aalenien
+aalenienne
+aaleniennes
+aaleniens
aas
abaca
abacas
@@ -47,14 +51,14 @@
abaisseriez
abaisserions
abaisserons
-abaisseront
-abaisses
-abaisseur
-abaisseurs
50 printed results
commande> x a.* 200
search for a.* (200,1,15)
aa
+aalenien
+aalenienne
+aaleniennes
+aaleniens
aas
abaca
abacas
@@ -250,10 +254,6 @@
abattant
abattants
abatte
-abattee
-abattees
-abattement
-abattements
200 printed results
commande> x .*a.*e.*i.*o.*u.* 50 10
search for .*a.*e.*i.*o.*u.* (50,10,15)
@@ -329,13 +329,13 @@
anthophages
bishop
bishops
+bronchopathie
+bronchopathies
cenesthopathie
cenesthopathies
chop
chopa
chopai
-chopaient
-chopais
50 printed results
commande> x a.*b 50
search for a.*b (50,1,15)
@@ -352,13 +352,14 @@
bob
bulb
cab
+cheb
cineclub
club
cob
coulomb
crib
cuproplomb
-13 printed results
+14 printed results
commande> x [abc]*b
search for [abc]*b (50,1,15)
cab
@@ -378,6 +379,7 @@
bob
bulb
cab
+cheb
cineclub
club
cob
@@ -386,14 +388,17 @@
cuproplomb
dab
deb
+dub
fob
guib
hidjab
+hijab
hub
jab
job
kebab
kob
+lamb
lob
mahaleb
mihrab
@@ -417,16 +422,14 @@
surplomb
toubab
toubib
-tub
-videoclub
-web
-winstub
50 printed results
commande> x .*(cba)+b
search for .*(cba)+b (50,1,15)
0 printed results
commande> x .*(nn)+.*
search for .*(nn)+.* (50,1,15)
+aalenienne
+aaleniennes
abandonna
abandonnai
abandonnaient
@@ -475,11 +478,10 @@
abandonniques
abandonnons
abbevillienne
-abbevilliennes
-abelienne
50 printed results
commande> x .*(nn)+.*x 200
search for .*(nn)+.*x (200,1,15)
+actionnariaux
annaux
anneaux
baronniaux
@@ -515,6 +517,7 @@
panneaux
paonneaux
pigeonneaux
+pitonneux
poissonneux
precautionneux
processionnaux
@@ -535,5 +538,5 @@
vallonneux
vanneaux
vicennaux
-55 printed results
+57 printed results
commande> q
Index: test/regression.pl
===================================================================
RCS file: /cvsroot/eliot/eliot/test/regression.pl,v
retrieving revision 1.1.6.2
retrieving revision 1.1.6.3
diff -u -b -r1.1.6.2 -r1.1.6.3
--- test/regression.pl 14 Dec 2007 10:15:30 -0000 1.1.6.2
+++ test/regression.pl 8 Jan 2008 12:32:12 -0000 1.1.6.3
@@ -14,8 +14,8 @@
chdir("$root_path/test");
my $driver_file = "driver";
-# Look for ~/ods4.dawg
-my $ods = "$ENV{HOME}/ods4.dawg";
+# Look for ~/ods5.dawg
+my $ods = "$ENV{HOME}/ods5.dawg";
# File extensions
my $input_ext = ".input";
Index: test/training_back.ref
===================================================================
RCS file: /cvsroot/eliot/eliot/test/training_back.ref,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- test/training_back.ref 20 Dec 2007 08:47:10 -0000 1.2.2.1
+++ test/training_back.ref 8 Jan 2008 12:32:12 -0000 1.2.2.2
@@ -12,16 +12,16 @@
LMUAEYE
commande> r
commande> a r
- 1: YEBLE 38 6F
- 2: BAYLE 36 6H
- 3: AMYLE 35 10D
- 4: ELYME 35 10D
- 5: ELYME 35 10H
+ 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: BEY 34 6H
- 8: LAYEE 34 10D
- 9: YUE 32 10F
- 10: AMYLE 30 5H
+ 7: ELYME 35 10D
+ 8: ELYME 35 10H
+ 9: LAYE 34 I3
+ 10: LAYEE 34 10D
commande> n 2
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@@ -30,18 +30,18 @@
C - - - - - - - - - - - - - - -
D - - - - - - - - - - - - - - -
E - - - - - - - - - - - - - - -
- F - - - - - - - - - - - - - - -
- G - - - - - - - - - - - - - - -
+ F - - - - - Y - - - - - - - - -
+ G - - - - - E - - - - - - - - -
H - - - F A B A c E E - - - - -
- I - - - - - A - - - - - - - - -
- J - - - - - Y - - - - - - - - -
- K - - - - - L - - - - - - - - -
- L - - - - - E - - - - - - - - -
+ I - - - - - L - - - - - - - - -
+ J - - - - - E - - - - - - - - -
+ K - - - - - - - - - - - - - - -
+ L - - - - - - - - - - - - - - -
M - - - - - - - - - - - - - - -
N - - - - - - - - - - - - - - -
O - - - - - - - - - - - - - - -
commande> a s
-116
+118
commande> n -1
commande> a s
80
Index: test/training_cross.ref
===================================================================
RCS file: /cvsroot/eliot/eliot/test/training_cross.ref,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -b -r1.1 -r1.1.4.1
--- test/training_cross.ref 1 Jan 2006 19:25:10 -0000 1.1
+++ test/training_cross.ref 8 Jan 2008 12:32:12 -0000 1.1.4.1
@@ -46,15 +46,15 @@
commande> r
commande> a r
1: KIMONO 38 6F
- 2: AMOK 34 6G
- 3: MOKA 34 6H
- 4: MOKO 34 6H
- 5: MAKI 34 6H
- 6: KAMI 34 6F
- 7: KINA 33 I3
+ 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: KAN 29 I3
- 10: OKA 27 I2
+ 9: KINA 33 I3
+ 10: KAN 29 I3
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@@ -88,9 +88,9 @@
4: SWEAT 32 L6
5: ETAIES 31 L1
6: AISEE 29 L4
- 7: ETAIS 27 L2
+ 7: TAIES 27 L2
8: TAISE 27 L3
- 9: TAIES 27 L2
+ 9: ETAIS 27 L2
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 9D
- 7: LAVASSE * 72 K9
+ 6: LAVASSE * 72 K9
+ 7: LAVASSE * 72 9D
8: VASSALE * 67 G8
9: LAVASSE * 64 G8
10: EVASAS 35 10I
@@ -160,12 +160,12 @@
2: BIQUE 42 8K
3: OTIQUE 39 8J
4: TIQUE 36 8K
- 5: BEQUET 30 N9
- 6: MAQUE 29 K9
- 7: EMBUT 29 M1
- 8: MOQUE 28 11D
- 9: QUETE 28 N6
- 10: TAQUE 26 K9
+ 5: BAQUET 34 K9
+ 6: BAQUE 32 K9
+ 7: BEQUET 30 N9
+ 8: EMBUT 29 M1
+ 9: MAQUE 29 K9
+ 10: MOQUE 28 11D
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@@ -196,13 +196,13 @@
1: OMNIBUS * 94 O4
2: EMBUIONS * 84 14H
3: BITUMONS * 62 15F
- 4: SIMOUN 38 O10
- 5: BOUSIN 38 O7
- 6: NIMBUS 38 O5
- 7: BISON 35 O8
- 8: BISOU 35 O8
- 9: BOUMS 35 O6
- 10: IMBUS 35 O6
+ 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
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@@ -236,9 +236,9 @@
4: AXEZ 44 K10
5: IXEE 33 14E
6: EXPIEZ 32 14D
- 7: ZEE 32 14F
- 8: ZOE 32 14F
- 9: EXPIEZ 32 14H
+ 7: GEX 32 5K
+ 8: EXPIEZ 32 14H
+ 9: EPIEZ 32 N10
10: EXPIE 32 N10
commande> n 1
commande> a g
@@ -306,14 +306,14 @@
commande> a r
1: VAINCU 28 13C
2: VAINC 25 K9
- 3: CONVOI 24 11D
- 4: CAVAI 24 K9
- 5: CONVIA 23 7A
- 6: VAGIN 23 K9
- 7: CONVIA 22 13J
+ 3: VACOA 25 K9
+ 4: CONVOI 24 11D
+ 5: CAVAI 24 K9
+ 6: CONVIA 23 7A
+ 7: VAGIN 23 K9
8: VINA 22 7C
9: CAVA 22 K9
- 10: CANE 21 7E
+ 10: CONVIA 22 13J
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@@ -349,8 +349,8 @@
6: AGRESSA 20 D7
7: OSES 19 11H
8: OSAS 19 11H
- 9: ESSORA 18 7A
- 10: GERA 18 7C
+ 9: AGES 18 5J
+ 10: GOSSERA 18 D7
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@@ -386,8 +386,8 @@
6: JEUDIS 30 C3
7: JUDD 29 N1
8: JAR 29 K9
- 9: JUPE 28 12L
- 10: JARD 28 D12
+ 9: JARD 28 D12
+ 10: JUPE 28 12L
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@@ -422,9 +422,9 @@
5: DYADES 36 C3
6: DYADE 34 D11
7: LAYES 34 B4
- 8: DELAYA 34 D10
- 9: YAWL 34 4J
- 10: DRAYE 30 E7
+ 8: YAWL 34 4J
+ 9: DELAYA 34 D10
+ 10: ALYA 33 F8
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@@ -453,14 +453,14 @@
commande> r
commande> a r
1: HEU 32 10B
- 2: BEDE 31 10B
- 3: HE 31 10B
+ 2: HE 31 10B
+ 3: BEDE 31 10B
4: BEE 29 10B
- 5: DEB 28 10B
- 6: IDEE 27 10A
- 7: HIEE 27 10A
- 8: HUEE 27 10A
- 9: BUEE 26 10A
+ 5: BE 28 10B
+ 6: DEB 28 10B
+ 7: IDEE 27 10A
+ 8: HIEE 27 10A
+ 9: HUEE 27 10A
10: HIE 26 10A
commande> n 1
commande> a g
@@ -491,13 +491,13 @@
commande> a r
1: CIEL 25 D1
2: CLE 22 12D
- 3: BLINDE 19 F10
- 4: ALBEDO 18 K10
- 5: DEY 18 7A
- 6: DELAVASSES 18 10F
- 7: LAIC 18 D12
- 8: BLIND 18 F10
- 9: CAID 18 D12
+ 3: BLE 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
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: BRoCARD 33 1A
- 5: pARFUMEE 33 H1
- 6: CRoBARD 33 1D
- 7: CRABIeR 30 1D
- 8: BICARRe 30 1B
+ 4: pARFUMEE 33 H1
+ 5: CRoBARD 33 1D
+ 6: BRoCARD 33 1A
+ 7: BICARRe 30 1B
+ 8: CRABIeR 30 1D
9: CIBARe 27 1D
- 10: DuRCIRA 27 1A
+ 10: CRoBAR 27 1D
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@@ -568,10 +568,10 @@
3: CAUDEE 27 1D
4: DAW 25 4J
5: CETEAU 24 1D
- 6: CADET 24 1D
- 7: CAGEE 24 1D
- 8: CEDAT 24 1D
- 9: CAUDE 24 1D
+ 6: CEDAT 24 1D
+ 7: QUETE 24 12H
+ 8: CAUDE 24 1D
+ 9: CAGUE 24 1D
10: CAGET 24 1D
commande> n 1
commande> a g
@@ -601,14 +601,14 @@
commande> r
commande> a r
1: CERcLAGE * 80 1D
- 2: RELEGuAT * 77 15A
- 3: GELERAiT * 77 15A
- 4: GALEREnT * 77 15A
- 5: dEREGLAT * 77 15A
- 6: REGALEnT * 77 15A
- 7: AiGRELET * 77 15A
- 8: REGELAiT * 77 15A
- 9: REGELAnT * 77 15A
+ 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
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: FLA 17 14A
- 10: NAKFA 17 F4
+ 9: NAKFA 17 F4
+ 10: FLA 17 14A
commande> n 1
commande> a g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
@@ -714,12 +714,12 @@
1: FANON 23 I3
2: KRAFT 19 F6
3: FRET 19 14A
- 4: REAI 18 E10
+ 4: REFAIT 18 13J
5: FANON 18 11E
- 6: FREON 18 11E
- 7: REFAIT 18 13J
- 8: FERAIT 18 13J
- 9: FRETIN 18 13J
+ 6: FRETIN 18 13J
+ 7: FERAIT 18 13J
+ 8: FREON 18 11E
+ 9: REAI 18 E10
10: EN 18 I13
commande> n 1
commande> a g
@@ -750,14 +750,14 @@
commande> a r
1: ET 18 I13
2: RELAVASSES 15 10F
- 3: VAINCUE 13 13C
+ 3: SE 13 M10
4: EX 13 11M
- 5: SE 13 M10
+ 5: VAINCUE 13 13C
6: TREK 13 F3
- 7: TEK 12 F4
- 8: TES 11 M8
- 9: RE 11 E10
- 10: TET 11 14B
+ 7: KEA 12 F6
+ 8: TEK 12 F4
+ 9: TET 11 14B
+ 10: RE 11 E10
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.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- test/training_cross2.ref 5 Nov 2006 17:27:03 -0000 1.1.2.1
+++ test/training_cross2.ref 8 Jan 2008 12:32:12 -0000 1.1.2.2
@@ -79,7 +79,7 @@
Dr
[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]
Er
[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]
Fr
[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]
- Gr [ffffffff:-1][ffffffff:-1][ffffffff:-1][00000200: 4][00ddf036:
1][00000000: 2][005c7518: 1][005c7518:
1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
+ Gr [ffffffff:-1][ffffffff:-1][ffffffff:-1][00000200: 4][00ddf036:
1][00000000: 2][005c751c: 1][005c751c:
1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Hr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][ffffffff:-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][ffffffff:-1][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]
Index: test/training_cross3.ref
===================================================================
RCS file: /cvsroot/eliot/eliot/test/training_cross3.ref,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- test/training_cross3.ref 5 Nov 2006 17:27:03 -0000 1.1.2.1
+++ test/training_cross3.ref 8 Jan 2008 12:32:12 -0000 1.1.2.2
@@ -45,7 +45,7 @@
Dr
[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]
Er
[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]
Fr
[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]
- Gr [ffffffff:-1][ffffffff:-1][ffffffff:-1][00000200: 4][00ddf036:
1][00000000: 2][005c7518: 1][005c7518:
1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
+ Gr [ffffffff:-1][ffffffff:-1][ffffffff:-1][00000200: 4][00ddf036:
1][00000000: 2][005c751c: 1][005c751c:
1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Hr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][ffffffff:-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][ffffffff:-1][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]
@@ -114,7 +114,7 @@
Dr
[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]
Er
[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]
Fr
[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]
- Gr [ffffffff:-1][ffffffff:-1][ffffffff:-1][00000200: 4][00ddf036:
1][00000000: 2][005c7518: 1][005c7518:
1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
+ Gr [ffffffff:-1][ffffffff:-1][ffffffff:-1][00000200: 4][00ddf036:
1][00000000: 2][005c751c: 1][005c751c:
1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Hr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][ffffffff:-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][ffffffff:-1][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]
@@ -150,7 +150,7 @@
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][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Fr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
- Gr [ffffffff:-1][ffffffff:-1][ffffffff:-1][00000200: 4][00ddf036:
1][00000000: 2][005c7518: 1][005c7518:
1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
+ Gr [ffffffff:-1][ffffffff:-1][ffffffff:-1][00000200: 4][00ddf036:
1][00000000: 2][005c751c: 1][005c751c:
1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-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]
@@ -165,7 +165,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][ffffffff:-1][ffffffff:-1][ffffffff:-1][005c7518:
1][00000000:-1][01384100:
1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
+ Fc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][005c751c:
1][00000000:-1][01384100:
1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-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]
@@ -184,7 +184,7 @@
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][005c795a: 0][010d714e:
1][00200020: 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]
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]
@@ -220,7 +220,7 @@
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][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Fr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
- Gr [ffffffff:-1][ffffffff:-1][ffffffff:-1][00000200: 4][00ddf036:
1][00000000: 2][005c7518: 1][005c7518:
1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
+ Gr [ffffffff:-1][ffffffff:-1][ffffffff:-1][00000200: 4][00ddf036:
1][00000000: 2][005c751c: 1][005c751c:
1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-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]
@@ -235,7 +235,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][ffffffff:-1][ffffffff:-1][ffffffff:-1][005c7518:
1][00000000:-1][01384100:
1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
+ Fc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][005c751c:
1][00000000:-1][01384100:
1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-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.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- test/training_joker2.ref 5 Nov 2006 17:27:03 -0000 1.2.2.1
+++ test/training_joker2.ref 8 Jan 2008 12:32:13 -0000 1.2.2.2
@@ -46,20 +46,20 @@
Dr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Er
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000008:
6][ffffffff:-1]
Fr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:16][00000000:-1][ffffffff:-1]
- Gr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:
5][00608022: 1][005c795a: 1][00008000: 3][00000000:-1][00000000:-1][00000000:
8]
+ Gr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:
5][00608022: 1][005c795e: 1][00008000: 3][00000000:-1][00000000:-1][00000000:
8]
Hr
[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]
Ir
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00200222:
1][02284302: 1][00000222: 3][00000000:-1][040c0020: 6][00000000:-1]
Jr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00080200:12][00002020:
5][ffffffff:-1][ffffffff:-1][00000000:12][00000000:-1][ffffffff:-1][00000000:-1]
Kr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][ffffffff:-1][00000000:-1]
Lr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][ffffffff:-1][00000000:-1]
Mr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][ffffffff:-1][00080000:
8]
- Nr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:26][00000000:
3][005c7518: 1]
+ Nr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:26][00000000:
3][005c751c: 1]
Or
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
-
Ac
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:12][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
Bc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][010d714e:
1][00000000:-1][00005040:
1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Cc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:
4][00000000:-1][00280022:
4][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][005c7518:
0][00000000:-1][01384100:
0][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][005c751c:
0][00000000:-1][01384100:
0][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][00008000:
1][00000000:-1][00200222:
1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Fc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00200020:
1][00000000:-1][00200022: 1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00008022:
4][00000000:-1][00008222: 4]
Gc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][010d714e:
1][00000000:-1][00005040:
1][ffffffff:-1][ffffffff:-1][00000000:11][00000000:-1][00000000:-1][00080000:11]
@@ -67,20 +67,20 @@
Ic
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000004:
5][00000000:-1][00000000:-1][00000000: 5][ffffffff:-1][00608022:
1][00000000:-1][00210800: 2][00000000:-1]
Jc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00200020:
1][00000000:-1][00008000: 3][00000000:-1]
Kc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:
9][00000000:-1][00000000:-1][00000000:12][00000000:-1]
- Lc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000048:
2][00000000:-1][00000000:-1][00004000: 3][00000000:-1]
+ Lc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00002048:
2][00000000:-1][00000000:-1][00004000: 3][00000000:-1]
Mc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000144:
2][00000000:-1][00000000:-1][00080220: 2][ffffffff:-1]
Nc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][010d714e:
1][00000000:-1][00005040: 1][ffffffff:-1][ffffffff:-1]
Oc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:15][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
commande> r
commande> a r
1: SaUGRENU * 82 E4
- 2: eNjUGUES * 66 D8
- 3: NUaGEUSe * 66 D1
+ 2: NUaGEUSe * 66 D1
+ 3: eNjUGUES * 66 D8
4: GUEUSANt * 66 11C
5: GUeUSENt * 64 D6
- 6: NUaGeUSE * 64 D4
+ 6: ENjUGUeS * 64 D2
7: GUEUSeNt * 64 D3
- 8: ENjUGUeS * 64 D2
+ 8: NUaGeUSE * 64 D4
9: GUeUSENT * 62 F1
10: GUEUSeNT * 60 F1
commande> q
Index: test/training_rosace.ref
===================================================================
RCS file: /cvsroot/eliot/eliot/test/training_rosace.ref,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- test/training_rosace.ref 5 Nov 2006 17:27:03 -0000 1.2.2.1
+++ test/training_rosace.ref 8 Jan 2008 12:32:13 -0000 1.2.2.2
@@ -64,20 +64,20 @@
Dr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Er
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000008:
6][ffffffff:-1]
Fr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:16][00000000:-1][ffffffff:-1]
- Gr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:
5][00608022: 1][005c795a: 1][00008000: 3][00000000:-1][00000000:-1][00000000:
8]
+ Gr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:
5][00608022: 1][005c795e: 1][00008000: 3][00000000:-1][00000000:-1][00000000:
8]
Hr
[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]
Ir
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00200222:
1][02284302: 1][00000222: 3][00000000:-1][040c0020: 6][00000000:-1]
Jr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00080200:12][00002020:
5][ffffffff:-1][ffffffff:-1][00000000:12][00000000:-1][ffffffff:-1][00000000:-1]
Kr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][ffffffff:-1][00000000:-1]
Lr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][ffffffff:-1][00000000:-1]
Mr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][ffffffff:-1][00080000:
8]
- Nr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:26][00000000:
3][005c7518: 1]
+ Nr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:26][00000000:
3][005c751c: 1]
Or
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
-
Ac
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:12][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
Bc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][010d714e:
1][00000000:-1][00005040:
1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Cc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:
4][00000000:-1][00280022:
4][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][005c7518:
0][00000000:-1][01384100:
0][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][005c751c:
0][00000000:-1][01384100:
0][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][00008000:
1][00000000:-1][00200222:
1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Fc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00200020:
1][00000000:-1][00200022: 1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00008022:
4][00000000:-1][00008222: 4]
Gc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][010d714e:
1][00000000:-1][00005040:
1][ffffffff:-1][ffffffff:-1][00000000:11][00000000:-1][00000000:-1][00080000:11]
@@ -85,7 +85,7 @@
Ic
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000004:
5][00000000:-1][00000000:-1][00000000: 5][ffffffff:-1][00608022:
1][00000000:-1][00210800: 2][00000000:-1]
Jc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00200020:
1][00000000:-1][00008000: 3][00000000:-1]
Kc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:
9][00000000:-1][00000000:-1][00000000:12][00000000:-1]
- Lc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000048:
2][00000000:-1][00000000:-1][00004000: 3][00000000:-1]
+ Lc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00002048:
2][00000000:-1][00000000:-1][00004000: 3][00000000:-1]
Mc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000144:
2][00000000:-1][00000000:-1][00080220: 2][ffffffff:-1]
Nc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][010d714e:
1][00000000:-1][00005040: 1][ffffffff:-1][ffffffff:-1]
Oc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:15][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
@@ -139,20 +139,20 @@
Dr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Er
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000008:
6][ffffffff:-1]
Fr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:16][00000000:-1][ffffffff:-1]
- Gr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:
5][00608022: 1][005c795a: 1][00008000: 3][00000000:-1][00000000:-1][00000000:
8]
+ Gr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:
5][00608022: 1][005c795e: 1][00008000: 3][00000000:-1][00000000:-1][00000000:
8]
Hr
[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]
Ir
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00200222:
1][02284302: 1][00000222: 3][00000000:-1][040c0020: 6][00000000:-1]
Jr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00080200:12][00002020:
5][ffffffff:-1][ffffffff:-1][00000000:12][00000000:-1][ffffffff:-1][00000000:-1]
Kr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][ffffffff:-1][00000000:-1]
Lr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][ffffffff:-1][00000000:-1]
Mr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][ffffffff:-1][00080000:
8]
- Nr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:26][00000000:
3][005c7518: 1]
+ Nr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:26][00000000:
3][005c751c: 1]
Or
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
-
Ac
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:12][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
Bc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][010d714e:
1][00000000:-1][00005040:
1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Cc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:
4][00000000:-1][00280022:
4][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][005c7518:
0][00000000:-1][01384100:
0][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][005c751c:
0][00000000:-1][01384100:
0][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][00008000:
1][00000000:-1][00200222:
1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Fc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00200020:
1][00000000:-1][00200022: 1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00008022:
4][00000000:-1][00008222: 4]
Gc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][010d714e:
1][00000000:-1][00005040:
1][ffffffff:-1][ffffffff:-1][00000000:11][00000000:-1][00000000:-1][00080000:11]
@@ -160,7 +160,7 @@
Ic
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000004:
5][00000000:-1][00000000:-1][00000000: 5][ffffffff:-1][00608022:
1][00000000:-1][00210800: 2][00000000:-1]
Jc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00200020:
1][00000000:-1][00008000: 3][00000000:-1]
Kc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:
9][00000000:-1][00000000:-1][00000000:12][00000000:-1]
- Lc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000048:
2][00000000:-1][00000000:-1][00004000: 3][00000000:-1]
+ Lc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00002048:
2][00000000:-1][00000000:-1][00004000: 3][00000000:-1]
Mc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000144:
2][00000000:-1][00000000:-1][00080220: 2][ffffffff:-1]
Nc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][010d714e:
1][00000000:-1][00005040: 1][ffffffff:-1][ffffffff:-1]
Oc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:15][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
@@ -169,13 +169,13 @@
commande>
commande> a r
1: SaUGRENU * 82 E4
- 2: ENjUGUES * 66 D8
- 3: NUaGEUSE * 66 D1
+ 2: NUaGEUSE * 66 D1
+ 3: ENjUGUES * 66 D8
4: GUEUSANt * 66 11C
5: GUEUSENt * 64 D6
- 6: NUaGEUSE * 64 D4
+ 6: ENjUGUES * 64 D2
7: GUEUSENt * 64 D3
- 8: ENjUGUES * 64 D2
+ 8: NUaGEUSE * 64 D4
9: GUeUSENT * 62 F1
10: GUEUSeNT * 60 F1
commande>
@@ -186,20 +186,20 @@
Dr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Er
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000008:
6][ffffffff:-1]
Fr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:16][00000000:-1][ffffffff:-1]
- Gr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:
5][00608022: 1][005c795a: 1][00008000: 3][00000000:-1][00000000:-1][00000000:
8]
+ Gr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:
5][00608022: 1][005c795e: 1][00008000: 3][00000000:-1][00000000:-1][00000000:
8]
Hr
[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]
Ir
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00200222:
1][02284302: 1][00000222: 3][00000000:-1][040c0020: 6][00000000:-1]
Jr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00080200:12][00002020:
5][ffffffff:-1][ffffffff:-1][00000000:12][00000000:-1][ffffffff:-1][00000000:-1]
Kr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][ffffffff:-1][00000000:-1]
Lr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][ffffffff:-1][00000000:-1]
Mr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][ffffffff:-1][00080000:
8]
- Nr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:26][00000000:
3][005c7518: 1]
+ Nr
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:26][00000000:
3][005c751c: 1]
Or
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
-
Ac
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:12][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1][00000000:-1]
Bc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][010d714e:
1][00000000:-1][00005040:
1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Cc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:
4][00000000:-1][00280022:
4][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][005c7518:
0][00000000:-1][01384100:
0][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][005c751c:
0][00000000:-1][01384100:
0][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][00008000:
1][00000000:-1][00200222:
1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1]
Fc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00200020:
1][00000000:-1][00200022: 1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00008022:
4][00000000:-1][00008222: 4]
Gc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][010d714e:
1][00000000:-1][00005040:
1][ffffffff:-1][ffffffff:-1][00000000:11][00000000:-1][00000000:-1][00080000:11]
@@ -207,7 +207,7 @@
Ic
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000004:
5][00000000:-1][00000000:-1][00000000: 5][ffffffff:-1][00608022:
1][00000000:-1][00210800: 2][00000000:-1]
Jc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00200020:
1][00000000:-1][00008000: 3][00000000:-1]
Kc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:
9][00000000:-1][00000000:-1][00000000:12][00000000:-1]
- Lc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000048:
2][00000000:-1][00000000:-1][00004000: 3][00000000:-1]
+ Lc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00002048:
2][00000000:-1][00000000:-1][00004000: 3][00000000:-1]
Mc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000144:
2][00000000:-1][00000000:-1][00080220: 2][ffffffff:-1]
Nc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][010d714e:
1][00000000:-1][00005040: 1][ffffffff:-1][ffffffff:-1]
Oc
[ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][ffffffff:-1][00000000:15][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.3.2.1
retrieving revision 1.3.2.2
diff -u -b -r1.3.2.1 -r1.3.2.2
--- test/training_search.ref 5 Nov 2006 17:27:03 -0000 1.3.2.1
+++ test/training_search.ref 8 Jan 2008 12:32:13 -0000 1.3.2.2
@@ -8,847 +8,892 @@
commande> r
commande> a r 1000
1: SPItZ 50 H8
- 2: ZINcS 46 H4
+ 2: ZaNIS 46 H4
3: ZaINS 46 H4
- 4: ZaNIS 46 H4
- 5: QuIZ 38 H8
- 6: QuIZ 38 H5
- 7: QuIZ 38 H6
- 8: QuIZ 38 H7
- 9: SPItZ 32 H4
- 10: ZIPS 30 H5
- 11: SPItZ 30 H5
+ 4: ZINcS 46 H4
+ 5: QuIZ 38 H7
+ 6: QuIZ 38 H8
+ 7: QuIZ 38 H5
+ 8: QuIZ 38 H6
+ 9: QINgS 38 H4
+ 10: SPItZ 32 H4
+ 11: SPItZ 30 H6
12: ZIPS 30 H6
- 13: SPItZ 30 H6
- 14: ZIPS 30 H7
- 15: ZIPS 30 H8
- 16: SPItZ 30 H7
- 17: ZIPs 28 H8
- 18: ZaNIS 28 H8
- 19: ZIP 28 H6
- 20: ZIPs 28 H6
- 21: ZIP 28 H8
- 22: ZaINS 28 H8
- 23: NaZIS 28 H8
- 24: ZuPS 28 H7
- 25: ZiPS 28 H8
- 26: ZINcS 28 H8
- 27: ZuPS 28 H5
- 28: ZIPs 28 H5
- 29: ZiPS 28 H7
- 30: ZIP 28 H7
- 31: ZuPS 28 H8
- 32: ZuPS 28 H6
- 33: NaZIS 28 H4
- 34: ZiPS 28 H6
- 35: ZiPS 28 H5
- 36: ZIPs 28 H7
- 37: ZaINS 26 H7
- 38: ZINcS 26 H7
- 39: ZaNIS 26 H7
- 40: ZaNIS 26 H5
- 41: ZiP 26 H7
- 42: ZaINS 26 H5
- 43: NaZIS 26 H5
- 44: ZaNIS 26 H6
- 45: ZaINS 26 H6
- 46: NaZIS 26 H6
- 47: ZuP 26 H7
- 48: ZINcS 26 H5
- 49: ZuP 26 H8
- 50: ZiP 26 H8
- 51: ZiP 26 H6
- 52: ZuP 26 H6
- 53: NaZIS 26 H7
- 54: ZINcS 26 H6
- 55: bINZ 24 H5
- 56: ZaNI 24 H7
- 57: NaZI 24 H5
- 58: NIeZ 24 H8
- 59: ZIpS 24 H5
- 60: NIeZ 24 H7
- 61: ZaIN 24 H7
- 62: ZISt 24 H5
- 63: bINZ 24 H6
- 64: ZISt 24 H7
- 65: ZIpS 24 H7
- 66: NIeZ 24 H5
- 67: ZIgS 24 H7
- 68: NIeZ 24 H6
- 69: NaZI 24 H7
- 70: bINZ 24 H8
- 71: ZINc 24 H7
- 72: bINZ 24 H7
- 73: ZINc 24 H8
- 74: ZIgS 24 H8
- 75: ZeNS 24 H5
- 76: ZeNS 24 H6
- 77: ZeNS 24 H8
- 78: ZIgS 24 H6
- 79: ZINc 24 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
+ 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: ZeNS 24 H7
- 82: ZaNI 24 H8
- 83: ZIpS 24 H8
- 84: ZIpS 24 H6
- 85: ZISt 24 H8
- 86: NaZI 24 H8
- 87: ZISt 24 H6
- 88: ZaIN 24 H5
- 89: ZaIN 24 H8
- 90: ZaNI 24 H6
- 91: ZIgS 24 H5
- 92: NaZI 24 H6
- 93: ZaIN 24 H6
- 94: ZINc 24 H5
- 95: ZIg 22 H7
- 96: ZeN 22 H7
- 97: rIZ 22 H8
- 98: NeZ 22 H6
- 99: ZeN 22 H8
-100: ZIg 22 H8
-101: ZIp 22 H8
-102: NeZ 22 H7
-103: rIZ 22 H6
+ 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: ZIp 22 H7
-106: NeZ 22 H8
-107: ZIg 22 H6
-108: ZeN 22 H6
-109: ZIp 22 H6
-110: cINQ 20 H8
-111: cINQ 20 H7
-112: cINQ 20 H6
-113: cINQ 20 H5
-114: PISaN 18 H4
-115: PIoNS 18 H4
-116: PuNIS 18 H4
-117: QuI 18 H7
-118: QuI 18 H6
-119: PINeS 18 H4
-120: PoINS 18 H4
-121: QuI 18 H8
-122: PaINS 18 H4
-123: PeINS 18 H4
-124: PeNIS 18 H4
-125: PIaNS 18 H4
-126: PIaNS 14 H8
-127: SPINs 14 H4
-128: SaPIN 14 H4
-129: sPINS 14 H8
-130: SuPIN 14 H8
-131: PaINS 14 H8
-132: PINeS 14 H8
-133: SaPIN 14 H8
-134: PeINS 14 H8
-135: PeNIS 14 H8
-136: PuNIS 14 H8
-137: PIoNS 14 H8
-138: SuPIN 14 H4
-139: PoINS 14 H8
-140: PISaN 14 H8
-141: PIoNS 12 H7
-142: PINS 12 H7
-143: PINeS 12 H7
-144: sPINS 12 H5
-145: SPIN 12 H8
-146: SPINs 12 H8
-147: PIaNS 12 H7
-148: PeNIS 12 H7
-149: PeINS 12 H7
-150: PaINS 12 H7
-151: sPINS 12 H4
-152: SPINs 12 H5
-153: PIaNS 12 H6
-154: SPIN 12 H7
-155: SPINs 12 H7
-156: PISaN 12 H6
-157: PuNIS 12 H5
-158: PIoNS 12 H5
-159: SuPIN 12 H7
-160: PISaN 12 H5
-161: PIaNS 12 H5
-162: PuNIS 12 H6
-163: SaPIN 12 H6
-164: SaPIN 12 H5
-165: SaPIN 12 H7
-166: PoINS 12 H6
-167: PoINS 12 H5
-168: SuPIN 12 H5
-169: PINS 12 H8
-170: PuNIS 12 H7
-171: PeNIS 12 H5
-172: PaINS 12 H6
-173: PIoNS 12 H6
-174: SPIN 12 H5
-175: PINS 12 H5
-176: SuPIN 12 H6
-177: PeINS 12 H5
-178: PINeS 12 H5
-179: SPIN 12 H6
-180: SPINs 12 H6
-181: PeNIS 12 H6
-182: PaINS 12 H5
-183: PeINS 12 H6
-184: PINS 12 H6
-185: sPINS 12 H7
-186: PISaN 12 H7
-187: sPINS 12 H6
-188: PoINS 12 H7
-189: PINeS 12 H6
-190: SPIs 10 H5
-191: PuIS 10 H5
-192: kIPS 10 H5
-193: IPeS 10 H7
-194: PuNI 10 H6
-195: SPIc 10 H5
-196: lISP 10 H6
-197: SPIs 10 H6
-198: SkIP 10 H5
-199: PuIS 10 H6
-200: lISP 10 H7
-201: PSI 10 H6
-202: SlIP 10 H5
-203: SlIP 10 H6
-204: PrIS 10 H5
-205: SIPo 10 H7
-206: IPeS 10 H5
-207: mIPS 10 H5
-208: kIPS 10 H7
-209: mIPS 10 H6
-210: SkIP 10 H7
-211: SlIP 10 H7
-212: SPiN 10 H6
-213: IPeS 10 H6
-214: kIPS 10 H6
-215: SIPo 10 H6
-216: SPI 10 H6
-217: SPIc 10 H6
-218: SIPo 10 H5
-219: SPIn 10 H6
-220: mIPS 10 H7
-221: SkIP 10 H6
-222: SPIn 10 H5
-223: PuNI 10 H5
-224: lISP 10 H5
-225: PoIS 10 H7
-226: PrIS 10 H7
-227: PSI 10 H7
-228: PuIS 10 H7
-229: PuNI 10 H7
-230: PaIN 10 H6
-231: PaIS 10 H6
-232: PInS 10 H5
-233: PINs 10 H5
-234: PaNS 10 H6
-235: PINe 10 H5
-236: PIlS 10 H5
-237: PaIN 10 H5
-238: PaIS 10 H5
-239: PaNS 10 H5
-240: PIaN 10 H6
-241: PIcS 10 H6
-242: PIeS 10 H6
-243: PIfS 10 H6
-244: PIlS 10 H6
-245: PIN 10 H6
-246: PINe 10 H6
-247: PINs 10 H6
-248: PInS 10 H6
-249: PIoN 10 H6
-250: PIS 10 H6
-251: PISe 10 H6
-252: PIaN 10 H5
-253: PIcS 10 H5
-254: PIeS 10 H5
-255: PIfS 10 H5
-256: PrIS 10 H6
-257: PoIS 10 H5
-258: PoIS 10 H6
-259: PlIS 10 H5
-260: PlIS 10 H6
-261: PiNS 10 H5
-262: PiNS 10 H6
-263: PISe 10 H5
-264: SPiN 10 H7
-265: PIoN 10 H5
-266: SPIs 10 H7
-267: SPIn 10 H7
-268: SPIc 10 H7
-269: SPI 10 H7
-270: PaIN 10 H7
-271: PaIS 10 H7
-272: PaNS 10 H7
-273: PIaN 10 H7
-274: PIcS 10 H7
-275: PIeS 10 H7
-276: PIfS 10 H7
-277: PIlS 10 H7
-278: PIN 10 H7
-279: PINe 10 H7
-280: PINs 10 H7
-281: PInS 10 H7
-282: PIoN 10 H7
-283: PIS 10 H7
-284: PISe 10 H7
-285: PiNS 10 H7
-286: PlIS 10 H7
-287: PlIS 10 H8
-288: PoIS 10 H8
-289: PrIS 10 H8
-290: PSI 10 H8
-291: PuIS 10 H8
-292: PuNI 10 H8
-293: SIPo 10 H8
-294: SkIP 10 H8
-295: SlIP 10 H8
-296: SPI 10 H8
-297: SPIc 10 H8
-298: SPIn 10 H8
-299: SPIs 10 H8
-300: SPiN 10 H8
-301: sPIN 10 H8
-302: sPIS 10 H8
-303: tIPS 10 H8
-304: tIPS 10 H5
-305: tIPS 10 H6
-306: tIPS 10 H7
-307: zIPS 10 H8
-308: sPIS 10 H5
-309: aPIS 10 H7
-310: aSPI 10 H7
-311: sPIN 10 H5
-312: sPIS 10 H6
-313: aPIS 10 H6
-314: zIPS 10 H5
-315: zIPS 10 H6
-316: zIPS 10 H7
-317: aPIS 10 H8
-318: aSPI 10 H8
-319: bIPS 10 H8
-320: ePIS 10 H8
-321: IPeS 10 H8
-322: kIPS 10 H8
-323: lISP 10 H8
-324: mIPS 10 H8
-325: PaIN 10 H8
-326: PaIS 10 H8
-327: PaNS 10 H8
-328: PIaN 10 H8
-329: PIcS 10 H8
-330: PIeS 10 H8
-331: PIfS 10 H8
-332: PIlS 10 H8
-333: PIN 10 H8
-334: PINe 10 H8
-335: PINs 10 H8
-336: PInS 10 H8
-337: PIoN 10 H8
-338: PIS 10 H8
-339: PISe 10 H8
-340: PiNS 10 H8
-341: sPIN 10 H6
-342: bIPS 10 H5
-343: aSPI 10 H5
-344: ePIS 10 H5
-345: bIPS 10 H7
-346: ePIS 10 H7
-347: aSPI 10 H6
-348: ePIS 10 H6
-349: aPIS 10 H5
-350: bIPS 10 H6
-351: SPiN 10 H5
-352: sPIS 10 H7
-353: sPIN 10 H7
-354: PaS 8 H7
-355: SPa 8 H8
-356: PhI 8 H7
-357: PI 8 H7
-358: SPi 8 H8
-359: bIP 8 H6
-360: PIc 8 H7
-361: PIf 8 H7
-362: IPe 8 H6
-363: PIe 8 H7
-364: PIn 8 H8
-365: sPI 8 H7
-366: PaN 8 H7
-367: SPi 8 H6
-368: PIs 8 H6
-369: PIu 8 H6
-370: ePI 8 H7
-371: PIf 8 H8
-372: sPI 8 H8
-373: PIe 8 H8
-374: PIc 8 H8
-375: ePI 8 H6
-376: PI 8 H8
-377: PhI 8 H8
-378: tIP 8 H8
-379: PaS 8 H8
-380: PuS 8 H8
-381: PaS 8 H6
-382: SPa 8 H6
-383: PaN 8 H6
-384: PsI 8 H8
-385: PuS 8 H7
-386: PSy 8 H8
-387: PSt 8 H8
-388: SeP 8 H8
-389: PSi 8 H8
-390: PsI 8 H7
-391: PSy 8 H7
-392: PSt 8 H7
-393: PSi 8 H7
-394: sPI 8 H6
-395: PhI 8 H6
-396: PlI 8 H7
-397: PiS 8 H7
-398: PlI 8 H8
-399: PiN 8 H7
-400: PIc 8 H6
-401: PIu 8 H7
-402: PIs 8 H7
-403: PiS 8 H8
-404: PIe 8 H6
-405: PIf 8 H6
-406: PiN 8 H8
-407: PIu 8 H8
-408: PIn 8 H7
-409: PIs 8 H8
-410: IPe 8 H7
-411: PIn 8 H6
-412: kIP 8 H6
-413: kIP 8 H8
-414: IPe 8 H8
-415: tIP 8 H7
-416: PSi 8 H6
-417: zIP 8 H8
-418: PSt 8 H6
-419: PSy 8 H6
-420: PsI 8 H6
-421: SeP 8 H6
-422: bIP 8 H7
-423: hIP 8 H8
-424: PuS 8 H6
-425: ePI 8 H8
-426: SPa 8 H7
-427: aPI 8 H7
-428: bIP 8 H8
-429: zIP 8 H7
-430: aPI 8 H8
-431: zIP 8 H6
-432: SeP 8 H7
-433: aPI 8 H6
-434: SPi 8 H7
-435: PiN 8 H6
-436: hIP 8 H7
-437: PiS 8 H6
-438: PlI 8 H6
-439: PaN 8 H8
-440: tIP 8 H6
-441: hIP 8 H6
-442: kIP 8 H7
-443: SNIf 6 H7
-444: pINS 6 H6
-445: gINS 6 H7
-446: pINS 6 H5
-447: IbNS 6 H6
-448: IbNS 6 H5
-449: IbNS 6 H7
-450: NuIS 6 H8
-451: fINS 6 H7
-452: oINS 6 H8
-453: SIeN 6 H7
-454: fINS 6 H5
-455: SeIN 6 H7
-456: SkIN 6 H7
-457: aNIS 6 H8
-458: fINS 6 H6
-459: SaIN 6 H7
-460: Pu 6 H8
-461: gINS 6 H6
-462: lINS 6 H8
-463: mINS 6 H8
-464: SpIN 6 H5
-465: INSu 6 H7
-466: IoNS 6 H8
-467: gINS 6 H5
-468: NaIS 6 H8
-469: NIaS 6 H8
-470: IoNS 6 H7
-471: INSu 6 H8
-472: NIdS 6 H8
-473: Pi 6 H8
-474: IbNS 6 H8
-475: NIeS 6 H8
-476: NIfS 6 H8
-477: gINS 6 H8
-478: fINS 6 H8
-479: SpIN 6 H6
-480: NItS 6 H8
-481: pINS 6 H7
-482: SoIN 6 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
+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
+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
+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
+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
+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: yINS 6 H8
-486: SaIN 6 H5
-487: NuIS 6 H7
-488: SaIN 6 H6
+485: lINS 6 H7
+486: lINS 6 H8
+487: SaIN 6 H7
+488: NuIS 6 H7
489: NaIS 6 H6
-490: NaIS 6 H5
-491: tINS 6 H6
-492: vINS 6 H8
-493: tINS 6 H5
-494: NIaS 6 H6
-495: SpIN 6 H7
-496: NIdS 6 H6
-497: uNIS 6 H8
-498: NIeS 6 H6
-499: NIfS 6 H6
-500: NItS 6 H6
-501: NIaS 6 H5
-502: NIdS 6 H5
-503: NIeS 6 H5
-504: NIfS 6 H5
-505: lINS 6 H6
-506: SkIN 6 H5
-507: aNIS 6 H5
-508: lINS 6 H5
-509: lINS 6 H7
-510: aNIS 6 H6
-511: SkIN 6 H6
-512: mINS 6 H7
-513: SNIf 6 H6
-514: mINS 6 H6
-515: SNIf 6 H5
-516: SIeN 6 H5
-517: mINS 6 H5
-518: NaIS 6 H7
-519: aNIS 6 H7
-520: tINS 6 H7
-521: NIaS 6 H7
-522: SIeN 6 H6
-523: NIdS 6 H7
-524: SeIN 6 H5
-525: NIeS 6 H7
-526: NIfS 6 H7
-527: IoNS 6 H5
-528: IoNS 6 H6
-529: uNIS 6 H5
-530: SoIN 6 H8
-531: SNIf 6 H8
-532: SoIN 6 H5
-533: INSu 6 H5
-534: SkIN 6 H8
-535: vINS 6 H7
-536: vINS 6 H6
-537: Pi 6 H7
-538: INSu 6 H6
-539: vINS 6 H5
-540: SIeN 6 H8
-541: yINS 6 H7
-542: Pu 6 H7
-543: SeIN 6 H8
-544: yINS 6 H6
-545: SaIN 6 H8
-546: yINS 6 H5
-547: pINS 6 H8
-548: NItS 6 H5
-549: tINS 6 H8
-550: SpIN 6 H8
-551: NuIS 6 H6
-552: uNIS 6 H6
-553: uNIS 6 H7
-554: NuIS 6 H5
-555: oINS 6 H5
-556: oINS 6 H6
-557: oINS 6 H7
-558: SoIN 6 H6
-559: vIS 4 H6
-560: SoN 4 H6
-561: yIN 4 H7
-562: SpI 4 H6
-563: SkI 4 H6
-564: SkI 4 H7
-565: SIx 4 H7
-566: uNI 4 H7
-567: SIs 4 H7
-568: SIr 4 H7
-569: yIN 4 H6
-570: SIl 4 H7
-571: uNS 4 H6
-572: tIN 4 H6
-573: sIS 4 H7
-574: vIN 4 H7
-575: SeN 4 H6
-576: SaI 4 H6
-577: SoI 4 H6
-578: uNI 4 H6
-579: uNS 4 H7
-580: SIc 4 H6
-581: vIS 4 H7
-582: sIS 4 H6
-583: SIl 4 H6
-584: vIN 4 H6
-585: SoN 4 H7
-586: tIN 4 H7
-587: SIr 4 H6
-588: SoI 4 H7
-589: SIs 4 H6
-590: SpI 4 H7
-591: SIx 4 H6
-592: aIS 4 H7
-593: yIN 4 H8
-594: vIS 4 H8
-595: vIN 4 H8
-596: uNS 4 H8
-597: uNI 4 H8
-598: tIN 4 H8
-599: sIS 4 H8
-600: SpI 4 H8
-601: SoN 4 H8
-602: SoI 4 H8
-603: SkI 4 H8
-604: SIx 4 H8
-605: SIs 4 H8
-606: SIr 4 H8
-607: SIl 4 H8
-608: SIc 4 H8
-609: SI 4 H8
-610: gIS 4 H6
-611: gIN 4 H6
-612: gIS 4 H7
-613: gIN 4 H7
-614: fIS 4 H6
-615: fIN 4 H6
-616: fIS 4 H7
-617: fIN 4 H7
-618: dIS 4 H6
-619: dIN 4 H6
-620: dIS 4 H7
-621: dIN 4 H7
-622: cIS 4 H6
-623: cIS 4 H7
-624: bIS 4 H6
-625: bIS 4 H7
-626: aNS 4 H6
-627: aIS 4 H6
-628: aNS 4 H7
-629: lIS 4 H8
-630: lIN 4 H8
-631: kSI 4 H8
-632: ISo 4 H8
-633: IoN 4 H8
-634: IN 4 H8
-635: IlS 4 H8
-636: IfS 4 H8
-637: IbN 4 H8
-638: gIS 4 H8
-639: gIN 4 H8
-640: fIS 4 H8
-641: fIN 4 H8
-642: dIS 4 H8
-643: dIN 4 H8
-644: cIS 4 H8
-645: bIS 4 H8
-646: aNS 4 H8
-647: aIS 4 H8
-648: SeN 4 H8
-649: SaI 4 H8
-650: rIS 4 H8
-651: pSI 4 H8
-652: pIS 4 H8
-653: pIN 4 H8
-654: NuS 4 H8
-655: NuI 4 H8
-656: NoS 4 H8
-657: NIt 4 H8
-658: NIf 4 H8
-659: NIe 4 H8
-660: NId 4 H8
-661: NIb 4 H8
-662: NIa 4 H8
-663: NI 4 H8
-664: NeS 4 H8
-665: mIS 4 H8
-666: mIN 4 H8
-667: lIS 4 H6
-668: mIN 4 H7
-669: pSI 4 H6
-670: mIS 4 H7
-671: mIN 4 H6
-672: pIS 4 H6
-673: pIN 4 H6
-674: mIS 4 H6
-675: pSI 4 H7
-676: NeS 4 H7
-677: pIS 4 H7
-678: pIN 4 H7
-679: NI 4 H7
-680: NIa 4 H7
-681: NIb 4 H7
-682: NId 4 H7
-683: NIe 4 H7
-684: NIf 4 H7
-685: NIt 4 H7
-686: NoS 4 H7
-687: NuI 4 H7
-688: NuS 4 H6
-689: NuI 4 H6
-690: NuS 4 H7
-691: NeS 4 H6
-692: NoS 4 H6
-693: NIa 4 H6
-694: NIt 4 H6
-695: NIf 4 H6
-696: NIe 4 H6
-697: NIb 4 H6
-698: NId 4 H6
-699: IbN 4 H7
-700: SIc 4 H7
-701: IfS 4 H7
-702: IlS 4 H7
-703: IN 4 H7
-704: SI 4 H7
-705: SeN 4 H7
-706: IoN 4 H7
-707: ISo 4 H7
-708: IbN 4 H6
-709: IfS 4 H6
-710: IlS 4 H6
-711: IoN 4 H6
-712: ISo 4 H6
-713: SaI 4 H7
-714: rIS 4 H6
-715: lIN 4 H7
-716: lIS 4 H7
-717: rIS 4 H7
-718: kSI 4 H6
-719: lIN 4 H6
-720: kSI 4 H7
-721: rI 2 H7
-722: aN 2 H8
-723: hI 2 H8
-724: Si 2 H7
-725: aI 2 H8
-726: aS 2 H8
-727: bI 2 H8
-728: Ne 2 H8
-729: Na 2 H8
-730: If 2 H8
-731: nI 2 H7
-732: cI 2 H8
-733: mI 2 H8
-734: oN 2 H7
-735: oS 2 H7
-736: lI 2 H8
-737: pI 2 H7
-738: fI 2 H8
-739: Il 2 H8
-740: iN 2 H8
-741: eS 2 H8
-742: eN 2 H8
-743: Se 2 H7
-744: In 2 H8
-745: Sa 2 H7
-746: uN 2 H8
-747: uN 2 H7
-748: mI 2 H7
-749: uS 2 H8
-750: vS 2 H8
-751: xI 2 H8
-752: aI 2 H7
-753: aN 2 H7
-754: lI 2 H7
-755: aS 2 H7
-756: bI 2 H7
-757: iN 2 H7
-758: cI 2 H7
-759: sI 2 H7
-760: eN 2 H7
-761: eS 2 H7
-762: fI 2 H7
-763: In 2 H7
-764: Il 2 H7
-765: If 2 H7
-766: hI 2 H7
-767: Su 2 H7
-768: Ni 2 H8
-769: No 2 H8
-770: Nu 2 H8
-771: nI 2 H8
-772: oN 2 H8
-773: oS 2 H8
-774: pI 2 H8
-775: Nu 2 H7
-776: rI 2 H8
-777: No 2 H7
-778: Sa 2 H8
-779: Ni 2 H7
-780: Se 2 H8
-781: xI 2 H7
-782: vS 2 H7
-783: Si 2 H8
-784: Ne 2 H7
-785: Na 2 H7
-786: Su 2 H8
-787: sI 2 H8
-788: uS 2 H7
+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
+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
+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
+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
+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
+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
+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
commande> j QuIZ H6
commande> t E?
commande> r
commande> a r 50
1: ZEn 12 9H
- 2: ZEf 12 9H
- 3: ZEe 12 9H
- 4: ZEc 12 9H
- 5: rEZ 12 9F
- 6: nEZ 12 9F
- 7: lEZ 12 9F
- 8: fEZ 12 9F
- 9: ZoE 11 9H
- 10: ZeE 11 9H
- 11: QuE 11 6H
- 12: Eh 5 G7
- 13: En 5 G7
- 14: Es 5 G7
- 15: Ex 5 G7
- 16: pIE 2 8G
- 17: oIE 2 8G
- 18: nIE 2 8G
- 19: mIE 2 8G
- 20: lIE 2 8G
- 21: hIE 2 8G
- 22: fIE 2 8G
- 23: aIE 2 8G
- 24: pEu 2 7F
- 25: lEu 2 7F
- 26: jEu 2 7F
- 27: hEu 2 7F
- 28: fEu 2 7F
- 29: rIE 2 8G
- 30: vIE 2 8G
- 31: EpI 2 8F
- 32: lEI 2 8F
- 33: IdE 2 8H
- 34: IlE 2 8H
- 35: IpE 2 8H
- 36: IrE 2 8H
- 37: IvE 2 8H
- 38: IxE 2 8H
- 39: Eu 2 7G
- 40: duE 2 7G
- 41: buE 2 7G
- 42: Eue 2 7G
- 43: Euh 2 7G
- 44: Eus 2 7G
- 45: Eut 2 7G
- 46: Eux 2 7G
- 47: euE 2 7G
- 48: guE 2 7G
- 49: huE 2 7G
- 50: luE 2 7G
+ 2: ZEk 12 9H
+ 3: ZEf 12 9H
+ 4: ZEe 12 9H
+ 5: ZEc 12 9H
+ 6: rEZ 12 9F
+ 7: nEZ 12 9F
+ 8: lEZ 12 9F
+ 9: fEZ 12 9F
+ 10: ZoE 11 9H
+ 11: ZeE 11 9H
+ 12: QuE 11 6H
+ 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
+ 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
commande> q
fin du mode entraînement
commande> q
Index: utils/game_io.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/utils/game_io.cpp,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -u -b -r1.9.2.5 -r1.9.2.6
--- utils/game_io.cpp 17 Dec 2007 11:27:42 -0000 1.9.2.5
+++ utils/game_io.cpp 8 Jan 2008 12:32:13 -0000 1.9.2.6
@@ -183,7 +183,7 @@
for (it = allTiles.begin(); it != allTiles.end(); it++)
{
- if (iGame.getBag().in(it->toChar()) > 9)
+ if (iGame.getBag().in(*it) > 9)
out << " ";
out << setw(2) << convertToMb(it->toChar());
}
@@ -191,7 +191,7 @@
for (it = allTiles.begin(); it != allTiles.end(); it++)
{
- out << " " << iGame.getBag().in(it->toChar());
+ out << " " << iGame.getBag().in(*it);
}
out << endl;
}
Index: wxwin/mainframe.cc
===================================================================
RCS file: /cvsroot/eliot/eliot/wxwin/mainframe.cc,v
retrieving revision 1.21.2.11
retrieving revision 1.21.2.12
diff -u -b -r1.21.2.11 -r1.21.2.12
--- wxwin/mainframe.cc 25 Dec 2007 12:39:19 -0000 1.21.2.11
+++ wxwin/mainframe.cc 8 Jan 2008 12:32:13 -0000 1.21.2.12
@@ -172,6 +172,7 @@
rack = new wxTextCtrl(this, Rack_ID, wxU(""), wxPoint(-1, -1), wxSize(-1,
-1), wxTE_PROCESS_ENTER);
listsizer->Add(rack, 0, wxEXPAND | wxALL, 1);
rack->SetToolTip(_("Rack"));
+ rack->Enable(false);
#ifdef ENABLE_RESLIST_IN_MAIN
reslist = new GfxResult(this,(MainFrame*)this,m_game);
listsizer->Add(reslist, 1, wxEXPAND | wxLEFT | wxRIGHT, 1);
@@ -209,10 +210,15 @@
b_play = new wxButton(this, Button_Play, _(" Play "));
b_rackrandomset->SetToolTip(_("Random rack"));
+ b_rackrandomset->Enable(false);
b_rackrandomnew->SetToolTip(_("Random complement of the rack"));
+ b_rackrandomnew->Enable(false);
b_search->SetToolTip( _("Search with the current rack"));
+ b_search->Enable(false);
b_back->SetToolTip( _("Go back one turn"));
+ b_back->Enable(false);
b_play->SetToolTip( _("Play the selected word"));
+ b_play->Enable(false);
wxBoxSizer *buttonsizer = new wxBoxSizer(wxHORIZONTAL);
buttonsizer->Add(b_rackrandomset, 1, wxEXPAND | wxTOP | wxBOTTOM | wxLEFT
, 1);
@@ -376,6 +382,15 @@
#ifdef ENABLE_RESLIST_IN_MAIN
reslist->SetGame(m_game);
#endif
+ // Re-enable the main buttons
+ b_rackrandomset->Enable(true);
+ b_rackrandomnew->Enable(true);
+ b_search->Enable(true);
+ b_back->Enable(true);
+ b_play->Enable(true);
+ rack->Enable(true);
+
+
UpdateStatusBar();
UpdateFrames(AuxFrame::FORCE_REFRESH);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Eliot-dev] eliot dic/automaton.cpp dic/compdic.cpp dic/dic... [cppdic],
eliot-dev <=