consolidate all repos to one for archive

semester_2/programiranje_2/primeri/Example06/CPoint.cpp

@@ -0,0 +1,15 @@
+#include <iostream>
+#include "CPoint.h"
+
+CPoint::CPoint() : p(), color(0) {
+}
+
+CPoint::CPoint(int x, int y, int c) : p(x, y), color(c) {
+}
+void CPoint::print() const {
+    p.print();
+    std::cout << "color=" << color << " " << std::endl;
+    //std::cout  << "("  << p.x << ", " << p.y << ", color= " << color << ")" << std::endl;
+    //std::cout  << "("  << p.getX() << ", " << p.getY() << ", color= " << color << ")" << std::endl;
+}
+

semester_2/programiranje_2/primeri/Example06/CPoint.h

@@ -0,0 +1,17 @@
+
+#ifndef EXAMPLE06_CPOINT_H
+#define EXAMPLE06_CPOINT_H
+
+#include "Point.h"
+
+class CPoint {
+private:
+    Point p;    // composition
+    int color;
+public:
+    CPoint();
+    CPoint(int x, int y, int c);
+    void print() const;
+};
+
+#endif //EXAMPLE06_CPOINT_H

semester_2/programiranje_2/primeri/Example06/Point.cpp

@@ -0,0 +1,28 @@
+
+#include <iostream>
+#include <cmath>
+#include "Point.h"
+
+Point::Point() : x(0), y(0) {
+}
+
+Point::Point (int x, int y) : x(x), y(y) {
+}
+
+int Point::getX() const {
+    return x;
+}
+
+int Point::getY() const {
+    return y;
+}
+
+void Point::print() const {
+    std::cout << "(" << x << ", " << y << ") " << std::endl;
+}
+
+double Point::distance(const Point& p) const {
+    return std::sqrt((double)(x - p.x)*(x - p.x)+(y - p.y)*(y - p.y));
+}
+
+

semester_2/programiranje_2/primeri/Example06/Point.h

@@ -0,0 +1,18 @@
+
+#ifndef EXAMPLE06_POINT_H
+#define EXAMPLE06_POINT_H
+
+class Point {
+private:
+    int x, y;
+public:
+    Point();  // default constructor
+    Point (int x, int y);  // constructor
+
+    int getX() const;
+    int getY() const;
+    void print() const;
+    double distance(const Point& p) const;
+};
+
+#endif //EXAMPLE06_POINT_H

semester_2/programiranje_2/primeri/Example06/main.cpp

@@ -0,0 +1,19 @@
+#include <iostream>
+#include "CPoint.h"
+
+int main() {
+    Point p1(3,4);
+    Point p2;
+    CPoint c1;
+    CPoint c2(1,2,3);
+    CPoint c3(c2);
+
+    p1.print();
+    c1.print();
+    c2.print();
+    c3.print();
+    std::cout << p1.distance(p2) << std::endl;
+    //std::cout << p1.distance(c1) << std::endl;
+    //std::cout << c1.distance(p1) << std::endl;
+    return 0;
+}