# HG changeset patch
# User Nina Engelhardt <nengel@mailbox.tu-berlin.de>
# Date 1359739041 -3600
# Node ID 2ef6476f36286229225a90fde6f42c8bbbdacea8
# Parent  3adfef46f3a75feaa59372f7c50a7a4ab013af1f
movie

diff -r 3adfef46f3a7 -r 2ef6476f3628 scripts/ucc_and_loop_graph_treatment/column_view.py
--- a/scripts/ucc_and_loop_graph_treatment/column_view.py	Fri Aug 31 18:21:25 2012 +0200
+++ b/scripts/ucc_and_loop_graph_treatment/column_view.py	Fri Feb 01 18:17:21 2013 +0100
@@ -9,10 +9,10 @@
 
 __num_idle = 0 #graph.node['start']['numcores'] * 2
 
-__vertical_scale_factor = 0.000001 #10000.0/float(total_height)
+__vertical_scale_factor = 0.00001 #10000.0/float(total_height)
 
-__cache_miss_min = 0.0002
-__cache_miss_max = 0.0007
+__cache_miss_min = 0.001
+__cache_miss_max = 0.003
 ### saving ###
 
 def save_computed_column_view(graph,num_cores,total_height,positioning,dependencies=None,filename=None):
diff -r 3adfef46f3a7 -r 2ef6476f3628 scripts/ucc_and_loop_graph_treatment/parse_loop_graph.py
--- a/scripts/ucc_and_loop_graph_treatment/parse_loop_graph.py	Fri Aug 31 18:21:25 2012 +0200
+++ b/scripts/ucc_and_loop_graph_treatment/parse_loop_graph.py	Fri Feb 01 18:17:21 2013 +0100
@@ -49,7 +49,11 @@
 			print "(Difference:", dif, "- Relative Error:", 100*float(dif)/float(lend['end']),"%)"
 			#print g.node['start']['starttimes']
 			#print g.node['start']['tscstarttimes']
-			column_view.save_computed_column_view(g,g.node['start']['numcores'],lend['end'],lend,[d["commDep"], d["dataDep"], d["ctlDep"]],"{0}.svg".format(sys.argv[1]))
+			filteredDeps = []
+			for key in ["commDep","dataDep","ctlDep"]:
+				if d.has_key(key):
+					filteredDeps.append(d[key])
+			column_view.save_computed_column_view(g,g.node['start']['numcores'],lend['end'],lend,filteredDeps,"{0}.svg".format(sys.argv[1]))
 			#column_view.save_comparative_column_view(g,g.node['start']['numcores'],max(actual_time,lend['end']),lend)
 			#column_view.save_tsc_scale(g,g.node['start']['numcores'],lend['end'])
 			return #
diff -r 3adfef46f3a7 -r 2ef6476f3628 scripts/ucc_and_loop_graph_treatment/parse_ucc.py
--- a/scripts/ucc_and_loop_graph_treatment/parse_ucc.py	Fri Aug 31 18:21:25 2012 +0200
+++ b/scripts/ucc_and_loop_graph_treatment/parse_ucc.py	Fri Feb 01 18:17:21 2013 +0100
@@ -16,6 +16,8 @@
 	uccfile = open(sys.argv[1])
 	d = read_from_file(uccfile)
 	g = uccgraph_from_dict(d)
+	nx.draw(g)
+	plt.show()
 	print "Parsed UCC from file", sys.argv[1], "and found:"
 	if d.has_key("unit"):
 		print len(d["unit"]), "Units"
@@ -54,8 +56,8 @@
 				if not aliases.has_key(unit):
 					d["unit"].append( unit )
 					aliases[unit]=unit
-				if int(row[4]) == 1:
-					aliases[unit[0],unit[1]+1]=aliases[unit]
+				#if int(row[4]) == 1:
+				#	aliases[unit[0],unit[1]+1]=aliases[unit]
 			if row[0] == "ctlDep":
 				if not d.has_key("ctlDep"):
 					d["ctlDep"] = []
@@ -90,15 +92,19 @@
 	g = nx.DiGraph()
 	g.add_node("start")
 	g.add_node("end")
-	g.add_nodes_from(d["unit"])
-	g.add_edges_from(d["ctlDep"], color=(0,0,0))
-	g.add_edges_from(d["commDep"], color=(255,0,0))
-	for i,(senders,receivers) in enumerate(d["NtoN"]):
-		g.add_node("NtoN"+str(i))
-		for node in senders:
-			g.add_edge(node,"NtoN0",color=(0,255,0))
-		for node in receivers:
-			g.add_edge("NtoN0",node,color=(0,255,0))
+	if d.has_key("unit"):
+		g.add_nodes_from(d["unit"])
+	if d.has_key("ctlDep"):
+		g.add_edges_from(d["ctlDep"], color=(0,0,0))
+	if d.has_key("commDep"):
+		g.add_edges_from(d["commDep"], color=(255,0,0))
+	if d.has_key("NtoN"):
+		for i,(senders,receivers) in enumerate(d["NtoN"]):
+			g.add_node("NtoN"+str(i))
+			for node in senders:
+				g.add_edge(node,"NtoN0",color=(0,255,0))
+			for node in receivers:
+				g.add_edge("NtoN0",node,color=(0,255,0))
 	for node in g:
 		if node != "start" and node != "end":
 			if len(g.predecessors(node)) == 0: