Anthex / LO53FP

Commit 477d730da6381584a52117cb8ecff698c5e8673d

Authored by Anthex
1 parent 0dd16e0d

fixed mixup between columns/rows

Showing 2 changed files with 10 additions and 9 deletions   Show diff stats
Inline Side-by-side
@@ -39,7 +39,7 @@ def main(args): @@ -39,7 +39,7 @@ def main(args):
39 39
40 #### Markov #### 40 #### Markov ####
41 MM = MarkovModel(Tf) 41 MM = MarkovModel(Tf)
42 - MM.path([8,7,8,7,8,7,8,5,8,2,9,8,1,9,8,9]) 42 + 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])
43 43
44 MM.printValues() 44 MM.printValues()
45 print("\r\nPERCENTAGES : \r\n") 45 print("\r\nPERCENTAGES : \r\n")
@@ -81,20 +81,21 @@ class MarkovModel(): @@ -81,20 +81,21 @@ class MarkovModel():
81 self.MarkovValues.append([]) 81 self.MarkovValues.append([])
82 for k in range (0, 10): 82 for k in range (0, 10):
83 self.MarkovValues[i].append(MarkovValue()) 83 self.MarkovValues[i].append(MarkovValue())
84 - 84 + self.MarkovValues[10][0].nb = 1 #initial position sigma increment
  85 +
85 def moveToCellID(self, nextCell): 86 def moveToCellID(self, nextCell):
86 - self.MarkovValues[self.previousCell][nextCell].nb += 1 87 + self.MarkovValues[nextCell][self.previousCell].nb += 1
87 self.MarkovValues[10][nextCell].nb += 1 88 self.MarkovValues[10][nextCell].nb += 1
88 - self.previousCell = nextCell  
89 self.refreshPercentage(self.previousCell) 89 self.refreshPercentage(self.previousCell)
90 - 90 + self.previousCell = nextCell
  91 +
91 def moveToCell(self, nextCell): 92 def moveToCell(self, nextCell):
92 self.moveToCellID(nextCell.location.getPositionInArray()+1) 93 self.moveToCellID(nextCell.location.getPositionInArray()+1)
93 94
94 def refreshPercentage(self, col): 95 def refreshPercentage(self, col):
95 - for k in range(0,10):  
96 - if self.MarkovValues[10][k].nb != 0:  
97 - self.MarkovValues[k][col].percentage = self.MarkovValues[k][col].nb / self.MarkovValues[10][col].nb 96 + if self.MarkovValues[10][col].nb:
  97 + for k in range(0,10):
  98 + self.MarkovValues[k][col].percentage = self.MarkovValues[k][col].nb / self.MarkovValues[10][col].nb
98 99
99 def printValues(self): 100 def printValues(self):
100 print("\t? \t1 \t2 \t3\t4 \t5 \t6 \t7 \t8 \t9") 101 print("\t? \t1 \t2 \t3\t4 \t5 \t6 \t7 \t8 \t9")
@@ -114,7 +115,7 @@ class MarkovModel(): @@ -114,7 +115,7 @@ class MarkovModel():
114 print("\t? \t1 \t2 \t3\t4 \t5 \t6 \t7 \t8 \t9") 115 print("\t? \t1 \t2 \t3\t4 \t5 \t6 \t7 \t8 \t9")
115 print("---------------------------------------------------------------------------------", end='') 116 print("---------------------------------------------------------------------------------", end='')
116 117
117 - for i in range (0, 10): 118 + for i in range (1, 10):
118 print("\r\n", end='') 119 print("\r\n", end='')
119 120
120 print(i, end='\t') 121 print(i, end='\t')