Separate out the main method

copycat/copycat.py

@@ -1,4 +1,3 @@
-import sys
 import logging
 logging.basicConfig(
 		level=logging.INFO,
@@ -8,6 +7,7 @@ logging.basicConfig(
 		filemode='w'
 )
 
+
 from workspace import workspace
 from workspaceFormulas import workspaceFormulas
 from slipnet import slipnet
@@ -22,6 +22,7 @@ def updateEverything():
 	workspaceFormulas.updateTemperature()
 	coderackPressures.calculatePressures()
 
+
 def mainLoop(lastUpdate):
 	temperature.tryUnclamp()
 	result = lastUpdate
@@ -32,6 +33,7 @@ def mainLoop(lastUpdate):
 	coderack.chooseAndRunCodelet()
 	return result
 
+
 def runTrial():
 	"""Run a trial of the copycat algorithm"""
 	answers = {}
@@ -45,24 +47,12 @@ def runTrial():
 		answer = workspace.rule.finalAnswer
 	else:
 		answer = None
-	print '%d: %s' % (coderack.codeletsRun,answer)
+	print '%d: %s' % (coderack.codeletsRun, answer)
-	answers[answer] = answers.get(answer,0) + 1
+	answers[answer] = answers.get(answer, 0) + 1
 	logging.debug('codelets used:')
-	for answer,count in answers.iteritems():
+	for answer, count in answers.iteritems():
-		print '%s:%d' % (answer,count)
+		print '%s:%d' % (answer, count)
 
-def main():
+def run(initial, modified, target):
-	#slipnet.setConceptualDepths(50.0)
+	workspace.setStrings(initial, modified, target)
-	"""Run the program"""
-	argc = len(sys.argv)
-	if argc == 4:
-		workspace.setStrings(initial=sys.argv[1].lower(),modified=sys.argv[2].lower(),target=sys.argv[3].lower())
-	elif argc == 1:
-		workspace.setStrings(initial='abc',modified='abd',target='ijk')
-	else:
-		print >> sys.stderr, 'Usage: %s [initial modified target]' % sys.argv[0]
-		return
 	runTrial()
-
-if __name__ == '__main__':
-	main()

copycat/main.py

@@ -0,0 +1,21 @@
+"""Run the copycat program"""
+
+
+import sys
+
+import copycat
+
+
+def main(program, args):
+	"""Run the program"""
+	try:
+		initial, modified, target = args
+		copycat.run(initial, modified, target)
+		return 0
+	except ValueError:
+		print >> sys.stderr, 'Usage: %s initial modified target' % program
+		return 1
+
+
+if __name__ == '__main__':
+	sys.exit(main(sys.argv[0], sys.argv[1:]))