25.12.2022 12:36

githubVladimirT · githubVladimirT · commit a6660d9003dc · 2022-12-25T12:36:15.000+03:00
Signed-off-by: Vladimir Tolstov &lt;vladimir.tolstov@selfip.ru&gt;
diff --git a/Makefile b/Makefile
@@ -1,3 +1,14 @@
+make: clean build run
+
 build:
 	mkdir build
-	g++ datatypes.cpp example.cpp -o build/example.out
+	g++ src/datatypes.cpp examples/example.cpp -o build/example.out
+	@echo "build: ok"
+
+clean:
+	rm -fr build/
+	@echo "ok"
+
+run:
+	@echo "run: ok"
+	build/example.out
diff --git a/datatypes.cpp b/datatypes.cpp
diff --git a/examples/example.cpp b/examples/example.cpp
@@ -1,4 +1,4 @@
-#include "datatypes.h"
+#include "../src/datatypes.h"
 #include <iostream>
 
 int main()
diff --git a/src/datatypes.cpp b/src/datatypes.cpp
@@ -0,0 +1,63 @@
+#include "datatypes.h"
+#include <iostream>
+
+using namespace DataTypes;
+
+Pair::Pair(int a = 0, int b = 0)
+{
+    match.x = a;
+    match.y = b;
+};
+
+pair Pair::get()
+{
+    return match;
+};
+
+void Pair::set(int a = 0, int b = 0)
+{
+    match.x = a;
+    match.y = b;
+};
+
+int Pair::sum()
+{
+    return match.x + match.y;
+};
+
+int Pair::fminuss()
+{
+    return match.x - match.y;
+};
+
+int Pair::sminusf()
+{
+    return match.y - match.x;
+};
+
+int Pair::multi()
+{
+    return match.x * match.y;
+};
+
+int Pair::fdivides()
+{
+    return match.x / match.y;
+};
+
+int Pair::sdividef()
+{
+    return match.y / match.x;
+};
+
+int Pair::power()
+{
+    int result = 1;
+
+    for (int i = 0; i < match.y; i++)
+    {
+        result *= match.x;
+    }
+
+    return result;
+};
diff --git a/src/datatypes.h b/src/datatypes.h
@@ -3,37 +3,26 @@
 
 namespace DataTypes
 {
-
     struct pair
     {
         int x;
         int y;
     };
-
     class Pair
     {
     private:
         pair match;
 
     public:
         Pair(int a, int b);
-
         pair get();
-
         void set(int a, int b);
-
         int sum();
-
         int fminuss();
-
         int sminusf();
-
         int multi();
-
         int fdivides();
-
         int sdividef();
-
         int power();
     };
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "datatypes.h"`
	`1`	`+#include "../src/datatypes.h"`
`2`	`2`	`#include <iostream>`
`3`	`3`
`4`	`4`	`int main()`