From a862e105e62abb61d9a2aa88484bb008008fb4e2 Mon Sep 17 00:00:00 2001 From: Anthex Date: Mon, 22 Apr 2019 14:19:51 +0200 Subject: [PATCH] add function to tidy up main, minor formatting changes --- main.py | 17 +---------------- structure.py | 9 +++++---- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/main.py b/main.py index 5c52ddd..33266b6 100644 --- a/main.py +++ b/main.py @@ -46,22 +46,7 @@ def main(args): print(d.toString()) print(d.getPositionInArray()) """ - MM.moveToCellID(8) - MM.moveToCellID(7) - MM.moveToCellID(8) - MM.moveToCellID(7) - MM.moveToCellID(8) - MM.moveToCellID(7) - MM.moveToCellID(8) - MM.moveToCellID(5) - MM.moveToCellID(8) - MM.moveToCellID(2) - MM.moveToCellID(9) - MM.moveToCellID(8) - MM.moveToCellID(1) - MM.moveToCell(Tf[2][2]) - MM.moveToCellID(8) - MM.moveToCell(Tf[2][2]) + MM.path([8,7,8,7,8,7,8,5,8,2,9,8,1,9,8,9]) MM.printValues() print("") diff --git a/structure.py b/structure.py index d2acb86..aa1bb23 100644 --- a/structure.py +++ b/structure.py @@ -10,13 +10,11 @@ class RSSVector(): self.n4 = n4 class Location(): - def __init__(self, x, y, z=0): self.x = x self.y = y self.z = z - def __mul__(self, multiplier): returnValue = Location(self.x, self.y, self.z) returnValue.x *= multiplier @@ -84,8 +82,7 @@ class MarkovModel(): self.MarkovValues.append([]) for k in range (0, 10): self.MarkovValues[i].append(MarkovValue()) - - + def moveToCellID(self, nextCell): self.MarkovValues[self.previousCell][nextCell].nb += 1 self.MarkovValues[10][nextCell].nb += 1 @@ -135,6 +132,10 @@ class MarkovModel(): max_id = k return max_id + def path(self, locationIDs): + for loc in locationIDs: + self.moveToCellID(loc) + def toString(self): return "" -- libgit2 0.21.4