pierre/Ustagammon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Moteur : classement de l'analyse d'un coup, comme gnubg de bureau

Browse Source 
engine_analyse_move rend les dix premiers coups de la liste de l'analyse,
chacun au niveau où gnubg l'a évalué, et refait d'abord l'analyse de la
chance comme AnalyzeMove : son cache change les coups restés à 0 pli.
Les références d'analyse gagnent le niveau de chaque coup du classement,
comparé par compare.py.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Pierre MARTIN
2026-11-12 02:47:38 +01:00
co-authored by Claude Opus 5.5
parent c42316d9d8
commit 1d21ac15d2
23 changed files with 516 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/reference/README.md
+9 -1
View File
@@ -256,7 +256,11 @@ Un fichier de résultat reprend le cas, avec `type` (`move`, `cube` ou
gnubg plus 1), `played_equity`, `best_move`, `best_equity`, `equity_loss`
(perte du coup joué, 0 ou négative : statistique « error-skill » de gnubg
changée de signe), `skill` (`none`, `doubtful`, `bad`, `very_bad`) et
`ranking` (les dix premiers coups, et jusqu'au coup joué) ; plus, une fois
`ranking` (les dix premiers coups, et jusqu'au coup joué, chacun avec
`move`, `ply` et `equity` : comme pour `hint`, `ply` est le niveau auquel
gnubg a réellement évalué le coup ; à la différence de `hint`, l'analyse
réévalue au niveau demandé le meilleur coup et le coup joué quand celui-ci
est une erreur, au-delà du seuil « douteux ») ; plus, une fois
pour toutes, `luck` : `value` (chance du jet) et `rating`
(`very_unlucky`, `unlucky`, `none`, `lucky`, `very_lucky`) ;
- **videau** : `analysed` (gnubg analyse-t-il cette décision ? pas à la
@@ -337,6 +341,10 @@ Pour chaque analyse (`engine-cli analysemove`, `analysecube`, `luck`, et
équité que le coup joué, à la tolérance près : remarque), même meilleur coup
sauf égalité, et `played_equity`, `best_equity`, `equity_loss` à la
tolérance près ;
- classement de l'analyse (`ranking`, dix coups au plus) : chaque coup de
gnubg présent (sauf égalité avec le dixième), au même `ply` et à la même
équité à la tolérance près ; son premier coup et le coup joué y sont
exactement `best` et `played` ;
- chance : `value` à la tolérance près ;
- videau : même `analysed`, même décision et équités à la tolérance près,
`equity_loss` à la tolérance près ;
tests/reference/analysis/move-bearoff-doubles.json
+2
View File
@@ -25,6 +25,7 @@
"ranking": [
{
"move": "6/off(2) 4/off 1/off",
"ply": 0,
"equity": 0.8888838
}
]
@@ -42,6 +43,7 @@
"ranking": [
{
"move": "6/off(2) 4/off 1/off",
"ply": 0,
"equity": 0.8888838
}
]
tests/reference/analysis/move-blitz-doubles.json
+119
View File
@@ -25,438 +25,547 @@
"ranking": [
{
"move": "13/10 6/3 4/1*(2)",
"ply": 0,
"equity": 0.9465638
},
{
"move": "8/5 6/3 4/1*(2)",
"ply": 0,
"equity": 0.9422797
},
{
"move": "13/7 13/10 6/3",
"ply": 0,
"equity": 0.94128984
},
{
"move": "13/7 8/5 6/3",
"ply": 0,
"equity": 0.9370698
},
{
"move": "13/10(2) 7/4 6/3",
"ply": 0,
"equity": 0.93615985
},
{
"move": "13/10(2) 8/5 6/3",
"ply": 0,
"equity": 0.9330082
},
{
"move": "13/10 8/5 7/4 6/3",
"ply": 0,
"equity": 0.932737
},
{
"move": "13/10 7/1* 6/3",
"ply": 0,
"equity": 0.9313148
},
{
"move": "8/5 7/1* 6/3",
"ply": 0,
"equity": 0.93129885
},
{
"move": "13/4 6/3",
"ply": 0,
"equity": 0.92980635
},
{
"move": "13/10 8/5(2) 6/3",
"ply": 0,
"equity": 0.9264537
},
{
"move": "13/10(3) 6/3",
"ply": 0,
"equity": 0.9262361
},
{
"move": "13/10(2) 4/1*(2)",
"ply": 0,
"equity": 0.92529553
},
{
"move": "8/5(2) 7/4 6/3",
"ply": 0,
"equity": 0.9252107
},
{
"move": "7/1* 6/3 4/1",
"ply": 0,
"equity": 0.92395884
},
{
"move": "13/10 6/3 5/2(2)",
"ply": 0,
"equity": 0.9204093
},
{
"move": "13/7 4/1*(2)",
"ply": 0,
"equity": 0.9190106
},
{
"move": "13/7(2)",
"ply": 0,
"equity": 0.9184398
},
{
"move": "13/10 8/5 4/1*(2)",
"ply": 0,
"equity": 0.9182539
},
{
"move": "7/4 6/3 5/2(2)",
"ply": 0,
"equity": 0.91752934
},
{
"move": "13/7 13/10(2)",
"ply": 0,
"equity": 0.91483337
},
{
"move": "13/10 8/2 6/3",
"ply": 0,
"equity": 0.912639
},
{
"move": "13/7 13/10 8/5",
"ply": 0,
"equity": 0.91152656
},
{
"move": "13/10(2) 7/1*",
"ply": 0,
"equity": 0.9115156
},
{
"move": "13/1*",
"ply": 0,
"equity": 0.9111869
},
{
"move": "13/10(2) 6/3 4/1*",
"ply": 0,
"equity": 0.91055506
},
{
"move": "8/2 8/5 6/3",
"ply": 0,
"equity": 0.9091699
},
{
"move": "8/2 7/4 6/3",
"ply": 0,
"equity": 0.90897554
},
{
"move": "13/7 8/5(2)",
"ply": 0,
"equity": 0.90817225
},
{
"move": "13/7 6/3 4/1*",
"ply": 0,
"equity": 0.90714073
},
{
"move": "13/10(2) 8/5 7/4",
"ply": 0,
"equity": 0.9070756
},
{
"move": "8/2(2)",
"ply": 0,
"equity": 0.9065211
},
{
"move": "13/10 8/5 7/1*",
"ply": 0,
"equity": 0.90571
},
{
"move": "13/10(3) 7/4",
"ply": 0,
"equity": 0.9040942
},
{
"move": "13/10 8/5 6/3 4/1*",
"ply": 0,
"equity": 0.90343916
},
{
"move": "8/5(2) 4/1*(2)",
"ply": 0,
"equity": 0.90325713
},
{
"move": "5/2(2) 4/1*(2)",
"ply": 0,
"equity": 0.90183336
},
{
"move": "13/10 7/1* 4/1",
"ply": 0,
"equity": 0.9013542
},
{
"move": "13/4 7/4",
"ply": 0,
"equity": 0.9010268
},
{
"move": "13/7 5/2(2)",
"ply": 0,
"equity": 0.90037674
},
{
"move": "8/5(2) 7/1*",
"ply": 0,
"equity": 0.89956194
},
{
"move": "13/10 8/5(2) 7/4",
"ply": 0,
"equity": 0.8988826
},
{
"move": "8/2 6/3 5/2",
"ply": 0,
"equity": 0.8984738
},
{
"move": "13/4 13/10",
"ply": 0,
"equity": 0.89749956
},
{
"move": "6/3(2) 4/1*(2)",
"ply": 0,
"equity": 0.8951012
},
{
"move": "13/10(2) 8/5(2)",
"ply": 0,
"equity": 0.89493525
},
{
"move": "13/7 8/2",
"ply": 0,
"equity": 0.8946096
},
{
"move": "13/7 6/3(2)",
"ply": 0,
"equity": 0.89403474
},
{
"move": "7/1* 5/2(2)",
"ply": 0,
"equity": 0.8924208
},
{
"move": "8/5 7/1* 4/1",
"ply": 0,
"equity": 0.891961
},
{
"move": "13/10(2) 6/3(2)",
"ply": 0,
"equity": 0.89077055
},
{
"move": "13/4 8/5",
"ply": 0,
"equity": 0.8907301
},
{
"move": "8/5(2) 6/3 4/1*",
"ply": 0,
"equity": 0.8900244
},
{
"move": "13/10(2) 5/2(2)",
"ply": 0,
"equity": 0.8890666
},
{
"move": "7/4 6/3(3)",
"ply": 0,
"equity": 0.8890004
},
{
"move": "13/10 7/4 5/2(2)",
"ply": 0,
"equity": 0.8888954
},
{
"move": "8/2 8/5 7/4",
"ply": 0,
"equity": 0.8876569
},
{
"move": "13/10(4)",
"ply": 0,
"equity": 0.88716996
},
{
"move": "7/1* 6/3(2)",
"ply": 0,
"equity": 0.8856077
},
{
"move": "8/2 4/1*(2)",
"ply": 0,
"equity": 0.8853629
},
{
"move": "13/10 6/3(3)",
"ply": 0,
"equity": 0.8853096
},
{
"move": "13/7 6/3 5/2",
"ply": 0,
"equity": 0.8831558
},
{
"move": "13/10 8/2 7/4",
"ply": 0,
"equity": 0.8819176
},
{
"move": "7/1* 4/1(2)",
"ply": 0,
"equity": 0.88113916
},
{
"move": "13/10 7/4 6/3(2)",
"ply": 0,
"equity": 0.88064635
},
{
"move": "13/10(3) 8/5",
"ply": 0,
"equity": 0.88049895
},
{
"move": "6/3 5/2(2) 4/1*",
"ply": 0,
"equity": 0.8790827
},
{
"move": "13/10(2) 8/2",
"ply": 0,
"equity": 0.8782023
},
{
"move": "6/3 5/2 4/1*(2)",
"ply": 0,
"equity": 0.8774586
},
{
"move": "8/5 6/3(3)",
"ply": 0,
"equity": 0.8774268
},
{
"move": "8/2 7/1*",
"ply": 0,
"equity": 0.8772669
},
{
"move": "13/7 13/10 4/1*",
"ply": 0,
"equity": 0.87700987
},
{
"move": "13/10 8/5 6/3(2)",
"ply": 0,
"equity": 0.8757389
},
{
"move": "13/10 8/2 8/5",
"ply": 0,
"equity": 0.87530077
},
{
"move": "13/10(2) 6/3 5/2",
"ply": 0,
"equity": 0.87215745
},
{
"move": "13/7 8/5 4/1*",
"ply": 0,
"equity": 0.87202764
},
{
"move": "8/5 7/4 6/3(2)",
"ply": 0,
"equity": 0.86896765
},
{
"move": "7/1* 6/3 5/2",
"ply": 0,
"equity": 0.8687051
},
{
"move": "13/10 7/4 6/3 5/2",
"ply": 0,
"equity": 0.8679464
},
{
"move": "8/2 6/3 4/1*",
"ply": 0,
"equity": 0.86750233
},
{
"move": "13/10(2) 8/5 4/1*",
"ply": 0,
"equity": 0.86701244
},
{
"move": "8/5(2) 6/3(2)",
"ply": 0,
"equity": 0.86167765
},
{
"move": "13/10(3) 4/1*",
"ply": 0,
"equity": 0.8568015
},
{
"move": "6/3(2) 5/2(2)",
"ply": 0,
"equity": 0.85501754
},
{
"move": "8/2 7/4 5/2",
"ply": 0,
"equity": 0.8537997
},
{
"move": "8/2 5/2(2)",
"ply": 0,
"equity": 0.8524791
},
{
"move": "13/10 8/5(2) 4/1*",
"ply": 0,
"equity": 0.84969926
},
{
"move": "13/10 8/2 5/2",
"ply": 0,
"equity": 0.8466199
},
{
"move": "8/2 6/3(2)",
"ply": 0,
"equity": 0.80814815
},
{
"move": "13/10 5/2(2) 4/1*",
"ply": 0,
"equity": 0.8037353
},
{
"move": "13/10 5/2 4/1*(2)",
"ply": 0,
"equity": 0.77350885
},
{
"move": "13/10 6/3(2) 4/1*",
"ply": 0,
"equity": 0.74067366
},
{
"move": "13/7 13/10 5/2",
"ply": 0,
"equity": 0.72703636
},
{
"move": "13/10(2) 7/4 5/2",
"ply": 0,
"equity": 0.7053956
},
{
"move": "6/3(3) 4/1*",
"ply": 0,
"equity": 0.66575944
},
{
"move": "13/10 7/1* 5/2",
"ply": 0,
"equity": 0.6462204
},
{
"move": "8/5 6/3(2) 4/1*",
"ply": 0,
"equity": 0.6374039
},
{
"move": "8/2 8/5 4/1*",
"ply": 0,
"equity": 0.62353325
},
{
"move": "13/10 8/2 4/1*",
"ply": 0,
"equity": 0.61257124
},
{
"move": "13/10 6/3 5/2 4/1*",
"ply": 0,
"equity": 0.5349428
},
{
"move": "7/1* 5/2 4/1",
"ply": 0,
"equity": 0.45721298
},
{
"move": "8/2 5/2 4/1*",
"ply": 0,
"equity": 0.44362232
},
{
"move": "13/4 5/2",
"ply": 0,
"equity": 0.43828273
},
{
"move": "13/10(3) 5/2",
"ply": 0,
"equity": 0.2798175
},
{
"move": "13/10 6/3(2) 5/2",
"ply": 0,
"equity": 0.24207813
},
{
"move": "6/3(3) 5/2",
"ply": 0,
"equity": 0.23385207
},
{
"move": "7/4 6/3(2) 5/2",
"ply": 0,
"equity": 0.22096781
},
{
"move": "13/7 5/2 4/1*",
"ply": 0,
"equity": 0.18849733
},
{
"move": "13/10(2) 5/2 4/1*",
"ply": 0,
"equity": 0.084023334
}
]
@@ -474,42 +583,52 @@
"ranking": [
{
"move": "13/10 7/1* 6/3",
"ply": 2,
"equity": 1.0
},
{
"move": "13/7 13/10 6/3",
"ply": 2,
"equity": 1.0
},
{
"move": "13/10(2) 8/5 6/3",
"ply": 2,
"equity": 1.0
},
{
"move": "13/7 8/5 6/3",
"ply": 2,
"equity": 1.0
},
{
"move": "13/10(2) 7/4 6/3",
"ply": 2,
"equity": 1.0
},
{
"move": "13/10 8/5 7/4 6/3",
"ply": 2,
"equity": 1.0
},
{
"move": "13/10(2) 5/2 4/1*",
"ply": 2,
"equity": -0.022027964
},
{
"move": "13/10 8/5(2) 6/3",
"ply": 2,
"equity": 1.0
},
{
"move": "13/4 6/3",
"ply": 2,
"equity": 1.0
},
{
"move": "13/10 6/3 4/1*(2)",
"ply": 2,
"equity": 0.99692726
}
]
tests/reference/analysis/move-crawford.json
+20
View File
@@ -25,42 +25,52 @@
"ranking": [
{
"move": "8/5 6/2",
"ply": 0,
"equity": 0.7345603
},
{
"move": "5/2 5/1*",
"ply": 0,
"equity": 0.7229391
},
{
"move": "8/1*",
"ply": 0,
"equity": 0.71705425
},
{
"move": "13/10 6/2",
"ply": 0,
"equity": 0.7142835
},
{
"move": "13/9 8/5",
"ply": 0,
"equity": 0.6963019
},
{
"move": "8/5 8/4",
"ply": 0,
"equity": 0.68610644
},
{
"move": "13/10 8/4",
"ply": 0,
"equity": 0.6855368
},
{
"move": "13/10 13/9",
"ply": 0,
"equity": 0.6818689
},
{
"move": "13/6",
"ply": 0,
"equity": 0.6633271
},
{
"move": "13/9 5/2",
"ply": 0,
"equity": 0.6538005
}
]
@@ -78,42 +88,52 @@
"ranking": [
{
"move": "8/5 6/2",
"ply": 2,
"equity": 0.7697691
},
{
"move": "13/10 6/2",
"ply": 2,
"equity": 0.7615671
},
{
"move": "13/9 8/5",
"ply": 2,
"equity": 0.69608325
},
{
"move": "5/2 5/1*",
"ply": 2,
"equity": 0.6911188
},
{
"move": "8/1*",
"ply": 2,
"equity": 0.6836242
},
{
"move": "13/10 13/9",
"ply": 2,
"equity": 0.6807338
},
{
"move": "13/10 8/4",
"ply": 1,
"equity": 0.6733323
},
{
"move": "13/6",
"ply": 1,
"equity": 0.66055346
},
{
"move": "8/5 8/4",
"ply": 1,
"equity": 0.6556259
},
{
"move": "13/9 5/2",
"ply": 1,
"equity": 0.645951
}
]
tests/reference/analysis/move-forced.json
+2
View File
@@ -25,6 +25,7 @@
"ranking": [
{
"move": "bar/24",
"ply": 0,
"equity": -1.0
}
]
@@ -42,6 +43,7 @@
"ranking": [
{
"move": "bar/24",
"ply": 0,
"equity": -1.0
}
]
tests/reference/analysis/move-jacoby.json
+24
View File
@@ -25,58 +25,72 @@
"ranking": [
{
"move": "13/3",
"ply": 0,
"equity": 0.9328213
},
{
"move": "13/9 13/7",
"ply": 0,
"equity": 0.9175232
},
{
"move": "8/2 7/3",
"ply": 0,
"equity": 0.91263336
},
{
"move": "13/7 8/4",
"ply": 0,
"equity": 0.90736973
},
{
"move": "13/9 7/1*",
"ply": 0,
"equity": 0.9053596
},
{
"move": "8/2 6/2",
"ply": 0,
"equity": 0.9017469
},
{
"move": "8/4 7/1*",
"ply": 0,
"equity": 0.89993495
},
{
"move": "13/7 6/2",
"ply": 0,
"equity": 0.8962312
},
{
"move": "7/1* 5/1",
"ply": 0,
"equity": 0.8907822
},
{
"move": "7/1* 6/2",
"ply": 0,
"equity": 0.87481093
},
{
"move": "13/9 8/2",
"ply": 0,
"equity": 0.87251335
},
{
"move": "8/4 8/2",
"ply": 0,
"equity": 0.8716274
},
{
"move": "13/7 5/1*",
"ply": 0,
"equity": 0.87005275
},
{
"move": "8/2 5/1*",
"ply": 0,
"equity": 0.50889754
}
]
@@ -94,42 +108,52 @@
"ranking": [
{
"move": "13/3",
"ply": 2,
"equity": 1.0
},
{
"move": "13/9 13/7",
"ply": 2,
"equity": 0.99894416
},
{
"move": "8/2 7/3",
"ply": 2,
"equity": 0.99641544
},
{
"move": "13/7 8/4",
"ply": 2,
"equity": 0.98718643
},
{
"move": "13/7 6/2",
"ply": 2,
"equity": 0.9808178
},
{
"move": "13/9 7/1*",
"ply": 2,
"equity": 0.9452111
},
{
"move": "8/2 5/1*",
"ply": 2,
"equity": 0.3304975
},
{
"move": "8/4 7/1*",
"ply": 1,
"equity": 0.93114305
},
{
"move": "7/1* 5/1",
"ply": 1,
"equity": 0.91711015
},
{
"move": "8/2 6/2",
"ply": 1,
"equity": 0.9160911
}
]
tests/reference/analysis/move-luck-lucky.json
+20
View File
@@ -25,42 +25,52 @@
"ranking": [
{
"move": "13/5 11/3",
"ply": 0,
"equity": 0.16933289
},
{
"move": "13/9(2) 11/3",
"ply": 0,
"equity": 0.16701066
},
{
"move": "13/5 9/5 7/3",
"ply": 0,
"equity": 0.16552198
},
{
"move": "13/5(2)",
"ply": 0,
"equity": 0.16473158
},
{
"move": "13/5 13/9 11/7",
"ply": 0,
"equity": 0.16365689
},
{
"move": "13/5 13/9 7/3",
"ply": 0,
"equity": 0.16245355
},
{
"move": "13/5 11/7 9/5",
"ply": 0,
"equity": 0.16167049
},
{
"move": "11/3 9/5(2)",
"ply": 0,
"equity": 0.16043647
},
{
"move": "13/9 11/3 11/7",
"ply": 0,
"equity": 0.1603657
},
{
"move": "13/5 11/7(2)",
"ply": 0,
"equity": 0.1602792
}
]
@@ -78,42 +88,52 @@
"ranking": [
{
"move": "13/5 11/3",
"ply": 2,
"equity": 0.15129912
},
{
"move": "13/5 13/9 11/7",
"ply": 2,
"equity": 0.15059008
},
{
"move": "13/9(2) 11/3",
"ply": 2,
"equity": 0.14950007
},
{
"move": "13/5 11/7 9/5",
"ply": 2,
"equity": 0.14858595
},
{
"move": "11/3 11/7 9/5",
"ply": 2,
"equity": 0.14829463
},
{
"move": "13/9 11/3 11/7",
"ply": 2,
"equity": 0.1463402
},
{
"move": "13/5 9/5 7/3",
"ply": 1,
"equity": 0.13938732
},
{
"move": "13/5 11/7(2)",
"ply": 1,
"equity": 0.13921705
},
{
"move": "13/9(2) 11/7(2)",
"ply": 1,
"equity": 0.13873637
},
{
"move": "13/5 13/9 6/2",
"ply": 1,
"equity": 0.13852078
}
]
tests/reference/analysis/move-luck-unlucky-bearoff.json
+8
View File
@@ -25,18 +25,22 @@
"ranking": [
{
"move": "3/off",
"ply": 0,
"equity": -0.8607614
},
{
"move": "2/off 1/off",
"ply": 0,
"equity": -0.8607614
},
{
"move": "2/1 2/off",
"ply": 0,
"equity": -0.95561147
},
{
"move": "3/1 2/1",
"ply": 0,
"equity": -1.0
}
]
@@ -54,18 +58,22 @@
"ranking": [
{
"move": "3/off",
"ply": 2,
"equity": -0.8607614
},
{
"move": "2/off 1/off",
"ply": 2,
"equity": -0.8607614
},
{
"move": "2/1 2/off",
"ply": 2,
"equity": -0.95561147
},
{
"move": "3/1 2/1",
"ply": 1,
"equity": -1.0
}
]
tests/reference/analysis/move-luck-unlucky.json
+20
View File
@@ -25,42 +25,52 @@
"ranking": [
{
"move": "18/9",
"ply": 0,
"equity": 0.2544027
},
{
"move": "18/14 13/8",
"ply": 0,
"equity": 0.22496489
},
{
"move": "24/20 18/13",
"ply": 0,
"equity": 0.20747662
},
{
"move": "24/20 13/8",
"ply": 0,
"equity": 0.1158272
},
{
"move": "13/9 13/8",
"ply": 0,
"equity": 0.09201278
},
{
"move": "24/15",
"ply": 0,
"equity": 0.061017293
},
{
"move": "18/13 6/2",
"ply": 0,
"equity": 0.03581623
},
{
"move": "13/4",
"ply": 0,
"equity": -0.028887823
},
{
"move": "13/8 6/2",
"ply": 0,
"equity": -0.033572298
},
{
"move": "18/13 8/4",
"ply": 0,
"equity": -0.09662818
}
]
@@ -78,42 +88,52 @@
"ranking": [
{
"move": "18/9",
"ply": 2,
"equity": 0.27687487
},
{
"move": "18/14 13/8",
"ply": 2,
"equity": 0.21801135
},
{
"move": "24/20 18/13",
"ply": 2,
"equity": 0.21000355
},
{
"move": "24/20 13/8",
"ply": 2,
"equity": 0.1144446
},
{
"move": "13/9 13/8",
"ply": 2,
"equity": 0.09412725
},
{
"move": "24/15",
"ply": 2,
"equity": 0.07892294
},
{
"move": "18/13 6/2",
"ply": 1,
"equity": -0.020656409
},
{
"move": "13/4",
"ply": 0,
"equity": -0.028887823
},
{
"move": "13/8 6/2",
"ply": 0,
"equity": -0.033572298
},
{
"move": "18/13 8/4",
"ply": 0,
"equity": -0.09662818
}
]
tests/reference/analysis/move-match.json
+20
View File
@@ -25,42 +25,52 @@
"ranking": [
{
"move": "13/5",
"ply": 0,
"equity": 0.7553502
},
{
"move": "18/13 8/5",
"ply": 0,
"equity": 0.5814649
},
{
"move": "24/16*",
"ply": 0,
"equity": 0.4581785
},
{
"move": "18/10",
"ply": 0,
"equity": 0.31719947
},
{
"move": "8/5 8/3",
"ply": 0,
"equity": 0.31371918
},
{
"move": "18/15 13/8",
"ply": 0,
"equity": 0.26037523
},
{
"move": "24/21 18/13",
"ply": 0,
"equity": 0.23547156
},
{
"move": "8/3 6/3",
"ply": 0,
"equity": 0.15432969
},
{
"move": "13/10 13/8",
"ply": 0,
"equity": 0.13837479
},
{
"move": "18/13 5/2",
"ply": 0,
"equity": 0.12815686
}
]
@@ -78,42 +88,52 @@
"ranking": [
{
"move": "13/5",
"ply": 2,
"equity": 0.85497326
},
{
"move": "24/16*",
"ply": 2,
"equity": 0.46805125
},
{
"move": "18/13 8/5",
"ply": 1,
"equity": 0.6511238
},
{
"move": "18/10",
"ply": 0,
"equity": 0.31719947
},
{
"move": "8/5 8/3",
"ply": 0,
"equity": 0.31371918
},
{
"move": "18/15 13/8",
"ply": 0,
"equity": 0.26037523
},
{
"move": "24/21 18/13",
"ply": 0,
"equity": 0.23547156
},
{
"move": "8/3 6/3",
"ply": 0,
"equity": 0.15432969
},
{
"move": "13/10 13/8",
"ply": 0,
"equity": 0.13837479
},
{
"move": "18/13 5/2",
"ply": 0,
"equity": 0.12815686
}
]
tests/reference/analysis/move-middlegame-blunder.json
+24
View File
@@ -25,58 +25,72 @@
"ranking": [
{
"move": "24/14",
"ply": 0,
"equity": 0.15439394
},
{
"move": "8/2 6/2",
"ply": 0,
"equity": 0.10821653
},
{
"move": "24/18 13/9",
"ply": 0,
"equity": 0.10337136
},
{
"move": "24/20 24/18",
"ply": 0,
"equity": 0.072762795
},
{
"move": "13/9 13/7",
"ply": 0,
"equity": 0.0029048775
},
{
"move": "24/20 13/7",
"ply": 0,
"equity": 9.1438415e-05
},
{
"move": "13/3",
"ply": 0,
"equity": -0.012697897
},
{
"move": "24/18 6/2",
"ply": 0,
"equity": -0.075399
},
{
"move": "24/18 8/4",
"ply": 0,
"equity": -0.088734664
},
{
"move": "24/20 8/2",
"ply": 0,
"equity": -0.095189385
},
{
"move": "13/9 8/2",
"ply": 0,
"equity": -0.09528468
},
{
"move": "13/7 8/4",
"ply": 0,
"equity": -0.12819159
},
{
"move": "13/7 6/2",
"ply": 0,
"equity": -0.14467186
},
{
"move": "8/4 8/2",
"ply": 0,
"equity": -0.35321844
}
]
@@ -94,42 +108,52 @@
"ranking": [
{
"move": "24/14",
"ply": 2,
"equity": 0.13111727
},
{
"move": "8/2 6/2",
"ply": 2,
"equity": 0.11303549
},
{
"move": "24/18 13/9",
"ply": 2,
"equity": 0.105096616
},
{
"move": "24/20 24/18",
"ply": 2,
"equity": 0.049068402
},
{
"move": "13/3",
"ply": 2,
"equity": -0.0040049786
},
{
"move": "8/4 8/2",
"ply": 2,
"equity": -0.36824828
},
{
"move": "13/9 13/7",
"ply": 2,
"equity": -0.014309813
},
{
"move": "24/20 13/7",
"ply": 1,
"equity": -0.029367238
},
{
"move": "24/18 8/4",
"ply": 1,
"equity": -0.081171095
},
{
"move": "24/18 6/2",
"ply": 1,
"equity": -0.09313507
}
]
tests/reference/analysis/move-middlegame-close.json
+20
View File
@@ -25,42 +25,52 @@
"ranking": [
{
"move": "24/14",
"ply": 0,
"equity": 0.15439394
},
{
"move": "8/2 6/2",
"ply": 0,
"equity": 0.10821653
},
{
"move": "24/18 13/9",
"ply": 0,
"equity": 0.10337136
},
{
"move": "24/20 24/18",
"ply": 0,
"equity": 0.072762795
},
{
"move": "13/9 13/7",
"ply": 0,
"equity": 0.0029048775
},
{
"move": "24/20 13/7",
"ply": 0,
"equity": 9.1438415e-05
},
{
"move": "13/3",
"ply": 0,
"equity": -0.012697897
},
{
"move": "24/18 6/2",
"ply": 0,
"equity": -0.075399
},
{
"move": "24/18 8/4",
"ply": 0,
"equity": -0.088734664
},
{
"move": "24/20 8/2",
"ply": 0,
"equity": -0.095189385
}
]
@@ -78,42 +88,52 @@
"ranking": [
{
"move": "24/14",
"ply": 2,
"equity": 0.13111727
},
{
"move": "8/2 6/2",
"ply": 2,
"equity": 0.11303549
},
{
"move": "24/18 13/9",
"ply": 2,
"equity": 0.105096616
},
{
"move": "24/20 24/18",
"ply": 2,
"equity": 0.049068402
},
{
"move": "13/3",
"ply": 2,
"equity": -0.0040049786
},
{
"move": "13/9 13/7",
"ply": 2,
"equity": -0.014309813
},
{
"move": "24/20 13/7",
"ply": 1,
"equity": -0.029367238
},
{
"move": "24/18 8/4",
"ply": 1,
"equity": -0.081171095
},
{
"move": "24/18 6/2",
"ply": 1,
"equity": -0.09313507
},
{
"move": "24/20 8/2",
"ply": 0,
"equity": -0.095189385
}
]
tests/reference/analysis/move-opening-31-best.json
+20
View File
@@ -25,42 +25,52 @@
"ranking": [
{
"move": "8/5 6/5",
"ply": 0,
"equity": 0.21258597
},
{
"move": "24/23 13/10",
"ply": 0,
"equity": -0.010789523
},
{
"move": "24/20",
"ply": 0,
"equity": -0.017392516
},
{
"move": "24/23 24/21",
"ply": 0,
"equity": -0.023609947
},
{
"move": "13/9",
"ply": 0,
"equity": -0.027675275
},
{
"move": "24/21 6/5",
"ply": 0,
"equity": -0.04369401
},
{
"move": "13/10 6/5",
"ply": 0,
"equity": -0.04984435
},
{
"move": "24/23 8/5",
"ply": 0,
"equity": -0.104100645
},
{
"move": "24/23 6/3",
"ply": 0,
"equity": -0.10542354
},
{
"move": "24/21 8/7",
"ply": 0,
"equity": -0.107585564
}
]
@@ -78,42 +88,52 @@
"ranking": [
{
"move": "8/5 6/5",
"ply": 1,
"equity": 0.20373425
},
{
"move": "24/23 13/10",
"ply": 1,
"equity": -0.022293653
},
{
"move": "24/20",
"ply": 1,
"equity": -0.031027086
},
{
"move": "24/23 24/21",
"ply": 1,
"equity": -0.03213631
},
{
"move": "13/9",
"ply": 1,
"equity": -0.040205758
},
{
"move": "24/21 6/5",
"ply": 0,
"equity": -0.04369401
},
{
"move": "13/10 6/5",
"ply": 0,
"equity": -0.04984435
},
{
"move": "24/23 8/5",
"ply": 0,
"equity": -0.104100645
},
{
"move": "24/23 6/3",
"ply": 0,
"equity": -0.10542354
},
{
"move": "24/21 8/7",
"ply": 0,
"equity": -0.107585564
}
]
tests/reference/analysis/move-opening-31-error.json
+20
View File
@@ -25,42 +25,52 @@
"ranking": [
{
"move": "8/5 6/5",
"ply": 0,
"equity": 0.21258597
},
{
"move": "24/23 13/10",
"ply": 0,
"equity": -0.010789523
},
{
"move": "24/20",
"ply": 0,
"equity": -0.017392516
},
{
"move": "24/23 24/21",
"ply": 0,
"equity": -0.023609947
},
{
"move": "13/9",
"ply": 0,
"equity": -0.027675275
},
{
"move": "24/21 6/5",
"ply": 0,
"equity": -0.04369401
},
{
"move": "13/10 6/5",
"ply": 0,
"equity": -0.04984435
},
{
"move": "24/23 8/5",
"ply": 0,
"equity": -0.104100645
},
{
"move": "24/23 6/3",
"ply": 0,
"equity": -0.10542354
},
{
"move": "24/21 8/7",
"ply": 0,
"equity": -0.107585564
}
]
@@ -78,42 +88,52 @@
"ranking": [
{
"move": "8/5 6/5",
"ply": 2,
"equity": 0.1998143
},
{
"move": "24/23 13/10",
"ply": 2,
"equity": -0.0118339015
},
{
"move": "24/20",
"ply": 1,
"equity": -0.031027086
},
{
"move": "24/23 24/21",
"ply": 1,
"equity": -0.03213631
},
{
"move": "13/9",
"ply": 1,
"equity": -0.040205758
},
{
"move": "24/21 6/5",
"ply": 0,
"equity": -0.04369401
},
{
"move": "13/10 6/5",
"ply": 0,
"equity": -0.04984435
},
{
"move": "24/23 8/5",
"ply": 0,
"equity": -0.104100645
},
{
"move": "24/23 6/3",
"ply": 0,
"equity": -0.10542354
},
{
"move": "24/21 8/7",
"ply": 0,
"equity": -0.107585564
}
]
tests/reference/analysis/move-opening-65-error.json
+14
View File
@@ -25,30 +25,37 @@
"ranking": [
{
"move": "24/13",
"ply": 0,
"equity": 0.082985915
},
{
"move": "24/18 13/8",
"ply": 0,
"equity": 0.03631018
},
{
"move": "13/8 13/7",
"ply": 0,
"equity": -0.05142035
},
{
"move": "13/2",
"ply": 0,
"equity": -0.13522762
},
{
"move": "24/18 8/3",
"ply": 0,
"equity": -0.14635906
},
{
"move": "13/7 8/3",
"ply": 0,
"equity": -0.17384717
},
{
"move": "8/3 8/2",
"ply": 0,
"equity": -0.37779096
}
]
@@ -66,30 +73,37 @@
"ranking": [
{
"move": "24/13",
"ply": 2,
"equity": 0.07996891
},
{
"move": "24/18 13/8",
"ply": 2,
"equity": 0.03882884
},
{
"move": "13/8 13/7",
"ply": 2,
"equity": -0.061850794
},
{
"move": "13/2",
"ply": 1,
"equity": -0.12083713
},
{
"move": "24/18 8/3",
"ply": 1,
"equity": -0.13999933
},
{
"move": "13/7 8/3",
"ply": 0,
"equity": -0.17384717
},
{
"move": "8/3 8/2",
"ply": 0,
"equity": -0.37779096
}
]
tests/reference/analysis/move-opening-double.json
+20
View File
@@ -25,42 +25,52 @@
"ranking": [
{
"move": "24/18(2) 13/7(2)",
"ply": 0,
"equity": 0.539388
},
{
"move": "24/18 13/7(3)",
"ply": 0,
"equity": 0.33099693
},
{
"move": "24/18(2) 8/2(2)",
"ply": 0,
"equity": 0.27119082
},
{
"move": "13/7(2) 8/2(2)",
"ply": 0,
"equity": 0.1563462
},
{
"move": "24/18 13/7(2) 8/2",
"ply": 0,
"equity": 0.14750561
},
{
"move": "13/7(4)",
"ply": 0,
"equity": 0.14310652
},
{
"move": "24/18(2) 13/7 8/2",
"ply": 0,
"equity": 0.12353878
},
{
"move": "13/7(3) 8/2",
"ply": 0,
"equity": 0.101389736
},
{
"move": "24/18 13/7 8/2(2)",
"ply": 0,
"equity": -0.05435923
},
{
"move": "24/18 8/2(3)",
"ply": 0,
"equity": -0.12482335
}
]
@@ -78,42 +88,52 @@
"ranking": [
{
"move": "24/18(2) 13/7(2)",
"ply": 1,
"equity": 0.5886327
},
{
"move": "24/18 13/7(3)",
"ply": 1,
"equity": 0.33312234
},
{
"move": "24/18(2) 8/2(2)",
"ply": 0,
"equity": 0.27119082
},
{
"move": "13/7(2) 8/2(2)",
"ply": 0,
"equity": 0.1563462
},
{
"move": "24/18 13/7(2) 8/2",
"ply": 0,
"equity": 0.14750561
},
{
"move": "13/7(4)",
"ply": 0,
"equity": 0.14310652
},
{
"move": "24/18(2) 13/7 8/2",
"ply": 0,
"equity": 0.12353878
},
{
"move": "13/7(3) 8/2",
"ply": 0,
"equity": 0.101389736
},
{
"move": "24/18 13/7 8/2(2)",
"ply": 0,
"equity": -0.05435923
},
{
"move": "24/18 8/2(3)",
"ply": 0,
"equity": -0.12482335
}
]
tests/reference/analysis/move-race.json
+39
View File
@@ -25,118 +25,147 @@
"ranking": [
{
"move": "13/9 11/6",
"ply": 0,
"equity": -0.22230339
},
{
"move": "11/6 9/5",
"ply": 0,
"equity": -0.22993731
},
{
"move": "13/8 9/5",
"ply": 0,
"equity": -0.23005769
},
{
"move": "13/9 13/8",
"ply": 0,
"equity": -0.23073325
},
{
"move": "13/8 11/7",
"ply": 0,
"equity": -0.23153114
},
{
"move": "11/7 11/6",
"ply": 0,
"equity": -0.2335976
},
{
"move": "13/8 7/3",
"ply": 0,
"equity": -0.23374501
},
{
"move": "11/6 7/3",
"ply": 0,
"equity": -0.23394687
},
{
"move": "13/4",
"ply": 0,
"equity": -0.23507257
},
{
"move": "13/9 7/2",
"ply": 0,
"equity": -0.23529215
},
{
"move": "7/3 7/2",
"ply": 0,
"equity": -0.23544219
},
{
"move": "11/2",
"ply": 0,
"equity": -0.235758
},
{
"move": "11/7 9/4",
"ply": 0,
"equity": -0.23589191
},
{
"move": "13/8 6/2",
"ply": 0,
"equity": -0.24026787
},
{
"move": "9/5 7/2",
"ply": 0,
"equity": -0.24087214
},
{
"move": "13/8 5/1",
"ply": 0,
"equity": -0.24252185
},
{
"move": "9/5 9/4",
"ply": 0,
"equity": -0.2440444
},
{
"move": "9/4 6/2",
"ply": 0,
"equity": -0.24487257
},
{
"move": "9/4 7/3",
"ply": 0,
"equity": -0.24512678
},
{
"move": "11/6 5/1",
"ply": 0,
"equity": -0.25016445
},
{
"move": "9/4 5/1",
"ply": 0,
"equity": -0.25572774
},
{
"move": "7/2 5/1",
"ply": 0,
"equity": -0.258138
},
{
"move": "7/3 6/1",
"ply": 0,
"equity": -0.25878713
},
{
"move": "7/2 6/2",
"ply": 0,
"equity": -0.26088732
},
{
"move": "13/9 6/1",
"ply": 0,
"equity": -0.26104733
},
{
"move": "9/5 6/1",
"ply": 0,
"equity": -0.26680842
},
{
"move": "11/7 6/1",
"ply": 0,
"equity": -0.2670043
},
{
"move": "6/2 6/1",
"ply": 0,
"equity": -0.27360544
},
{
"move": "6/1 5/1",
"ply": 0,
"equity": -0.31466243
}
]
@@ -154,42 +183,52 @@
"ranking": [
{
"move": "13/9 11/6",
"ply": 2,
"equity": -0.21922025
},
{
"move": "13/9 13/8",
"ply": 2,
"equity": -0.2202243
},
{
"move": "11/6 9/5",
"ply": 2,
"equity": -0.22022447
},
{
"move": "13/8 9/5",
"ply": 2,
"equity": -0.22088149
},
{
"move": "11/7 11/6",
"ply": 2,
"equity": -0.22277355
},
{
"move": "13/4",
"ply": 2,
"equity": -0.2230124
},
{
"move": "6/1 5/1",
"ply": 2,
"equity": -0.29347342
},
{
"move": "11/7 9/4",
"ply": 1,
"equity": -0.22985312
},
{
"move": "13/8 11/7",
"ply": 1,
"equity": -0.23169218
},
{
"move": "13/9 7/2",
"ply": 1,
"equity": -0.23561361
}
]
tests/reference/compare.py
+30
View File
@@ -210,6 +210,36 @@ def compare_move_analysis(report, cli, case):
report.number(where, "equity_loss", expected["equity_loss"], actual["equity_loss"])
same_label(report, where, "skill", expected["skill"], actual["skill"],
expected["equity_loss"], SKILL_THRESHOLDS)
compare_analysis_ranking(report, where, expected, actual)
def compare_analysis_ranking(report, where, expected, actual):
"""Classement de l'analyse : les dix premiers coups de gnubg (le moteur
n'en rend pas plus), au même niveau et à la même équité, à la tolérance
près ; le meilleur coup et le coup joué y ont exactement les évaluations
de best et played."""
engine = actual["ranking"]
reference = expected["ranking"][:10]
report.same(where, "taille du classement", len(reference), len(engine))
by_move = {m["move"]: m for m in engine}
for m in reference:
other = by_move.get(m["move"])
here = "%s classement %s" % (where, m["move"])
if other is None:
# Un coup à égalité avec le dixième peut changer de côté.
tied = abs(m["equity"] - reference[-1]["equity"]) <= report.tolerance
if not tied:
report.same(here, "présent", True, False)
continue
report.same(here, "ply", m["ply"], other["ply"])
report.number(here, "equity", m["equity"], other["equity"])
if engine:
report.same(where, "classement, meilleur coup", actual["best"], engine[0])
for m in engine:
if m["move"] == actual["played"]["move"]:
report.same(where, "classement, coup joué", actual["played"], m)
report.same(where, "classement, rang du coup joué", actual["rank"],
engine.index(m) + 1)
def compare_cube_analysis(report, cli, case):
tests/reference/generate.py
+21 -8
View File
@@ -221,15 +221,25 @@ def set_analysis(ply):
def analyse_game():
"""Analyse la partie en cours ; renvoie ses enregistrements et ses
statistiques par joueur (« X », « O »). Le cache est vidé avant : les
"""Analyse la partie en cours ; renvoie ses enregistrements, ses
statistiques par joueur (« X », « O ») et les informations du match. Le cache est vidé avant : les
évaluations à 2 plis faites pour choisir un coup y laissent des
résultats à 0 pli des réseaux d'élagage, que l'analyse à 0 pli
reprendrait (voir analyse_move)."""
gnubg.command("clear cache")
gnubg.command("analyse game")
game = gnubg.match(analysis=1, verbose=1, statistics=1, boards=1)["games"][-1]
return game["game"], game["stats"]
match = gnubg.match(analysis=1, verbose=1, statistics=1, boards=1)
game = match["games"][-1]
return game["game"], game["stats"], match["match-info"]
def move_plies(match_info, move):
"""Niveau auquel gnubg a évalué un coup de l'analyse : gnubg.match ne
donne le réglage d'un coup (« evalcontext ») que s'il diffère du réglage
par défaut de la partie (« default-eval-context », celui du premier coup
évalué rencontré)."""
context = move.get("evalcontext", {})
return context.get("plies", match_info["default-eval-context"]["plies"])
def last_record(records, action):
@@ -280,7 +290,7 @@ def analyse_move(case, ply):
# vient de jouer est la position retournée.
played_id = gnubg.positionid(swapped(gnubg.board()))
set_analysis(ply)
records, stats = analyse_game()
records, stats, match_info = analyse_game()
record = last_record(records, "move")
analysis = record["analysis"]
moves, index = analysis["moves"], analysis["imove"]
@@ -304,7 +314,10 @@ def analyse_move(case, ply):
# comptée en positif.
"equity_loss": f32(-stats[record["player"]]["moves"]["error-skill"]),
"skill": SKILLS[analysis.get("skill")],
"ranking": [{"move": notation(m["move"]), "equity": f32(m["score"])} for m in kept],
# Avec le niveau de chaque coup : les coups écartés par les filtres
# gardent celui d'un niveau inférieur (voir README.md).
"ranking": [{"move": notation(m["move"]), "ply": move_plies(match_info, m),
"equity": f32(m["score"])} for m in kept],
}
luck = {"value": f32(analysis["luck-value"]), "rating": LUCKS[analysis.get("luck")]}
return level, luck
@@ -322,7 +335,7 @@ def analyse_cube(case, ply):
# meilleur coup, l'analyse du videau portant sur la position avant.
gnubg.command("set dice 2 1")
gnubg.command("move " + best_move())
records, stats = analyse_game()
records, stats, _ = analyse_game()
record = last_record(records, "move")
analysed = "nd-cubeful-eq" in record["analysis"]
skill = record["analysis"].get("cube-skill")
@@ -332,7 +345,7 @@ def analyse_cube(case, ply):
# du double.
gnubg.command("double")
gnubg.command("drop" if action == "pass" else "take")
records, stats = analyse_game()
records, stats, _ = analyse_game()
analysed = "nd-cubeful-eq" in last_record(records, "double").get("analysis", {})
record = last_record(records, {"double": "double", "take": "take", "pass": "drop"}[action])
skill = record.get("analysis", {}).get("skill")
tests/test_reference.sh
+2 -1
View File
@@ -130,7 +130,8 @@ if .type == "move" then
and (.played_position_id | test("^[A-Za-z0-9+/]{14}$")) and (.played_equity | nombre)
and (.best_move | type) == "string" and (.best_equity | nombre)
and (.equity_loss | nombre) and .equity_loss <= 0 and (.skill | skill)
and (.ranking | length) >= ([.rank, ([.move_count, 10] | min)] | max))
and (.ranking | length) >= ([.rank, ([.move_count, 10] | min)] | max)
and all(.ranking[]; (.move | type) == "string" and (.ply | nombre) and (.equity | nombre)))
then empty else "analyse de coup incomplète" end)
elif .type == "cube" then
(if (.plies | keys) == ["0", "2"] and (.action | IN("no_double", "double", "take", "pass"))