X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FIdler.py;h=d11fe90db5686293d6528518ad565088c5d23964;hp=89783e355b63e314dda2f6aeed9dfb8400c335ed;hb=81da4cd39d67db53ea95c6ddb5855e050a3f4391;hpb=ed18ff345c52cd0d868b8e26ee23cfcd7711abfd

diff --git a/sql-edition/servers/Idler.py b/sql-edition/servers/Idler.py
index 89783e3..d11fe90 100755
--- a/sql-edition/servers/Idler.py
+++ b/sql-edition/servers/Idler.py
@@ -6,20 +6,26 @@ from MessageKeeper import MessageKeeper
 
 orderings = None
 
+IDLER_TEXT_SPEED=1.8
+
 class Idler:
 	def __init__(self, v):
 		self.v = v
 
 	def next(self):
+		"""Displays next stage of the idler"""
 		pass
 
 	def reset(self):
+		"""Resets the idler to a known intial state"""
 		pass
 	
 	def finished(self):
+		"""Returns True if the idler is considered finished"""
 		return False
 
 	def affinity(self):
+		"""How much we want this idler to be the next one chosen"""
 		return 1
 
 class TrainIdler(Idler):
@@ -87,28 +93,37 @@ class TrainIdler(Idler):
 class OrderMaker:
 	def __init__(self, n=8):
 		self.n = n
-		self.a = []
-		self.u = []
-		self.s = []
-		for x in range(0,n):
-			self.u.append(False)
-		self.go()
-
-	def go(self):
-		from copy import deepcopy
-		if len(self.s) == self.n:
-			self.a.append(deepcopy(self.s))
-		else:
-			for x in range(0,self.n):
-				if self.u[x]: continue
-				self.s.append(x)
-				self.u[x] = True
-				self.go()
-				self.u[x] = False
-				self.s.pop()
-
-	def order(self):
-		return self.a
+		self.make_factorials(n)
+	
+	def make_factorials(self, n):
+		self.factorial = []
+		a = 1
+		for i in range(1,n+1):
+			self.factorial.append(a)
+			a *= i
+
+	def order(self, index):
+		used = []
+		for i in range(0,self.n):
+			used.append(i)
+		i = self.n-1
+		j = 0
+		res = []
+		while i >= 0:
+			a = index/self.factorial[i]
+			index %= self.factorial[i]
+			res.append(a+1)
+			i -= 1
+			j += 1
+		for i in range(0,self.n):
+			tmp = used[res[i]-1]
+			for j in range(res[i],self.n):
+				used[j-1] = used[j]
+			res[i] = tmp
+		return res
+
+	def __getitem__(self, i):
+		return self.order(i)
 
 class GrayIdler(Idler):
 	def __init__(self, v, one=None, zero=None, reorder=0):
@@ -122,7 +137,7 @@ class GrayIdler(Idler):
 		self.reorder = reorder
 		global orderings
 		if not orderings:
-			orderings = OrderMaker().order()
+			orderings = OrderMaker()
 
 	def next(self):
 		output = self.do_next_state()
@@ -194,7 +209,7 @@ class StringIdler(Idler):
 		self.mk = MessageKeeper(v)
 		self.text = self.clean_text(text) + "          "
 		
-		msg = [("",False, None),(self.text, repeat, 0.8)]
+		msg = [("",False, None),(self.text, repeat, IDLER_TEXT_SPEED)]
 		self.mk.set_messages(msg)
 
 	def clean_text(self, text):