trying to optimize code in Lab 12 var 6

Author: potat-dev

Variants/Lab_12/var_6/HugeInt.cpp

@@ -176,7 +176,7 @@ HugeInt& HugeInt::operator++() {
   ++(*this);
   return *this;
 }
- 
+
 HugeInt& HugeInt::operator--() {
   --(*this);
   return *this;
@@ -209,6 +209,7 @@ HugeInt HugeInt::simple_sum(HugeInt &b) {
   }
   if (result[max]) max++;
   HugeInt res(result, max);
+  res.shrink_to_fit();
   return res;
 }
 
@@ -228,6 +229,7 @@ HugeInt HugeInt::simple_dif(HugeInt &b) {
     }
   }
   HugeInt res(result, depth);
+  res.shrink_to_fit();
   return res;
 }
 
@@ -344,34 +346,23 @@ HugeInt operator*(HugeInt &n1, HugeInt &n2) {
   return temp;
 }
 
-HugeInt operator%(HugeInt &n1, HugeInt &n2) {
-  // максимально неоптимальная реализация
-  // для оптимизации нужно сначала реализовать оператор деления
-  // TODO: когда-нибудь исправить!!
+HugeInt operator%(HugeInt &n1, HugeInt &n2) { 
+  HugeInt cn1(n1), cn2(n2);
 
-  if (n1 < n2) return n1;
-  HugeInt a(n1), b(n2), main_sum("1");
-  if (b.negative) {
-    b = -b;
-    a = -a;
-  }
-  for (HugeInt i("0"); i <= a; i = i + b) {
-    main_sum++;
-  }
-  HugeInt last_sum = b * main_sum;
-  if (!a.negative) {
-    return a - last_sum;
-  } else {
-    return a + last_sum;
+  while (cn2 < cn1) {
+    cn1 = cn1.dif(cn2);
+    cn1.shrink_to_fit();
   }
+  cn1.shrink_to_fit();
+  return cn1;
 }
 
 void HugeInt::shrink_to_fit() {
   for (int i = 39; i > -1; i--) {
     if (number[i] != 0) {
       depth = i + 1;
       break;
-    } 
+    }
   }
   if (depth == 0) depth++;
 }

Variants/Lab_12/var_6/HugeInt.h

@@ -42,14 +42,14 @@ class HugeInt {
 
     HugeInt operator-() const;
 
-    friend bool operator== (HugeInt &n1, HugeInt &n2);
-    friend bool operator!= (HugeInt &n1, HugeInt &n2);
+    friend bool operator==(HugeInt &n1, HugeInt &n2);
+    friend bool operator!=(HugeInt &n1, HugeInt &n2);
 
-    friend bool operator> (HugeInt &d1, HugeInt &d2);
-    friend bool operator<= (HugeInt &d1, HugeInt &d2);
+    friend bool operator>(HugeInt &d1, HugeInt &d2);
+    friend bool operator<=(HugeInt &d1, HugeInt &d2);
 
-    friend bool operator< (HugeInt &n1, HugeInt &n2);
-    friend bool operator>= (HugeInt &n1, HugeInt &n2);
+    friend bool operator<(HugeInt &n1, HugeInt &n2);
+    friend bool operator>=(HugeInt &n1, HugeInt &n2);
 
     HugeInt& operator++(); // версия префикс
     HugeInt& operator--(); // версия префикс
@@ -60,6 +60,7 @@ class HugeInt {
     friend HugeInt operator+(HugeInt &n1, HugeInt &n2);
     friend HugeInt operator-(HugeInt &n1, HugeInt &n2);
     friend HugeInt operator*(HugeInt &n1, HugeInt &n2);
+    friend HugeInt operator/(HugeInt &n1, HugeInt &n2);
     friend HugeInt operator%(HugeInt &n1, HugeInt &n2);
 
     friend std::ostream& operator<<(std::ostream &out, const HugeInt &n);

Variants/Lab_12/var_6/L12_6.cpp Variants/Lab_12/var_6/main.cppVariants/Lab_12/var_6/L12_6.cpp renamed to Variants/Lab_12/var_6/main.cpp

@@ -23,6 +23,25 @@
 using namespace std;
 
 int main() {
+  HugeInt a, b, c, d;
+  a.set("618"); b.set("42"); c.set("123"); d.set("98765");
+  unsigned int at(618), bt(42), ct(123), dt(98765);
+
+  cout << a << "\t% " << b << "\t= " << (a % b) << "\t(" << (at % bt) << ")" << endl;
+  cout << a << "\t% " << c << "\t= " << (a % c) << "\t(" << (at % ct) << ")" << endl;
+  cout << a << "\t% " << d << "\t= " << (a % d) << "\t(" << (at % dt) << ")" << endl;
+  cout << b << "\t% " << a << "\t= " << (b % a) << "\t(" << (bt % at) << ")" << endl;
+  cout << b << "\t% " << c << "\t= " << (b % c) << "\t(" << (bt % ct) << ")" << endl;
+  cout << b << "\t% " << d << "\t= " << (b % d) << "\t(" << (bt % dt) << ")" << endl;
+  cout << c << "\t% " << a << "\t= " << (c % a) << "\t(" << (ct % at) << ")" << endl;
+  cout << c << "\t% " << b << "\t= " << (c % b) << "\t(" << (ct % bt) << ")" << endl;
+  cout << c << "\t% " << d << "\t= " << (c % d) << "\t(" << (ct % dt) << ")" << endl;
+  cout << d << "\t% " << a << "\t= " << (d % a) << "\t(" << (dt % at) << ")" << endl;
+  cout << d << "\t% " << b << "\t= " << (d % b) << "\t(" << (dt % bt) << ")" << endl;
+  cout << d << "\t% " << c << "\t= " << (d % c) << "\t(" << (dt % ct) << ")" << endl;
+}
+
+int main_test() {
   setlocale(LC_ALL, "Russian");
 
   HugeInt a, b("7"), s;