From 723322b79b0a4f3c630aa6a870ac0f1a25c62c90 Mon Sep 17 00:00:00 2001
From: Thomas Lapp <tlapp@etu.unistra.fr>
Date: Mon, 22 Mar 2021 21:51:45 +0100
Subject: [PATCH] correction bugs
---
...ainArrayListPersoRemoveDecrementation.java | 6 +++---
.../MainArrayListPersoRemoveFirstValue.java | 6 +++---
.../MainArrayListStdRemoveDecrementation.java | 17 +++-------------
.../p4a/MainArrayListStdRemoveFirstValue.java | 20 +++----------------
...inLinkedListPersoRemoveDecrementation.java | 6 +++---
.../MainLinkedListPersoRemoveFirstValue.java | 6 +++---
P4A/src/p4a/MainLinkedListStd.java | 10 ----------
...MainLinkedListStdRemoveDecrementation.java | 17 +++-------------
.../MainLinkedListStdRemoveFirstValue.java | 6 +++---
9 files changed, 24 insertions(+), 70 deletions(-)
delete mode 100644 P4A/src/p4a/MainLinkedListStd.java
diff --git a/P4A/src/p4a/MainArrayListPersoRemoveDecrementation.java b/P4A/src/p4a/MainArrayListPersoRemoveDecrementation.java
index a59e93b..d0ef55f 100644
--- a/P4A/src/p4a/MainArrayListPersoRemoveDecrementation.java
+++ b/P4A/src/p4a/MainArrayListPersoRemoveDecrementation.java
@@ -2,14 +2,14 @@ package p4a;
public class MainArrayListPersoRemoveDecrementation {
public static void main(String[] args) {
- LinkedListPerso<Integer> linkedList = new LinkedListPerso<Integer>();
+ ArrayListPerso<Integer> arrayList = new ArrayListPerso<Integer>();
int nbOperation = Integer.parseInt(args[0]);
for (int i = 0; i < nbOperation; i++) {
- linkedList.ajout(0, i);
+ arrayList.ajout(0, i);
}
for (int i = nbOperation-1; i >= 0; i--) {
- linkedList.suppression(i);
+ arrayList.suppression(i);
}
}
}
diff --git a/P4A/src/p4a/MainArrayListPersoRemoveFirstValue.java b/P4A/src/p4a/MainArrayListPersoRemoveFirstValue.java
index 21e3614..e9b462b 100644
--- a/P4A/src/p4a/MainArrayListPersoRemoveFirstValue.java
+++ b/P4A/src/p4a/MainArrayListPersoRemoveFirstValue.java
@@ -2,14 +2,14 @@ package p4a;
public class MainArrayListPersoRemoveFirstValue {
public static void main(String[] args) {
- LinkedListPerso<Integer> linkedList = new LinkedListPerso<Integer>();
+ ArrayListPerso<Integer> arrayList = new ArrayListPerso<Integer>();
int nbOperation = Integer.parseInt(args[0]);
for (int i = 0; i < nbOperation; i++) {
- linkedList.ajout(0, i);
+ arrayList.ajout(0, i);
}
for (int i = 0; i < nbOperation; i++) {
- linkedList.suppression(0);
+ arrayList.suppression(0);
}
}
}
diff --git a/P4A/src/p4a/MainArrayListStdRemoveDecrementation.java b/P4A/src/p4a/MainArrayListStdRemoveDecrementation.java
index 10d00cf..6d2e4fb 100644
--- a/P4A/src/p4a/MainArrayListStdRemoveDecrementation.java
+++ b/P4A/src/p4a/MainArrayListStdRemoveDecrementation.java
@@ -2,25 +2,14 @@ package p4a;
public class MainArrayListStdRemoveDecrementation {
public static void main(String[] args) {
-<<<<<<< HEAD
- LinkedListStd<Integer> linkedList = new LinkedListStd<Integer>();
+ ArrayListStd<Integer> arrayList = new ArrayListStd<Integer>();
int nbOperation = Integer.parseInt(args[0]);
for (int i = 0; i < nbOperation; i++) {
- linkedList.ajout(0, i);
+ arrayList.ajout(0, i);
}
for (int i = nbOperation-1; i >= 0; i--) {
- linkedList.suppression(i);
-=======
- ArrayListStd<Integer> arrayListStd = new ArrayListStd<Integer>();
- int nbOperation = Integer.parseInt(args[0]);
-
- for (int i = 0; i < nbOperation; i++) {
- arrayListStd.ajout(0, i);
- }
- for (int i = nbOperation-1; i >= 0; i--) {
- arrayListStd.suppression(i);
->>>>>>> af571803536d0b71fa91c1f897612b43608d9bbd
+ arrayList.suppression(i);
}
}
diff --git a/P4A/src/p4a/MainArrayListStdRemoveFirstValue.java b/P4A/src/p4a/MainArrayListStdRemoveFirstValue.java
index 992e55e..2eb9b4a 100644
--- a/P4A/src/p4a/MainArrayListStdRemoveFirstValue.java
+++ b/P4A/src/p4a/MainArrayListStdRemoveFirstValue.java
@@ -2,28 +2,14 @@ package p4a;
public class MainArrayListStdRemoveFirstValue {
public static void main(String[] args) {
-<<<<<<< HEAD
- LinkedListStd<Integer> linkedList = new LinkedListStd<Integer>();
+ ArrayListStd<Integer> arrayList = new ArrayListStd<Integer>();
int nbOperation = Integer.parseInt(args[0]);
for (int i = 0; i < nbOperation; i++) {
- linkedList.ajout(0, i);
-=======
- ArrayListStd<Integer> arrayListStd = new ArrayListStd<Integer>();
- int nbOperation = Integer.parseInt(args[0]);
-
- for (int i = 0; i < nbOperation; i++) {
- arrayListStd.ajout(0, i);
->>>>>>> af571803536d0b71fa91c1f897612b43608d9bbd
+ arrayList.ajout(0, i);
}
-
for (int i = 0; i < nbOperation; i++) {
-<<<<<<< HEAD
- linkedList.suppression(0);
-=======
- arrayListStd.suppression(0);
->>>>>>> af571803536d0b71fa91c1f897612b43608d9bbd
+ arrayList.suppression(0);
}
-
}
}
diff --git a/P4A/src/p4a/MainLinkedListPersoRemoveDecrementation.java b/P4A/src/p4a/MainLinkedListPersoRemoveDecrementation.java
index 8ac6c4b..a5cb174 100644
--- a/P4A/src/p4a/MainLinkedListPersoRemoveDecrementation.java
+++ b/P4A/src/p4a/MainLinkedListPersoRemoveDecrementation.java
@@ -2,14 +2,14 @@ package p4a;
public class MainLinkedListPersoRemoveDecrementation {
public static void main(String[] args) {
- ArrayListPerso<Integer> arrayList = new ArrayListPerso<Integer>();
+ LinkedListPerso<Integer> linkedList = new LinkedListPerso<Integer>();
int nbOperation = Integer.parseInt(args[0]);
for (int i = 0; i < nbOperation; i++) {
- arrayList.ajout(0, i);
+ linkedList.ajout(0, i);
}
for (int i = nbOperation-1; i >= 0; i--) {
- arrayList.suppression(i);
+ linkedList.suppression(i);
}
}
}
diff --git a/P4A/src/p4a/MainLinkedListPersoRemoveFirstValue.java b/P4A/src/p4a/MainLinkedListPersoRemoveFirstValue.java
index 57495b7..858c7cb 100644
--- a/P4A/src/p4a/MainLinkedListPersoRemoveFirstValue.java
+++ b/P4A/src/p4a/MainLinkedListPersoRemoveFirstValue.java
@@ -2,14 +2,14 @@ package p4a;
public class MainLinkedListPersoRemoveFirstValue {
public static void main(String[] args) {
- ArrayListPerso<Integer> arrayList = new ArrayListPerso<Integer>();
+ LinkedListPerso<Integer> linkedList = new LinkedListPerso<Integer>();
int nbOperation = Integer.parseInt(args[0]);
for (int i = 0; i < nbOperation; i++) {
- arrayList.ajout(0, i);
+ linkedList.ajout(0, i);
}
for (int i = 0; i < nbOperation; i++) {
- arrayList.suppression(0);
+ linkedList.suppression(0);
}
}
}
diff --git a/P4A/src/p4a/MainLinkedListStd.java b/P4A/src/p4a/MainLinkedListStd.java
deleted file mode 100644
index 085a464..0000000
--- a/P4A/src/p4a/MainLinkedListStd.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package p4a;
-
-public class MainLinkedListStd {
-
- public static void main(String[] args) {
-
-
- }
-
-}
diff --git a/P4A/src/p4a/MainLinkedListStdRemoveDecrementation.java b/P4A/src/p4a/MainLinkedListStdRemoveDecrementation.java
index e0b9d8c..28df542 100644
--- a/P4A/src/p4a/MainLinkedListStdRemoveDecrementation.java
+++ b/P4A/src/p4a/MainLinkedListStdRemoveDecrementation.java
@@ -2,25 +2,14 @@ package p4a;
public class MainLinkedListStdRemoveDecrementation {
public static void main(String[] args) {
-<<<<<<< HEAD
- ArrayListStd<Integer> arrayList = new ArrayListStd<Integer>();
+ LinkedListStd<Integer> linkedList = new LinkedListStd<Integer>();
int nbOperation = Integer.parseInt(args[0]);
for (int i = 0; i < nbOperation; i++) {
- arrayList.ajout(0, i);
+ linkedList.ajout(0, i);
}
for (int i = nbOperation-1; i >= 0; i--) {
- arrayList.suppression(i);
-=======
- LinkedListStd<Integer> linkedListStd = new LinkedListStd<Integer>();
- int nbOperation = Integer.parseInt(args[0]);
-
- for (int i = 0; i < nbOperation; i++) {
- linkedListStd.ajout(0, i);
- }
- for (int i = nbOperation-1; i >= 0; i--) {
- linkedListStd.suppression(i);
->>>>>>> af571803536d0b71fa91c1f897612b43608d9bbd
+ linkedList.suppression(i);
}
}
}
diff --git a/P4A/src/p4a/MainLinkedListStdRemoveFirstValue.java b/P4A/src/p4a/MainLinkedListStdRemoveFirstValue.java
index 8c3ab9a..92bc748 100644
--- a/P4A/src/p4a/MainLinkedListStdRemoveFirstValue.java
+++ b/P4A/src/p4a/MainLinkedListStdRemoveFirstValue.java
@@ -2,14 +2,14 @@ package p4a;
public class MainLinkedListStdRemoveFirstValue {
public static void main(String[] args) {
- ArrayListStd<Integer> arrayList = new ArrayListStd<Integer>();
+ LinkedListStd<Integer> linkedList = new LinkedListStd<Integer>();
int nbOperation = Integer.parseInt(args[0]);
for (int i = 0; i < nbOperation; i++) {
- arrayList.ajout(0, i);
+ linkedList.ajout(0, i);
}
for (int i = 0; i < nbOperation; i++) {
- arrayList.suppression(0);
+ linkedList.suppression(0);
}
}
}
--
GitLab