aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeanpouget-abadie <jean.pougetabadie@gmail.com>2015-02-06 11:23:51 -0500
committerjeanpouget-abadie <jean.pougetabadie@gmail.com>2015-02-06 11:23:51 -0500
commit300363430bf01b2a4dfa190797450b6f4b809a08 (patch)
treed2538fa7b47d180fb88b26bdf40cadfba833d11c
parent07aaef11e08916bf022743b570566a78f0ec27df (diff)
downloadcascades-300363430bf01b2a4dfa190797450b6f4b809a08.tar.gz
better plots
-rw-r--r--paper/figures/barabasi_albert.pdfbin30634 -> 13530 bytes
-rw-r--r--paper/figures/kronecker_l2_norm.pdfbin30708 -> 29653 bytes
-rw-r--r--paper/figures/kronecker_l2_norm_nonsparse.pdfbin30729 -> 29643 bytes
-rw-r--r--paper/figures/watts_strogatz.pdfbin30785 -> 13563 bytes
-rw-r--r--paper/sections/experiments.tex14
-rw-r--r--src/make_plots.py13
6 files changed, 16 insertions, 11 deletions
diff --git a/paper/figures/barabasi_albert.pdf b/paper/figures/barabasi_albert.pdf
index 98532f4..a7ad5a0 100644
--- a/paper/figures/barabasi_albert.pdf
+++ b/paper/figures/barabasi_albert.pdf
Binary files differ
diff --git a/paper/figures/kronecker_l2_norm.pdf b/paper/figures/kronecker_l2_norm.pdf
index 5177233..0e119f1 100644
--- a/paper/figures/kronecker_l2_norm.pdf
+++ b/paper/figures/kronecker_l2_norm.pdf
Binary files differ
diff --git a/paper/figures/kronecker_l2_norm_nonsparse.pdf b/paper/figures/kronecker_l2_norm_nonsparse.pdf
index 18ceabf..1a440c5 100644
--- a/paper/figures/kronecker_l2_norm_nonsparse.pdf
+++ b/paper/figures/kronecker_l2_norm_nonsparse.pdf
Binary files differ
diff --git a/paper/figures/watts_strogatz.pdf b/paper/figures/watts_strogatz.pdf
index ddaa525..2ffd642 100644
--- a/paper/figures/watts_strogatz.pdf
+++ b/paper/figures/watts_strogatz.pdf
Binary files differ
diff --git a/paper/sections/experiments.tex b/paper/sections/experiments.tex
index 701d5e7..fc98fb9 100644
--- a/paper/sections/experiments.tex
+++ b/paper/sections/experiments.tex
@@ -8,13 +8,15 @@
\begin{table*}[t]
\centering
\begin{tabular}{c c c}
-\includegraphics[scale=.3]{figures/barabasi_albert.pdf}
-& \includegraphics[scale=.3]{figures/watts_strogatz.pdf}
-& \includegraphics[scale=.3]{figures/ROC_curve.pdf} \\
+\includegraphics[scale=.28]{figures/barabasi_albert.pdf}
+& \includegraphics[scale=.28]{figures/watts_strogatz.pdf}
+& \includegraphics[scale=.28]{figures/ROC_curve.pdf} \\
+
(a) Barabasi-Albert (F$1$ \emph{vs.} $n$) & (b) Watts-Strogatz (F$1$ \emph{vs.} $n$) & (c) Holme-Kim (Prec-Recall) \\
- \includegraphics[scale=.3]{figures/kronecker_l2_norm.pdf}
-& \includegraphics[scale=.3]{figures/kronecker_l2_norm_nonsparse.pdf}
-& \includegraphics[scale=.3]{figures/watts_strogatz_p_init.pdf} \\
+ \includegraphics[scale=.28]{figures/kronecker_l2_norm.pdf}
+& \includegraphics[scale=.28]{figures/kronecker_l2_norm_nonsparse.pdf}
+& \includegraphics[scale=.28]{figures/watts_strogatz_p_init.pdf} \\
+
(d) Sparse Kronecker ($\ell_2$-norm \emph{vs.} $n$ ) & (e) Non-sparse Kronecker ($\ell_2$-norm \emph{vs.} $n$) & (f) Watts-Strogatz (F$1$ \emph{vs.} $p_{\text{init}}$)
\end{tabular}
\captionof{figure}{Figures (a) and (b) report the F$1$-score in $\log$ scale
diff --git a/src/make_plots.py b/src/make_plots.py
index 9615d1b..85850b1 100644
--- a/src/make_plots.py
+++ b/src/make_plots.py
@@ -101,9 +101,10 @@ def plot_barabasi_albert_graph():
ax.plot(x, lasso, 'ko-', color="orange", label="Lasso")
ax.plot(x, max_likel, 'ko-', color="cornflowerblue", label="MLE")
ax.plot(x, sparse_recov, 'ko-', color="k", label="Our Method")
- plt.legend(loc="lower right")
+ plt.legend(loc="lower right", fontsize=18)
ax.set_xticks(x)
ax.set_xticklabels(tuple(labels))
+
plt.savefig("../paper/figures/"+"barabasi_albert.pdf")
@@ -111,7 +112,7 @@ def plot_barabasi_albert_graph():
def plot_kronecker_l2norm():
plt.clf()
fig = plt.figure(1)
- x = [50, 100, 500, 1000, 2000]
+ x = [50, 150, 500, 1000, 2000]
sparse_recov = [62, 60, 36, 28, 21]
max_likel = [139, 101, 42, 31, 25]
lasso = [50, 48, 33, 29, 23]
@@ -130,14 +131,15 @@ def plot_kronecker_l2norm():
ax.plot(x, sparse_recov, 'ko-', color="k", label="Our Method")
plt.legend(loc="upper right")
ax.set_xticks(x)
- ax.set_xticklabels(tuple(x))
+ ax.set_xticklabels(tuple([50, 100, 500, 1000, 2000]))
+ ax.set_yticklabels(tuple(['', 20, 40, 60, 80, 100, 120, 140]))
plt.savefig("../paper/figures/"+"kronecker_l2_norm.pdf")
def plot_kronecker_l2norm_nonsparse():
plt.clf()
fig = plt.figure(1)
- x = [50, 100, 500, 1000, 2000]
+ x = [50, 150, 500, 1000, 2000]
sparse_recov = [56, 55, 28, 21, 15]
max_likel = [125, 80, 35, 25, 20]
lasso = [47, 47, 27, 22, 17]
@@ -156,7 +158,8 @@ def plot_kronecker_l2norm_nonsparse():
ax.plot(x, sparse_recov, 'ko-', color="k", label="Our Method")
plt.legend(loc="upper right")
ax.set_xticks(x)
- ax.set_xticklabels(tuple(x))
+ ax.set_xticklabels(tuple([50, 100, 500, 1000, 2000]))
+ ax.set_yticklabels(tuple(['', 20, 40, 60, 80, 100, 120, 140]))
plt.savefig("../paper/figures/"+"kronecker_l2_norm_nonsparse.pdf")