Adding last files

code/plot.r

-#!/usr/bin/env Rscript
+#!/usr/bin/Rscript --slave
 library(ggplot2)
 
 # Chargement des données
-perf                <- read.table("../data/src/data.tsv", header = TRUE)
+perf                <- read.table("../data/src/dataTree.tsv", header = TRUE)
 
 perfOpeAdd          <- perf[(perf$Operation == "add") & (perf$Size == "100000") , ]
 perfOpeContains     <- perf[(perf$Operation == "contains") & (perf$Size == "100000") , ]
@@ -10,32 +10,32 @@ perfOpeRemove       <- perf[(perf$Operation == "remove") & (perf$Size == "100000
 
 
 # Analyses de la version initiale
-png("../data/plots/initial/v0_exectime_add.png")
+png("../data/plots/v0_exectime_add.png")
 ggplot (data = perfOpeAdd, aes(x = OpSize, y = Time, color = Type)) +
 	geom_point() + geom_smooth() +
 	ggtitle("Temps d'execution global pour l'ajout d'objets\ndans des structures de 100.000 objets")
 
-png("../data/plots/initial/v0_exectime_contains.png")
+png("../data/plots/v0_exectime_contains.png")
 ggplot (data = perfOpeContains, aes(x = OpSize, y = Time, color = Type)) +
 	geom_point() + geom_smooth() +
 	ggtitle("Temps d'execution global pour la recherche d'objets\ndans des structures de 100.000 objets")
 
-png("../data/plots/initial/v0_exectime_remove.png")
+png("../data/plots/v0_exectime_remove.png")
 ggplot (data = perfOpeRemove, aes(x = OpSize, y = Time, color = Type)) +
 	geom_point() + geom_smooth() +
 	ggtitle("Temps d'execution global pour la suppression d'objets\ndans des structures de 100000 objets")
 
-png("../data/plots/initial/v0_memory_add.png")
+png("../data/plots/v0_memory_add.png")
 ggplot(data = perfOpeAdd, aes(x = OpSize, y = Mem, color = Type)) +
 	geom_point() + geom_smooth() +
 	ggtitle("Utilisation globale de la mémoire pour l'ajout d'objets\ndans des structures de 100.000 objets")
 
-png("../data/plots/initial/v0_memory_contains.png")
+png("../data/plots/v0_memory_contains.png")
 ggplot(data = perfOpeContains, aes(x = OpSize, y = Mem, color = Type)) +
 	geom_point() + geom_smooth() +
 	ggtitle("Utilisation globale de la mémoire pour la recherche d'objets\ndans des structures de 100.000 objets")
 
-png("../data/plots/initial/v0_memory_add.png")
+png("../data/plots/v0_memory_remove.png")
 ggplot(data = perfOpeRemove, aes(x = OpSize, y = Mem, color = Type)) +
 	geom_point() + geom_smooth() +
 	ggtitle("Utilisation globale de la mémoire pour la suppression d'objets\ndans des structures de 100.000 objets")

code/script.sh

@@ -38,7 +38,7 @@ for size in ${structSize[*]}; do
 		for opSize in ${operationSize[*]}; do
 			for type in ${structType[*]}; do
 				echo -ne "$size\t$operation\t$opSize\t$type"
-				/usr/bin/time -f "\t%U\t%M" java -jar struct.jar $type $size $operation $opSize 2>&1
+				/usr/bin/time -f "\t%U\t%M" java -cp . main $type $size $operation $opSize 2>&1
 			done
 		done
 	done

data/src/dataTree.tsv

+Size	Operation	OpSize	Type	Time	Mem
+1000	add	1000	ArrayList	0.05	36076
+1000	add	1000	LinkedList	0.05	36160
+1000	add	1000	Set	0.05	36196
+1000	add	25000	ArrayList	0.06	37204
+1000	add	25000	LinkedList	0.06	37540
+1000	add	25000	Set	0.06	38700
+1000	add	50000	ArrayList	0.05	37952
+1000	add	50000	LinkedList	0.08	38896
+1000	add	50000	Set	0.08	40836
+1000	add	75000	ArrayList	0.07	38840
+1000	add	75000	LinkedList	0.07	40864
+1000	add	75000	Set	0.10	43284
+1000	add	100000	ArrayList	0.06	39436
+1000	add	100000	LinkedList	0.07	40800
+1000	add	100000	Set	0.11	46028
+1000	contains	1000	ArrayList	0.07	36688
+1000	contains	1000	LinkedList	0.06	36268
+1000	contains	1000	Set	0.05	36112
+1000	contains	25000	ArrayList	0.12	37272
+1000	contains	25000	LinkedList	0.16	36820
+1000	contains	25000	Set	0.05	36940
+1000	contains	50000	ArrayList	0.13	37664
+1000	contains	50000	LinkedList	0.21	37288
+1000	contains	50000	Set	0.07	37288
+1000	contains	75000	ArrayList	0.15	37972
+1000	contains	75000	LinkedList	0.31	38084
+1000	contains	75000	Set	0.09	37996
+1000	contains	100000	ArrayList	0.21	38292
+1000	contains	100000	LinkedList	0.38	38512
+1000	contains	100000	Set	0.07	38576
+1000	remove	1000	ArrayList	0.08	36544
+1000	remove	1000	LinkedList	0.06	36136
+1000	remove	1000	Set	0.04	36032
+1000	remove	25000	ArrayList	0.11	37024
+1000	remove	25000	LinkedList	0.16	36992
+1000	remove	25000	Set	0.05	36940
+1000	remove	50000	ArrayList	0.12	37636
+1000	remove	50000	LinkedList	0.20	37160
+1000	remove	50000	Set	0.06	37432
+1000	remove	75000	ArrayList	0.13	37840
+1000	remove	75000	LinkedList	0.29	37668
+1000	remove	75000	Set	0.08	38100
+1000	remove	100000	ArrayList	0.18	38312
+1000	remove	100000	LinkedList	0.38	38296
+1000	remove	100000	Set	0.06	38484
+25000	add	1000	ArrayList	0.03	37044
+25000	add	1000	LinkedList	0.05	37796
+25000	add	1000	Set	0.05	38748
+25000	add	25000	ArrayList	0.07	37992
+25000	add	25000	LinkedList	0.06	38940
+25000	add	25000	Set	0.07	40588
+25000	add	50000	ArrayList	0.07	38796
+25000	add	50000	LinkedList	0.08	40704
+25000	add	50000	Set	0.12	43144
+25000	add	75000	ArrayList	0.06	39372
+25000	add	75000	LinkedList	0.08	41356
+25000	add	75000	Set	0.11	45992
+25000	add	100000	ArrayList	0.06	40488
+25000	add	100000	LinkedList	0.07	42116
+25000	add	100000	Set	0.11	47240
+25000	contains	1000	ArrayList	0.10	37748
+25000	contains	1000	LinkedList	0.16	38200
+25000	contains	1000	Set	0.06	38752
+25000	contains	25000	ArrayList	0.69	38260
+25000	contains	25000	LinkedList	2.08	38732
+25000	contains	25000	Set	0.07	41056
+25000	contains	50000	ArrayList	1.28	38744
+25000	contains	50000	LinkedList	4.02	39188
+25000	contains	50000	Set	0.08	42176
+25000	contains	75000	ArrayList	1.88	39112
+25000	contains	75000	LinkedList	6.05	39520
+25000	contains	75000	Set	0.10	44260
+25000	contains	100000	ArrayList	2.48	39372
+25000	contains	100000	LinkedList	8.02	39524
+25000	contains	100000	Set	0.09	43732
+25000	remove	1000	ArrayList	0.14	37672
+25000	remove	1000	LinkedList	0.16	38512
+25000	remove	1000	Set	0.07	38708
+25000	remove	25000	ArrayList	0.68	38104
+25000	remove	25000	LinkedList	2.09	38684
+25000	remove	25000	Set	0.10	40884
+25000	remove	50000	ArrayList	1.27	38516
+25000	remove	50000	LinkedList	4.06	39236
+25000	remove	50000	Set	0.09	42468
+25000	remove	75000	ArrayList	1.90	38864
+25000	remove	75000	LinkedList	6.08	39276
+25000	remove	75000	Set	0.09	45160
+25000	remove	100000	ArrayList	2.60	39396
+25000	remove	100000	LinkedList	8.22	39680
+25000	remove	100000	Set	0.13	44888
+50000	add	1000	ArrayList	0.05	38144
+50000	add	1000	LinkedList	0.06	39120
+50000	add	1000	Set	0.07	40744
+50000	add	25000	ArrayList	0.06	38860
+50000	add	25000	LinkedList	0.07	40100
+50000	add	25000	Set	0.08	43348
+50000	add	50000	ArrayList	0.08	39464
+50000	add	50000	LinkedList	0.06	41448
+50000	add	50000	Set	0.11	45956
+50000	add	75000	ArrayList	0.07	40468
+50000	add	75000	LinkedList	0.08	42856
+50000	add	75000	Set	0.15	46924
+50000	add	100000	ArrayList	0.07	40732
+50000	add	100000	LinkedList	0.08	43148
+50000	add	100000	Set	0.13	48568
+50000	contains	1000	ArrayList	0.13	38520
+50000	contains	1000	LinkedList	0.24	39060
+50000	contains	1000	Set	0.08	41184
+50000	contains	25000	ArrayList	1.27	39000
+50000	contains	25000	LinkedList	4.03	39760
+50000	contains	25000	Set	0.08	43452
+50000	contains	50000	ArrayList	2.43	39580
+50000	contains	50000	LinkedList	8.06	40144
+50000	contains	50000	Set	0.11	44764
+50000	contains	75000	ArrayList	3.70	39580
+50000	contains	75000	LinkedList	10.52	40496
+50000	contains	75000	Set	0.08	45124
+50000	contains	100000	ArrayList	2.88	39636
+50000	contains	100000	LinkedList	9.47	41128
+50000	contains	100000	Set	0.08	44548
+50000	remove	1000	ArrayList	0.07	38512
+50000	remove	1000	LinkedList	0.14	39092
+50000	remove	1000	Set	0.04	41436
+50000	remove	25000	ArrayList	0.77	39100
+50000	remove	25000	LinkedList	2.43	39692
+50000	remove	25000	Set	0.07	43140
+50000	remove	50000	ArrayList	1.53	39240
+50000	remove	50000	LinkedList	4.85	39948
+50000	remove	50000	Set	0.07	45068
+50000	remove	75000	ArrayList	2.27	39592
+50000	remove	75000	LinkedList	7.23	40004
+50000	remove	75000	Set	0.07	44448
+50000	remove	100000	ArrayList	2.92	39692
+50000	remove	100000	LinkedList	9.60	40112
+50000	remove	100000	Set	0.07	45380
+75000	add	1000	ArrayList	0.08	38768
+75000	add	1000	LinkedList	0.05	40412
+75000	add	1000	Set	0.04	43312
+75000	add	25000	ArrayList	0.04	39476
+75000	add	25000	LinkedList	0.04	41408
+75000	add	25000	Set	0.07	45948
+75000	add	50000	ArrayList	0.04	40408
+75000	add	50000	LinkedList	0.05	43156
+75000	add	50000	Set	0.08	47436
+75000	add	75000	ArrayList	0.05	41016
+75000	add	75000	LinkedList	0.05	42912
+75000	add	75000	Set	0.09	48632
+75000	add	100000	ArrayList	0.04	42300
+75000	add	100000	LinkedList	0.09	44864
+75000	add	100000	Set	0.08	49548
+75000	contains	1000	ArrayList	0.10	39520
+75000	contains	1000	LinkedList	0.19	40208
+75000	contains	1000	Set	0.05	43296
+75000	contains	25000	ArrayList	1.13	39912
+75000	contains	25000	LinkedList	3.64	40796
+75000	contains	25000	Set	0.08	43796
+75000	contains	50000	ArrayList	2.19	40020
+75000	contains	50000	LinkedList	7.15	40576
+75000	contains	50000	Set	0.08	44700
+75000	contains	75000	ArrayList	3.30	40196
+75000	contains	75000	LinkedList	10.75	41728
+75000	contains	75000	Set	0.09	45020
+75000	contains	100000	ArrayList	4.35	40844
+75000	contains	100000	LinkedList	14.25	40652
+75000	contains	100000	Set	0.09	45536
+75000	remove	1000	ArrayList	0.11	39480
+75000	remove	1000	LinkedList	0.21	40304
+75000	remove	1000	Set	0.07	43748
+75000	remove	25000	ArrayList	1.14	39856
+75000	remove	25000	LinkedList	3.71	40980
+75000	remove	25000	Set	0.04	44376
+75000	remove	50000	ArrayList	2.34	40204
+75000	remove	50000	LinkedList	7.41	41004
+75000	remove	50000	Set	0.07	44608
+75000	remove	75000	ArrayList	3.35	40260
+75000	remove	75000	LinkedList	11.00	40636
+75000	remove	75000	Set	0.07	45136
+75000	remove	100000	ArrayList	4.40	40232
+75000	remove	100000	LinkedList	14.72	41752
+75000	remove	100000	Set	0.10	45812
+100000	add	1000	ArrayList	0.04	39344
+100000	add	1000	LinkedList	0.05	41192
+100000	add	1000	Set	0.08	46188
+100000	add	25000	ArrayList	0.04	40644
+100000	add	25000	LinkedList	0.05	42204
+100000	add	25000	Set	0.09	47160
+100000	add	50000	ArrayList	0.05	40860
+100000	add	50000	LinkedList	0.10	43536
+100000	add	50000	Set	0.11	50912
+100000	add	75000	ArrayList	0.06	42220
+100000	add	75000	LinkedList	0.06	43940
+100000	add	75000	Set	0.10	49872
+100000	add	100000	ArrayList	0.05	42732
+100000	add	100000	LinkedList	0.05	45592
+100000	add	100000	Set	0.10	52960
+100000	contains	1000	ArrayList	0.12	39892
+100000	contains	1000	LinkedList	0.24	41012
+100000	contains	1000	Set	0.08	45624
+100000	contains	25000	ArrayList	1.54	40304
+100000	contains	25000	LinkedList	5.07	41460
+100000	contains	25000	Set	0.08	46800
+100000	contains	50000	ArrayList	3.18	40052
+100000	contains	50000	LinkedList	10.07	42572
+100000	contains	50000	Set	0.10	47124
+100000	contains	75000	ArrayList	4.67	40756
+100000	contains	75000	LinkedList	14.55	41320
+100000	contains	75000	Set	0.11	46984
+100000	contains	100000	ArrayList	6.17	40824
+100000	contains	100000	LinkedList	20.17	42840
+100000	contains	100000	Set	0.12	48756
+100000	remove	1000	ArrayList	0.12	39904
+100000	remove	1000	LinkedList	0.26	41172
+100000	remove	1000	Set	0.08	46476
+100000	remove	25000	ArrayList	1.59	40520
+100000	remove	25000	LinkedList	4.96	41816
+100000	remove	25000	Set	0.08	46468
+100000	remove	50000	ArrayList	2.84	40684
+100000	remove	50000	LinkedList	9.54	41676
+100000	remove	50000	Set	0.10	46976
+100000	remove	75000	ArrayList	4.20	40944
+100000	remove	75000	LinkedList	14.03	42468
+100000	remove	75000	Set	0.13	48628
+100000	remove	100000	ArrayList	5.94	41300
+100000	remove	100000	LinkedList	19.53	41168
+100000	remove	100000	Set	0.11	47424