Merge branch 'lab-14-dev'

Author: potat-dev

Reports/Lab_14_report.pdf

@@ -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 << endl << "item: " << i++ << endl;
+    curr->shape->print();
+    curr = curr->next;
+  }
+}

Semester_2/Lab_14/list.cpp

@@ -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/list.h

@@ -19,49 +19,94 @@
 //* Segment: координаты начала и коодинаты конца
 
 //? исправить: сделать чтобы айдишники задавались по умолчанию автоматически
-//? доп: написать функцию сравнения длин контуров двух фигур
-// (круг сравнивать с отрезком -> длина окружности сравнивается с длиной отрезка)
+//? доп: написать функцию сравнения длин контуров(!) двух фигур
+//? (круг сравнивать с отрезком -> длина окружности сравнивается с длиной отрезка)
 
 #include "shape.h"
+#include "list.h"
 
 int main() {
   FigureList list;
 
-  Circle *c_1 = new Circle(42, {0, 0}, 1, "lol kek");
-  Circle *c_2 = new Circle(24, {4, 2}, 7, "cheburek");
-  Segment *s_1 = new Segment(1, {0, 0}, {42, 42});
+  cout << endl << "---- id_2 id_1 id_0 -> [] ----" << endl;
 
-  list.push_front(c_1);
-  list.push_front(c_2);
-  list.push_front(s_1);
+  Circle *c1 = new Circle({0, 0}, 1, "lol kek");
+  Circle *c2 = new Circle({4, 2}, 7, "cheburek");
+  Segment *s1 = new Segment({0, 0}, {42, 42});
 
-  list.print_all();
+  list.push_front(c1);
+  list.push_front(c2);
+  list.push_front(s1);
 
-  cout << endl << "----------" << endl;
+  list.print_all(); // list now: [id_2, id_1, id_0]
 
-  list.push_back(new Segment(2, {6, 18}, {4, 2}));
-  list.push_front(new Circle(618, {7, 7}, 7, "kek"));
-  list.print_all();
+  cout << endl << "---- id_4 -> [] <- id_3 ----" << endl;
 
-  cout << endl << "----------" << endl;
+  list.push_back(new Segment({6, 18}, {4, 2}));
+  list.push_front(new Circle({7, 7}, 7, "kek"));
 
-  list.get(2).print();
-  cout << "---------\n";
-  list.get(42).print();
+  list.print_all(); // list now: [id_4, id_2, id_1, id_0, id_3]
 
-  cout << endl << "----------del 42----------" << endl;
-  list.erase(42);
-  list.print_all();
+  cout << endl << "---- [] -> id_3 id_1 ----" << endl;
 
-  cout << endl << "----------del 2--------" << endl;
-  list.erase(2);
-  list.print_all();
+  cout << endl; list.get(3).print();
+  cout << endl; list.get(1).print();
 
-  cout << endl << "----------del 618--------" << endl;
-  list.erase(618);
-  list.print_all();
+  cout << endl << "---- [] -x-> id_4 ----" << endl;
 
-  cout << endl << "----------" << endl;
-  list.push_front(new Segment(42));
-  list.print_all();
+  list.erase(4);
+  list.print_all(); // list now: [id_2, id_1, id_0, id_3]
+
+  cout << endl << "---- [] -x-> id_0 ----" << endl;
+
+  list.erase(0);
+  list.print_all(); // list now: [id_2, id_1, id_3]
+
+  cout << endl << "---- [] -x-> id_3 ----" << endl;
+
+  list.erase(3);
+  list.print_all(); // list now: [id_2, id_1]
+
+  cout << endl << "---- id_5 -> [] ----" << endl;
+
+  list.push_front(new Segment);
+
+  list.print_all(); // list now: [id_5, id_2, id_1]
+
+  cout << endl << "-------- dop --------" << endl;
+
+  cout << endl << "contour id_1: " << list.get(1).get_contour_length();
+  cout << endl << "contour id_2: " << list.get(2).get_contour_length();
+  cout << endl << "contour id_5: " << list.get(5).get_contour_length();
+
+  cout << endl << endl << "id_1 == id_2: ";
+  cout << (list.get(1) == list.get(2) ? "True" : "False");
+
+  cout << endl << "id_1 == id_5: ";
+  cout << (list.get(1) == list.get(5) ? "True" : "False");
+
+  cout << endl << "id_2 == id_5: ";
+  cout << (list.get(2) == list.get(5) ? "True" : "False");
+
+  // для теста нужно создать одинаковые Circle и Segment (например равные нулю)
+
+  cout << endl << endl << "---- [] <- id_6 ----" << endl;
+
+  list.push_back(new Circle); // list now: [id_5, id_2, id_1, id_6]
+
+  cout << endl << "contour id_6: " << list.get(6).get_contour_length();
+
+  cout << endl << "id_5 == id_6: ";
+  cout << (list.get(5) == list.get(6) ? "True" : "False") << endl;
+
+  cout << endl << "------ list_2 ------" << endl;
+
+  FigureList list2;
+  for (double i = 0; i < 5; i++) {
+    list2.push_front(new Circle({0, 0}, i));
+    list2.push_back(new Segment({0, 0}, {i, i}));
+  }
+
+  list2.print_all();
+  // list_2 now: [id_15, id_13, id_11, id_9, id_7, id_8, id_10, id_12, id_14, id_16]
 }

Semester_2/Lab_14/main.cpp

@@ -1,9 +1,12 @@
 #include "shape.h"
+#include "math.h"
+#define M_2PI 6.283185307179586232
+
 using namespace std;
 
 // class Point
 
-Point::Point(int x, int y):
+Point::Point(double x, double y):
   x(x), y(y) {
 }
 
@@ -14,23 +17,36 @@ ostream& operator<<(ostream &out, Point &p) {
 
 // class Shape
 
-Shape::Shape(int id, Point pos):
-  id(id), pos(pos) {
+Shape::Shape(Point pos):
+  id(next_id()), pos(pos) {
+}
+
+unsigned long Shape::next_id() {
+  static unsigned long next_id = 0;
+  return next_id++;
 }
 
 void Shape::print() {
   cout << "id: " << id << endl;
   cout << "pos: " << pos << endl;
 }
 
-int Shape::get_id() {
+unsigned long Shape::get_id() {
   return id;
 }
 
+double Shape::get_contour_length() {
+  return 0;
+}
+
+bool Shape::operator==(Shape &s) {
+  return get_contour_length() == s.get_contour_length();
+}
+
 // class Circle
 
-Circle::Circle(int id, Point pos, int r, string text):
-  Shape(id, pos), r(r), text(text) {
+Circle::Circle(Point pos, double r, string text):
+  Shape(pos), r(r), text(text) {
 }
 
 void Circle::print() {
@@ -40,10 +56,14 @@ void Circle::print() {
   cout << "text: " << text << endl;
 }
 
+double Circle::get_contour_length() {
+  return M_2PI * r;
+}
+
 // class Segment
 
-Segment::Segment(int id, Point start, Point end):
-  Shape(id, start), start(start), end(end) {
+Segment::Segment(Point start, Point end):
+  Shape(start), start(start), end(end) {
 }
 
 void Segment::print() {
@@ -53,79 +73,6 @@ void Segment::print() {
   cout << "end pos: " << end << endl;
 }
 
-// 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;
-  }
+double Segment::get_contour_length() {
+  return sqrt(pow(end.x - start.x, 2) + pow(end.y - start.y, 2));
 }