diff --git a/librerie/exercise5/matrix/csr/matrixcsr.cpp b/librerie/exercise5/matrix/csr/matrixcsr.cpp index a250f11..bd987ce 100755 --- a/librerie/exercise5/matrix/csr/matrixcsr.cpp +++ b/librerie/exercise5/matrix/csr/matrixcsr.cpp @@ -39,7 +39,6 @@ MatrixCSR::MatrixCSR(const MatrixCSR& toCopy) : MatrixCSR(toCopy.rows, toC template MatrixCSR::MatrixCSR(MatrixCSR&& toMove) noexcept{ - std::swap(rows, toMove.rows); std::swap(columns, toMove.columns); std::swap(size, toMove.size); @@ -69,7 +68,6 @@ MatrixCSR& MatrixCSR::operator=(const MatrixCSR& toCopy){ template MatrixCSR& MatrixCSR::operator=(MatrixCSR&& toMove) noexcept{ - Clear(); std::swap(rows, toMove.rows); std::swap(columns, toMove.columns); std::swap(size, toMove.size); diff --git a/librerie/exercise5/matrix/vec/matrixvec.cpp b/librerie/exercise5/matrix/vec/matrixvec.cpp index c4075f4..d83a6c6 100755 --- a/librerie/exercise5/matrix/vec/matrixvec.cpp +++ b/librerie/exercise5/matrix/vec/matrixvec.cpp @@ -48,7 +48,6 @@ MatrixVec& MatrixVec::operator=(const MatrixVec& toCopy){ template MatrixVec& MatrixVec::operator=(MatrixVec&& toMove) noexcept{ - Clear(); std::swap(rows, toMove.rows); std::swap(columns, toMove.columns); std::swap(size, toMove.size); diff --git a/librerie/exercise5/zlasdtest/exercise5/simpletest.cpp b/librerie/exercise5/zlasdtest/exercise5/simpletest.cpp index f5f8126..877fc52 100755 --- a/librerie/exercise5/zlasdtest/exercise5/simpletest.cpp +++ b/librerie/exercise5/zlasdtest/exercise5/simpletest.cpp @@ -235,8 +235,8 @@ void stestMatrixFloat(Mat& mat, uint& testnum, uint& testerr) { SetCell(loctestnum, loctesterr, mat, true, 2, 0, 2.1); SetCell(loctestnum, loctesterr, mat, true, 3, 2, 3.0); - SetCell(loctestnum, loctesterr, mat, true, 2, 1, 2.1); - SetCell(loctestnum, loctesterr, mat, true, 1, 0, 1.2); + SetCell(loctestnum, loctesterr, mat, true, 2, 1, 2.1); //11 + SetCell(loctestnum, loctesterr, mat, true, 1, 0, 1.2); //12 Mat newmat(5, 10); newmat = std::move(mat); diff --git a/librerie/exercise5/zmytest/test.cpp b/librerie/exercise5/zmytest/test.cpp index d11a4dd..c6b8bb5 100755 --- a/librerie/exercise5/zmytest/test.cpp +++ b/librerie/exercise5/zmytest/test.cpp @@ -36,24 +36,6 @@ void menu(){ if(choice==1){ lasdtest(); }else{ - MatrixCSR mat; - mat.RowResize(5); - mat.ColumnResize(5); - - mat(0,1) = 1; - mat(0,3) = 4; - mat(1,0) = 2; - mat(1,4) = 8; - mat(2,1) = 3; - mat(2,2) = 5; - mat(3,4) = 9; - mat(4,1) = 6; - mat(4,3) = 7; - mat(4,0) = 13; - - mat.ColumnResize(2); - - MatrixCSR copmat; - copmat = std::move(mat); + } } diff --git a/librerie/exercise5_alessandro.zip b/librerie/exercise5_alessandro.zip deleted file mode 100644 index 5cbda9e..0000000 Binary files a/librerie/exercise5_alessandro.zip and /dev/null differ