fixed plot file names in post

Author: vlabatut

src/post/description/_all_post.R

@@ -15,10 +15,10 @@ source("src/post/description/avgdist_evol.R")
 source("src/post/description/centr_clusters.R")
 source("src/post/description/centr_vs_centr.R")
 source("src/post/description/centr_vs_occ.R")
-#source("src/post/description/char_distr.R")
+source("src/post/description/char_distr.R")
 #source("src/post/description/char_sim.R")
 #source("src/post/description/char_tj_comp.R")
-#source("src/post/description/comp_vs_edges.R")
+source("src/post/description/comp_vs_edges.R")
 #source("src/post/description/comp_vs_vertices.R")
 #source("src/post/description/deg_plots.R")
 #source("src/post/description/diameters.R")

src/post/description/avgdist_evol.R

@@ -97,7 +97,7 @@ for(i in 1:2)
 	print(summary(fit))
 
 	# plot distance as a function of graph order
-	plot.file <- get.path.stats.topo(net.type="static", mode="scenes", meas.name=paste0(MEAS_DISTANCE,SFX_AVG), weights="none", filtered=filt.txt, suf=paste0("evolution_",order.txt,"_lines"))
+	plot.file <- get.path.stats.topo(net.type="static", mode="scenes", meas.name=MEAS_MULTI_GRAPH, weights="none", filtered=filt.txt, suf=paste0("distance-average_vs_nodes_",order.txt))
 	tlog(2, "Plotting in file ",plot.file)
 	for(fformat in PLOT_FORMAT)
 	{	if(fformat==PLOT_FORMAT_PDF)
@@ -127,7 +127,7 @@ tlog(0, "Unfiltered/filtered loop complete")
 
 ###############################################################################
 # same thing, but plots both unfiltered and filtered figures in the same file
-plot.file <- get.path.stats.topo(net.type="static", mode="scenes", meas.name=paste0(MEAS_DISTANCE,SFX_AVG), weights="none", filtered="both", suf=paste0("evolution_",order.txt,"_lines"))
+plot.file <- get.path.stats.topo(net.type="static", mode="scenes", meas.name=MEAS_MULTI_GRAPH, weights="none", filtered="both", suf=paste0("distance-average_vs_nodes_",order.txt))
 tlog(0, "Plotting both unfiltered and filtered results in file ",plot.file)
 
 # process all formats

src/post/description/comp_vs_edges.R

@@ -36,7 +36,6 @@ if(length(filt.names)==0) stop("Empty list of filtered characters")
 g.filt <- delete_vertices(g, V(g)$Filter=="Discard")
 
 # plot settings
-xlab <- "Number of edges"
 ylab <- "Largest component size (proportion of vertices)"
 
 # compute both types of weights
@@ -46,6 +45,7 @@ wts <- c("Duration","Occurrences")
 res <- list()
 for(wt in wts)
 {	tlog(2, "Dealing with ",wt," weights")
+	xlab <- paste0("Number of edges, ordered by ",wt)
 
 	# remove each edge iteratively
 	tlog(4, "Removing edges iteratively for the unfiltered graph")
@@ -65,7 +65,7 @@ for(wt in wts)
 	}
 	res[[paste0("Unfiltered-",wt)]] <- vals
 	# plot results
-	plot.file <- get.path.stats.topo(net.type="static", mode="scenes", meas.name=MEAS_LINKWEIGHT, weights=tolower(wt), order="publication", filtered="unfiltered", suf="evolution_lines")
+	plot.file <- get.path.stats.topo(net.type="static", mode="scenes", meas.name=MEAS_MULTI_GRAPH, weights=tolower(wt), filtered="unfiltered", suf="giant-comp-size_vs_links")
 	tlog(4, "Plotting in file ",plot.file)
 	for(fformat in PLOT_FORMAT)
 	{	if(fformat==PLOT_FORMAT_PDF)
@@ -101,7 +101,7 @@ for(wt in wts)
 	}
 	res[[paste0("Filtered-",wt)]] <- vals.filt
 	# plot result
-	plot.file <- get.path.stats.topo(net.type="static", mode="scenes", meas.name=MEAS_LINKWEIGHT, weights=tolower(wt), order="publication", filtered="filtered", suf="comp_vs_edges")
+	plot.file <- get.path.stats.topo(net.type="static", mode="scenes", meas.name=MEAS_MULTI_GRAPH, weights=tolower(wt), filtered="filtered", suf="giant-comp-size_vs_links")
 	tlog(4, "Plotting in file ",plot.file)
 	for(fformat in PLOT_FORMAT)
 	{	if(fformat==PLOT_FORMAT_PDF)
@@ -130,8 +130,9 @@ for(wt in wts)
 tlog(0, "Plot figures combining unfiltered and filtered nets results")
 for(wt in wts)
 {	tlog(2, "Dealing with ",wt," weights")
+	xlab <- paste0("Number of edges, ordered by ",wt)
 
-	plot.file <- get.path.stats.topo(net.type="static", mode="scenes", meas.name=MEAS_LINKWEIGHT, weights=tolower(wt), order="publication", filtered="both", suf="comp_vs_edges")
+	plot.file <- get.path.stats.topo(net.type="static", mode="scenes", meas.name=MEAS_MULTI_GRAPH, weights=tolower(wt), filtered="both", suf="giant-comp-size_vs_links")
 	tlog(4, "Plotting in file ",plot.file)
 	for(fformat in PLOT_FORMAT)
 	{	if(fformat==PLOT_FORMAT_PDF)
@@ -157,14 +158,15 @@ for(wt in wts)
 			legend(
 				title="Characters",
 				x="bottomright",
-				fill=pal["Discard","Keep"],
+				fill=pal[c("Discard","Keep")],
 				legend=c("Unfiltered","Filtered")
 			)
 		dev.off()
 	}
 }
 
 # both types of weights in the same figure
+xlab <- paste0("Number of edges ordered by weight")
 tlog(0, "Plot figures combining both types of weights")
 for(filtered in c(FALSE,TRUE))
 {	if(filtered)
@@ -183,7 +185,7 @@ for(filtered in c(FALSE,TRUE))
 	}
 	tlog(2, "Dealing with the ",tolower(fn)," network")
 
-	plot.file <- get.path.stats.topo(net.type="static", mode="scenes", meas.name=MEAS_LINKWEIGHT, weights="both", order="publication", filtered=filt.txt, suf="comp_vs_edges")
+	plot.file <- get.path.stats.topo(net.type="static", mode="scenes", meas.name=MEAS_MULTI_GRAPH, weights="both", filtered=filt.txt, suf="giant-comp-size_vs_links")
 	tlog(4, "Plotting in file ",plot.file)
 	for(fformat in PLOT_FORMAT)
 	{	if(fformat==PLOT_FORMAT_PDF)
@@ -218,7 +220,8 @@ for(filtered in c(FALSE,TRUE))
 }
 
 # all in the same figure
-plot.file <- get.path.stats.topo(net.type="static", mode="scenes", meas.name=MEAS_LINKWEIGHT, weights="both", order="publication", filtered="both", suf="comp_vs_edges")
+plot.file <- get.path.stats.topo(net.type="static", mode="scenes", meas.name=MEAS_MULTI_GRAPH, weights="both", filtered="both", suf="giant-comp-size_vs_links")
+xlab <- paste0("Number of edges ordered by weight")
 tlog(0, "Plot everything in the same file ",plot.file)
 for(fformat in PLOT_FORMAT)
 {	if(fformat==PLOT_FORMAT_PDF)
@@ -257,7 +260,7 @@ for(fformat in PLOT_FORMAT)
 		legend(
 			title="Characters",
 			x="topleft",
-			fill=pal["Discard","Keep"],
+			fill=pal[c("Discard","Keep")],
 			legend=c("Unfiltered","Filtered")
 		)
 		legend(