final settings

briatte · Jul 27, 2014 · b8d16fe · b8d16fe
1 parent 9b19e66
commit b8d16fe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/dossiers-ch.r b/dossiers-ch.r
@@ -336,7 +336,7 @@ if(!file.exists("networks-ch.rda") | update) {
     # gexf
 
     gexf = paste0("net_ch", gsub("\\D", "", k), ".gexf")
-    if(!file.exists(gexf) & gsub("\\D", "", k) > 47) {
+    if(!file.exists(gexf) & gsub("\\D", "", k) > 47 & export) {
 
       rgb = t(col2rgb(colors[ names(colors) %in% as.character(n %v% "party") ]))
       mode = "fruchtermanreingold"

diff --git a/dossiers-se.r b/dossiers-se.r
@@ -226,8 +226,8 @@ if(!file.exists("networks-se.rda") | update) {
     party = n %v% "party"
     names(party) = network.vertex.names(n)
 
-    i = colors[ party[ n %e% "source" ] ]
-    j = colors[ party[ n %e% "target" ] ]
+    i = colors[ b[ n %e% "source", "parti" ] ]
+    j = colors[ b[ n %e% "target", "parti" ] ]
 
     party = as.vector(i)
     party[ i != j ] = "#AAAAAA"
@@ -254,7 +254,7 @@ if(!file.exists("networks-se.rda") | update) {
     # gexf
 
     gexf = paste0("net_se", k, ".gexf")
-    if(!file.exists(gexf)) {
+    if(!file.exists(gexf) & export) {
 
       rgb = t(col2rgb(colors[ names(colors) %in% as.character(n %v% "party") ]))
       mode = "fruchtermanreingold"

diff --git a/make.r b/make.r
@@ -55,9 +55,10 @@ order = c("ECOLO", "SOC-F", "SOC-V", "LIB-F", "LIB-V",
 # scrapers
 
 update = TRUE
+export = FALSE
 
-# source("dossiers-ch.r")
+source("dossiers-ch.r")
 source("dossiers-se.r")
-# source("plots.r")
+source("plots.r")
 
 # kthxbye