Creating pull request for them

README.md

@@ -1,2 +1,5 @@
 # InteractiveProgramming
 This is the base repo for the interactive programming project for Software Design, Spring 2016 at Olin College.
+
+
+To run code: simply run WH_ShapeMap.py to get the output graph (references WH_Freshmen.csv). See writeup document for more details.

WH_Freshmen.csv

@@ -0,0 +1,51 @@
+101,R2,N/A,N/A,N/A,N/A,,,,,
+102,Gwyn and Regina,Female,1,2,3,,,,,
+103,Emily Y. and Jingyi,Female,12,2.5,2,,"J,E","12,12","3,2","1,3"
+104,Andrew P. and Sam,Male,1,2,2,,"S,A","1,1","2,2","1,3"
+105,Bryan and Nathan,Male,1,2,2,,,,,
+106,Emma and Erica,Female,,,,,,,,
+107,Alex S. and David,Male,,,,,,,,
+109,[Nick Tatar],N/A,N/A,N/A,N/A,,,,,
+110,[Nick Tatar],N/A,N/A,N/A,N/A,,,,,
+118,[Kitchen],N/A,N/A,N/A,N/A,,,,,
+120,[Gym],N/A,N/A,N/A,N/A,,,,,
+123,[Ball Room],N/A,N/A,N/A,N/A,,,,,
+125,[Service Room],N/A,N/A,N/A,N/A,,,,,
+124,Anna,Female,,,,,,,,
+126,Diego and Sean,Male,11,2,4,,,,,
+127,Annie and Tehya,Female,11,2,3,,,,,
+128,Louise and Katya,Nonbinary/Female,1,2.5,2,,"L,K","11,3","3,2","1,3"
+129,Carl and Kevin G.,Male,2,2,2,,,,,
+130,Danny and Will,Male,12,2,2,,,,,
+131,Alex H. and Leon,Male,,,,,,,,
+201,Eric and Max S.,Male,1,2.5,1,,"M,E","1,1","3,2","1,1"
+202,Dhash and Taylor,Male,3,2,2,,,,,
+203,Jamie and Jeremy,Male,2,2,3,,,,,
+204,Margo and Nicole,Female,1,3,1,,,,,
+205,Lauren G. and Uma,Female,2,2.5,2,,"L,U","2,2","3,2","2,2"
+207,Claire and Liv,Female,12,1,3,,,,,
+209,John Moreland and Joseph,Male,12,3,1,,,,,
+210,Jared and Max D.,Male,1,2,1,,,,,
+211,Katie and Serena,Female,2.5,3,2.5,,"S,K","1,4","3,3","2,3"
+212,Ariana and Emily K.,Female,12,2,3.5,,"A,E","12,12","2,2","4,3"
+213,Linnea and Mary,Female,12.5,2,2,,"M,L","1,12","2,2","3,1"
+214,John Mathai and Justin,Male,12,3,1,,,,,
+215,Daniel D. and Steven,Male,2.5,2,2,,"S,D","4,1","2,2","0,2"
+218,R2,N/A,N/A,N/A,N/A,,,,,
+220,R2,N/A,N/A,N/A,N/A,,,,,
+223,Harper and Paige,Female,11,2,3,,,,,
+224,Charlie and Rachel,Female,1.5,2,2.5,,"R,C","1,2","2,2","2,3"
+225,Apurva and Sara,Female,1,2,3,,,,,
+226,Jonah,Male,,,,,,,,
+227,Matt and Arpan,Male,2,2,3.5,,"M, A","2,2","2,2","3,4"
+228,Mica and Min,Female,11,2,3,,,,,
+229,Lydia and Kim,Female,12.5,2.5,4,,"K,L","1,12","2,3","3,5"
+230,Andrew and Hunter,Male,,,,,,,,
+231,Bill and Isaac,Male,1.5,2,2.5,,"I,B","1,2","2,2","3,2"
+301,Chloe and Kaitlyn,Female,11.5,1.5,3,,"K,C","12, 11","2,1","0,3"
+302,Audrey and Izzy,Female,12.5,2.5,1,,"A,I","1,12","2,3","0,1"
+303,Ian and Kevin Z.,Male,2,2,3,,,,,
+304,Cedric and Duncan,Male,,,,,,,,
+305,Lauren P. and March,Female,1.5,2.5,4,,"L,M","2,1","2,3","4,4"
+306,Coleman and Max W.,Male,,,,,,,,
+307,Jonathan and Sung,Male,12,2.5,1.5,,"S,J","1,11","3,2","2,1"

WH_Interactive_Map.py

@@ -0,0 +1,128 @@
+from bokeh.models import BoxSelectTool, BoxZoomTool, LassoSelectTool, HoverTool, Quad
+from bokeh.plotting import figure, output_file, show, gridplot, ColumnDataSource
+from bokeh.models.widgets import Dropdown, Panel, Tabs, CheckboxButtonGroup, RadioGroup
+from bokeh.io import output_file, show, vform, save
+import csv
+
+#PROJECT OVERVIEW:
+#Create an interactive map of West Hall showing hallway culture via gender distribution, sleeping habits, time spent in hallways, etc.
+#(If we hear back from STAR, we'll also have data on how people move from year to year, which will be awesome to implement)
+
+#PROGRESS:
+#currently outputs to an html file which has 3 tabs - WH1, WH2, and WH3
+#rooms are currently blue squares, have hover functionality with correct labels but no data
+#Also have buttons that are currently nonfunctional but are planned to be able to display different color coordinations for each room.
+#Initializes and draws all rooms from a .csv file with data from survey sent to first years.
+
+#NEXT STEPS:
+#Get more room data from people (keep collecting survey responses)
+#Draw rooms in correct places
+#Make import for roommate names work correctly
+#Make hover display room number and inhabitant names instead of '???'
+#Make buttons functional
+	#figure out how to make buttons active
+	#make metric for color changing and coordination
+
+
+# output to static HTML file
+output_file("WH_Firstyears.html")
+
+class Room(object):
+	def __init__(self, roomNum='000', roommates='[Roommate Names Here]', gender='[Some Gender Here]', bedtime=0, lightsleep=0, halltime=0, top=1, bottom=0, left=0, right=1):
+		self.roomNum = roomNum
+		self.roommates = roommates
+		self.gender = gender
+		self.bedtime = bedtime
+		self.lightsleep = lightsleep
+		self.halltime = halltime
+		self.top = top
+		self.bottom = bottom
+		self.left = left
+		self.right = right
+
+	def __str__(self):
+		return 'Room Number: %s / Current Inhabitants: %s / Gender: %s / Average Bedtime: %s' %(self.roomNum, self.roommates, self.gender, self.bedtime)
+
+	def drawRoom(self):
+		if int(self.roomNum)<200:
+			#draw on first floor
+			rooms1 = p1.quad(top=self.top,bottom=self.bottom, left=self.left, right=self.right,
+								nonselection_fill_alpha=0.01,
+								nonselection_fill_color=None,
+								nonselection_line_color="firebrick",
+								nonselection_line_alpha=1.0,
+								selection_color="blue",
+								selection_fill_alpha=.5)
+
+		elif int(self.roomNum)<300:
+			#draw on second floor
+			rooms2 = p2.quad(top=self.top,bottom=self.bottom, left=self.left, right=self.right,
+								nonselection_fill_alpha=0.01,
+								nonselection_fill_color=None,
+								nonselection_line_color="firebrick",
+								nonselection_line_alpha=1.0,
+								selection_color="blue",
+								selection_fill_alpha=.5)
+		else:
+			#draw on third floor
+			rooms3 = p3.quad(top=self.top,bottom=self.bottom, left=self.left, right=self.right,
+								nonselection_fill_alpha=0.01,
+								nonselection_fill_color=None,
+								nonselection_line_color="firebrick",
+								nonselection_line_alpha=1.0,
+								selection_color="blue",
+								selection_fill_alpha=.5)
+
+
+TOOLS = "box_zoom,box_select,resize,reset,hover,tap"
+
+#draws first floor of WH
+p1 = figure(plot_width=400, plot_height=400, tools=TOOLS,title="West Hall First Floor")
+tab1 =  Panel(child=p1, title="WH1")
+p1.segment(x0=[1, 1, 1, 6], y0=[1, 6, 1, 1], x1=[6, 6, 1, 6],
+          y1=[1, 6, 6, 6], color="#F4A582", line_width=3)
+p1.select_one(HoverTool).tooltips = [('Room Number','@roomNum'),('Inhabitants','@roommates')]
+
+#draws second floor of WH
+p2 = figure(plot_width=400, plot_height=400, tools=TOOLS,title="West Hall Second Floor")
+tab2 = Panel(child=p2, title="WH2")
+p2.segment(x0=[1, 1, 1, 6], y0=[1, 6, 1, 1], x1=[6, 6, 1, 6],
+          y1=[1, 6, 6, 6], color="#F4A582", line_width=3)
+p2.select_one(HoverTool).tooltips = [('Room Number','@roomNum'),('Inhabitants','@roommates')]
+
+#draws third floor of WH
+p3 = figure(plot_width=400, plot_height=400, tools=TOOLS,title="West Hall Third Floor")
+tab3 = Panel(child=p3, title="WH3")
+p3.segment(x0=[1, 1, 1, 6], y0=[1, 6, 1, 1], x1=[6, 6, 1, 6],
+          y1=[1, 6, 6, 6], color="#F4A582", line_width=3)
+p3.select_one(HoverTool).tooltips = [('Room Number','@roomNum'),('Inhabitants','@roommates')]
+
+
+#Pull data from csv file and create Room objects from it!
+with open('WH_Freshmen.csv') as csvfile:
+	freshmen_data = csv.reader(csvfile, delimiter=',', quotechar='\"')
+	#roomList = []
+	for row in freshmen_data:
+		roomA = Room() #initializes a new Room for each row in the csv data file
+		roomA.roomNum = row[0]
+		roomA.roomates = row[1] #not working for some reason?
+		roomA.gender = row[2]
+		roomA.bedtime = row[3]
+		roomA.lightsleep = row[4]
+		roomA.halltime = row[5]
+		roomA.top = 2
+		roomA.bottom = 1
+		roomA.left = 1
+		roomA.right = 2
+		roomA.drawRoom()
+		#roomList.append(roomA) #creates list of all Room objects
+
+dropdown_choices = [("Gender", "gender"), ("Bedtime", "bedtime"), ("Light Sleeper", "lightsleep"), ("Time in Hallway", "halltime")]
+dropdown = Dropdown(label="Hallway Metrics", type="warning", menu=dropdown_choices)
+
+tabs = Tabs(tabs=[tab1, tab2, tab3])
+layout = vform(dropdown, tabs)
+
+# show the results
+save(tabs)
+show(layout)

WH_ServerExperimentation.py

@@ -0,0 +1,137 @@
+from bokeh.models import BoxSelectTool, BoxZoomTool, LassoSelectTool, HoverTool, Quad
+from bokeh.plotting import figure, output_file, show, gridplot, ColumnDataSource, output_server
+from bokeh.models.widgets import Dropdown, Panel, Tabs, CheckboxButtonGroup, RadioGroup
+from bokeh.io import output_file, show, vform, save
+import csv
+
+#PROJECT OVERVIEW:
+#Create an interactive map of West Hall showing hallway culture via gender distribution, sleeping habits, time spent in hallways, etc.
+#(If we hear back from STAR, we'll also have data on how people move from year to year, which will be awesome to implement)
+
+#PROGRESS:
+#currently outputs to an html file which has 3 tabs - WH1, WH2, and WH3
+#rooms are currently blue squares, have hover functionality with correct labels but no data
+#rooms are 1 unit squares with an x position between 0 and 11 and a y position between 1 and 13.
+#Also have buttons that are currently nonfunctional but are planned to be able to display different color coordinations for each room.
+#Initializes and draws all rooms from a .csv file with data from survey sent to first years.
+
+#NEXT STEPS:
+#Get more room data from people (keep collecting survey responses)
+#Draw rooms in correct places
+#Make import for roommate names work correctly
+#Make hover display room number and inhabitant names instead of '???'
+#Make buttons functional
+	#figure out how to make buttons active
+	#make metric for color changing and coordination
+	#bokeh server things
+
+
+# output to static HTML file
+
+class Room(object):
+	def __init__(self, roomNum='000', roommates='[Roommate Names Here]', gender='[Some Gender Here]', bedtime=0, lightsleep=0, halltime=0, top=1, bottom=0, left=0, right=1):
+		self.roomNum = roomNum
+		self.roommates = roommates
+		self.gender = gender
+		self.bedtime = bedtime
+		self.lightsleep = lightsleep
+		self.halltime = halltime
+		self.top = top
+		self.bottom = bottom
+		self.left = left
+		self.right = right
+		self.gendercolor = "green"
+		self.bedtimecolor = "blue"
+		self.color = 
+
+	def __str__(self):
+		return 'Room Number: %s / Current Inhabitants: %s / Gender: %s / Average Bedtime: %s' %(self.roomNum, self.roommates, self.gender, self.bedtime)
+
+	def drawRoom(self):
+		if int(self.roomNum)<200:
+			#draw on first floor
+			rooms1 = p1.quad(top=self.top,bottom=self.bottom, left=self.left, right=self.right,
+								nonselection_fill_alpha=0.01,
+								nonselection_fill_color=None,
+								nonselection_line_color="firebrick",
+								nonselection_line_alpha=1.0,
+								selection_color="blue",
+								selection_fill_alpha=.5)
+
+		elif int(self.roomNum)<300:
+			#draw on second floor
+			rooms2 = p2.quad(top=self.top,bottom=self.bottom, left=self.left, right=self.right,
+								nonselection_fill_alpha=0.01,
+								nonselection_fill_color=None,
+								nonselection_line_color="firebrick",
+								nonselection_line_alpha=1.0,
+								selection_color="blue",
+								selection_fill_alpha=.5)
+		else:
+			#draw on third floor
+			rooms3 = p3.quad(top=self.top,bottom=self.bottom, left=self.left, right=self.right,
+								nonselection_fill_alpha=0.01,
+								nonselection_fill_color=None,
+								nonselection_line_color="firebrick",
+								nonselection_line_alpha=1.0,
+								selection_color="blue",
+								selection_fill_alpha=.5)
+
+TOOLS = "box_zoom,box_select,resize,reset,hover,tap"
+
+#draws first floor of WH
+p1 = figure(plot_width=400, plot_height=400, tools=TOOLS,title="West Hall First Floor")
+
+p1.segment(x0=[0, 4, 4, 7, 7, 11, 11, 7, 7, 4, 4, 0], y0=[13, 13, 12, 12, 13, 13, 10, 10, 1, 1, 10, 10], 
+		  x1=[4, 4, 7, 7, 11, 11, 7, 7, 4, 4, 0, 0], y1=[13, 12, 12, 13, 13, 10, 10, 1, 1, 10, 10, 13], color="green", line_width=3)
+p1.select_one(HoverTool).tooltips = [('Room Number','@roomNum'),('Inhabitants','@roommates')]
+
+#draws second floor of WH
+p2 = figure(plot_width=400, plot_height=400, tools=TOOLS,title="West Hall Second Floor")
+
+p2.segment(x0=[0, 4, 4, 7, 7, 11, 11, 7, 7, 4, 4, 0], y0=[13, 13, 12, 12, 13, 13, 10, 10, 1, 1, 10, 10], 
+		  x1=[4, 4, 7, 7, 11, 11, 7, 7, 4, 4, 0, 0], y1=[13, 12, 12, 13, 13, 10, 10, 1, 1, 10, 10, 13], color="#F4A582", line_width=3)
+p2.select_one(HoverTool).tooltips = [('Room Number','@roomNum'),('Inhabitants','@roommates')]
+
+#draws third floor of WH
+p3 = figure(plot_width=400, plot_height=400, tools=TOOLS,title="West Hall Third Floor")
+
+p3.segment(x0=[0, 4, 4, 7, 7, 11, 11, 7, 7, 4, 4, 0], y0=[13, 13, 12, 12, 13, 13, 10, 10, 1, 1, 10, 10], 
+		  x1=[4, 4, 7, 7, 11, 11, 7, 7, 4, 4, 0, 0], y1=[13, 12, 12, 13, 13, 10, 10, 1, 1, 10, 10, 13], color="#F4A582", line_width=3)
+p3.select_one(HoverTool).tooltips = [('Room Number','@roomNum'),('Inhabitants','@roommates')]
+
+
+#Pull data from csv file and create Room objects from it!
+with open('WH_Freshmen.csv') as csvfile:
+	freshmen_data = csv.reader(csvfile, delimiter=',', quotechar='\"')
+	#roomList = []
+	for row in freshmen_data:
+		roomA = Room() #initializes a new Room for each row in the csv data file
+		roomA.roomNum = row[0]
+		roomA.roomates = row[1] #not working for some reason?
+		roomA.gender = row[2]
+		roomA.bedtime = row[3]
+		roomA.lightsleep = row[4]
+		roomA.halltime = row[5]
+		roomA.top = 13
+		roomA.bottom = 12
+		roomA.left = 0
+		roomA.right = 1
+		roomA.color = roomA.gendercolor
+		roomA.drawRoom()
+		#roomList.append(roomA) #creates list of all Room objects
+
+dropdown_choices = [("Gender", "gender"), ("Bedtime", "bedtime"), ("Light Sleeper", "lightsleep"), ("Time in Hallway", "halltime")]
+dropdown = Dropdown(label="Hallway Metrics", type="warning", menu=dropdown_choices)
+
+#creating a callback function for changing the color of the room
+def callback(obj, attr, old, new):
+    ...
+dropdown.on_change('selected', callback)
+
+tabs = Tabs(tabs=[Panel(child=p1, title="WH1"), Panel(child=p2, title="WH2"), Panel(child=p3, title="WH3")])
+layout = vform(dropdown, tabs)
+
+# show the results
+save(tabs)
+show(layout)