X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fsimulate.py;fp=src%2Fsimulate.py;h=d3afdf930b840c567a312d9e9aec03e76bb8294a;hb=bde6a9634c116c190cb631e962ccda551503a5c5;hp=1a38656415b1a2d60b6999d98408deddfc9dc029;hpb=47363bd0ed17d01c273471c2eb3bebbdc3aeae67;p=progcomp10.git

diff --git a/src/simulate.py b/src/simulate.py
index 1a38656..d3afdf9 100755
--- a/src/simulate.py
+++ b/src/simulate.py
@@ -6,22 +6,19 @@ Licensed under an MIT-style license: see the LICENSE file for details.
 '''
 
 # Import and add your agents here:
-from link.C.c_agents import c_angel, c_lucifer, c_streetfighter, c_frenchie
+#from link.C.c_agents import c_angel, c_lucifer, c_streetfighter, c_frenchie
 
 from SampleAgents import Angel, Lucifer, Dummy, Frenchie, Streetfighter
-Agents =  [c_angel,c_lucifer,c_streetfighter,c_frenchie]
+Agents =  [Angel,Lucifer,Streetfighter,Frenchie]
 
 ####################################
 # Developers only past this point! #
 ####################################
 
 import sys
+from conf import *
 from uccProgComp import Supervisor
 
-maxIterations = 150
-startingPopulations = 10
-verbose = False
-trials = 1
 usage = "Usage: rps [-v] [-i iterations=150] [-n starting_populations=10] [-t trials=1]"
 for i in range (1,len(sys.argv)):
 	if sys.argv[i] == "-i":
@@ -50,23 +47,23 @@ for i in range (1,len(sys.argv)):
 			sys.exit(1)
 
 	elif sys.argv[i] == "-v":
-		verbose = True
+		VERBOSE = True
 
 
 iteration = 0
 trial = 0
 winners = {}
-while trial < trials:
+while trial < TRIALS:
 	sup = Supervisor ()
 	for Agent in Agents: sup.RegisterAgent (Agent)
-	sup.GeneratePopulation (startingPopulations)
+	sup.GeneratePopulation (STARTING_POPULATION)
 
 	trial += 1
 	iteration = 0
-	while iteration < maxIterations and not sup.IsGameOver ():
+	while iteration < MAX_ITERATIONS and not sup.IsGameOver ():
 		iteration += 1
 		sup.Iterate ()
-		if not verbose: continue
+		if not VERBOSE: continue
 		print "Iteration %d:" % iteration
 		for key, value in sup.GetStats ().iteritems():
 			print "%s: Population=%d, Newborns=%d, Deaths=%d" % (key, value[0], value[1], value[2])