fixed char_sim

Author: vlabatut

src/post/description/_all_post.R

@@ -16,7 +16,7 @@ source("src/post/description/centr_clusters.R")
 source("src/post/description/centr_vs_centr.R")
 source("src/post/description/centr_vs_occ.R")
 source("src/post/description/char_distr.R")
-#source("src/post/description/char_sim.R")
+source("src/post/description/char_sim.R")
 #source("src/post/description/char_tj_comp.R")
 source("src/post/description/comp_vs_edges.R")
 #source("src/post/description/comp_vs_vertices.R")

src/post/description/char_sim.R

@@ -18,7 +18,7 @@ start.rec.log(text="CharSim")
 ################################################################################
 # main parameters
 wide <- TRUE				# wide plots showing volumes as rectangles
-narr.smooth <- FALSE			# whether to use narrative smoothing or cumulative scene-based networks
+narr.smooth <- TRUE			# whether to use narrative smoothing or cumulative scene-based networks
 weighted <- TRUE			# whether to use the graph weights
 sc.lim <- NA				# limit on the considered scenes (NA for no limit)
 pub.order <- TRUE			# whether to use the volume publication vs. story order
@@ -69,7 +69,7 @@ if(narr.smooth)
 	)
 	# possibly set weights
 	if(weighted)
-	{	gs[["unfiltered"]] <- future_lapply(gs[["unfiltered"]], function(g) {E(g)$weight <- E(g)$Occurrences;return(g)})
+	{	gs[["unfiltered"]] <- future_lapply(gs[["unfiltered"]], function(g) {E(g)$weight <- E(g)$Occurrences; return(g)})
 		w.name <- "occurrences"
 	}
 
@@ -219,7 +219,7 @@ for(m in 1:length(sim.meas))
 				if(wide)
 					draw.volume.rects(ylim, volume.stats)
 				# horizontal dotted line
-				if(names(sim.meas)[m]=="pearson")
+				if(names(sim.meas)[m]=="sim-pearson")
 					abline(h=0, lty=2)
 				# add line
 				lines(
@@ -281,7 +281,7 @@ for(m in 1:length(sim.meas))
 				)
 			}
 			# horizontal dotted line
-			if(names(sim.meas)[m]=="pearson")
+			if(names(sim.meas)[m]=="sim-pearson")
 				abline(h=0, lty=2)
 			# legend
 			legend(

src/static/extract_scene.R

@@ -73,13 +73,15 @@ extract.static.graph.scenes <- function(inter.df, char.stats, scene.stats, scene
 	{	#tlog(2,"Initializing the graph list")
 		s <- 1
 		while(scenes.ord[s]!=inter.df[is[1],COL_SCENE_ID])
-		{	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]]),")")
+		{	#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]]),")")
 			if(length(scene.chars[[scenes.ord[s]]])==0)
 				g <- make_empty_graph(n=0, directed=FALSE)
 			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,])
 			}
+			g <- set_edge_attr(g, name=COL_OCCURRENCES, value=NA)
+			g <- set_edge_attr(g, name=COL_DURATION, value=NA)
 			res[[s]] <- g
 			s <- s + 1
 		}