splitted into separate files & optimized

Author: potat-dev

Semester_2/Lab_14/list.cpp

@@ -0,0 +1,82 @@
+#include "shape.h"
+#include "list.h"
+
+using namespace std;
+
+// class Node
+
+Node::Node(Shape* s, Node* next):
+  shape(s), next(next) {
+}
+
+// class FigureList
+
+FigureList::FigureList() {
+  head = NULL;
+  size = 0;
+}
+
+void FigureList::push_front(Shape* s) {
+  Node *temp = new Node(s);
+  if (size) {
+    temp->next = head;
+    head = temp;
+  } else {
+    head = temp;
+  }
+  size++;
+}
+
+void FigureList::push_back(Shape* s) {
+  Node *temp = new Node(s);
+  if (size) {
+    Node *last = head;
+    while (last->next)
+      last = last->next;
+    last->next = temp;
+  } else {
+    head = temp;
+  }
+  size++;
+}
+
+Shape& FigureList::get(int id) {
+  Node *curr = head;
+  while (curr) {
+    if (curr->shape->get_id() == id)
+      return *(curr->shape);
+    curr = curr->next;
+  }
+  return *(curr->shape);
+}
+
+void FigureList::erase(int id) {
+  Node *curr = head, *prev = NULL;
+  while (curr) {
+    if (curr->shape->get_id() == id) {
+      if (curr == head) { // первый элемент
+        head = head->next;
+      } else if (curr->next) { // элемент посередине
+        prev->next = curr->next;
+      } else { // последний элемент
+        prev->next = NULL;
+      }
+      delete curr->shape;
+      delete curr;
+      size--;
+      return;
+    }
+    prev = curr;
+    curr = curr->next;
+  }
+}
+
+void FigureList::print_all() {
+  Node* curr = head;
+  int i = 1;
+  while (curr) {
+    cout << "\nitem: " << i++ << endl;
+    curr->shape->print();
+    curr = curr->next;
+  }
+}

Semester_2/Lab_14/list.h

@@ -0,0 +1,25 @@
+#pragma once
+
+#include "shape.h"
+
+class Node {
+  public:
+    Shape* shape;
+    Node* next;
+    Node(Shape* s = NULL, Node* next = NULL);
+};
+
+class FigureList {
+  private:
+    Node* head;
+    int size;
+    // int ids[];
+
+  public:
+    FigureList();
+    void push_front(Shape* s);
+    void push_back(Shape* s);
+    Shape &get(int id);
+    void erase(int id);
+    void print_all();
+};

Semester_2/Lab_14/main.cpp

@@ -23,6 +23,7 @@
 //? (круг сравнивать с отрезком -> длина окружности сравнивается с длиной отрезка)
 
 #include "shape.h"
+#include "list.h"
 
 int main() {
   FigureList list;
@@ -67,7 +68,7 @@ int main() {
 
   cout << endl << "---------- dop ----------" << endl;
 
-  cout << "id_42 == id_24: "
+  cout << endl << "id_42 == id_24: "
        << (list.get(42) == list.get(24) ? "True" : "False")
        << endl;
 

Semester_2/Lab_14/shape.cpp

@@ -1,7 +1,6 @@
 #include "shape.h"
-
 #include "math.h"
-#define PI 3.1415926535898
+#define M_2PI 6.283185307179586232
 
 using namespace std;
 
@@ -53,7 +52,7 @@ void Circle::print() {
 }
 
 double Circle::get_contour_length() {
-  return 2 * PI * r;
+  return M_2PI * r;
 }
 
 // class Segment
@@ -71,81 +70,4 @@ void Segment::print() {
 
 double Segment::get_contour_length() {
   return sqrt(pow(end.x - start.x, 2) + pow(end.y - start.y, 2));
-}
-
-// class Node
-
-Node::Node(Shape* s, Node* next):
-  shape(s), next(next) {
-}
-
-// class FigureList
-
-FigureList::FigureList() {
-  head = NULL;
-  size = 0;
-}
-
-void FigureList::push_front(Shape* s) {
-  Node *temp = new Node(s);
-  if (size) {
-    temp->next = head;
-    head = temp;
-  } else {
-    head = temp;
-  }
-  size++;
-}
-
-void FigureList::push_back(Shape* s) {
-  Node *temp = new Node(s);
-  if (size) {
-    Node *last = head;
-    while (last->next)
-      last = last->next;
-    last->next = temp;
-  } else {
-    head = temp;
-  }
-  size++;
-}
-
-Shape& FigureList::get(int id) {
-  Node *curr = head;
-  while (curr) {
-    if (curr->shape->get_id() == id)
-      return *(curr->shape);
-    curr = curr->next;
-  }
-  return *(curr->shape);
-}
-
-void FigureList::erase(int id) {
-  Node *curr = head, *prev = NULL;
-  while (curr) {
-    if (curr->shape->get_id() == id) {
-      if (curr == head) { // первый элемент
-        head = head->next;
-      } else if (curr->next) { // элемент посередине
-        prev->next = curr->next;
-      } else { // последний элемент
-        prev->next = NULL;
-      }
-      delete curr->shape;
-      delete curr;
-      return;
-    }
-    prev = curr;
-    curr = curr->next;
-  }
-}
-
-void FigureList::print_all() {
-  Node* curr = head;
-  int i = 1;
-  while (curr) {
-    cout << "\nitem: " << i++ << endl;
-    curr->shape->print();
-    curr = curr->next;
-  }
 }

Semester_2/Lab_14/shape.h

@@ -45,26 +45,4 @@ class Segment : public Shape {
     Segment(int id, Point start = {0}, Point end = {0});
     virtual void print();
     virtual double get_contour_length();
-};
-
-class Node {
-  public:
-    Shape* shape;
-    Node* next;
-    Node(Shape* s = NULL, Node* next = NULL);
-};
-
-class FigureList {
-  private:
-    Node* head;
-    int size;
-    // int ids[];
-
-  public:
-    FigureList();
-    void push_front(Shape* s);
-    void push_back(Shape* s);
-    Shape &get(int id);
-    void erase(int id);
-    void print_all();
 };