operator+ implemented

Author: potat-dev

Variants/Lab_12/var_12/main.cpp

@@ -119,12 +119,29 @@ int main() {
 
   cout << m10.get(0, 0) << " at 0, 0" << endl
        << m10.get(9, 9) << " at 9, 9" << endl
-       << m10.get(5, 5) << " at 5, 5" << endl;
+       << m10.get(5, 5) << " at 5, 5" << endl << endl;
 
   /*
   // Error in 'get' operator: Invalid index
   cout << m10.get(10, 10) << " at 10, 10" << endl;
   */
 
-  
+  m10.transpose().print();
+  m9.transpose().print();
+
+  Matrix test(
+    {
+      {1, 2, 3},
+      {4, 5, 6},
+      {7, 8, 9}
+    }
+  );
+
+  test.print();
+  test.transpose().print();
+
+  // operators test
+
+  Matrix summ = Matrix(5, 1) + Matrix(5, 2);
+  summ.print();
 }

Variants/Lab_12/var_12/matrix.cpp

@@ -101,4 +101,46 @@ unsigned int get_size(vector <vector <double>> arr) {
     }
   }
   return size;
+}
+
+// преобразования
+
+void swap(double *d1, double *d2) {
+  double temp = *d1;
+  *d1 = *d2;
+  *d2 = temp;
+}
+
+Matrix& Matrix::transpose() {
+  for (int y = 0; y < this->size() - 1; y++) {
+    for (int x = y + 1; x < this->size(); x++) {
+      swap(&arr[y][x], &arr[x][y]);
+    }
+  }
+  return *this;
+}
+
+// операторы
+
+Matrix& Matrix::operator+=(const Matrix& m) {
+  try {
+    if (arr.size() == m.arr.size()) {
+      for (int x = 0; x < m.arr.size(); x++) {
+        for (int y = 0; y < m.arr.size(); y++) {
+          arr[y][x] += m.arr[y][x];
+        }
+      }
+    } else {
+      throw "Matrices have different sizes";
+    }
+  } catch (const char *s) {
+    cerr << "Error in + operator: " << s << endl;
+    exit(1);
+  }
+  return *this;
+}
+
+Matrix operator+(Matrix a, const Matrix& b) {
+  a += b;
+  return a;
 }

Variants/Lab_12/var_12/matrix.h

@@ -22,4 +22,14 @@ class Matrix {
     const unsigned int size();
 
     void print();
+
+    // преобразования
+
+    Matrix& transpose();
+
+    // операторы
+
+    Matrix& operator+=(const Matrix& x);
+    friend Matrix operator+(Matrix a, const Matrix &b);
+
 };