finished cum dyn net extr

Author: vlabatut

src/dev_ASOIAF.R

@@ -70,5 +70,5 @@ generate.static.plots.base(data=data)
 end.rec.log()
 
 # TODO
-# - cum net: test if pub order extr works
-# - code novel order dyn net extr, and anal
+# - sortir mêmes figures que padraig
+# - transformer chapitres en volumes ?

src/post/asoiaf/extr_dyn.R

@@ -1,4 +1,6 @@
-# Extracts dynamic ASOIAF networks.
+# Extracts dynamic ASOIAF networks. The "publication" order follows the comic publication
+# order. The "story" order matches parts of issues to novel chapter and reorder them
+# accordingly, in order to match the books.
 # 
 # Vincent Labatut
 # 02/2023
@@ -24,6 +26,7 @@ inter.df <- data$inter.df
 char.stats <- data$char.stats
 scene.stats <- data$scene.stats
 scene.chars <- data$scene.chars
+panel.stats <- data$panel.stats
 page.stats <- data$page.stats
 volume.stats <- data$volume.stats
 scene.stats <- data$scene.stats
@@ -38,28 +41,47 @@ for(filtered in c(FALSE,TRUE))
 			scene.chars=scene.chars, scene.stats=scene.stats, 
 			volume.stats=volume.stats, 
 			filtered=filtered, 
-			pub.order=FALSE
+			pub.order=TRUE,
+			narr.unit="scene"
 	)
-	cum.write.graph(gs=gg, filtered=filtered, pub.order=FALSE, char.det="implicit")
-	gg <- cum.read.graph(filtered=filtered, remove.isolates=TRUE, pub.order=FALSE, char.det="implicit")
+	cum.write.graph(gs=gg, filtered=filtered, pub.order=TRUE, char.det="implicit")
+	gg <- cum.read.graph(filtered=filtered, remove.isolates=TRUE, pub.order=TRUE, char.det="implicit")
 }
 
 
+
+
+###############################################################################
 # extract dynamic networks using the novel publication order (slightly different from the comic's)
 tlog(2,"Extracting novel-ordered dynamic networks")
 
 # read map file
 map.file <- file.path(DATA_FOLDER,"mapping.csv")
 map <- read.csv(map.file, header=TRUE, check.names=FALSE, stringsAsFactors=FALSE)
-# compute page ranks
+# compute new page ranks
 parts <- sapply(1:nrow(page.stats), function(p) map[map[,COL_VOLUME]==page.stats[p,COL_VOLUME] & map[,COL_PAGE_START]<=page.stats[p,COL_PAGE] & map[,COL_PAGE_END]>=page.stats[p,COL_PAGE], COL_RANK])
 page.stats[,COL_RANK] <- rank(parts*(nrow(page.stats)+1) + page.stats[,COL_PAGE])
-# compute other ranks
+# compute other ranks based on new page ranks
 panel.stats[,COL_RANK] <- rank(page.stats[panel.stats[,COL_PAGE_ID],COL_RANK]*(nrow(panel.stats)+1) + panel.stats[,COL_PANEL])
-# TODO
-scene.stats[,COL_RANK] <- rank(volume.stats[scene.stats[,COL_VOLUME_ID],COL_RANK]*(nrow(scene.stats)+1) + scene.stats[,COL_SCENE_ID], ties.method="first")
-inter.df[,COL_RANK] <- rank(volume.stats[inter.df[,COL_VOLUME_ID],COL_RANK]*(nrow(inter.df)+1) + 1:nrow(inter.df), ties.method="first")
+scene.stats[,COL_RANK] <- rank(page.stats[scene.stats[,COL_PAGE_START_ID],COL_RANK]*(nrow(scene.stats)+1) + scene.stats[,COL_SCENE_ID], ties.method="first")
+inter.df[,COL_RANK] <- rank(page.stats[inter.df[,COL_PAGE_START_ID],COL_RANK]*(nrow(inter.df)+1) + 1:nrow(inter.df), ties.method="first")
 
+# extract dynamic networks using the novel chapter order
+tlog(2,"Extracting publication-ordered dynamic networks")
+for(filtered in c(FALSE,TRUE))
+{	tlog(4,"Dealing with ",if(filtered) "" else "un","filtered networks")
+	gg <- cum.graph.extraction(
+			inter.df=inter.df,
+			char.stats=char.stats, 
+			scene.chars=scene.chars, scene.stats=scene.stats, 
+			volume.stats=volume.stats, 
+			filtered=filtered, 
+			pub.order=FALSE,
+			narr.unit="scene"
+	)
+	cum.write.graph(gs=gg, filtered=filtered, pub.order=FALSE, char.det="implicit")
+	gg <- cum.read.graph(filtered=filtered, remove.isolates=TRUE, pub.order=FALSE, char.det="implicit")
+}
 
 
 

src/static/extract_graphs_scene.R

@@ -70,9 +70,9 @@ extract.static.graph.scenes <- function(inter.df, char.stats, scene.stats, scene
 	# possibly init the list with empty graphs or isolates
 	if(ret.seq)
 	{	gg <- list()
-		tlog(2,"Initializing the graph list")
+		#tlog(2,"Initializing the graph list")
 		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]]),")")
+		{	#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]]),")")
 			# 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)
@@ -91,7 +91,7 @@ extract.static.graph.scenes <- function(inter.df, char.stats, scene.stats, scene
 	{	# get the current scene id
 		cur.scene <- inter.df[i,COL_SCENE_ID]
 		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),")")
+		#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]