auto id generation & bug fixes

Author: potat-dev

Semester_2/Lab_14/list.cpp

@@ -75,7 +75,7 @@ void FigureList::print_all() {
   Node* curr = head;
   int i = 1;
   while (curr) {
-    cout << "\nitem: " << i++ << endl;
+    cout << endl << "item: " << i++ << endl;
     curr->shape->print();
     curr = curr->next;
   }

Semester_2/Lab_14/shape.cpp

@@ -6,7 +6,7 @@ using namespace std;
 
 // class Point
 
-Point::Point(int x, int y):
+Point::Point(double x, double y):
   x(x), y(y) {
 }
 
@@ -17,16 +17,21 @@ 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;
 }
 
@@ -40,8 +45,8 @@ bool Shape::operator==(Shape &s) {
 
 // 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() {
@@ -57,8 +62,8 @@ double Circle::get_contour_length() {
 
 // 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() {

Semester_2/Lab_14/shape.h

@@ -8,31 +8,32 @@ using namespace std;
 
 class Point {
   public:
-    int x, y;
-    Point(int x = 0, int y = 0);
+    double x, y;
+    Point(double x = 0, double y = 0);
     friend ostream& operator<<(ostream &out, Point &p);
 };
 
 class Shape {
   protected:
-    int id;
     Point pos;
+    unsigned long id;
 
   public:
-    Shape(int id, Point pos = {0});
+    Shape(Point pos = {0});
     virtual void print();
-    int get_id();
+    unsigned long get_id();
+    unsigned long next_id();
     virtual double get_contour_length();
     bool operator==(Shape &s);
 };
 
 class Circle : public Shape {
   protected:
-    int r;
+    double r;
     string text;
 
   public:
-    Circle(int id, Point pos = {0}, int r = 1, string text = "");
+    Circle(Point pos = {0}, double r = 0, string text = "");
     virtual void print();
     virtual double get_contour_length();
 };
@@ -42,7 +43,7 @@ class Segment : public Shape {
     Point start, end;
 
   public:
-    Segment(int id, Point start = {0}, Point end = {0});
+    Segment(Point start = {0}, Point end = {0});
     virtual void print();
     virtual double get_contour_length();
 };