revised dyn net extr function

Author: vlabatut

src/static/extract_graphs_scene.R

@@ -71,17 +71,10 @@ extract.static.graph.scenes <- function(inter.df, char.stats, scene.stats, scene
 	# possibly init the list with empty graphs or isolates
 	if(ret.seq)
 	{	#tlog(2,"Initializing the graph list")
-		s <- 1
-		while(scene.stats[scenes.ord[s],COL_SCENE_ID]!=inter.df[is[1],COL_SCENE_ID])
+		for(s in 1:length(scenes.ord))
 		{	#tlog(4,"Processing s=",s," (scenes.ord[s]=",scenes.ord[s]," and inter.df[is[1],COL_SCENE_ID]=",inter.df[is[1],COL_SCENE_ID],") -- (length(scene.chars[[s]]=",length(scene.chars[[s]]),")")
-			# no character: empty graph
-			if(length(scene.chars[[scenes.ord[s]]])==0)
-				g <- make_empty_graph(n=0, directed=FALSE)
-			# a single character: single vertex graph
-			else if(length(scene.chars[[scenes.ord[s]]])==1)
-			{	idx <- which(char.stats[,COL_NAME]==scene.chars[[scenes.ord[s]]])
-				g <- graph_from_data_frame(d=static.df, directed=FALSE, vertices=char.stats[idx,])
-			}
+			# init graph with all vertices (characters) and no edge
+			g <- graph_from_data_frame(d=static.df, directed=FALSE, vertices=char.stats)
 			g <- set_edge_attr(g, name=COL_OCCURRENCES, value=NA)
 			g <- set_edge_attr(g, name=COL_DURATION, value=NA)
 			res[[s]] <- g
@@ -97,8 +90,8 @@ extract.static.graph.scenes <- function(inter.df, char.stats, scene.stats, scene
 	for(i in is)
 	{	# get the current scene id
 		cur.scene <- inter.df[i,COL_SCENE_ID]
-		cur.scene.idx <- which(scenes.ord==cur.scene)
-		#tlog(4,"Processing scene ",cur.scene," (",cur.scene.idx,"/",length(scenes.ord),")")
+		cur.scene.idx <- which(scene.stats[scenes.ord,COL_RANK]==cur.scene)
+		#tlog(4,"Processing interaction #",i,"/",length(is)," from scene ",cur.scene," (",cur.scene.idx,"/",length(scenes.ord),")")
 
 		# get the characters
 		from.char <- inter.df[i,COL_CHAR_FROM]
@@ -125,22 +118,11 @@ extract.static.graph.scenes <- function(inter.df, char.stats, scene.stats, scene
 
 		# if graph sequence required
 		if(ret.seq)
-		{	# possibly copy previous graph
-			if(!is.na(prev.scene) && cur.scene!=prev.scene)
-			{	#tlog(4,"prev.scene=",prev.scene," cur.scene=",cur.scene)
-				# possibly several times, to represent interaction-less scenes
-				for(s in (prev.scene.idx+1):(cur.scene.idx-1))
-				{	tlog(6,"s=",s," scenes.ord[s-1]=",scenes.ord[s-1]," length(res)=",length(res))
-					g <- res[[s-1]]
-					g <- set_graph_attr(graph=g, name="SceneId", value=scene.stats[scenes.ord[s],COL_SCENE_ID])
-					res[[s]] <- g
-				}
-			}
-			# build and add current graph
-			static.df <- static.df[order(static.df[,COL_CHAR_FROM],static.df[,COL_CHAR_TO]),]
-			idx <- which(char.stats[,COL_NAME] %in% c(cbind(static.df[,COL_CHAR_FROM],static.df[,COL_CHAR_TO])))
-			g <- graph_from_data_frame(d=static.df, directed=FALSE, vertices=char.stats[idx,])
-			g$SceneId <- cur.scene
+		{	# retrieve existing graph for the current scene
+			g <- res[[cur.scene.idx]]
+			# update with current interaction
+			g <- add_edges(graph=g, edges=c(from.char,to.char), attr=list(Occurrences=1, Duration=length))
+			# update result list
 			res[[cur.scene.idx]] <- g
 		}