fixed a number of minor bugs in the dyn net scripts

Author: vlabatut

src/common/_include.R

@@ -90,5 +90,6 @@ source("src/static/plot_stats_base.R")
 source("src/static/plot_stats_comp.R")
 
 source("src/dynamic/cumulative.R")
+source("src/dynamic/evol_prop.R")
 source("src/dynamic/instant.R")
 source("src/dynamic/narr_smooth.R")

src/common/file_system.R

@@ -175,7 +175,7 @@ get.path.data.graph <- function(mode, char.det=NA, net.type, order=NA, window.si
 # window.size: value for this parameter (ignored for mode="scenes").
 # overlap: value for this parameter, specified for of the above parameter value.
 # (also ignored for mode="scenes").
-# weights: either "occurrences" or "duration" (ignored for mode="window.xxx").
+# weights: "occurrences", "duration", "none" (ignored for mode="window.xxx").
 # arc: the narrative arc to plot (optional).
 # vol: the volume to plot (optional, and ignored if arc is specified).
 # filtered: whether this concerns the filtered version of the graph.
@@ -266,7 +266,7 @@ get.path.stat.table <- function(object, mode, char.det=NA, net.type, order=NA, w
 # window.size: value for this parameter (ignored for mode="scenes").
 # overlap: value for this parameter, specified for of the above parameter value.
 # (also ignored for mode="scenes").
-# weights: either "occurrences" or "duration" (ignored for mode="window.xxx").
+# weights: "occurrences", "duration", "none" (ignored for mode="window.xxx").
 # arc: the narrative arc to plot (optional).
 # vol: the volume to plot (optional, and ignored if arc is specified).
 # filtered: whether this concerns the filtered version of the graph (or NA if not applicable).
@@ -369,7 +369,7 @@ get.path.stats.topo <- function(mode, char.det=NA, net.type, order=NA, att=NA, m
 # meas.name: name of the plot measure.
 # window.size: value for this parameter.
 # overlap: value for this parameter, specified for of the above parameter value.
-# weights: value for this parameters, either "duration" or "occurrences".
+# weights: value for this parameters ("occurrences", "duration", "none").
 # arc: the narrative arc to plot (optional).
 # vol: the volume to plot (optional, and ignored if arc is specified).
 # filtered: whether this concerns the filtered version of the graph.

src/common/plots/_plot_misc.R

@@ -17,23 +17,33 @@ source("src/common/plots/plot_distr.R")
 #
 # ylim: limits of the y axis in the plot.
 # volume.stats: table containing the volume characteristics.
+# narr.unit: narrative unit of the x axis (scene or chapter).
 ###############################################################################
-draw.volume.rects <- function(ylim, volume.stats)
+draw.volume.rects <- function(ylim, volume.stats, narr.unit)
 {# rectangle colors
 rec.pal <- c("gray90","gray80")
 
+if(narr.unit=="scene")
+{start.col <- COL_SCENE_START_ID
+end.col <- COL_SCENE_END_ID
+}
+else if(narr.unit=="narr.unit")
+{start.col <- COL_CHAPTER_START_ID
+end.col <- COL_CHAPTER_END_ID
+}
+
 # draw each volume
 for(v in 1:nrow(volume.stats))
 {	rect(
-xleft=volume.stats[v,COL_SCENE_START_ID], 
-xright=volume.stats[v,COL_SCENE_END_ID], 
+xleft=volume.stats[v,start.col], 
+xright=volume.stats[v,end.col], 
 ybottom=ylim[1]-abs(ylim[1])*0.05, 
 ytop=ylim[2], 
 col=rec.pal[(v %% 2)+1], 
 border=NA, density=NA
 )
 text(
-x=(volume.stats[v,COL_SCENE_START_ID]+volume.stats[v,COL_SCENE_END_ID])/2, 
+x=(volume.stats[v,start.col]+volume.stats[v,end.col])/2, 
 y=ylim[2], 
 labels=volume.stats[v,COL_VOLUME],
 cex=0.55, adj=c(0.5,1)

src/common/table_cols.R

@@ -37,6 +37,8 @@ COL_VOLUMES_BY_ARC <- "AvgVolumesByArc"	# average number of volumes by arc
 COL_CHAPTER <- "Chapter" # chapter number, relative to a (novel) volume
 COL_CHAPTER_ID <- "ChapterId"# unique chapter id (overall)
 COL_CHAPTERS <- "Chapters"# number of chapters in a volume/arc
+COL_CHAPTER_END_ID <- "EndChapterId"# unique id of an end chapter (overall)
+COL_CHAPTER_START_ID <- "StartChapterId"# unique id of an start chapter (overall)
 # TODO implement stat computation for chapters, which were added afterwards (to handle ASOIAF)
 
 
@@ -49,7 +51,7 @@ COL_PAGE_ID <- "PageId"	# unique page id (overall)
 COL_PAGE_END <- "EndPage"# end page number, relative to a volume
 COL_PAGE_END_ID <- "EndPageId"# unique id of an end page (overall)
 COL_PAGE_START <- "StartPage"# start page number, relative to a volume
-COL_PAGE_START_ID <- "StartPageId"# unique id of an end page (overall)
+COL_PAGE_START_ID <- "StartPageId"# unique id of an start page (overall)
 COL_PAGES <- "Pages"# number of pages
 
 # page stats

src/dev_ASOIAF.R

@@ -68,10 +68,10 @@ generate.static.plots.base(data=data)
 
 ###############################################################################
 # extract dynamic networks
-extract.dyn.nets.asoiaf(data)
+extract.dyn.nets.asoiaf(data, narr.units=c("scene", "chapter"))
 
 # compute and plot a few measures
-# TODO
+plot.dyn.props.asoiaf(data, narr.units=c("scene", "chapter"))