[Eliot-dev] eliot/test driver duplicate_2_ai.ref freegame_3...

[eliot-dev]

CVSROOT:        /cvsroot/eliot
Module name:    eliot
Branch:         
Changes by:     Antoine Fraboulet <address@hidden>      06/01/01 19:25:10

Modified files:
        test           : driver duplicate_2_ai.ref freegame_3_ai.ref 
                         freegame_passing.ref load_game.input 
                         load_game.ref test.elt training_back.ref 
                         training_search.ref 
Added files:
        test           : fumee load_saved_game.input load_saved_game.ref 
                         load_test_adv.input load_test_adv.ref 
                         regexp.input regexp.ref training_cross.input 
                         training_cross.ref 

Log message:
        - driver
        add "training_cross" test that checks horizontal scores in 
board_cross.cpp
        add several load/save tests
        add regexp test
        
        - Corrections
        training_search.ref : correcting reference file - 5 points instead of 4 
on (Eh, En, Es, Ex)
        training_back.ref : sorting order (linked to points bug - insertion 
order in list)
        duplicate_2_ai.ref : correct score, change the whole game
        freegame_passing.ref : correct score (JEUNE H11 +2 : 45 -> 47)
        freegame_3_ai.ref : correct score 13:CAPEYE+4, 14:VOLETE+3, 16:FULL+2, 
17:VIDE+5

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/test/driver.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/test/duplicate_2_ai.ref.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/test/freegame_3_ai.ref.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/test/freegame_passing.ref.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/test/fumee?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/test/load_game.input.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/test/load_game.ref.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/test/load_saved_game.input?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/test/load_saved_game.ref?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/test/load_test_adv.input?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/test/load_test_adv.ref?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/test/regexp.input?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/test/regexp.ref?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/test/test.elt.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/test/training_back.ref.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/test/training_cross.input?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/test/training_cross.ref?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/test/training_search.ref.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: eliot/test/driver
diff -u eliot/test/driver:1.3 eliot/test/driver:1.4
--- eliot/test/driver:1.3       Tue Dec 27 09:13:48 2005
+++ eliot/test/driver   Sun Jan  1 19:25:10 2006
@@ -10,10 +10,9 @@
 #
 # Everything after a # is ignored.
 
-
-#
+################
 # Training mode
-#
+################
 
 # Check various words in the dictionary
 training_dict       0  # randseed unused
@@ -25,18 +24,19 @@
 training_play       4
 # Training rack+search+play+back 
 training_back       5
+# Board cross off by one score problem
+training_cross      0
 
-#
+#################
 # Duplicate mode
-#
+#################
 
 # 2 AI players
 duplicate_2_ai      5
 
-
-#
+#################
 # Free game mode
-#
+#################
 
 # The human player always passes, letting the AI player do what it wants
 freegame_passing    1
@@ -45,7 +45,22 @@
 # Three AI players
 freegame_3_ai       2
 
-#
+##############
 # Load / Save 
-#
+##############
+
+# load a standard training game (fumee)
 load_game           0
+# save and reload a training game, standard format
+load_saved_game     5
+# load a training game with advanced format (test.elt)
+# load_test_adv       0 # We need to specifie a much more complete file format
+                        # before we can handle load/save on duplicate and
+                       # freegame games
+
+#####################
+# Regular Expression
+#####################
+
+# test some patterns
+regexp              0
Index: eliot/test/duplicate_2_ai.ref
diff -u eliot/test/duplicate_2_ai.ref:1.2 eliot/test/duplicate_2_ai.ref:1.3
--- eliot/test/duplicate_2_ai.ref:1.2   Sat Dec 24 17:50:11 2005
+++ eliot/test/duplicate_2_ai.ref       Sun Jan  1 19:25:10 2006
@@ -3,16 +3,16 @@
 mode duplicate
 [?] pour l'aide
 commande> a S
-Joueur 0:  884
-Joueur 1:  884
+Joueur 0:  866
+Joueur 1:  866
 commande> a T
-Joueur 0: ENOT
-Joueur 1: ENOT
+Joueur 0: RTTUW
+Joueur 1: RTTUW
 commande> a l
  A B C D E F G H I J K L M N O P Q R S T U V W X Y Z ?
- 0 0 0 0 1 0 0 0 0 0 0 0 0 1 1 0 0 0 0 1 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 2 1 0 1 0 0 0 0
 commande> a p
-Eliot
+Eliot 1.5
 
 Game type: Duplicate
 Player 0: Computer
@@ -23,29 +23,27 @@
     1 |  EA?AEBF | FABAcEE         |  H4 |  80 | 0 | *
     2 |  LMUAEYE | YEBLE           |  6F |  38 | 0 |  
     3 | AMU+JEIG | MEJUGEAI        |  9G |  78 | 0 | *
-    4 |  LEHNMGA | HALE            |  8L |  43 | 0 |  
+    4 |  LEHNMGA | HALE            |  8L |  46 | 0 |  
     5 | GMN+NSEO | MENSONGE        |  O1 |  83 | 0 | *
-    6 |  ARAURIU | FURIA           |  4H |  16 | 0 |  
-    7 | ARU+TSDE | DATEURS         | 11B |  78 | 0 | *
-    8 |  AONIAVP | PAVANE          |  2J |  34 | 0 |  
-    9 | IO+DSONE | NODOSITE        |  D5 |  70 | 0 | *
-   10 |  OXTOLNS | LUXONS          |  J8 |  35 | 0 |  
-   11 | OT+ZMIAI | MAZOT           |  8A |  45 | 0 |  
-   12 | IIO+WIFT | WU              | F10 |  31 | 0 |  
-   13 | FIIIOT+C | CHETIF          |  L7 |  28 | 0 |  
-   14 | IIO+LBEV | BALIVE          | C10 |  26 | 0 |  
-   15 | IO+PL?KC | ChEIK           | 15A |  48 | 0 |  
-   16 | LOP+EERR | OPERERA         |  B2 |  22 | 0 |  
-   17 | L+IERDTU | DUIT            |  C1 |  22 | 0 |  
-   18 | ELR+RNUE | DELURER         |  1C |  27 | 0 |  
-   19 | N+SUOSHT | MEJUGEAIS       |  9G |  29 | 0 |  
-   20 | HNOSTU+I | SUSHI           | 13J |  31 | 0 |  
-   21 |  NOT+EQT | QAT             |  M1 |  20 | 0 |  
+    6 |  ARAURIU | RAIRA           |  5B |  21 | 0 |  
+    7 | UU+TSDEA | RUSTAUDE        |  B5 |  63 | 0 | *
+    8 |  ONIAVPD | VIDA            | A12 |  45 | 0 |  
+    9 | NOP+SONE | PENONS          |  K1 |  33 | 0 |  
+   10 | O+OXTOLN | LUX             |  J8 |  32 | 0 |  
+   11 | NOOOT+SZ | ZOOS            | 11E |  38 | 0 |  
+   12 | NOT+MIAI | DOMINAIT        | 14A |  74 | 0 | *
+   13 |  CERPFEO | FEROCE          | 15G |  47 | 0 |  
+   14 | P+BSVQIU | PIQUAS          |  C1 |  32 | 0 |  
+   15 | BV+ETLIE | LEVITE          |  A1 |  39 | 0 |  
+   16 | B+RLD?UC | PUBLiC          |  1C |  36 | 0 |  
+   17 | DR+NTERR | DENREE          |  2J |  22 | 0 |  
+   18 | RRT+TUKE | TREK            | 13F |  36 | 0 |  
+   19 | RTU+THWI | HAI             |  7G |  23 | 0 |  
 
-   Total: 884
+   Total: 866
 
-Rack 0: ENOT
-Rack 1: ENOT
+Rack 0: RTTUW
+Rack 1: RTTUW
 commande> q
 fin du mode duplicate
 commande> q
Index: eliot/test/freegame_3_ai.ref
diff -u eliot/test/freegame_3_ai.ref:1.2 eliot/test/freegame_3_ai.ref:1.3
--- eliot/test/freegame_3_ai.ref:1.2    Sat Dec 24 17:50:11 2005
+++ eliot/test/freegame_3_ai.ref        Sun Jan  1 19:25:10 2006
@@ -7,11 +7,11 @@
 Joueur 1: DEPKAS
 Joueur 2: DILMQ
 commande> a S
-Joueur 0:  392
-Joueur 1:  258
+Joueur 0:  398
+Joueur 1:  266
 Joueur 2:  205
 commande> a p
-Eliot
+Eliot 1.5
 
 Game type: Free game
 Player 0: Computer
@@ -32,15 +32,15 @@
    10 | EE+ONLAS | ENOLATES        |  E4 |  82 | 0 | *
    11 | AIMOU+NN | NOMINAUX        |  L5 |  69 | 1 | *
    12 | MQR+LIHJ | HI              |  F6 |  28 | 2 |  
-   13 |  PLCYEFE | CAPEYE          |  3I |  48 | 0 |  
-   14 |  EVLETDE | VOLETE          |  D8 |  36 | 1 |  
+   13 |  PLCYEFE | CAPEYE          |  3I |  52 | 0 |  
+   14 |  EVLETDE | VOLETE          |  D8 |  39 | 1 |  
    15 | JLMQR+OB | ROB             |  O3 |  25 | 2 |  
-   16 | FL+UUSML | FULL            |  D1 |  24 | 0 |  
-   17 | DE+ICPEV | VICE            |  C2 |  27 | 1 |  
+   16 | FL+UUSML | FULL            |  D1 |  26 | 0 |  
+   17 | DE+ICPEV | VICE            |  C2 |  32 | 1 |  
    18 | JLMQ+DSI | JANS            |  5G |  24 | 2 |  
    19 | MSU+SAAI | ASSUMAI         | 15A |  85 | 0 | *
 
-   Total: 855
+   Total: 869
 
 Rack 0: 
 Rack 1: DEP+KAS
Index: eliot/test/freegame_passing.ref
diff -u eliot/test/freegame_passing.ref:1.2 eliot/test/freegame_passing.ref:1.3
--- eliot/test/freegame_passing.ref:1.2 Sat Dec 24 17:50:11 2005
+++ eliot/test/freegame_passing.ref     Sun Jan  1 19:25:10 2006
@@ -28,7 +28,7 @@
 commande> p
 commande> p
 commande> a p
-Eliot
+Eliot 1.5
 
 Game type: Free game
 Player 0: Human
@@ -46,7 +46,7 @@
     8 | TW+LAEPU | PAVE            | A12 |  36 | 1 |  
     9 | LTUW+FAA | FATWA           |  N2 |  42 | 1 |  
    10 | LU+JAEYU | LAYE            |  O1 |  61 | 1 |  
-   11 | JUU+SENI | JEUNE           | H11 |  45 | 1 |  
+   11 | JUU+SENI | JEUNE           | H11 |  47 | 1 |  
    12 | ISU+RMPN | SPRAY           |  3K |  32 | 1 |  
    13 | IMNU+AIV | VLAN            |  8L |  33 | 1 |  
    14 | IIMU+UQE | QUI             | B10 |  30 | 1 |  
@@ -54,7 +54,7 @@
    16 |  ODITREE | ETOURDIE        |  1B |  80 | 1 | *
    17 |  TEN?IKR | jERKE           |  8A |  69 | 1 |  
 
-   Total: 848
+   Total: 850
 
 Rack 0: EGISSTU
 Rack 1: INT+ESDO
Index: eliot/test/load_game.input
diff -u eliot/test/load_game.input:1.1 eliot/test/load_game.input:1.2
--- eliot/test/load_game.input:1.1      Tue Dec 27 09:13:48 2005
+++ eliot/test/load_game.input  Sun Jan  1 19:25:10 2006
@@ -1,2 +1,6 @@
-c test.elt
+c fumee
+a g
+a l
+a p
+q
 q
Index: eliot/test/load_game.ref
diff -u eliot/test/load_game.ref:1.1 eliot/test/load_game.ref:1.2
--- eliot/test/load_game.ref:1.1        Tue Dec 27 09:13:48 2005
+++ eliot/test/load_game.ref    Sun Jan  1 19:25:10 2006
@@ -1,3 +1,60 @@
 [?] pour l'aide
-commande> c test.elt
-chargement de -test.elt-
+commande> c fumee
+mode entraînement
+[?] pour l'aide
+commande> a g
+     1  2  3  4  5  6  7  8  9 10 11 12 13 14 15
+ A   B  R  A  D  e  R  I  E  -  -  -  -  -  -  -
+ B   -  -  -  -  -  -  -  S  -  H  -  -  -  -  -
+ C   -  -  D  I  A  L  Y  S  E  E  -  -  V  -  -
+ D   C  I  E  L  -  -  -  O  -  U  -  M  A  T  H
+ E   E  -  -  -  -  -  -  R  -  -  -  -  I  -  -
+ F   R  -  -  -  -  K  -  A  -  -  -  -  N  -  -
+ G   c  -  -  -  -  I  -  G  -  -  -  -  C  -  -
+ H   L  -  -  F  U  M  E  E  -  L  O  Q  U  E  T
+ I   A  -  F  A  N  O  N  -  -  A  -  -  E  T  -
+ J   G  -  -  -  -  N  -  -  -  V  -  -  -  -  T
+ K   E  -  -  -  J  O  U  R  N  A  L  -  -  -  O
+ L   -  -  -  W  E  S  T  I  E  S  -  -  -  -  P
+ M   -  -  D  U  T  -  -  -  -  S  -  -  -  -  A
+ N   -  -  -  -  -  -  -  -  -  E  X  P  I  E  Z
+ O   -  -  -  O  M  N  I  B  U  S  -  -  -  -  E
+commande> a l
+ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z ?
+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0
+commande> a p
+Eliot 1.5
+
+Game type: Training
+Player 0: Human
+
+    N |   RACK   |    SOLUTION     | REF | PTS | P | BONUS
+   ===|==========|=================|=====|=====|===|======
+    1 |  EUOFMIE | FUMEE           |  H4 |  26 | 0 |  
+    2 | IO+EOKAN | KIMONO          |  6F |  38 | 0 |  
+    3 | AE+EWTIS | WESTIE          |  L4 |  49 | 0 |  
+    4 | A+EAVSLS | LAVASSE         | 10H |  86 | 0 | *
+    5 |  BTUOMEQ | LOQUET          | H10 |  63 | 0 |  
+    6 | BM+UNOSI | OMNIBUS         |  O4 |  94 | 0 | *
+    7 |  IOZXEGP | EXPIEZ          | N10 |  52 | 0 |  
+    8 | GO+AETPI | TOPAZE          | 15J |  60 | 0 |  
+    9 | GI+AVNCO | VAINCU          | 13C |  28 | 0 |  
+   10 | GO+ESRAS | ESSORAGE        |  8A |  80 | 0 | *
+   11 |  JEUDIDR | JOUR            |  K5 |  44 | 0 |  
+   12 | DDEI+ALY | DIALYSE         |  C3 |  56 | 0 |  
+   13 | D+IHUEEB | HEU             | 10B |  32 | 0 |  
+   14 | BDEI+CIL | CIEL            |  D1 |  25 | 0 |  
+   15 | BDI+RRA? | BRADeRIE        |  A1 |  86 | 0 | *
+   16 |  EUGTDEA | DUT             |  M3 |  29 | 0 |  
+   17 | AEEG+LR? | CERcLAGE        |  1D |  80 | 0 | *
+   18 |  TFLATNN | JOURNAL         |  K5 |  30 | 0 |  
+   19 | AFNTT+HM | MATH            | D12 |  24 | 0 |  
+   20 | AFNT+NRE | FANON           |  I3 |  23 | 0 |  
+   21 |      ERT | ET              | I13 |  18 | 0 |  
+
+   Total: 1023
+
+Rack 0: R
+commande> q
+fin du mode entraînement
+commande> q
Index: eliot/test/test.elt
diff -u eliot/test/test.elt:1.1 eliot/test/test.elt:1.2
--- eliot/test/test.elt:1.1     Tue Dec 27 09:13:48 2005
+++ eliot/test/test.elt Sun Jan  1 19:25:10 2006
@@ -1,7 +1,7 @@
-Eliot
+Eliot 1.5
 
 Game type: Training
-Player 0: Human
+Player 0: Computer
 
     N |   RACK   |    SOLUTION     | REF | PTS | P | BONUS
    ===|==========|=================|=====|=====|===|======
Index: eliot/test/training_back.ref
diff -u eliot/test/training_back.ref:1.1 eliot/test/training_back.ref:1.2
--- eliot/test/training_back.ref:1.1    Tue Dec 27 01:04:49 2005
+++ eliot/test/training_back.ref        Sun Jan  1 19:25:10 2006
@@ -15,11 +15,11 @@
   1: YEBLE              38 6F
   2: BAYLE              36 6H
   3: AMYLE              35 10D
-  4: ELYME              35 10H
-  5: BAYE               35 6H
-  6: ELYME              35 10D
-  7: LAYEE              34 10D
-  8: BEY                34 6H
+  4: ELYME              35 10D
+  5: ELYME              35 10H
+  6: BAYE               35 6H
+  7: BEY                34 6H
+  8: LAYEE              34 10D
   9: YUE                32 10F
  10: AMYLE              30 5H
 commande> n 2
@@ -59,7 +59,7 @@
  N   -  -  -  -  -  -  -  -  -  -  -  -  -  -  -
  O   -  -  -  -  -  -  -  -  -  -  -  -  -  -  -
 commande> a p
-Eliot
+Eliot 1.5
 
 Game type: Training
 Player 0: Human
@@ -73,7 +73,7 @@
 Rack 0: LMUAEYE
 commande> n -1
 commande> a p
-Eliot
+Eliot 1.5
 
 Game type: Training
 Player 0: Human
@@ -110,20 +110,20 @@
 commande> n 1
 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 ?
- 9 2 2 3 13 1 2 2 7 1 1 4 3 6 6 2 1 6 6 6 6 2 1 1 1 1 2
+ 9 2 2 3 13 1 2 2 7 1 1 5 3 6 6 2 1 6 6 6 6 2 1 1 1 1 2
 commande> a p
-Eliot
+Eliot 1.5
 
 Game type: Training
 Player 0: Human
 
     N |   RACK   |    SOLUTION     | REF | PTS | P | BONUS
    ===|==========|=================|=====|=====|===|======
-    1 |  JEIFLEH | FILEE           |  H4 |  24 | 0 |  
+    1 |  IEIEIEF | FIEE            |  H8 |  14 | 0 |  
 
-   Total: 24
+   Total: 14
 
-Rack 0: HJ
+Rack 0: EII
 commande> q
 fin du mode entraînement
 commande> q
Index: eliot/test/training_search.ref
diff -u eliot/test/training_search.ref:1.2 eliot/test/training_search.ref:1.3
--- eliot/test/training_search.ref:1.2  Sat Dec 24 17:50:11 2005
+++ eliot/test/training_search.ref      Sun Jan  1 19:25:10 2006
@@ -810,10 +810,10 @@
   9: ZoE                11 9H
  10: ZeE                11 9H
  11: QuE                11 6H
- 12: Eh                  4 G7
- 13: En                  4 G7
- 14: Es                  4 G7
- 15: Ex                  4 G7
+ 12: Eh                  5 G7
+ 13: En                  5 G7
+ 14: Es                  5 G7
+ 15: Ex                  5 G7
  16: aIE                 2 8G
  17: fIE                 2 8G
  18: IxE                 2 8H