From 58699b7d2e442e4161818b727ef95efe0f8da539 Mon Sep 17 00:00:00 2001
From: Alessandro Ferro <49845537+xfarrow@users.noreply.github.com>
Date: Wed, 2 Jun 2021 11:50:40 +0200
Subject: [PATCH] Library 5

bugfix
---
 librerie/exercise5/matrix/csr/matrixcsr.cpp | 61 +++++++++++----------
 librerie/exercise5/zmytest/test.cpp         | 22 ++------
 2 files changed, 38 insertions(+), 45 deletions(-)

diff --git a/librerie/exercise5/matrix/csr/matrixcsr.cpp b/librerie/exercise5/matrix/csr/matrixcsr.cpp
index 2848d3e..ea8cca3 100755
--- a/librerie/exercise5/matrix/csr/matrixcsr.cpp
+++ b/librerie/exercise5/matrix/csr/matrixcsr.cpp
@@ -140,28 +140,32 @@ void MatrixCSR<Data>::ColumnResize(const ulong& new_column_size){
     Clear();
   }
   else if(new_column_size < columns){
-    Node** last;
-    Node** last_not_deleted;
+    Node** prev;
     Node* toDelete;
+    Node** toModify;
     for(ulong i=0 ; i<R.Size()-1 ; ++i){ // iterate over the R array
-      last = R[i+1];
-      last_not_deleted = R[i];
-      for(Node** ptr = R[i] ; ptr!=R[i+1] ; ptr = &( (*(*ptr)).next ) ){
+      prev = R[i]; // in case an element must be deleted, this is its previous element.
+
+      for(Node** ptr = R[i] ; ptr!=R[i+1] ; ){
         if(((*ptr)->value).second < new_column_size){
-          last_not_deleted = &( (*(*ptr)).next );
+          prev = &( (*(*ptr)).next );
+          ptr = &( (*(*ptr)).next);
         }else{
+          std::cout<<"\n\nSto cancellando "<<((*ptr)->value).first<<"\n\n";
           toDelete = *ptr;
+          toModify = &( (*(*ptr)).next );
           *ptr = (*(*ptr)).next;
           delete toDelete;
           --size;
 
+          //debug();
+
           for(ulong j=i+1 ; j<R.Size() ; ++j){
-            if(R[j] == last){
-              R[j] = last_not_deleted;
+            if(R[j] == toModify){
+              R[j] = prev;
             }
             else break;
           }
-          if(ptr == R[i+1]) break;
         }
       }
     }
@@ -270,26 +274,27 @@ void MatrixCSR<Data>::FoldPostOrder(const typename FoldableContainer<Data>::Fold
 template <typename Data>
 void MatrixCSR<Data>::debug(){
   std::cout<<std::endl;
-  std::cout<<"rows: "<<rows<<" columns: "<<columns<<" size: "<<size<<"\n\n";
-  Node* tmp = head;
 
-  while(tmp!=nullptr){
-    std::cout<<(tmp->value).first<<"|"<< (tmp->value).second;
-    std::cout<<std::endl;
-    std::cout<<&(tmp->next);
-
-    std::cout<<std::endl;
-    std::cout<<std::endl;
-
-    tmp = tmp->next;
-  }
-
-  std::cout << "R VECTOR:" << '\n';
-  for(ulong i=0; i<R.Size();++i){
-    std::cout << R[i] << '\n';
-  }
-  std::cout<<std::endl;
-  std::cout<<std::endl;
+  // std::cout<<"rows: "<<rows<<" columns: "<<columns<<" size: "<<size<<"\n\n";
+  // Node* tmp = head;
+  //
+  // while(tmp!=nullptr){
+  //   std::cout<<(tmp->value).first<<"|"<< (tmp->value).second;
+  //   std::cout<<std::endl;
+  //   std::cout<<&(tmp->next);
+  //
+  //   std::cout<<std::endl;
+  //   std::cout<<std::endl;
+  //
+  //   tmp = tmp->next;
+  // }
+  //
+  // std::cout << "R VECTOR:" << '\n';
+  // for(ulong i=0; i<R.Size();++i){
+  //   std::cout << R[i] << '\n';
+  // }
+  // std::cout<<std::endl;
+  // std::cout<<std::endl;
 
   //// print
   // for(int i=0; i<rows; ++i){
diff --git a/librerie/exercise5/zmytest/test.cpp b/librerie/exercise5/zmytest/test.cpp
index 4a8ebb3..4c198dc 100755
--- a/librerie/exercise5/zmytest/test.cpp
+++ b/librerie/exercise5/zmytest/test.cpp
@@ -34,23 +34,11 @@ void menu(){
     mat(3,4) = 9;
     mat(4,1) = 6;
     mat(4,3) = 7;
+    mat(4,0) = 13;
 
-    for(ulong i=0 ; i<mat.RowNumber() ; ++i){
-      for(ulong j=0 ; j<mat.ColumnNumber() ; ++j){
-        cout<<mat(i,j)<<" ";
-      }
-    cout<<endl;
-    }
-    mat(3,0) = 5;
-    mat(3,1) = 6;
-    mat(3,2) = 7;
-    mat(3,3) = 8;
+    mat.ColumnResize(2);
 
-    for(ulong i=0 ; i<mat.RowNumber() ; ++i){
-      for(ulong j=0 ; j<mat.ColumnNumber() ; ++j){
-        cout<<mat(i,j)<<" ";
-      }
-    cout<<endl;
-    }
-}
+    mat.debug();
+
+  }
 }