adjusted sex_stats post script

Author: vlabatut

src/common/file_system.R

@@ -254,6 +254,7 @@ get.path.stat.table <- function(object, mode, net.type, order=NA, window.size=NA
 # mode: either "scenes", "panel.window", or "page.window".
 # net.type: "static", "cumulative", "narr_smooth".
 # order: "publication" vs. "story" order for the dynamic networks.
+# att: vertex attribute concerned.
 # meas.name: file-ready name of the measure.
 # window.size: value for this parameter (ignored for mode="scenes").
 # overlap: value for this parameter, specified for of the above parameter value.
@@ -267,7 +268,7 @@ get.path.stat.table <- function(object, mode, net.type, order=NA, window.size=NA
 # 
 # returns: full path.
 ###############################################################################
-get.path.stats.topo <- function(mode, net.type, order=NA, meas.name=NA, window.size=NA, overlap=NA, weights=NA, arc=NA, vol=NA, filtered=NA, pref=NA, suf=NA)
+get.path.stats.topo <- function(mode, net.type, order=NA, att=NA, meas.name=NA, window.size=NA, overlap=NA, weights=NA, arc=NA, vol=NA, filtered=NA, subfold=NA, pref=NA, suf=NA)
 {	# base folder
 	if(mode=="panel.window")
 		folder <- STAT_PANELS_FOLDER
@@ -295,9 +296,6 @@ get.path.stats.topo <- function(mode, net.type, order=NA, meas.name=NA, window.s
 		if(!is.logical(vol))
 			folder <- file.path(folder, "separate", vol)
 	}
-#	# possibly add extra subfolder
-#	if(!is.na(subfold))
-#		folder <- file.path(folder, subfold)
 	# possibly add window size
 	if(!is.na(window.size))
 	{	folder <- file.path(folder, paste0("ws=",window.size))
@@ -308,9 +306,15 @@ get.path.stats.topo <- function(mode, net.type, order=NA, meas.name=NA, window.s
 	# possibly add overlap
 	else if(!is.na(overlap))
 		folder <- file.path(folder, paste0("ol=",overlap))
+	# possibly add attribute name
+	if(!is.na(att))
+		folder <- file.path(folder,"attributes",att)
 	# add weight subfolder
 	if(!is.na(weights))
 		folder <- file.path(folder, "weights", weights)
+	# possibly add extra subfolder
+	if(!is.na(subfold))
+		folder <- file.path(folder, subfold)
 	# possibly add measure object
 	if(!is.na(meas.name))
 		folder <- file.path(folder, ALL_MEASURES[[meas.name]]$object, ALL_MEASURES[[meas.name]]$folder)

src/post/description/_all_post.R

@@ -26,6 +26,6 @@ source("src/post/description/nei_vs_deg.R")
 source("src/post/description/partial_extr.R")
 source("src/post/description/pref_attach.R")
 source("src/post/description/robustness.R")
-#source("src/post/description/sex_stats.R")
+source("src/post/description/sex_stats.R")
 #source("src/post/description/trans_vs_deg.R")
 #source("src/post/description/weight_plots.R")

src/post/description/pref_attach.R

@@ -273,7 +273,7 @@ for(mode in modes)
 		# create/complete figure
 		if(!filts[f])
 		{	# open plot file
-			plot.file <- get.path.stats.topo(net.type="static", mode="scenes", meas.name=MEAS_MULTI_NODES, filtered="both", suf=paste0("pref-attach-",mode,"_vs_degree"))
+			plot.file <- get.path.stats.topo(net.type="static", mode="scenes", weights="none", meas.name=MEAS_MULTI_NODES, filtered="both", suf=paste0("pref-attach-",mode,"_vs_degree"))
 			tlog(2,"Plot in file ",plot.file)
 			pdf(file=paste0(plot.file,PLOT_FORMAT_PDF), bg="white")
 			# plot parameters

src/post/description/robustness.R

@@ -104,7 +104,7 @@ tlog.end.loop(0,"Loop over measures is complete")
 meass <- c(MEAS_DEGREE, MEAS_BETWEENNESS, "random")
 
 # file and common parameters
-plot.file <- get.path.stats.topo(net.type="static", mode="scenes", meas.name=MEAS_MULTI_GRAPH, filtered="both", suf=paste0("giant-comp-size_vs_centrality"))
+plot.file <- get.path.stats.topo(net.type="static", mode="scenes", weights="none", meas.name=MEAS_MULTI_GRAPH, filtered="both", suf=paste0("giant-comp-size_vs_centrality"))
 tlog(4, "Plotting in file ",plot.file)
 xlab <- "Proportion of vertices removed"
 pal <- ATT_COLORS_FILT[c("Discard","Keep")]