Anthex / LO53FP

Commit a862e105e62abb61d9a2aa88484bb008008fb4e2

Authored by Anthex
1 parent 57a9ebb0

add function to tidy up main, minor formatting changes

Showing 2 changed files with 6 additions and 20 deletions   Show diff stats
Inline Side-by-side
@@ -46,22 +46,7 @@ def main(args): @@ -46,22 +46,7 @@ def main(args):
46 print(d.toString()) 46 print(d.toString())
47 print(d.getPositionInArray()) 47 print(d.getPositionInArray())
48 """ 48 """
49 - MM.moveToCellID(8)  
50 - MM.moveToCellID(7)  
51 - MM.moveToCellID(8)  
52 - MM.moveToCellID(7)  
53 - MM.moveToCellID(8)  
54 - MM.moveToCellID(7)  
55 - MM.moveToCellID(8)  
56 - MM.moveToCellID(5)  
57 - MM.moveToCellID(8)  
58 - MM.moveToCellID(2)  
59 - MM.moveToCellID(9)  
60 - MM.moveToCellID(8)  
61 - MM.moveToCellID(1)  
62 - MM.moveToCell(Tf[2][2])  
63 - MM.moveToCellID(8)  
64 - MM.moveToCell(Tf[2][2]) 49 + MM.path([8,7,8,7,8,7,8,5,8,2,9,8,1,9,8,9])
65 50
66 MM.printValues() 51 MM.printValues()
67 print("") 52 print("")
@@ -10,13 +10,11 @@ class RSSVector(): @@ -10,13 +10,11 @@ class RSSVector():
10 self.n4 = n4 10 self.n4 = n4
11 11
12 class Location(): 12 class Location():
13 -  
14 def __init__(self, x, y, z=0): 13 def __init__(self, x, y, z=0):
15 self.x = x 14 self.x = x
16 self.y = y 15 self.y = y
17 self.z = z 16 self.z = z
18 17
19 -  
20 def __mul__(self, multiplier): 18 def __mul__(self, multiplier):
21 returnValue = Location(self.x, self.y, self.z) 19 returnValue = Location(self.x, self.y, self.z)
22 returnValue.x *= multiplier 20 returnValue.x *= multiplier
@@ -84,8 +82,7 @@ class MarkovModel(): @@ -84,8 +82,7 @@ class MarkovModel():
84 self.MarkovValues.append([]) 82 self.MarkovValues.append([])
85 for k in range (0, 10): 83 for k in range (0, 10):
86 self.MarkovValues[i].append(MarkovValue()) 84 self.MarkovValues[i].append(MarkovValue())
87 -  
88 - 85 +
89 def moveToCellID(self, nextCell): 86 def moveToCellID(self, nextCell):
90 self.MarkovValues[self.previousCell][nextCell].nb += 1 87 self.MarkovValues[self.previousCell][nextCell].nb += 1
91 self.MarkovValues[10][nextCell].nb += 1 88 self.MarkovValues[10][nextCell].nb += 1
@@ -135,6 +132,10 @@ class MarkovModel(): @@ -135,6 +132,10 @@ class MarkovModel():
135 max_id = k 132 max_id = k
136 return max_id 133 return max_id
137 134
  135 + def path(self, locationIDs):
  136 + for loc in locationIDs:
  137 + self.moveToCellID(loc)
  138 +
138 def toString(self): 139 def toString(self):
139 return "" 140 return ""
140 141