Large cleanup with the code. Now it mostly follows pep convention

Author: davidruffner

seatingchart/__init__.py

@@ -1 +1,2 @@
 __author__ = 'davidruffner'
+

seatingchart/example/testseatingchart3.py

@@ -1,5 +1,4 @@
-import seatingchart as sc 
-import random
+import seatingchart.seatingchart as sc
 import numpy as np
 import matplotlib.pyplot as plt
 import copy
@@ -12,18 +11,16 @@
 nguests = len(guestlist.guests)
 seatsper = 5
 
-chart = sc.SeatingChart(guestlist,nguests/seatsper,seatsper)
-chart0=copy.deepcopy(chart)
+chart = sc.SeatingChart(guestlist, nguests/seatsper, seatsper)
+chart0 = copy.deepcopy(chart)
 print ''
 print "Guests to be seated and their friends"
 
-org = sc.Organizer(guestlist,chart)
-org0 = sc.Organizer(guestlist,chart0)
-#Seat everyone
+org = sc.Organizer(guestlist, chart)
+org0 = sc.Organizer(guestlist, chart0)
+# Seat everyone
 org.seatguests()
 
-
-
 print "The final seating chart"
 chart.print_seatingchart()
 chart.print_chart()
@@ -39,29 +36,27 @@
 friendsT2 = np.zeros(nsteps)
 friendsT3 = np.zeros(nsteps)
 for i in steps:
-    friendsT1[i] = org1.metropolisstep(0.01)
-    friendsT2[i] = org2.metropolisstep(.1)
-    friendsT3[i] = org3.metropolisstep(1)
+    friendsT1[i] = org1.metropolisstep(temp=0.01)
+    friendsT2[i] = org2.metropolisstep(temp=.1)
+    friendsT3[i] = org3.metropolisstep(temp=1)
 
-#Now compare to what happens if i just seat people with friends
+# Now compare to what happens if i just seat people with friends
 org0.sc.print_chart()
 org0.seatguestsfriends()
-count=org0.friendcount()
+count = org0.friendcount()
 print "Number of friends with seating with friends method"
 print count
-print "friends T1,T2,T3"
-print [friendsT1[-1],friendsT2[-1],friendsT3[-1]]
-plt.plot(steps, friendsT1,label='T1')
-plt.plot(steps, friendsT2,label='T2')
-plt.plot(steps, friendsT3,label='T3')
-plt.legend( loc='upper left')
-plt.xlabel="step"
-plt.ylabel="friendships"
+print "friends T1, T2, T3"
+print [friendsT1[-1], friendsT2[-1], friendsT3[-1]]
+plt.plot(steps, friendsT1, label='T1')
+plt.plot(steps, friendsT2, label='T2')
+plt.plot(steps, friendsT3, label='T3')
+plt.legend(loc='upper left')
+plt.xlabel = "step"
+plt.ylabel = "friendships"
 
 org0.sc.to_excel('SeatingChart0.xlsx')
 org1.sc.to_excel('SeatingChart1.xlsx')
 
 
 plt.show()
-
-