From a2bb49b809552fa0bfc63cf056aec34677d18c15 Mon Sep 17 00:00:00 2001 From: Kevin Ellis Date: Wed, 22 Apr 2020 15:46:16 -0400 Subject: [PATCH] improved some plotting stuff --- bin/graphs.py | 6 ++++-- official_figures | 10 ++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/bin/graphs.py b/bin/graphs.py index c4da5dfea..cb85aee1b 100644 --- a/bin/graphs.py +++ b/bin/graphs.py @@ -696,8 +696,10 @@ def plotECResult( # taken from https://learnui.design/tools/data-color-picker.html # we need to make sure that purple and teal are mapped onto colors that contrasts nicely # because we use these color schemes in other plots - mapping = dict(zip(["teal","orange","purple","cyan"], - ["#003f5c","#ffa600","#ef5675","#7a5195"])) + mapping = dict(zip(["teal","orange","purple","cyan", + "c1","c2","c3","c4","c5","c6"], + ["#003f5c","#ffa600","#ef5675","#7a5195", + "#003f5c","#444e86","#955196","#dd5182","#ff6e54","#ffa600"])) arguments.checkpoints = [mapping.get(ck,ck) for ck in arguments.checkpoints ] diff --git a/official_figures b/official_figures index c7b4b4eca..f21cf077d 100644 --- a/official_figures +++ b/official_figures @@ -8,7 +8,7 @@ python bin/graphs.py --checkpoints `grep -h 'it=20.*graph=True.pickle' jobs/tex python bin/graphs.py --x-label "" -i 20 --testingTimeout 600 --title "Text editing" --export figures/text_hits.png --checkpoints teal `grep -h 'it=20.*graph=True.pickle' jobs/text_ellisk_2019-01-2*` purple `grep -h 'it=20.*.pickle' jobs/text_no_recognition_ellisk*|sed 's/Exported checkpoint to//g'` orange `grep -h it=20.*graph jobs/text_no_generative_ellisk_2019-02-14*` cyan `grep -h it=20 jobs/baseline_ec_text*|sed 's/Exported checkpoint to//g'` --noTime --baseline enum 31 NS 0 python bin/graphs.py -i 20 --testingTimeout 600 --export figures/text_time.png --checkpoints teal `grep -h 'it=20.*graph=True.pickle' jobs/text_ellisk_2019-01-2*` purple `grep -h 'it=20.*.pickle' jobs/text_no_recognition_ellisk*|sed 's/Exported checkpoint to//g'` orange `grep -h it=20.*graph jobs/text_no_generative_ellisk_2019-02-14*` cyan `grep -h it=20 jobs/baseline_ec_text*|sed 's/Exported checkpoint to//g'` --title "Text editing" --onlyTime --averageColors -c python bin/graphs.py -i 20 --testingTimeout 600 --title "Text editing" --export figures/text_hits_ws.png --checkpoints teal `grep -h 'it=20.*graph=True.pickle' jobs/text_ellisk_2019-01-2*` purple `grep -h 'it=20.*.pickle' jobs/text_no_recognition_ellisk*|sed 's/Exported checkpoint to//g'` orange `grep -h it=20.*graph jobs/text_no_generative_ellisk_2019-02-14*` cyan `grep -h it=20 jobs/baseline_ec_text*|sed 's/Exported checkpoint to//g'` --noTime --baseline enum 31 NS 0 -python bin/graphs.py --x-label "" -i 20 --testingTimeout 600 --title "Text editing (memorize)" --export figures/text_memorize.png --checkpoints teal `grep -h 'it=20.*graph=True.pickle' jobs/text_ellisk_2019-01-2*` purple `grep -h 'it=20.*graph=True.pickle' jobs/text_memorize_ellisk*` orange `grep -h it=20 jobs/text_memorize_no_recognition_ellisk*|sed 's/Exported checkpoint to//g'` --noTime --averageColors -c +python bin/graphs.py -i 20 --testingTimeout 600 --title "Text editing" --export figures/text_memorize.png --checkpoints teal `grep -h 'it=20.*graph=True.pickle' jobs/text_ellisk_2019-01-2*` orange `grep -h 'it=20.*graph=True.pickle' jobs/text_memorize_ellisk*` purple `grep -h it=20 jobs/text_memorize_no_recognition_ellisk*|sed 's/Exported checkpoint to//g'` --noTime --averageColors -c ### List figures - time and hits split @@ -19,25 +19,27 @@ python bin/graphs.py -i 20 --testingTimeout 600 --export figures/list_time.png - python bin/graphs.py -i 20 --testingTimeout 600 --title "List processing" --export figures/list_hard_hits_ws.png --checkpoints teal `grep -h 'it=20.*graph=True.pickle' jobs/list_hard_test_ellisk*|head -n 5` purple `grep -h 'it=20.*.pickle' jobs/list_hard_test_no_recognition_ellisk*|sed 's/Exported checkpoint to//g'` orange `grep -h it=20.*graph jobs/list_hard_test_no_dsl_ellisk*` cyan `grep -h it=20 jobs/baseline_ec_list*|sed 's/Exported checkpoint to//g'` --noTime --baseline enum 22 NS 15 python bin/graphs.py -i 20 --testingTimeout 600 --export figures/list_hard_time.png --checkpoints teal `grep -h 'it=20.*graph=True.pickle' jobs/list_hard_test_ellisk*|head -n 5` purple `grep -h 'it=20.*.pickle' jobs/list_hard_test_no_recognition_ellisk*|sed 's/Exported checkpoint to//g'` orange `grep -h it=20.*graph jobs/list_hard_test_no_dsl_ellisk*` cyan `grep -h it=20 jobs/baseline_ec_list*|sed 's/Exported checkpoint to//g'` --title "List processing" --onlyTime -c --averageColors python bin/graphs.py -i 20 --testingTimeout 600 --title "List processing" --export figures/list_hard_hits_ws.png --checkpoints teal `grep -h 'it=20.*graph=True.pickle' jobs/list_hard_test_ellisk*|head -n 5` purple `grep -h 'it=20.*.pickle' jobs/list_hard_test_no_recognition_ellisk*|sed 's/Exported checkpoint to//g'` orange `grep -h it=20.*graph jobs/list_hard_test_no_dsl_ellisk*` --noTime 31 NS 15 -python bin/graphs.py --x-label "" -i 20 --testingTimeout 600 --title "List processing (memorize)" --export figures/list_memorize.png --checkpoints teal `grep -h 'it=20.*graph=True.pickle' jobs/list_hard_test_ellisk*|head -n 5` purple `grep -h 'it=20.*graph=True.pickle' jobs/list_memorize_ellisk*` orange `grep -h 'it=20.*.pickle' jobs/list_memorize_no_recognition_ellisk*|sed 's/Exported checkpoint to//g'` --noTime --averageColors -c +python bin/graphs.py -i 20 --testingTimeout 600 --title "List processing" --export figures/list_memorize.png --checkpoints teal `grep -h 'it=20.*graph=True.pickle' jobs/list_hard_test_ellisk*|head -n 5` orange `grep -h 'it=20.*graph=True.pickle' jobs/list_memorize_ellisk*` purple `grep -h 'it=20.*.pickle' jobs/list_memorize_no_recognition_ellisk*|sed 's/Exported checkpoint to//g'` --noTime --averageColors -c ### LOGO figures - time and hits split python bin/graphs.py --checkpoints teal `grep -h it=20.*graph jobs/logo_batch_50_1h_ell*` orange `grep -h it=20.*graph jobs/logo_no_dsl_auxiliary_batch_50_1h*` purple `grep -h it=20.*pickle jobs/logo_no_recognition_batch_50_1h*|sed 's/Exported checkpoint to//g'` cyan `grep -h it=20 jobs/baseline_ec_logo*|sed 's/Exported checkpoint to//g'` --export figures/logo_hits.png --noTime -i 20 --x-label "" --title "LOGO Graphics" --baseline enum 25 NS 1.2 python bin/graphs.py --checkpoints teal `grep -h it=20.*graph jobs/logo_batch_50_1h_ell*` orange `grep -h it=20.*graph jobs/logo_no_dsl_auxiliary_batch_50_1h*` purple `grep -h it=20.*pickle jobs/logo_no_recognition_batch_50_1h*|sed 's/Exported checkpoint to//g'` cyan `grep -h it=20 jobs/baseline_ec_logo*|sed 's/Exported checkpoint to//g'` --export figures/logo_time.png --onlyTime -i 20 --testingTimeout 600 --title "LOGO graphics" -c --averageColors python bin/graphs.py --checkpoints teal `grep -h it=20.*graph jobs/logo_batch_50_1h_ell*` orange `grep -h it=20.*graph jobs/logo_no_dsl_auxiliary_batch_50_1h*` purple `grep -h it=20.*pickle jobs/logo_no_recognition_batch_50_1h*|sed 's/Exported checkpoint to//g'` cyan `grep -h it=20 jobs/baseline_ec_logo*|sed 's/Exported checkpoint to//g'` --export figures/logo_hits_ws.png --noTime -i 20 --title "LOGO Graphics" --baseline enum 25 NS 1.2 +python bin/graphs.py --checkpoints teal `grep -h it=20.*graph jobs/logo_batch_50_1h_ell*` orange `grep -h it=20.*graph jobs/logo_memorize_ellisk*` purple `grep -h it=20.*pickle jobs/logo_memorize_no_recognition_ellisk*|sed 's/Exported checkpoint to//g'` --export figures/logo_memorize.png --noTime -i 20 --title "LOGO Graphics" --averageColors -c + ### Rational figures - time and hits split python bin/graphs.py --checkpoint teal `grep -h it=20.*graph jobs/rational_batch*` orange `grep -h it=20.*graph jobs/rational_no_dsl*` purple `grep -h it=20.*pickle jobs/rational_noRecognition*|sed 's/Exported checkpoint to//g'` cyan `grep -h it=20 jobs/rational_baseline_ec*|sed 's/Exported checkpoint to//g'` --noTime --x-label "" --title "Symbolic Regression" --export figures/rational_hits.png --baseline enum 65 NS 69 -i 20b python bin/graphs.py --checkpoint teal `grep -h it=20.*graph jobs/rational_batch*` orange `grep -h it=20.*graph jobs/rational_no_dsl*` purple `grep -h it=20.*pickle jobs/rational_noRecognition*|sed 's/Exported checkpoint to//g'` cyan `grep -h it=20 jobs/rational_baseline_ec*|sed 's/Exported checkpoint to//g'` --onlyTime --export figures/rational_time.png --testingTimeout 600 -i 20 --title "Symbolic regression" -c --averageColors python bin/graphs.py --checkpoint teal `grep -h it=20.*graph jobs/rational_batch*` orange `grep -h it=20.*graph jobs/rational_no_dsl*` purple `grep -h it=20.*pickle jobs/rational_noRecognition*|sed 's/Exported checkpoint to//g'` cyan `grep -h it=20 jobs/rational_baseline_ec*|sed 's/Exported checkpoint to//g'` --noTime --title "Symbolic Regression" --export figures/rational_hits_ws.png --baseline enum 65 NS 69 -i 20 -python bin/graphs.py --checkpoint teal `grep -h it=20.*graph jobs/rational_batch*` purple `grep -h it=20.*graph jobs/rational_memorize_*2020-04-14_*` orange `grep -h it=20.*pickle jobs/rational_memorize_no_recognition*|sed 's/Exported checkpoint to//g'` --noTime --x-label "" --title "Symbolic Regression (memorize)" --export figures/rational_memorize.png -i 20 --averageColors -c +python bin/graphs.py --checkpoint teal `grep -h it=20.*graph jobs/rational_batch*` orange `grep -h it=20.*graph jobs/rational_memorize_*2020-04-14_*` purple `grep -h it=20.*pickle jobs/rational_memorize_no_recognition*|sed 's/Exported checkpoint to//g'` --noTime --title "Symbolic Regression" --export figures/rational_memorize.png -i 20 --averageColors -c ### Tower figures - time and hits split # actual baseline results are both 9, separated for visibility python bin/graphs.py --checkpoints teal `grep -h it=20.*graph jobs/tower_batch_50_3600*` orange `grep -h it=20.*graph jobs/tower_no_dsl_batch_50_3600*` purple `grep -h it=20.*pickle jobs/tower_no_recognition_batch_50_3600*|sed 's/Exported checkpoint to//g'` cyan `grep -h it=20 jobs/baseline_ec_tower*|sed 's/Exported checkpoint to//g'` --export figures/tower_hits.png --noTime --x-label "" --title "Tower building" --baseline enum 8 NS 10 -i 20 python bin/graphs.py --checkpoints teal `grep -h it=20.*graph jobs/tower_batch_50_3600*` orange `grep -h it=20.*graph jobs/tower_no_dsl_batch_50_3600*` purple `grep -h it=20.*pickle jobs/tower_no_recognition_batch_50_3600*|sed 's/Exported checkpoint to//g'` cyan `grep -h it=20 jobs/baseline_ec_tower*|sed 's/Exported checkpoint to//g'` --export figures/tower_time.png --onlyTime --testingTimeout 600 -i 20 --title "Tower building" --averageColors -c python bin/graphs.py --checkpoints teal `grep -h it=20.*graph jobs/tower_batch_50_3600*` orange `grep -h it=20.*graph jobs/tower_no_dsl_batch_50_3600*` purple `grep -h it=20.*pickle jobs/tower_no_recognition_batch_50_3600*|sed 's/Exported checkpoint to//g'` cyan `grep -h it=20 jobs/baseline_ec_tower*|sed 's/Exported checkpoint to//g'` --export figures/tower_hits_ws.png --noTime --title "Tower building" --baseline enum 8 NS 10 -i 20 -python bin/graphs.py --checkpoints teal `grep -h it=20.*graph jobs/tower_batch_50_3600*` purple `grep -h it=20.*graph jobs/tower_memorize_ellisk*` orange `grep -h it=20.* jobs/tower_memorize_no_recognition_ellisk*|sed 's/Exported checkpoint to//g'` --export figures/tower_memorize.png --noTime --x-label "" --title "Tower building (memorize)" --noTime --averageColors -c -i 20 +python bin/graphs.py --checkpoints teal `grep -h it=20.*graph jobs/tower_batch_50_3600*` orange `grep -h it=20.*graph jobs/tower_memorize_ellisk*` purple `grep -h it=20.* jobs/tower_memorize_no_recognition_ellisk*|sed 's/Exported checkpoint to//g'` --export figures/tower_memorize.png --noTime --title "Tower building" --noTime --averageColors -c -i 20 ### Regex figures - time and hits split