diff --git a/src/Tests.sh b/Tests.sh
old mode 100644
new mode 100755
similarity index 87%
rename from src/Tests.sh
rename to Tests.sh
index 3f7c09e7e0a7833ce490da40c0162c59726e877d..905bbb4e0d178d17815b338077027f704d7f2724
--- a/src/Tests.sh
+++ b/Tests.sh
@@ -4,12 +4,12 @@ type[0]="ArrayList"
type[1]="LinkedList"
type[2]="Vector"
-sizeType[0]=1000
-sizeType[1]=10000
+sizeType[0]=100000
+sizeType[1]=500000
sizeType[2]=1000000
-occurrence[0]=1000
-occurrence[1]=10000
+occurrence[0]=100000
+occurrence[1]=500000
occurrence[2]=1000000
operationType[0]="enTete"
@@ -43,4 +43,4 @@ done
-Rscript cmdR.R
+Rscript /graphs/cmdR.R
diff --git a/graphs/DeleteparOccuEtTemps.png b/graphs/DeleteparOccuEtTemps.png
new file mode 100644
index 0000000000000000000000000000000000000000..39564883fe34d74ce031d238a49bb2d9141460ca
Binary files /dev/null and b/graphs/DeleteparOccuEtTemps.png differ
diff --git a/graphs/Rplots.pdf b/graphs/Rplots.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..3bf5cd37116b95cb22754a5ec47f02f749280c12
Binary files /dev/null and b/graphs/Rplots.pdf differ
diff --git a/graphs/addQparOccuEtTemps.png b/graphs/addQparOccuEtTemps.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c5c25df333b7bfeb93447e284ad89e6efbbb793
Binary files /dev/null and b/graphs/addQparOccuEtTemps.png differ
diff --git a/graphs/addTparOccuEtTemps.png b/graphs/addTparOccuEtTemps.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c2f2eed619d7db21076a166fb417eb2a931a15f
Binary files /dev/null and b/graphs/addTparOccuEtTemps.png differ
diff --git a/graphs/allComparaisonMemoire.png b/graphs/allComparaisonMemoire.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2dce45fb8c0c8f4fa0ed5fa80f832c720053963
Binary files /dev/null and b/graphs/allComparaisonMemoire.png differ
diff --git a/graphs/allComparaisonTime.png b/graphs/allComparaisonTime.png
new file mode 100644
index 0000000000000000000000000000000000000000..c082e98fbf64ffb0c1b28cfe1fbf5e3a4de91b6c
Binary files /dev/null and b/graphs/allComparaisonTime.png differ
diff --git a/graphs/cmdR.R b/graphs/cmdR.R
new file mode 100755
index 0000000000000000000000000000000000000000..a2d8d2efc860afd81f88c526a721c0e00bd49dcc
--- /dev/null
+++ b/graphs/cmdR.R
@@ -0,0 +1,65 @@
+#!/usr/bin/env Rscript
+
+
+library(ggplot2)
+
+perf <- read.table("../results.dat", header = TRUE)
+
+ggplot(perf,aes(x=occu, y=temps, color=struct))+
+ geom_point()+geom_smooth()+
+ ggtitle("Le temps sur les opérations ")+
+ xlab("Occurence")+
+ ylab("Temps")+
+ facet_grid(rows=vars(struct),cols=vars(test))
+ggsave("allComparaisonTime.png")
+
+ggplot(perf,aes(x=occu, y=memoire, color=struct))+
+ geom_point()+geom_smooth()+
+ ggtitle("La mémoire prise par les opérations ")+
+ xlab("Occurence")+
+ ylab("Memoire")+
+ facet_grid(rows=vars(struct),cols=vars(test))+
+ ylim(0,100000)
+ggsave("allComparaisonMemoire.png")
+
+ggplot(subset(perf, test =="0"), aes(x=occu, y=temps, color=struct))+
+ geom_point()+geom_smooth()+
+ ggtitle("Par occurénce sur le temps, Test : addQ")+
+ xlab("Occurence")+
+ ylab("Temps")
+ggsave("addQparOccuEtTemps.png")
+
+ggplot(subset(perf, test =="0"), aes(x=occu, y=memoire, color=struct))+
+ geom_point()+geom_smooth()+
+ ggtitle("Par occurénce sur le mémoire, Test : addQ")+
+ xlab("Occurence")+
+ ylab("Memoire")
+ggsave("addQparOccuEtTemps.png")
+
+ggplot(subset(perf, test =="1"), aes(x=occu, y=temps, color=struct))+
+ geom_point()+geom_smooth()+
+ ggtitle("Par occurénce sur le temps, Test : addT")+
+ xlab("Occurence")+
+ ylab("Temps")
+ggsave("addTparOccuEtTemps.png")
+
+ggplot(subset(perf, test =="1"), aes(x=occu, y=memoire, color=struct))+
+ geom_point()+geom_smooth()+
+ ggtitle("Par occurénce sur le mémoire, Test : addT")+
+ xlab("Occurence")+
+ ylab("Memoire")
+ggsave("addTparOccuEtTemps.png")
+
+ggplot(subset(perf, test =="2"), aes(x=occu, y=temps, color=struct))+
+ geom_point()+geom_smooth()+
+ ggtitle("Par occurénce sur le temps, Test : Delete")+
+ xlab("Occurence")+
+ ylab("Temps")
+ggsave("DeleteparOccuEtTemps.png")
+
+ggplot(subset(perf, test =="2"), aes(x=occu, y=memoire, color=struct))+
+ geom_point()+geom_smooth()+
+ ggtitle("Par occurénce sur le mémoire, Test : Delete")+
+ xlab("Occurence")+
+ ylab("Memoire")
+ggsave("DeleteparOccuEtTemps.png")
diff --git a/results.dat b/results.dat
new file mode 100755
index 0000000000000000000000000000000000000000..173f3464c3327082ae19b4ea231e59dcfb1c2e64
--- /dev/null
+++ b/results.dat
@@ -0,0 +1,82 @@
+struct Type test occu temps memoire
+ArrayList 100000 enTete 100000 0.10 54524
+LinkedList 100000 enTete 100000 0.10 56488
+Vector 100000 enTete 100000 0.06 56432
+ArrayList 100000 enTete 500000 0.14 60088
+LinkedList 100000 enTete 500000 0.16 75076
+Vector 100000 enTete 500000 0.13 68324
+ArrayList 100000 enTete 1000000 0.14 82708
+LinkedList 100000 enTete 1000000 0.14 96452
+Vector 100000 enTete 1000000 0.17 80960
+ArrayList 100000 enQueue 100000 1.02 57432
+LinkedList 100000 enQueue 100000 0.12 56960
+Vector 100000 enQueue 100000 1.09 55944
+ArrayList 100000 enQueue 500000 26.04 62396
+LinkedList 100000 enQueue 500000 0.14 73928
+Vector 100000 enQueue 500000 28.19 66100
+ArrayList 100000 enQueue 1000000 109.93 85000
+LinkedList 100000 enQueue 1000000 0.17 93336
+Vector 100000 enQueue 1000000 114.06 82752
+ArrayList 100000 effacer 100000 1.17 58788
+LinkedList 100000 effacer 100000 0.13 59348
+Vector 100000 effacer 100000 1.11 53848
+ArrayList 100000 effacer 500000 28.21 67472
+LinkedList 100000 effacer 500000 0.18 69528
+Vector 100000 effacer 500000 34.56 66568
+ArrayList 100000 effacer 1000000 113.91 85128
+LinkedList 100000 effacer 1000000 0.19 90012
+Vector 100000 effacer 1000000 112.35 84368
+ArrayList 500000 enTete 100000 0.10 49488
+LinkedList 500000 enTete 100000 0.11 53936
+Vector 500000 enTete 100000 0.11 49408
+ArrayList 500000 enTete 500000 0.11 60028
+LinkedList 500000 enTete 500000 0.14 68796
+Vector 500000 enTete 500000 0.14 63244
+ArrayList 500000 enTete 1000000 0.18 78924
+LinkedList 500000 enTete 1000000 0.14 93292
+Vector 500000 enTete 1000000 0.19 74704
+ArrayList 500000 enQueue 100000 1.20 51472
+LinkedList 500000 enQueue 100000 0.13 60628
+Vector 500000 enQueue 100000 1.15 51820
+ArrayList 500000 enQueue 500000 30.12 58276
+LinkedList 500000 enQueue 500000 0.15 70888
+Vector 500000 enQueue 500000 29.79 61728
+ArrayList 500000 enQueue 1000000 117.66 81240
+LinkedList 500000 enQueue 1000000 0.15 95960
+Vector 500000 enQueue 1000000 117.86 71580
+ArrayList 500000 effacer 100000 1.10 53504
+LinkedList 500000 effacer 100000 0.11 56660
+Vector 500000 effacer 100000 1.06 49664
+ArrayList 500000 effacer 500000 28.50 58128
+LinkedList 500000 effacer 500000 0.14 74188
+Vector 500000 effacer 500000 27.43 61700
+ArrayList 500000 effacer 1000000 106.24 84324
+LinkedList 500000 effacer 1000000 0.14 96720
+Vector 500000 effacer 1000000 107.54 75968
+ArrayList 1000000 enTete 100000 0.09 55632
+LinkedList 1000000 enTete 100000 0.11 56288
+Vector 1000000 enTete 100000 0.11 56784
+ArrayList 1000000 enTete 500000 0.12 62048
+LinkedList 1000000 enTete 500000 0.15 68848
+Vector 1000000 enTete 500000 0.13 60272
+ArrayList 1000000 enTete 1000000 0.14 73172
+LinkedList 1000000 enTete 1000000 0.15 90980
+Vector 1000000 enTete 1000000 0.13 75656
+ArrayList 1000000 enQueue 100000 1.12 58504
+LinkedList 1000000 enQueue 100000 0.12 56528
+Vector 1000000 enQueue 100000 1.11 54100
+ArrayList 1000000 enQueue 500000 26.04 62000
+LinkedList 1000000 enQueue 500000 0.14 74232
+Vector 1000000 enQueue 500000 27.65 60528
+ArrayList 1000000 enQueue 1000000 111.74 75552
+LinkedList 1000000 enQueue 1000000 0.19 90132
+Vector 1000000 enQueue 1000000 107.03 68804
+ArrayList 1000000 effacer 100000 1.13 58568
+LinkedList 1000000 effacer 100000 0.13 54340
+Vector 1000000 effacer 100000 1.14 54264
+ArrayList 1000000 effacer 500000 26.17 65236
+LinkedList 1000000 effacer 500000 0.16 73016
+Vector 1000000 effacer 500000 26.77 65588
+ArrayList 1000000 effacer 1000000 101.45 73488
+LinkedList 1000000 effacer 1000000 0.18 89840
+Vector 1000000 effacer 1000000 107.32 70976
diff --git a/src/ArrayListI.java b/src/ArrayListI.java
index ca0655dc6be0ce329eff10ff32f6a90174810d04..3812a53b8cff019051170adbaa3efce1676f0791 100644
--- a/src/ArrayListI.java
+++ b/src/ArrayListI.java
@@ -5,7 +5,7 @@ public class ArrayListI<E> extends ArrayList<E> implements IStruct{
private ArrayList<Integer> AL;
public ArrayListI(int taille){
- this.AL=new ArrayList<>(taille);
+ this.AL=new ArrayList<Integer>(taille);
}
@Override
diff --git a/src/LinkedListI.class b/src/LinkedListI.class
index 8d3b4200aeaf9dc4d8547c399b4a30e312b13e20..0a295b4d2d17f1f007314c0a01775c578afa5627 100644
Binary files a/src/LinkedListI.class and b/src/LinkedListI.class differ
diff --git a/src/Main.class b/src/Main.class
index ec2817aac5fbcef441932db542f97104676dea44..ac7fd82655c101cc40d5aa7cbf44bf1428a6fe01 100644
Binary files a/src/Main.class and b/src/Main.class differ
diff --git a/src/Main.java b/src/Main.java
index 859d62ef54c215311096e5ead0d221ea1d6f20bd..dade1ae75fa8c9c9953f0ad0d57f3a1ccda54283 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -7,7 +7,7 @@ public class Main {
if (args.length < 4) {
System.err.println("\nUsage : java Main.java [STRUCTURE] [TEST] [ITERATION] [TAILLE]");
System.err.println("Usage : STRUCTURE [ArrayList | LinkedList | Vector]");
- System.err.println("Usage : TEST [0 : enTete | 1 : enQueue | 2 : effacer]\n");
+ System.err.println("Usage : TEST [enTete | enQueue | effacer]\n");
System.err.println("Usage : TAILLE [Taille de la structure ?]\n");
System.exit(1);
@@ -31,11 +31,11 @@ public class Main {
break;
case "Vector" :
- l = new VectorI();
+ l = new VectorI(tailleinit);
break;
default:
- System.err.println("Les structures disponibles sont : [ArrayList | LinkedList]\n");
+ System.err.println("Les structures disponibles sont : [ArrayList | LinkedList | Vector]\n");
break;
}
diff --git a/src/Rplots.pdf b/src/Rplots.pdf
deleted file mode 100644
index 8194bb178505e0bd62211ea6cfab0ae1c8a5defc..0000000000000000000000000000000000000000
Binary files a/src/Rplots.pdf and /dev/null differ
diff --git a/src/VectorI.class b/src/VectorI.class
index 019c36b2010c600a3477fec047b5d9d977a68183..a2a7597627a3a72029dc5e7bf267ae4e4c20be2d 100644
Binary files a/src/VectorI.class and b/src/VectorI.class differ
diff --git a/src/VectorI.java b/src/VectorI.java
index 045b271c7469d7d07c67f18929988e77c2aeb932..bb92ba7a24590de682bc4812ca4f654789a1320e 100644
--- a/src/VectorI.java
+++ b/src/VectorI.java
@@ -4,8 +4,8 @@ public class VectorI<E> extends Vector<E> implements IStruct{
private Vector<Integer> V;
- public VectorI(){
- this.V = new Vector<>();
+ public VectorI(int taille ){
+ this.V = new Vector<>(taille);
}
@Override
diff --git a/src/cmdR.R b/src/cmdR.R
deleted file mode 100644
index 281583fe266244cef46c4e74cdb905d4991f8553..0000000000000000000000000000000000000000
--- a/src/cmdR.R
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env Rscript
-
-
-perf <- read.table(file="../graphs/results",
- header=FALSE,
- col.names=c("TempsE","Memoire","Iteration"))
-
-perf
-
-library(ggplot2)
-
-ggplot(perf,aes(x=TempsE, y=Iteration, color=Iteration))+ geom_point()