Version 10.09

lukasmonk · Dec 3, 2016 · abcd8af · abcd8af
1 parent d44f3a5
commit abcd8af
Show file tree

Hide file tree

Showing 437 changed files with 26,294 additions and 12,081 deletions.
diff --git a/Code/Albums.pyc b/Code/Albums.pyc
diff --git a/Code/Analisis.py b/Code/Analisis.py
@@ -660,7 +660,7 @@ def grabarBase(self, partida, rm, siTodos=True):
         nombre = self.etiquetaMotor()
         tiempo = self.etiquetaTiempo()
         comentario = " {%s %s %s} " % (rm.abrTexto(), nombre, tiempo)
-        jugada = partida.pgnBaseRAW(self.mAnalisis.posJugada / 2 + 1)
+        jugada = partida.pgnBaseRAW(self.jg.posicionBase.jugadas)
         li = jugada.split(" ")
         n = 1 if siW else 2
         if siTodos:

diff --git a/Code/Analisis.pyc b/Code/Analisis.pyc
diff --git a/Code/AnalisisIndexes.py b/Code/AnalisisIndexes.py
@@ -249,7 +249,7 @@ def get_gamestage(cp, mrm):
 def tp_gamestage(cp, mrm):
     return _("Game stage"), calc_gamestage(cp, mrm), get_gamestage(cp, mrm)
 
-def genIndexes(partida):
+def genIndexes(partida, alm):
     average = {True: 0, False: 0}
     domination = {True: 0, False: 0}
     complexity = {True: 0.0, False: 0.0}
@@ -312,6 +312,7 @@ def genIndexes(partida):
     ct = _("Total")
     cpt = " " + _("pts")
     xac = txt_levels
+    prc = "%"
 
     inicio = '<tr><td align="center">%s</td>'
     resto = '<td align="center">%s</td><td align="center">%s</td><td align="center">%s</td></tr>'
@@ -328,6 +329,7 @@ def genIndexes(partida):
     txt += plantillaC % (_("Narrowness"), xac(narrowness[True]), xac(narrowness[False]), xac(narrownessT))
     txt += plantillaC % (_("Pieces activity"), xac(piecesactivity[True]), xac(piecesactivity[False]), xac(piecesactivityT))
     txt += plantillaC % (_("Exchange tendency"), xac(exchangetendency[True]), xac(exchangetendency[False]), xac(exchangetendencyT))
+    txt += plantillaL % ( "%", alm.porcW, prc, alm.porcB, prc, alm.porcT, prc)
 
     txtHTML = '<table border="1" cellpadding="5" cellspacing="1" >%s%s</table>' % (cab, txt)
     # Analisis.csv_formula(partida)

diff --git a/Code/AnalisisIndexes.pyc b/Code/AnalisisIndexes.pyc
diff --git a/Code/Apertura.pyc b/Code/Apertura.pyc
diff --git a/Code/AperturasStd.pyc b/Code/AperturasStd.pyc
diff --git a/Code/BMT.pyc b/Code/BMT.pyc
diff --git a/Code/BaseConfig.pyc b/Code/BaseConfig.pyc
diff --git a/Code/BookGuide.pyc b/Code/BookGuide.pyc
diff --git a/Code/Books.pyc b/Code/Books.pyc
diff --git a/Code/CPU.pyc b/Code/CPU.pyc
diff --git a/Code/CajonDesastre.py b/Code/CajonDesastre.py
@@ -79,7 +79,6 @@ def dicDisk(configuracion):
     dicDisk_SQL(backup, configuracion.fichEstadFicsElo, tabla="color")
     dicDisk_SQL(backup, configuracion.fichEstadFideElo, tabla="color")
     dicDisk_SQL(backup, configuracion.fichEstadMicElo, tabla="color")
-    dicDisk_SQL(backup, configuracion.carpeta + "/*.xfcc", tabla="config")
     dicDisk_SQL(backup, configuracion.ficheroMate, siAllTables=True)
 
     # Cache

diff --git a/Code/CajonDesastre.pyc b/Code/CajonDesastre.pyc
diff --git a/Code/Configuracion.pyc b/Code/Configuracion.pyc
diff --git a/Code/Constantes.py b/Code/Constantes.py
@@ -3,8 +3,8 @@
 kSigueApertura, kSigueUsuario, kMalApertura = range(3)
 
 kJugNueva, kJugEntPos, kJugPGN, kJugEntMaq, kJugGM, kJugRemoto, kJugSolo, kJug60, kJugElo, kJugMicElo, \
-kJugBooks, kJugAperturas, kJugBoxing, kJugEntTac, kJugMvM, kJugAlbum, kJugFics, kJugFide, kJugXFCC, \
-kJugWorldMap, kJugRoute, kJugEntLight, kJugWashingCreate, kJugWashingTactics, kJugWashingReplay = range(25)
+kJugBooks, kJugAperturas, kJugBoxing, kJugEntTac, kJugMvM, kJugAlbum, kJugFics, kJugFide, \
+kJugWorldMap, kJugRoute, kJugEntLight, kJugWashingCreate, kJugWashingTactics, kJugWashingReplay = range(24)
 
 kFinNormal, kFinReinicio = range(2)
 

diff --git a/Code/Constantes.pyc b/Code/Constantes.pyc
diff --git a/Code/ControlPGN.py b/Code/ControlPGN.py
@@ -149,7 +149,7 @@ def actual(self):
 
         if tipoJuego == kJugGM:
             return self.actualGM()
-        elif tipoJuego in (kJugPGN, kJugSolo, kJugXFCC, kJugRoute):
+        elif tipoJuego in (kJugPGN, kJugSolo, kJugRoute):
             return self.gestor.actualPGN()
 
         if tipoJuego == kJugRemoto:

diff --git a/Code/ControlPGN.pyc b/Code/ControlPGN.pyc
diff --git a/Code/ControlPosicion.pyc b/Code/ControlPosicion.pyc
diff --git a/Code/DBgames.py b/Code/DBgames.py
@@ -299,7 +299,7 @@ def rootGames(self):
         alm = self.root()
         return alm.W + alm.B + alm.D + alm.O
 
-    def children(self, pvBase):
+    def children(self, pvBase, allmoves=True):
         fen_base = makePV(pvBase)
         li = getExMoves()
         liResp = []
@@ -311,6 +311,8 @@ def children(self, pvBase):
             fen = getFen()
             hashFen = self._fen2hash(fen)
             alm = self._readRowExt(rfather, hashFen, fen)
+            if not allmoves and (alm.W +alm.B+alm.D+alm.O) == 0:
+                continue
             alm.move = move
             liResp.append(alm)
         return liResp
@@ -452,11 +454,14 @@ def siFaltanRegistrosPorLeer(self):
 
     def filterPV(self, pv, condicionAdicional=None):
         if type(pv) == list:  # transpositions
-            li = []
-            for unpv in pv:
-                xpv = pv2xpv(unpv)
-                li.append('XPV GLOB "%s*"' % xpv)
-            condicion = "(%s)" % (" OR ".join(li),)
+            if pv:
+                li = []
+                for unpv in pv:
+                    xpv = pv2xpv(unpv)
+                    li.append('XPV GLOB "%s*"' % xpv)
+                condicion = "(%s)" % (" OR ".join(li),)
+            else:
+                condicion = ""
         else:
             xpv = pv2xpv(pv)
             condicion = 'XPV GLOB "%s*"' % xpv if xpv else ""
@@ -554,68 +559,46 @@ def borrarLista(self, lista):
             del self.liRowids[recno]
         self._conexion.commit()
 
-    def getSummary(self, pvBase, dicAnalisis, siFigurinesPGN):
+    def getSummary(self, pvBase, dicAnalisis, siFigurinesPGN, allmoves=True):
         liMoves = []
         siBlancas = pvBase.count(" ") % 2 == 1 if pvBase else True
 
-        if pvBase is None:
-            root = self.dbSTAT.root()
-            w, d, b, o = root.W, root.D, root.B, root.O
-            tt = w + d + b + o
+        liChildren = self.dbSTAT.children(pvBase, allmoves)
+
+        tt = 0
+
+        lipvmove = []
+        for alm in liChildren:
+            w, d, b, o = alm.W, alm.D, alm.B, alm.O
+            t = w + d + b + o
+            # if t == 0:
+            # continue
+
             dic = {}
+            pvmove = alm.move
+            pv = pvBase + " " + pvmove
+            pv = pv.strip()
+            lipvmove.append(pvmove)
             dic["numero"] = ""
-            dic["pvmove"] = ""
-            dic["pv"] = ""
-            dic["analisis"] = None
-            dic["games"] = tt
+            dic["pvmove"] = pvmove
+            dic["pv"] = pv
+            dic["analisis"] = dicAnalisis.get(pvmove, None)
+            dic["games"] = t
+            tt += t
             dic["white"] = w
             dic["draw"] = d
             dic["black"] = b
             dic["other"] = o
-            dic["pwhite"] = w * 100.0 / tt if tt else 0.0
-            dic["pdraw"] = d * 100.0 / tt if tt else 0.0
-            dic["pblack"] = b * 100.0 / tt if tt else 0.0
-            dic["pother"] = o * 100.0 / tt if tt else 0.0
-            dic["move"] = _("Total")
-            dic["alm"] = None
-            liMoves.append(dic)
+            dic["pwhite"] = w * 100.0 / t if t else 0.0
+            dic["pdraw"] = d * 100.0 / t if t else 0.0
+            dic["pblack"] = b * 100.0 / t if t else 0.0
+            dic["pother"] = o * 100.0 / t if t else 0.0
 
-        else:
-            liChildren = self.dbSTAT.children(pvBase)
+            dic["alm"] = alm
 
-            tt = 0
-
-            lipvmove = []
-            for alm in liChildren:
-                w, d, b, o = alm.W, alm.D, alm.B, alm.O
-                t = w + d + b + o
-                # if t == 0:
-                # continue
-
-                dic = {}
-                pvmove = alm.move
-                pv = pvBase + " " + pvmove
-                pv = pv.strip()
-                lipvmove.append(pvmove)
-                dic["numero"] = ""
-                dic["pvmove"] = pvmove
-                dic["pv"] = pv
-                dic["analisis"] = dicAnalisis.get(pvmove, None)
-                dic["games"] = t
-                tt += t
-                dic["white"] = w
-                dic["draw"] = d
-                dic["black"] = b
-                dic["other"] = o
-                dic["pwhite"] = w * 100.0 / t if t else 0.0
-                dic["pdraw"] = d * 100.0 / t if t else 0.0
-                dic["pblack"] = b * 100.0 / t if t else 0.0
-                dic["pother"] = o * 100.0 / t if t else 0.0
-
-                dic["alm"] = alm
-
-                liMoves.append(dic)
+            liMoves.append(dic)
 
+        if allmoves:
             for pvmove in dicAnalisis:
                 if pvmove not in lipvmove:
                     dic = {}
@@ -637,8 +620,9 @@ def getSummary(self, pvBase, dicAnalisis, siFigurinesPGN):
 
                     liMoves.append(dic)
 
-            liMoves = sorted(liMoves, key=lambda dic: -dic["games"])
+        liMoves = sorted(liMoves, key=lambda dic: -dic["games"])
 
+        tg = w = d = l = 0
         for dic in liMoves:
             dic["pgames"] = dic["games"] * 100.0 / tt if tt else 0.0
             dic["pdrawwhite"] = dic["pwhite"] + dic["pdraw"]
@@ -658,6 +642,13 @@ def getSummary(self, pvBase, dicAnalisis, siFigurinesPGN):
                 dic["plost"] = dic["pwhite"]
                 dic["pwin"] = dic["pblack"]
 
+            g = dic["games"]
+            tg += g
+            w += dic["win"]
+            l += dic["lost"]
+            d += dic["draw"]
+
+
             pvmove = dic["pvmove"]
             if pvmove:
                 pv = dic["pv"]
@@ -676,6 +667,18 @@ def getSummary(self, pvBase, dicAnalisis, siFigurinesPGN):
                     dic["move"] = pvmove
                 dic["partida"] = p
 
+        dic = {}
+        dic["games"] = tg
+        dic["win"] = w
+        dic["draw"] = d
+        dic["lost"] = l
+        dic["pwin"] = w*100.0/tg if tg else 0.0
+        dic["pdraw"] = d*100.0/tg if tg else 0.0
+        dic["plost"] = l*100.0/tg if tg else 0.0
+        dic["pdrawwin"] = (w+d)*100.0/tg if tg else 0.0
+        dic["pdrawlost"] = (l+d)*100.0/tg if tg else 0.0
+        liMoves.append(dic)
+
         return liMoves
 
     def recrearSTAT(self, dispatch, depth):

diff --git a/Code/DBgames.pyc b/Code/DBgames.pyc
diff --git a/Code/DGT.pyc b/Code/DGT.pyc
diff --git a/Code/EnginesLinux.py b/Code/EnginesLinux.py
@@ -36,17 +36,19 @@ def mas(cm):
 
     cm = ConfigMotor("komodo", "Don Dailey, Larry Kaufman", "5r1 32-bit", "http://komodochess.com/")
     cm.path = "Linux/komodo-5r1-32bit"
+    cm.path_64 = "Linux/komodo-8-linux-generic", "8 64bits"
     cm.ordenUCI("Ponder", "false")
     cm.ordenUCI("Hash", "32")
     cm.elo = 3053
     cm.ponMultiPV(20, 99)
     mas(cm)
 
-    cm = ConfigMotor("stockfish", "Tord Romstad, Marco Costalba, Joona Kiiski", "3", "http://stockfishchess.org/")
-    cm.path = "Linux/stockfish-3-32-ja"
-    cm.elo = 3079
+    cm = ConfigMotor("stockfish", "Tord Romstad, Marco Costalba, Joona Kiiski", "8 32bits", "http://stockfishchess.org/")
+    cm.path = "Linux/stockfish_8_x32_old"
+    cm.path_64 = "Linux/stockfish_8_x64", "8 64bits"
+    cm.elo = 3300
     cm.ordenUCI("Ponder", "false")
-    cm.ordenUCI("Hash", "32")
+    cm.ordenUCI("Hash", "64")
     cm.ordenUCI("Threads", "1")
     cm.ponMultiPV(20, 500)
     mas(cm)
@@ -147,6 +149,17 @@ def mas(cm):
     cm.elo = 2900
     mas(cm)
 
+    cm = ConfigMotor("irina", "Lucas Monge", "0.12", "")
+    cm.path = "irina"
+    cm.elo = 1200
+    mas(cm)
+
+    cm = ConfigMotor("rodentII", "Pawel Koziol", "0.9.64", "http://www.pkoziol.cal24.pl/rodent/rodent.htm")
+    cm.path = "RodentII_x32"
+    cm.elo = 2912
+    cm.ordenUCI("Hash", "64")
+    mas(cm)
+
     return dicRivales
 
 def dicMotoresFixedElo():

diff --git a/Code/EnginesMicElo.pyc b/Code/EnginesMicElo.pyc
diff --git a/Code/EnginesWindows.py b/Code/EnginesWindows.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: latin-1 -*-
 
 import collections
 
@@ -149,7 +149,7 @@ def mas(cm):
     cm.ponMultiPV(1, 4)
     mas(cm)
 
-    cm = ConfigMotor("cheng", "Martin Sedlák", "4 0.39", "http://www.vlasak.biz/cheng")
+    cm = ConfigMotor("cheng", "Martin Sedlák", "4 0.39", "http://www.vlasak.biz/cheng")
     cm.path = "cheng4.exe"
     cm.elo = 2750
     cm.ponMultiPV(20, 256)
@@ -219,7 +219,7 @@ def mas(cm):
     cm.ponMultiPV(20, 100)
     mas(cm)
 
-    cm = ConfigMotor("texel", "Peter Österlund", "1.05 32bit", "http://web.comhem.se/petero2home/javachess/index.html#texel")
+    cm = ConfigMotor("texel", "Peter Österlund", "1.05 32bit", "http://web.comhem.se/petero2home/javachess/index.html#texel")
     cm.path = "texel32old.exe"
     cm.elo = 3100
     cm.ordenUCI("Hash", "32")
@@ -260,10 +260,10 @@ def mas(cm):
     cm.elo = 1200
     mas(cm)
 
-    cm = ConfigMotor("rodentII", "Pawel Koziol", "0.9.3", "http://www.pkoziol.cal24.pl/rodent/rodent.htm")
-    cm.path = "rodentII_x32.exe"
-    cm.path_64 = "rodentII_x64.exe", "0.9.3 64bit"
-    cm.elo = 2866
+    cm = ConfigMotor("rodentII", "Pawel Koziol", "0.9.64", "http://www.pkoziol.cal24.pl/rodent/rodent.htm")
+    cm.path = "RodentII_x32.exe"
+    cm.path_64 = "RodentII_x64.exe", "0.9.64 64bit"
+    cm.elo = 2912
     cm.ordenUCI("Hash", "64")
     mas(cm)
 

diff --git a/Code/EnginesWindows.pyc b/Code/EnginesWindows.pyc
diff --git a/Code/Entrenamientos.pyc b/Code/Entrenamientos.pyc
diff --git a/Code/Everest.pyc b/Code/Everest.pyc
diff --git a/Code/GM.pyc b/Code/GM.pyc
diff --git a/Code/Gestor.py b/Code/Gestor.py
@@ -52,6 +52,8 @@ def __init__(self, procesador):
         self.ayudas = None
         self.ayudasPGN = 0
 
+        self.siCompetitivo = False
+
         self.resultado = kDesconocido
 
         self.categoria = None
@@ -145,16 +147,14 @@ def otherCandidates(self, liMoves, posicion, liC):
                 liPlayer.append((mov.hasta(), "P+"))
             elif mov.captura():
                 liPlayer.append((mov.hasta(), "Px"))
-        fen = posicion.fen()
-        if "w" in fen:
-            fen = fen.replace(" w ", " b ")
-        else:
-            fen = fen.replace(" b ", " w ")
+        oposic = posicion.copia()
+        oposic.siBlancas = not posicion.siBlancas
+        oposic.alPaso = ""
         siJaque = LCEngine.isCheck()
-        LCEngine.setFen(fen)
+        LCEngine.setFen(oposic.fen())
         liO = LCEngine.getExMoves()
         liRival = []
-        for mov in liO:
+        for n, mov in enumerate(liO):
             if not siJaque:
                 if mov.mate():
                     liRival.append((mov.hasta(), "R#"))
@@ -443,9 +443,7 @@ def ponVista(self):
 
     def siMiraKibitzers(self):
         return (self.estado == kFinJuego) or \
-               self.tipoJuego in (
-                   kJugEntPos, kJugPGN, kJugEntMaq, kJugEntTac, kJugGM, kJugSolo, kJugBooks, kJugAperturas,
-                   kJugXFCC) or \
+               self.tipoJuego in (kJugEntPos, kJugPGN, kJugEntMaq, kJugEntTac, kJugGM, kJugSolo, kJugBooks, kJugAperturas) or \
                (self.tipoJuego in (kJugElo, kJugMicElo) and not self.siCompetitivo)
 
     def miraKibitzers(self, jg, columnaClave):
@@ -890,8 +888,7 @@ def analizaPosicion(self, fila, clave):
         if self.estado == kFinJuego:
             maxRecursion = 9999
         else:
-            if not (self.tipoJuego in [kJugEntPos, kJugPGN, kJugEntMaq, kJugGM, kJugSolo, kJugBooks, kJugAperturas,
-                                       kJugEntTac, kJugXFCC] or
+            if not (self.tipoJuego in [kJugEntPos, kJugPGN, kJugEntMaq, kJugGM, kJugSolo, kJugBooks, kJugAperturas, kJugEntTac] or
                         (self.tipoJuego in [kJugElo, kJugMicElo] and not self.siCompetitivo)):
                 if siUltimo or self.ayudas == 0:
                     return
@@ -1388,7 +1385,7 @@ def utilidades(self, liMasOpciones=None, siArbol=True):
     def showAnalisis(self):
         um = self.procesador.unMomento()
         alm = Histogram.genHistograms(self.partida, self.configuracion.centipawns)
-        alm.indexesHTML, alm.indexesRAW = AnalisisIndexes.genIndexes(self.partida)
+        alm.indexesHTML, alm.indexesRAW = AnalisisIndexes.genIndexes(self.partida, alm)
         um.final()
         PantallaAnalisis.showGraph(self.pantalla, self, alm, Analisis.muestraAnalisis)
 

diff --git a/Code/Gestor.pyc b/Code/Gestor.pyc
diff --git a/Code/Gestor60.pyc b/Code/Gestor60.pyc
diff --git a/Code/GestorAlbum.pyc b/Code/GestorAlbum.pyc
diff --git a/Code/GestorAperturas.pyc b/Code/GestorAperturas.pyc
diff --git a/Code/GestorBooks.pyc b/Code/GestorBooks.pyc