fixed file path

Author: vlabatut

src/dev_ASOIAF.R

@@ -71,4 +71,4 @@ end.rec.log()
 
 # TODO
 # - sortir mêmes figures que padraig
-# - transformer chapitres en volumes ?
+# - extraire cum net par chap au lieu de scènes

src/dynamic/cumulative.R

@@ -147,7 +147,10 @@ cum.write.graph <- function(gs, filtered, pub.order=TRUE, char.det=NA)
 	else			# by story order
 		ord.fold <- "story"
 
-	base.file <- get.path.data.graph(mode="scenes", char.det=char.det, net.type="cumulative", order=ord.fold, filtered=filtered, pref="cum")
+	# retrieve narrative unit
+	narr.unit <- strsplit(gs[[1]]$NarrUnit, split="_")[[1]][1]
+	
+	base.file <- get.path.data.graph(mode="scenes", char.det=char.det, net.type="cumulative", order=ord.fold, filtered=filtered, subfold=narr.unit, pref="cum")
 	write.dynamic.graph(gs=gs, base.path=base.file)
 }
 
@@ -162,16 +165,17 @@ cum.write.graph <- function(gs, filtered, pub.order=TRUE, char.det=NA)
 # remove.isolates: whether to remove isolates in each time slice.
 # pub.order: whether to consider volumes in publication vs. story order.
 # char.det: character detection mode ("implicit" or "explicit").
+# narr.unit: narrative unit used to extract the dynamic network (scene, volume, etc.).
 #
 # returns: list of igraph objects representing a dynamic graph.
 ###############################################################################
-cum.read.graph <- function(filtered, remove.isolates=TRUE, pub.order=TRUE, char.det=NA)
+cum.read.graph <- function(filtered, remove.isolates=TRUE, pub.order=TRUE, char.det=NA, narr.unit=NA)
 {	if(pub.order)	# by publication order
 		ord.fold <- "publication"
 	else			# by story order
 		ord.fold <- "story"
 
-	base.file <- get.path.data.graph(mode="scenes", char.det=char.det, net.type="cumulative", order=ord.fold, filtered=filtered, pref="cum")
+	base.file <- get.path.data.graph(mode="scenes", char.det=char.det, net.type="cumulative", order=ord.fold, filtered=filtered, subfold=narr.unit, pref="cum")
 	gs <- read.dynamic.graph(base.file=base.file, remove.isolates=remove.isolates)
 
 	return(gs)

src/post/asoiaf/extr_dyn.R

@@ -18,6 +18,8 @@ start.rec.log(text="ExtrDyn")
 
 ################################################################################
 tlog(0,"Extract dynamic networks for ASOIAF")
+char.det <- "implicit"
+narr.unit <- "scene"
 
 # read raw data
 tlog(2,"Reading previously computed corpus stats")
@@ -33,6 +35,7 @@ scene.stats <- data$scene.stats
 
 # extract dynamic networks using the comic publication order (=comic story order)
 tlog(2,"Extracting publication-ordered dynamic networks")
+pub.order <- TRUE
 for(filtered in c(FALSE,TRUE))
 {	tlog(4,"Dealing with ",if(filtered) "" else "un","filtered networks")
 	gg <- cum.graph.extraction(
@@ -41,11 +44,11 @@ for(filtered in c(FALSE,TRUE))
 			scene.chars=scene.chars, scene.stats=scene.stats, 
 			volume.stats=volume.stats, 
 			filtered=filtered, 
-			pub.order=TRUE,
-			narr.unit="scene"
+			pub.order=pub.order,
+			narr.unit=narr.unit
 	)
-	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")
+	cum.write.graph(gs=gg, filtered=filtered, pub.order=pub.order, char.det=char.det)
+	gg <- cum.read.graph(filtered=filtered, remove.isolates=TRUE, pub.order=pub.order, char.det=char.det, narr.unit=narr.unit)
 }
 
 
@@ -68,6 +71,7 @@ inter.df[,COL_RANK] <- rank(page.stats[inter.df[,COL_PAGE_START_ID],COL_RANK]*(n
 
 # extract dynamic networks using the novel chapter order
 tlog(2,"Extracting publication-ordered dynamic networks")
+pub.order <- FALSE
 for(filtered in c(FALSE,TRUE))
 {	tlog(4,"Dealing with ",if(filtered) "" else "un","filtered networks")
 	gg <- cum.graph.extraction(
@@ -76,16 +80,28 @@ for(filtered in c(FALSE,TRUE))
 			scene.chars=scene.chars, scene.stats=scene.stats, 
 			volume.stats=volume.stats, 
 			filtered=filtered, 
-			pub.order=FALSE,
-			narr.unit="scene"
+			pub.order=pub.order,
+			narr.unit=narr.unit
 	)
-	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=pub.order, char.det=char.det)
+	gg <- cum.read.graph(filtered=filtered, remove.isolates=TRUE, pub.order=pub.order, char.det=char.det, narr.unit=narr.unit)
 }
 
 
 
 
+###############################################################################
+# alternative: replace volumes by chapters
+
+# create new volume table
+# replace each volume and volume id in all the other tables
+# problem: cannot process all the volume stats
+
+# alt: create a new narrative unit "chapter"?
+
+
+
+
 ###############################################################################
 # end logging
 tlog(0,"Process complete")