From 477d730da6381584a52117cb8ecff698c5e8673d Mon Sep 17 00:00:00 2001
From: Anthex <achille.dantz@gmail.com>
Date: Mon, 22 Apr 2019 16:21:38 +0200
Subject: [PATCH] fixed mixup between columns/rows

---
 main.py      |  2 +-
 structure.py | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/main.py b/main.py
index 65ddc64..604fb04 100644
--- a/main.py
+++ b/main.py
@@ -39,7 +39,7 @@ def main(args):
 
         #### Markov ####
         MM = MarkovModel(Tf)    
-        MM.path([8,7,8,7,8,7,8,5,8,2,9,8,1,9,8,9])
+        MM.path([8,7,8,7,8,7,8,5,8,2,9,8,1,9,8,9,5,4,3,2,3,2,4,5,4,5,6,6,7,6,9,5,9,3])
         
         MM.printValues()
         print("\r\nPERCENTAGES : \r\n")
diff --git a/structure.py b/structure.py
index a79041c..e80fd8e 100644
--- a/structure.py
+++ b/structure.py
@@ -81,20 +81,21 @@ class MarkovModel():
             self.MarkovValues.append([])
             for k in range (0, 10):
                 self.MarkovValues[i].append(MarkovValue())
-                    
+        self.MarkovValues[10][0].nb = 1 #initial position sigma increment  
+              
     def moveToCellID(self, nextCell):
-        self.MarkovValues[self.previousCell][nextCell].nb += 1     
+        self.MarkovValues[nextCell][self.previousCell].nb += 1     
         self.MarkovValues[10][nextCell].nb += 1
-        self.previousCell = nextCell
         self.refreshPercentage(self.previousCell)
-
+        self.previousCell = nextCell
+        
     def moveToCell(self, nextCell):
         self.moveToCellID(nextCell.location.getPositionInArray()+1)
 
     def refreshPercentage(self, col):
-        for k in range(0,10):
-            if  self.MarkovValues[10][k].nb != 0:
-                self.MarkovValues[k][col].percentage = self.MarkovValues[k][col].nb / self.MarkovValues[10][col].nb
+        if  self.MarkovValues[10][col].nb:
+            for k in range(0,10):
+                    self.MarkovValues[k][col].percentage = self.MarkovValues[k][col].nb / self.MarkovValues[10][col].nb
             
     def printValues(self):
         print("\t? \t1 \t2 \t3\t4 \t5 \t6 \t7 \t8 \t9")
@@ -114,7 +115,7 @@ class MarkovModel():
         print("\t? \t1 \t2 \t3\t4 \t5 \t6 \t7 \t8 \t9")
         print("---------------------------------------------------------------------------------", end='')
         
-        for i in range (0, 10):
+        for i in range (1, 10):
             print("\r\n", end='')
             
             print(i, end='\t')
--
libgit2 0.21.4