summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Luevano <55825613+luevano@users.noreply.github.com>2019-12-17 15:44:56 -0700
committerDavid Luevano <55825613+luevano@users.noreply.github.com>2019-12-17 15:44:56 -0700
commit96a3f2b2950451a478c951e642a4aa188219682b (patch)
tree555129129febd716f7ff64e352a92cc94fdfb13c
parentb799e335edf24e29e6afa328440cbb9180a25bb2 (diff)
Add ignores
-rw-r--r--.gitignore4
-rw-r--r--data/benchmarks.csv177
-rw-r--r--data/figs/mae_diff_param_lj_e.pdfbin13696 -> 0 bytes
-rw-r--r--data/figs/mae_diff_param_lj_s.pdfbin12679 -> 0 bytes
-rw-r--r--data/figs/mae_diff_tr_sizes.pdfbin10839 -> 0 bytes
-rw-r--r--main.py6
6 files changed, 7 insertions, 180 deletions
diff --git a/.gitignore b/.gitignore
index a1bdb4dde..02ab56ded 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,3 +114,7 @@ venv.bak/
# Original data.
.original_data/
+
+# Benchmarks and figures
+benchmarks.csv
+.figs/ \ No newline at end of file
diff --git a/data/benchmarks.csv b/data/benchmarks.csv
deleted file mode 100644
index f81c902e1..000000000
--- a/data/benchmarks.csv
+++ /dev/null
@@ -1,177 +0,0 @@
-ml_type,tr_size,te_size,kernel_s,mae,time,lj_s,lj_e,date_ran
-CM,1500,1500,1000.0,31.512240475332977,100.3640273,na,na,14/12/2019
-L-JM,1500,1500,1000.0,14.071581760048153,101.6336081,1,1,14/12/2019
-CM,2000,1500,1000.0,28.245321081132253,152.88077109999998,na,na,14/12/2019
-L-JM,2000,1500,1000.0,12.641839980374655,155.5011396,1,1,14/12/2019
-CM,2500,1500,1000.0,26.97361909951274,215.9536518,na,na,14/12/2019
-L-JM,2500,1500,1000.0,11.785532138202667,211.8681615,1,1,14/12/2019
-CM,3000,1500,1000.0,24.641045831013365,278.5150912,na,na,14/12/2019
-L-JM,3000,1500,1000.0,11.08713556535848,278.5971606,1,1,14/12/2019
-CM,3500,1500,1000.0,23.152765029544195,401.9234568,na,na,14/12/2019
-L-JM,3500,1500,1000.0,10.430573100461325,408.3161812,1,1,14/12/2019
-CM,4000,1500,1000.0,22.15854674774742,499.55023489999996,na,na,14/12/2019
-L-JM,4000,1500,1000.0,10.117842321543852,503.7487102,1,1,14/12/2019
-CM,4500,1500,1000.0,21.180935112846054,605.4631191999999,na,na,14/12/2019
-L-JM,4500,1500,1000.0,9.677330400431318,604.4122219,1,1,14/12/2019
-CM,5000,1500,1000.0,20.30113013118839,699.0641616,na,na,14/12/2019
-L-JM,5000,1500,1000.0,9.143465812164308,701.9964291,1,1,14/12/2019
-CM,5500,1500,1000.0,19.749349939851125,816.2225933,na,na,14/12/2019
-L-JM,5500,1500,1000.0,8.902193965087893,800.8945613,1,1,14/12/2019
-CM,6000,1101,1000.0,18.989775833821966,894.5558989,na,na,14/12/2019
-L-JM,6000,1101,1000.0,8.595942764490113,885.4234397,1,1,14/12/2019
-CM,6500,601,1000.0,19.424238707695146,956.2706457,na,na,14/12/2019
-L-JM,6500,601,1000.0,8.636351001125403,950.2348745,1,1,14/12/2019
-L-JM,1500,1500,1000.0,25.971068591988388,113.6740279,1.5,1,14/12/2019
-L-JM,2000,1500,1000.0,23.332141255879883,176.44235379999998,1.5,1,14/12/2019
-L-JM,2500,1500,1000.0,21.692867970005768,245.19673870000003,1.5,1,14/12/2019
-L-JM,3000,1500,1000.0,20.59071302639572,328.621371,1.5,1,14/12/2019
-L-JM,3500,1500,1000.0,19.735266507048408,415.9199613,1.5,1,14/12/2019
-L-JM,4000,1500,1000.0,18.834051404314636,519.1557511,1.5,1,14/12/2019
-L-JM,4500,1500,1000.0,17.957638371625624,617.7238379,1.5,1,14/12/2019
-L-JM,5000,1500,1000.0,16.972922026017606,730.4018292,1.5,1,14/12/2019
-L-JM,5500,1500,1000.0,16.395492789509397,846.8666075,1.5,1,14/12/2019
-L-JM,6000,1101,1000.0,15.777389296181523,927.473866,1.5,1,14/12/2019
-L-JM,6500,601,1000.0,14.209911716905589,1009.5176146,1.5,1,14/12/2019
-L-JM,1500,1500,1000.0,28.83987694576565,113.8754708,2,1,14/12/2019
-L-JM,2000,1500,1000.0,26.596450258715805,175.00251580000003,2,1,14/12/2019
-L-JM,2500,1500,1000.0,25.24225833702623,250.13395500000001,2,1,14/12/2019
-L-JM,3000,1500,1000.0,24.218064992425827,331.4902702,2,1,14/12/2019
-L-JM,3500,1500,1000.0,23.753584334828926,418.1716937,2,1,14/12/2019
-L-JM,4000,1500,1000.0,22.796982394926633,508.1620121,2,1,14/12/2019
-L-JM,4500,1500,1000.0,22.094972526780207,620.0088331000001,2,1,14/12/2019
-L-JM,5000,1500,1000.0,21.32928554974122,719.5075616,2,1,14/12/2019
-L-JM,5500,1500,1000.0,20.839213236756795,853.7258727,2,1,14/12/2019
-L-JM,6000,1101,1000.0,20.469720091240188,919.2635181,2,1,14/12/2019
-L-JM,6500,601,1000.0,18.97332428701078,991.9277882,2,1,14/12/2019
-L-JM,1500,1500,1000.0,28.834687237181544,112.75118160000001,2.5,1,15/12/2019
-L-JM,2000,1500,1000.0,26.524798614302835,174.36785940000001,2.5,1,15/12/2019
-L-JM,2500,1500,1000.0,25.21431444031365,247.27555790000002,2.5,1,15/12/2019
-L-JM,3000,1500,1000.0,24.1868798509265,327.2753287,2.5,1,15/12/2019
-L-JM,3500,1500,1000.0,23.70991305338383,414.2050979,2.5,1,15/12/2019
-L-JM,4000,1500,1000.0,22.76540519550355,511.5177748,2.5,1,15/12/2019
-L-JM,4500,1500,1000.0,22.114765667859746,609.2158499,2.5,1,15/12/2019
-L-JM,5000,1500,1000.0,21.358232378530058,717.5175853000001,2.5,1,15/12/2019
-L-JM,5500,1500,1000.0,20.85827359348054,833.1339069,2.5,1,15/12/2019
-L-JM,6000,1101,1000.0,20.47802544079168,913.8767508999999,2.5,1,15/12/2019
-L-JM,6500,601,1000.0,18.974561750612214,983.2796894999999,2.5,1,15/12/2019
-L-JM,1500,1500,1000.0,32.66494718071635,115.4841954,3,1,15/12/2019
-L-JM,2000,1500,1000.0,28.7706412893922,177.2390435,3,1,15/12/2019
-L-JM,2500,1500,1000.0,26.93394969655416,249.6755776,3,1,15/12/2019
-L-JM,3000,1500,1000.0,25.592547303146002,331.0301091,3,1,15/12/2019
-L-JM,3500,1500,1000.0,24.823386571052417,424.3857741,3,1,15/12/2019
-L-JM,4000,1500,1000.0,23.723362785716677,516.4350475,3,1,15/12/2019
-L-JM,4500,1500,1000.0,22.96364383080498,615.7131781,3,1,15/12/2019
-L-JM,5000,1500,1000.0,22.097596606763833,732.2697349,3,1,15/12/2019
-L-JM,5500,1500,1000.0,21.463723095992123,850.7737075,3,1,15/12/2019
-L-JM,6000,1101,1000.0,21.098415947303895,909.3228279,3,1,15/12/2019
-L-JM,6500,601,1000.0,19.604458837712464,985.2199813000001,3,1,15/12/2019
-L-JM,1500,1500,1000.0,13.25081292192078,113.2111716,0.75,1,15/12/2019
-L-JM,2000,1500,1000.0,11.898306360562803,176.1226983,0.75,1,15/12/2019
-L-JM,2500,1500,1000.0,11.331479928387962,245.3395849,0.75,1,15/12/2019
-L-JM,3000,1500,1000.0,10.822743636769616,328.4253929,0.75,1,15/12/2019
-L-JM,3500,1500,1000.0,10.341161537587485,416.6295876,0.75,1,15/12/2019
-L-JM,4000,1500,1000.0,10.05422347022756,512.5809536,0.75,1,15/12/2019
-L-JM,4500,1500,1000.0,9.678447398895264,616.4628192,0.75,1,15/12/2019
-L-JM,5000,1500,1000.0,9.348294603434246,722.3488736,0.75,1,15/12/2019
-L-JM,5500,1500,1000.0,9.158434114440919,839.2501411999999,0.75,1,15/12/2019
-L-JM,6000,1101,1000.0,8.85969851676255,918.4742979,0.75,1,15/12/2019
-L-JM,6500,601,1000.0,8.978569760943016,997.4762726,0.75,1,15/12/2019
-L-JM,1500,1500,1000.0,14.31648555157471,112.708166,0.5,1,15/12/2019
-L-JM,2000,1500,1000.0,13.100616600819906,173.49587910000002,0.5,1,15/12/2019
-L-JM,2500,1500,1000.0,12.631016832621258,244.59541330000002,0.5,1,15/12/2019
-L-JM,3000,1500,1000.0,12.372139003845216,325.2085343,0.5,1,15/12/2019
-L-JM,3500,1500,1000.0,12.052149805135091,412.00539760000004,0.5,1,15/12/2019
-L-JM,4000,1500,1000.0,11.926307619750977,506.9327447,0.5,1,15/12/2019
-L-JM,4500,1500,1000.0,11.605206087137859,603.1267876000001,0.5,1,15/12/2019
-L-JM,5000,1500,1000.0,11.364976841634116,709.4308111,0.5,1,15/12/2019
-L-JM,5500,1500,1000.0,11.303823874104818,825.9382915000001,0.5,1,15/12/2019
-L-JM,6000,1101,1000.0,11.054803368952145,915.2881399,0.5,1,15/12/2019
-L-JM,6500,601,1000.0,11.402072457096146,984.6962941,0.5,1,15/12/2019
-L-JM,1500,1500,1000.0,16.515109934611004,117.3274013,0.25,1,15/12/2019
-L-JM,2000,1500,1000.0,15.618779733296712,177.3680046,0.25,1,15/12/2019
-L-JM,2500,1500,1000.0,15.289220743123371,247.515579,0.25,1,15/12/2019
-L-JM,3000,1500,1000.0,15.11142683183797,327.60220580000004,0.25,1,15/12/2019
-L-JM,3500,1500,1000.0,14.843900964528402,411.6829181,0.25,1,15/12/2019
-L-JM,4000,1500,1000.0,14.726752273071288,513.3648273,0.25,1,15/12/2019
-L-JM,4500,1500,1000.0,14.419325491251628,613.8661824000001,0.25,1,15/12/2019
-L-JM,5000,1500,1000.0,14.256678564778646,711.8209704,0.25,1,15/12/2019
-L-JM,5500,1500,1000.0,14.237603645751953,825.8206864,0.25,1,15/12/2019
-L-JM,6000,1101,1000.0,14.04869658132167,909.8488734,0.25,1,15/12/2019
-L-JM,6500,601,1000.0,14.660941845581258,994.2622263000001,0.25,1,15/12/2019
-L-JM,1500,1500,1000.0,13.917265603817388,111.8063593,1,1.5,15/12/2019
-L-JM,2000,1500,1000.0,12.393746784561161,174.0463799,1,1.5,15/12/2019
-L-JM,2500,1500,1000.0,11.310800296285631,242.5622126,1,1.5,15/12/2019
-L-JM,3000,1500,1000.0,10.573622634081524,323.0661685,1,1.5,15/12/2019
-L-JM,3500,1500,1000.0,9.875938797266643,406.5680506,1,1.5,15/12/2019
-L-JM,4000,1500,1000.0,9.510982350137393,503.7767193,1,1.5,15/12/2019
-L-JM,4500,1500,1000.0,9.119124757146201,596.6460913,1,1.5,15/12/2019
-L-JM,5000,1500,1000.0,8.599406629679363,706.859301,1,1.5,15/12/2019
-L-JM,5500,1500,1000.0,8.368502939493816,818.7217491,1,1.5,15/12/2019
-L-JM,6000,1101,1000.0,8.063868108397717,897.7200943,1,1.5,15/12/2019
-L-JM,6500,601,1000.0,8.136913764498198,974.7133005,1,1.5,15/12/2019
-L-JM,1500,1500,1000.0,14.09852163185247,111.0557463,1,2,15/12/2019
-L-JM,2000,1500,1000.0,12.44589603171794,172.8484317,1,2,15/12/2019
-L-JM,2500,1500,1000.0,11.252518187896092,245.6580888,1,2,15/12/2019
-L-JM,3000,1500,1000.0,10.49970513110606,319.36993149999995,1,2,15/12/2019
-L-JM,3500,1500,1000.0,9.76052582794444,409.32987959999997,1,2,15/12/2019
-L-JM,4000,1500,1000.0,9.367906394826731,505.0419491,1,2,15/12/2019
-L-JM,4500,1500,1000.0,8.953196634539921,613.9279513,1,2,15/12/2019
-L-JM,5000,1500,1000.0,8.49635838229116,708.8533507000001,1,2,15/12/2019
-L-JM,5500,1500,1000.0,8.250896130411785,824.6985384,1,2,15/12/2019
-L-JM,6000,1101,1000.0,7.941628870483316,896.7534047,1,2,15/12/2019
-L-JM,6500,601,1000.0,7.984307747999562,967.4740421,1,2,15/12/2019
-L-JM,1500,1500,1000.0,14.530905711745902,113.61682520000001,1,2.5,15/12/2019
-L-JM,2000,1500,1000.0,12.780882489283243,178.76914259999998,1,2.5,15/12/2019
-L-JM,2500,1500,1000.0,11.50745587341436,255.22816189999998,1,2.5,15/12/2019
-L-JM,3000,1500,1000.0,10.72320711825816,329.5140962,1,2.5,15/12/2019
-L-JM,3500,1500,1000.0,9.959901313243869,418.59089370000004,1,2.5,15/12/2019
-L-JM,4000,1500,1000.0,9.540940698993367,514.2713362,1,2.5,15/12/2019
-L-JM,4500,1500,1000.0,9.075100561608632,622.6434419,1,2.5,15/12/2019
-L-JM,5000,1500,1000.0,8.632106214462283,715.8135177,1,2.5,15/12/2019
-L-JM,5500,1500,1000.0,8.353497416613262,834.1856596,1,2.5,15/12/2019
-L-JM,6000,1101,1000.0,7.997364105073893,919.106896,1,2.5,15/12/2019
-L-JM,6500,601,1000.0,8.032743632894189,1003.1057952,1,2.5,15/12/2019
-L-JM,1500,1500,1000.0,14.880831269627889,112.38430980000001,1,3,15/12/2019
-L-JM,2000,1500,1000.0,13.064014818353021,174.3569823,1,3,15/12/2019
-L-JM,2500,1500,1000.0,11.762643989761354,243.2211045,1,3,15/12/2019
-L-JM,3000,1500,1000.0,10.968917869575504,324.5920986,1,3,15/12/2019
-L-JM,3500,1500,1000.0,10.200866189011894,410.9065092,1,3,15/12/2019
-L-JM,4000,1500,1000.0,9.746818656939825,498.6132275,1,3,15/12/2019
-L-JM,4500,1500,1000.0,9.23931041631953,606.2137346000001,1,3,15/12/2019
-L-JM,5000,1500,1000.0,8.780373388102213,705.5607821000001,1,3,15/12/2019
-L-JM,5500,1500,1000.0,8.485089657131196,820.0846994,1,3,15/12/2019
-L-JM,6000,1101,1000.0,8.135665582644734,895.5069686,1,3,15/12/2019
-L-JM,6500,601,1000.0,8.187855192343129,958.1212525999999,1,3,15/12/2019
-L-JM,1500,1500,1000.0,14.046177239428841,114.7886533,1,0.75,15/12/2019
-L-JM,2000,1500,1000.0,12.700155820409142,177.8000633,1,0.75,15/12/2019
-L-JM,2500,1500,1000.0,11.999409877098083,249.8877674,1,0.75,15/12/2019
-L-JM,3000,1500,1000.0,11.349961215230307,331.60657760000004,1,0.75,15/12/2019
-L-JM,3500,1500,1000.0,10.72300334940847,421.4194003,1,0.75,15/12/2019
-L-JM,4000,1500,1000.0,10.448034243490858,514.5383338,1,0.75,15/12/2019
-L-JM,4500,1500,1000.0,10.017663810821535,617.0386821,1,0.75,15/12/2019
-L-JM,5000,1500,1000.0,9.517057082204184,716.4373566,1,0.75,15/12/2019
-L-JM,5500,1500,1000.0,9.273669176727296,832.6763739,1,0.75,15/12/2019
-L-JM,6000,1101,1000.0,8.995569295995784,911.0825957,1,0.75,15/12/2019
-L-JM,6500,601,1000.0,9.010769006846546,979.3535823999999,1,0.75,15/12/2019
-L-JM,1500,1500,1000.0,13.967123082429293,111.65990760000001,1,0.5,15/12/2019
-L-JM,2000,1500,1000.0,12.697881535001121,172.2946484,1,0.5,15/12/2019
-L-JM,2500,1500,1000.0,12.145461895324708,241.1312698,1,0.5,15/12/2019
-L-JM,3000,1500,1000.0,11.588876514109295,323.0631537,1,0.5,15/12/2019
-L-JM,3500,1500,1000.0,11.044433803100585,415.137312,1,0.5,15/12/2019
-L-JM,4000,1500,1000.0,10.80793491441091,504.8102572,1,0.5,15/12/2019
-L-JM,4500,1500,1000.0,10.405684053039552,602.5219337,1,0.5,15/12/2019
-L-JM,5000,1500,1000.0,9.965184934692385,711.8197224,1,0.5,15/12/2019
-L-JM,5500,1500,1000.0,9.748910655822755,825.7830675,1,0.5,15/12/2019
-L-JM,6000,1101,1000.0,9.48353206175095,908.3770869,1,0.5,15/12/2019
-L-JM,6500,601,1000.0,9.485751465046862,971.9107026,1,0.5,15/12/2019
-L-JM,1500,1500,1000.0,14.028847422150934,112.4397257,1,0.25,15/12/2019
-L-JM,2000,1500,1000.0,12.743222420338949,174.4159427,1,0.25,15/12/2019
-L-JM,2500,1500,1000.0,12.272876975964866,249.5782289,1,0.25,15/12/2019
-L-JM,3000,1500,1000.0,11.804296119425455,328.94519329999997,1,0.25,15/12/2019
-L-JM,3500,1500,1000.0,11.369661207082114,412.7472373,1,0.25,15/12/2019
-L-JM,4000,1500,1000.0,11.183031419891359,511.8257998,1,0.25,15/12/2019
-L-JM,4500,1500,1000.0,10.825626690989177,609.6951702,1,0.25,15/12/2019
-L-JM,5000,1500,1000.0,10.460318843851725,721.2592548,1,0.25,15/12/2019
-L-JM,5500,1500,1000.0,10.294279163879395,825.8027392,1,0.25,15/12/2019
-L-JM,6000,1101,1000.0,10.018516495014302,921.2132997,1,0.25,15/12/2019
-L-JM,6500,601,1000.0,10.097973922018602,980.0041144,1,0.25,15/12/2019
diff --git a/data/figs/mae_diff_param_lj_e.pdf b/data/figs/mae_diff_param_lj_e.pdf
deleted file mode 100644
index 20e6676eb..000000000
--- a/data/figs/mae_diff_param_lj_e.pdf
+++ /dev/null
Binary files differ
diff --git a/data/figs/mae_diff_param_lj_s.pdf b/data/figs/mae_diff_param_lj_s.pdf
deleted file mode 100644
index abf50c9b6..000000000
--- a/data/figs/mae_diff_param_lj_s.pdf
+++ /dev/null
Binary files differ
diff --git a/data/figs/mae_diff_tr_sizes.pdf b/data/figs/mae_diff_tr_sizes.pdf
deleted file mode 100644
index 0d6fb923c..000000000
--- a/data/figs/mae_diff_tr_sizes.pdf
+++ /dev/null
Binary files differ
diff --git a/main.py b/main.py
index 3cfa1bfb6..3bf86572e 100644
--- a/main.py
+++ b/main.py
@@ -178,7 +178,7 @@ def pl():
plot_axis.set_ylabel('mae')
plot_axis.set_title('mae for different tr_sizes')
# Get the figure and save it.
- # plot_axis.get_figure().savefig('data\\figs\\mae_diff_tr_sizes.pdf')
+ # plot_axis.get_figure().savefig('.figs\\mae_diff_tr_sizes.pdf')
# Get the rest of the benchmark data and drop unnecesary column.
new_data = data.drop(index=range(0, 22))
@@ -207,7 +207,7 @@ def pl():
last_axis.set_ylabel('mae')
last_axis.set_title('mae for different parameters of lj(s)')
- last_axis.get_figure().savefig('data\\figs\\mae_diff_param_lj_s.pdf')
+ last_axis.get_figure().savefig('.figs\\mae_diff_param_lj_s.pdf')
ndf_axis = nd_first.plot(x='tr_size',
y='1, 1',
@@ -230,7 +230,7 @@ def pl():
last_axis.set_ylabel('mae')
last_axis.set_title('mae for different parameters of lj(e)')
- last_axis.get_figure().savefig('data\\figs\\mae_diff_param_lj_e.pdf')
+ last_axis.get_figure().savefig('.figs\\mae_diff_param_lj_e.pdf')
if __name__ == '__main__':