updated post to fit last modifs in net extr fct

Author: vlabatut

src/post/asoiaf/extr_dyn.R

@@ -20,6 +20,7 @@ tlog(0,"Extract dynamic networks for ASOIAF")
 # read raw data
 tlog(2,"Reading previously computed corpus stats")
 data <- read.corpus.data(char.det="implicit")
+inter.df <- data$inter.df
 char.stats <- data$char.stats
 scene.stats <- data$scene.stats
 scene.chars <- data$scene.chars
@@ -31,15 +32,17 @@ 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=pub.order, 
-			char.det="implicit"
+			pub.order=FALSE
 	)
-	cum.write.graph(gs=gg, filtered=filtered, pub.order="publication", char.det="implicit")
+	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")
 }
+	
 
 # extract dynamic networks using the novel publication order (slightly different from the comic's)
 tlog(2,"Extracting novel-ordered dynamic networks")

src/post/description/avgdist_evol.R

@@ -40,12 +40,14 @@ for(pub.order in c(FALSE, TRUE))
 
 	# compute the sequence of scene-based graphs (possibly one for each scene)
 	tlog(0, "Extract graph sequence")
-	gs <- extract.static.graph.scenes(
+	gs <- cum.graph.extraction(
 		inter.df=data$inter.df, 
 		char.stats=data$char.stats, 
 		scene.stats=data$scene.stats, scene.chars=data$scene.chars,
 		volume.stats=data$volume.stats, 
-		ret.seq=TRUE, pub.order=pub.order
+		filtered=FALSE, 
+		pub.order=pub.order,  
+		narr.unit="scene"
 	)
 
 	# init lists

src/post/description/char_sim.R

@@ -110,13 +110,16 @@ for(narr.smooth in c(FALSE,TRUE))
 			else
 			{	net.type <- "cumulative"
 				tlog(14,"Extracting the sequence of graphs")
-				gs[["unfiltered"]] <- extract.static.graph.scenes(
+				gs[["unfiltered"]] <- cum.graph.extraction(
 					inter.df=data$inter.df, 
 					char.stats=char.stats, 
 					volume.stats=volume.stats, 
 					scene.stats=scene.stats, scene.chars=scene.chars,
-					ret.seq=TRUE, pub.order=pub.order
+					filtered=FALSE, 
+					pub.order=pub.order,  
+					narr.unit="scene"
 				)
+					
 				# possibly set weights
 				if(weighted)
 				{	gs[["unfiltered"]] <- future_lapply(gs[["unfiltered"]], function(g) {E(g)$weight <- E(g)$Occurrences; return(g)})

src/post/description/pref_attach.R

@@ -66,13 +66,16 @@ if(length(filt.names)==0) stop("Empty list of filtered characters")
 tlog(0,"Extract the sequence of scene-related cumulative graphs")
 data <- read.corpus.data(char.det="implicit")
 # compute the sequence of scene-based graphs (possibly one for each scene)
-gs.unf <- extract.static.graph.scenes(
+gs.unf <- cum.graph.extraction(
 	inter.df=data$inter.df,
 	char.stats=data$char.stats, 
 	scene.stats=data$scene.stats, scene.chars=data$scene.chars,
 	volume.stats=data$volume.stats, 
-	ret.seq=TRUE, pub.order=TRUE	# TODO check that this parm is used in the rest of the graph (should be a main script param)
+	filtered=FALSE, 
+	pub.order=TRUE,  
+	narr.unit="scene"
 )
+	
 gs.filt <- future_lapply(gs.unf, function(g) delete_vertices(g, v=intersect(filt.names,V(g)$name)))
 # build the list for latter use
 gsl <- list()