jezv 1 gadu atpakaļ
vecāks
revīzija
424bb83153
6 mainītis faili ar 33 papildinājumiem un 11 dzēšanām
  1. 3 1
      .gitignore
  2. 3 0
      .gitmodules
  3. 1 0
      Fraction
  4. 2 1
      Rational.cpp
  5. 6 9
      main_rational.cpp
  6. 18 0
      makefile

+ 3 - 1
.gitignore

@@ -1 +1,3 @@
-.vscode
+.vscode
+*.o
+*.out

+ 3 - 0
.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Fraction"]
+	path = Fraction
+	url = https://git.hostfl.ru/jezv__/Fraction.git

+ 1 - 0
Fraction

@@ -0,0 +1 @@
+Subproject commit 9eb9e98cd9035b69380c59263ec3a14fc5a6742e

+ 2 - 1
Rational.cpp

@@ -90,13 +90,14 @@ Rational::operator int() const
 int Rational::lcm(int num1, int num2)
 {
     int result = 1;
-    for(int dnum = 2; num1 != 1 or num2 != 1; dnum++)
+    for(int dnum = 2; num1 > 1 or num2 > 1; dnum++)
     {
         if(num1%dnum==0 or num2%dnum==0)
         {
             num1%dnum==0 ? num1/=dnum : num1*1;
             num2%dnum==0 ? num2/=dnum : num1*1;
             result *= dnum;
+            dnum--;
         }
     }
     return result;

+ 6 - 9
main_rational.cpp

@@ -1,16 +1,13 @@
 #include <iostream>
 #include "Rational.h"
-#include "../Fraction/Fraction.h"
+
 
 using namespace std;
 
 int main() {
-    Fraction f(Rational(415, 94));
-    cout << f << endl;
-    cout << Rational(f);
-
-    Fraction f2(2.57463);
-    cout << f << endl;
-    cout << Rational(f);
-    return 0;
+    Rational r(19,20);
+    cout << r << endl;
+    Rational r2(3, 727);
+    r += r2;
+    cout << r;
 }

+ 18 - 0
makefile

@@ -0,0 +1,18 @@
+all: Fractional.o Rational.o main_rational.o
+	g++ Fractional.o Rational.o main_rational.o
+
+main: Rational.o main_rational.o
+	g++ Rational.o main_rational.o
+
+Fractional.o: main_rational.cpp
+	g++ -c Fraction/Fractional.cpp
+
+Rational.o: main_rational.cpp
+	g++ -c Rational.cpp
+
+main_rational.o: main_rational.cpp
+	g++ -c main_rational.cpp
+
+clean:
+	rm -rf *.o all
+