Skip to content

Commit 6839868

Browse files
committed
tweak image generation
1 parent c57d7c0 commit 6839868

8 files changed

Lines changed: 50 additions & 39 deletions

File tree

-3 Bytes
Binary file not shown.
16 Bytes
Binary file not shown.

python/src/images/vary_k.pdf

-17 Bytes
Binary file not shown.

python/src/leave_one_out.py

Lines changed: 18 additions & 19 deletions
Large diffs are not rendered by default.

python/src/subset_validator.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@
2323
java_guava = [0.10330579,0.071428575,0.04477612,0.05532863,0.042372882,0.046865217,0.036753446,0.034443818,0.029850746,0.03514377,0.030805686,0.032786883,0.029288704,0.028169014,0.03409091,0.027760051,0.026697177,0.025316456,0.033333335,0.02254283,0.027272727,0.024691358,0.024647888,0.02567394,0.024539877,0.025817556,0.023809524,0.023255814,0.02587519,0.031927712]
2424
ax.plot(range(1,len(java_guava)+1), java_guava, label="java_guava", marker='>', color='m')
2525

26+
ax.tick_params(axis='both', which='major', labelsize=18)
2627
ax.yaxis.grid(True, linestyle='-', which='major', color='lightgrey', alpha=0.5)
27-
ax.set_xlabel("Number of training files in sample corpus subset", fontsize=14)
28-
ax.set_ylabel("Median Error rate for 50 trials", fontsize=14)
28+
ax.set_xlabel("Number of training files in sample corpus subset", fontsize=20)
29+
ax.set_ylabel("Median Error rate for 50 trials", fontsize=20)
2930
#ax.set_title("Effect of Corpus size on Median Leave-one-out Validation Error Rate")
30-
plt.legend()
31+
plt.legend(fontsize=18)
3132
plt.tight_layout()
3233
fig.savefig('images/subset_validator.pdf', format='pdf')
3334
plt.show()

python/src/vary_k.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@
1818
ax.plot(ks, antlr, label="antlr", marker='.', color='k')
1919
ax.plot(ks, sqlite, label="sqlite", marker='o', color='y')
2020
ax.plot(ks, tsql, label="tsql", marker='p', color='r')
21-
ax.set_xlabel("$k$ nearest neighbors", fontsize=14)
22-
ax.set_ylabel("Median error rate", fontsize=14)
21+
ax.tick_params(axis='both', which='major', labelsize=18)
22+
23+
ax.set_xlabel("$k$ nearest neighbors", fontsize=20)
24+
ax.set_ylabel("Median error rate", fontsize=20)
2325
#ax.set_title("k Nearest Neighbors vs\nLeave-one-out Validation Error Rate")
24-
plt.legend()
26+
plt.legend(fontsize=18)
2527
fig.savefig('images/vary_k.pdf', format='pdf')
2628
plt.show()

src/org/antlr/codebuff/validation/LeaveOneOutValidator.java

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,14 @@
2424
import java.util.concurrent.Executors;
2525
import java.util.concurrent.TimeUnit;
2626

27+
import static org.antlr.codebuff.Tool.ANTLR4_DESCR;
28+
import static org.antlr.codebuff.Tool.JAVA8_DESCR;
29+
import static org.antlr.codebuff.Tool.JAVA8_GUAVA_DESCR;
30+
import static org.antlr.codebuff.Tool.JAVA_DESCR;
31+
import static org.antlr.codebuff.Tool.JAVA_GUAVA_DESCR;
32+
import static org.antlr.codebuff.Tool.SQLITE_CLEAN_DESCR;
2733
import static org.antlr.codebuff.Tool.SQLITE_NOISY_DESCR;
34+
import static org.antlr.codebuff.Tool.TSQL_CLEAN_DESCR;
2835
import static org.antlr.codebuff.Tool.TSQL_NOISY_DESCR;
2936
import static org.antlr.codebuff.Tool.getFilenames;
3037
import static org.antlr.codebuff.Tool.load;
@@ -275,12 +282,13 @@ public static String testAllLanguages(LangDescriptor[] languages, String[] corpu
275282
" widths=.35,\n"+
276283
" labels=labels,\n"+
277284
" showfliers=False)\n"+
278-
"ax.set_xticklabels(labels, rotation=60, fontsize=12)\n"+
279-
"plt.xticks(range(1,len(labels)+1), labels, rotation=60)\n" +
285+
"ax.set_xticklabels(labels, rotation=60, fontsize=18)\n"+
286+
"ax.tick_params(axis='both', which='major', labelsize=18)\n"+
287+
"plt.xticks(range(1,len(labels)+1), labels, rotation=60, fontsize=18)\n" +
280288
"pylab.ylim([0,.28])\n"+
281289
"ax.yaxis.grid(True, linestyle='-', which='major', color='lightgrey', alpha=0.5)\n" +
282-
"ax.set_xlabel(\"Grammar and corpus size\", fontsize=14)\n"+
283-
"ax.set_ylabel(\"Misclassification Error Rate\", fontsize=14)\n" +
290+
"ax.set_xlabel(\"Grammar and corpus size\", fontsize=20)\n"+
291+
"ax.set_ylabel(\"Misclassification Error Rate\", fontsize=20)\n" +
284292
"# ax.set_title(\"Leave-one-out Validation Using Error Rate\\nBetween Formatted and Original File\")\n"+
285293
"plt.tight_layout()\n" +
286294
"fig.savefig('images/%s', format='pdf')\n"+
@@ -290,13 +298,13 @@ public static String testAllLanguages(LangDescriptor[] languages, String[] corpu
290298

291299
public static void main(String[] args) throws Exception {
292300
LangDescriptor[] languages = new LangDescriptor[] {
293-
// JAVA_DESCR,
294-
// JAVA8_DESCR,
295-
// JAVA_GUAVA_DESCR,
296-
// JAVA8_GUAVA_DESCR,
297-
// ANTLR4_DESCR,
298-
// SQLITE_CLEAN_DESCR,
299-
// TSQL_CLEAN_DESCR,
301+
JAVA_DESCR,
302+
JAVA8_DESCR,
303+
JAVA_GUAVA_DESCR,
304+
JAVA8_GUAVA_DESCR,
305+
ANTLR4_DESCR,
306+
SQLITE_CLEAN_DESCR,
307+
TSQL_CLEAN_DESCR,
300308
SQLITE_NOISY_DESCR,
301309
TSQL_NOISY_DESCR,
302310
// QUORUM_DESCR,

src/org/antlr/codebuff/validation/TestK.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,11 @@ public static void writePython(LangDescriptor[] languages, List<Integer> ks, Flo
123123
"fig = plt.figure()\n"+
124124
"ax = plt.subplot(111)\n"+
125125
"%s"+
126-
"ax.set_xlabel(\"$k$ nearest neighbors\", fontsize=14)\n"+
127-
"ax.set_ylabel(\"Median error rate\", fontsize=14)\n" +
126+
"ax.tick_params(axis='both', which='major', labelsize=18)\n" +
127+
"ax.set_xlabel(\"$k$ nearest neighbors\", fontsize=20)\n"+
128+
"ax.set_ylabel(\"Median error rate\", fontsize=20)\n" +
128129
"#ax.set_title(\"k Nearest Neighbors vs\\nLeave-one-out Validation Error Rate\")\n"+
129-
"plt.legend()\n" +
130+
"plt.legend(fontsize=18)\n\n" +
130131
"fig.savefig('images/vary_k.pdf', format='pdf')\n"+
131132
"plt.show()\n";
132133
String code = String.format(python, Tool.version, new Date(), data, ks, plot);

0 commit comments

Comments
 (0)