diff --git a/graphs/DeleteparOccuEtTemps.png b/graphs/DeleteparOccuEtTemps.png deleted file mode 100644 index 39564883fe34d74ce031d238a49bb2d9141460ca..0000000000000000000000000000000000000000 Binary files a/graphs/DeleteparOccuEtTemps.png and /dev/null differ diff --git a/graphs/addQparOccuEtTemps.png b/graphs/addQparOccuEtTemps.png deleted file mode 100644 index 4c5c25df333b7bfeb93447e284ad89e6efbbb793..0000000000000000000000000000000000000000 Binary files a/graphs/addQparOccuEtTemps.png and /dev/null differ diff --git a/graphs/addTparOccuEtTemps.png b/graphs/addTparOccuEtTemps.png deleted file mode 100644 index 6c2f2eed619d7db21076a166fb417eb2a931a15f..0000000000000000000000000000000000000000 Binary files a/graphs/addTparOccuEtTemps.png and /dev/null differ diff --git a/graphs/allComparaisonMemoireAarray.png b/graphs/allComparaisonMemoireAarray.png new file mode 100644 index 0000000000000000000000000000000000000000..b0287f1f19f42c03ce81bc51e24769a1d66f57cc Binary files /dev/null and b/graphs/allComparaisonMemoireAarray.png differ diff --git a/graphs/allComparaisonTimeArray.png b/graphs/allComparaisonTimeArray.png new file mode 100644 index 0000000000000000000000000000000000000000..d2e23e4564e6c522fc6894248c6f10156e104af5 Binary files /dev/null and b/graphs/allComparaisonTimeArray.png differ diff --git a/graphs/cmdR.R b/graphs/cmdR.R index a2d8d2efc860afd81f88c526a721c0e00bd49dcc..92250f63ea8d4b404503f10edbc0618363665e7f 100755 --- a/graphs/cmdR.R +++ b/graphs/cmdR.R @@ -22,44 +22,19 @@ ggplot(perf,aes(x=occu, y=memoire, color=struct))+ 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))+ +ggplot(perf,aes(x=occu, y=temps, color=struct))+ geom_point()+geom_smooth()+ - ggtitle("Par occurénce sur le temps, Test : Delete")+ + ggtitle("Le temps sur les opérations ")+ xlab("Occurence")+ - ylab("Temps") -ggsave("DeleteparOccuEtTemps.png") + ylab("Temps")+ + facet_grid(rows=vars(struct),cols=vars(test)) +ggsave("allComparaisonTimeAnalyse.png") -ggplot(subset(perf, test =="2"), aes(x=occu, y=memoire, color=struct))+ +ggplot(perf,aes(x=occu, y=memoire, color=struct))+ geom_point()+geom_smooth()+ - ggtitle("Par occurénce sur le mémoire, Test : Delete")+ + ggtitle("La mémoire prise par les opérations ")+ xlab("Occurence")+ - ylab("Memoire") -ggsave("DeleteparOccuEtTemps.png") + ylab("Memoire")+ + facet_grid(rows=vars(struct),cols=vars(test))+ + ylim(0,100000) +ggsave("allComparaisonMemoireAnalyse.png") diff --git a/src/ArrayListI2.java b/src/ArrayListI2.java new file mode 100644 index 0000000000000000000000000000000000000000..b6a0077367c9d9c91082168d6dcfbbe6df4f91f1 --- /dev/null +++ b/src/ArrayListI2.java @@ -0,0 +1,33 @@ +import java.util.*; +import javax.swing.JButton; + +public class ArrayListI2<E> extends ArrayList<E> implements IStructure{ + + private ArrayList<Integer> AL; + private JButton btn; + + public ArrayListI2(int taille){ + this.AL=new ArrayList<>(taille); + } + + @Override + public void enTete(int n){ + for(int i=0;i<n;i++) { + this.AL.add(btn); + } + } + + @Override + public void enQueue(int n){ + for(int i=0;i<n;i++) { + this.AL.add(btn); + } + //System.out.println("AL ok"); + } + + @Override + public void effacer(){ + this.AL.clear(); + //System.out.println("AL clear"); + } +}