Made some micro optimizations to Golomb Ruler

Author: mcmathews

GolombRulers/GolombRulers.py

@@ -1,6 +1,7 @@
 from queue import PriorityQueue
 import math
 import time
+import sys
 
 
 def widthsToTickMarks(widths):
@@ -23,31 +24,26 @@ def widthsToMeasurableDistances(widths):
 	return measurableDistances
 
 
-def getChildren(widths, maxChildren):
+def getChildren(widths, maxChildren, mds):
 	children = []
 
-	mds = widthsToMeasurableDistances(widths)
-
-	# can be made more efficient
-	# might need to make this go higher
 	for md in range(1, maxChildren):
 		if md not in mds:
 			children.append(widths + [md])
 
 	return children
 
 
-def isValid(widths):
-	return max(widthsToMeasurableDistances(widths).values()) <= 1
+def isValid(mds):
+	return max(mds.values()) <= 1
 
 
 def getCost(widths):
 	return sum(widths)
 
 
-def getHeuristic(widths, order):
+def getHeuristic(widths, order, mds):
 	unusedWidths = []
-	mds = widthsToMeasurableDistances(widths)
 	md = 1
 	while len(unusedWidths) + len(widths) < order - 1:
 		if md not in mds:
@@ -61,25 +57,26 @@ def search(order):
 	queue = PriorityQueue()
 	maxChildren = math.floor(order * 1.5)
 	while True:
-		queue.put((0, []))
+		queue.put((0, [], {}))
 		while not queue.empty():
-			f, widths = queue.get()
+			f, widths, mds = queue.get()
 			if len(widths) == order - 1:
 				return widths
 
-			children = getChildren(widths, maxChildren)
+			children = getChildren(widths, maxChildren, mds)
 			for child in children:
-				if not isValid(child):
+				mds = widthsToMeasurableDistances(child)
+				if not isValid(mds):
 					continue
 				g = getCost(child)
-				h = getHeuristic(child, order)
-				queue.put((g + h, child))
+				h = getHeuristic(child, order, mds)
+				queue.put((g + h, child, mds))
 		print("Solution not found with maxChildren = " + str(maxChildren));
 		maxChildren += 1
 
 
 def main():
-	order = int(input())
+	order = int(sys.argv[1])
 	start = time.time()
 	print(widthsToTickMarks(search(order)))
 	print("Time: " + str(time.time() - start))