From 31162629a08bc2d3c9a8a4ca5ee58f35c01cea1e Mon Sep 17 00:00:00 2001
From: Santo Cariotti <dcariotti24@gmail.com>
Date: Sun, 3 May 2020 18:34:18 +0200
Subject: fix: pop w value

---
 I_anno/Programmazione_2/data_structures/list.cc    | 30 ++++++++++++-------
 .../data_structures/list_double.cc                 | 34 ++++++++++++----------
 2 files changed, 38 insertions(+), 26 deletions(-)

(limited to 'I_anno/Programmazione_2/data_structures')

diff --git a/I_anno/Programmazione_2/data_structures/list.cc b/I_anno/Programmazione_2/data_structures/list.cc
index 02ae2fd..2aa97de 100644
--- a/I_anno/Programmazione_2/data_structures/list.cc
+++ b/I_anno/Programmazione_2/data_structures/list.cc
@@ -72,6 +72,23 @@ public:
         return this;
     }
 
+    list* pop(int val) {
+        if(_head == nullptr)
+            return this;
+        else if(_head->value == val) 
+            return pop_front();
+
+        node<T>* iter = _head;
+        while(iter && iter->next && iter->next->value != val)
+            iter = iter->next;
+
+        node<T>* temp = iter->next;
+        iter->next = iter->next->next;
+        delete temp;
+
+        return this;
+    }
+
     list* pop_front() {
         if(_head == nullptr)
             return this;
@@ -138,17 +155,8 @@ int main() {
     l->print(); cout << endl;
     l->push_front(1);
     l->print(); cout << endl;
-
-    // output
-    // 1 2
-    // 1 2 5
-    // 1 2 5 10 15
-    // 1 2 5 6 10 15
-    // 1 2 4 5 6 10 15
-    // 1 2 3 4 5 6 10 15
-    // 1 2 3 4 5 6 10
-    // 2 3 4 5 6 10
-    // 1 2 3 4 5 6 10
+    l->pop(1);
+    l->print(); cout << endl;
 
     return 0;
 }
diff --git a/I_anno/Programmazione_2/data_structures/list_double.cc b/I_anno/Programmazione_2/data_structures/list_double.cc
index b229237..d8dda99 100644
--- a/I_anno/Programmazione_2/data_structures/list_double.cc
+++ b/I_anno/Programmazione_2/data_structures/list_double.cc
@@ -82,6 +82,24 @@ public:
         return this;
     }
 
+    list* pop(int val) {
+        if(_head == nullptr)
+            return this;
+        else if(_head->value == val) 
+            return pop_front();
+
+        node<T>* iter = _head;
+        while(iter && iter->next && iter->next->value != val)
+            iter = iter->next;
+
+        node<T>* temp = iter->next;
+        iter->next = iter->next->next;
+        iter->next->prev = iter;
+        delete temp;
+
+        return this;
+    }
+
     list* pop_front() {
         if(_head == nullptr)
             return this;
@@ -151,22 +169,8 @@ int main() {
     l->print(); cout << endl;
     l->pop_front();
     l->print(); cout << endl;
-    l->pop_back();
+    l->pop(2);
     l->print(); cout << endl;
 
-    // output
-    /*
-     * 1 [[ -1, 2 ]],  2 [[ 1, -1 ]],
-     * 1 [[ -1, 2 ]],  2 [[ 1, 5 ]],  5 [[ 2, -1 ]],
-     * 1 [[ -1, 2 ]],  2 [[ 1, 5 ]],  5 [[ 2, 10 ]],  10 [[ 5, 15 ]],  15 [[ 10, -1 ]],
-     * 1 [[ -1, 2 ]],  2 [[ 1, 5 ]],  5 [[ 2, 6 ]],  6 [[ 5, 10 ]],  10 [[ 6, 15 ]],  15 [[ 10, -1 ]],
-     * 1 [[ -1, 2 ]],  2 [[ 1, 5 ]],  5 [[ 2, 7 ]],  7 [[ 5, 6 ]],  6 [[ 7, 10 ]],  10 [[ 6, 15 ]],  15 [[ 10, -1 ]],
-     * 1 [[ -1, 2 ]],  2 [[ 1, 4 ]],  4 [[ 2, 5 ]],  5 [[ 4, 7 ]],  7 [[ 5, 6 ]],  6 [[ 7, 10 ]],  10 [[ 6, 15 ]],  15 [[ 10, -1 ]],
-     * 1 [[ -1, 2 ]],  2 [[ 1, 4 ]],  4 [[ 2, 3 ]],  3 [[ 4, 5 ]],  5 [[ 3, 7 ]],  7 [[ 5, 6 ]],  6 [[ 7, 10 ]],  10 [[ 6, 15 ]],  15 [[ 10, -1 ]],
-     * 1 [[ -1, 2 ]],  2 [[ 1, 4 ]],  4 [[ 2, 3 ]],  3 [[ 4, 5 ]],  5 [[ 3, 7 ]],  7 [[ 5, 6 ]],  6 [[ 7, 10 ]],  10 [[ 6, -1 ]],
-     * 2 [[ -1, 4 ]],  4 [[ 2, 3 ]],  3 [[ 4, 5 ]],  5 [[ 3, 7 ]],  7 [[ 5, 6 ]],  6 [[ 7, 10 ]],  10 [[ 6, -1 ]],
-     * 2 [[ -1, 4 ]],  4 [[ 2, 3 ]],  3 [[ 4, 5 ]],  5 [[ 3, 7 ]],  7 [[ 5, 6 ]],  6 [[ 7, -1 ]],
-     */
-
     return 0;
 }
-- 
cgit v1.2.3-18-g5258