From de3aca0b26abbdeee6916cb3f98fce12008f22e8 Mon Sep 17 00:00:00 2001 From: markusvleno Date: Mon, 19 Oct 2020 15:14:01 +0530 Subject: [PATCH] minor changes --- Programs/armstrong.cpp | 18 +++++++------ Programs/armstrong_between_intervals.cpp | 20 ++++++++------ Programs/ascii.cpp | 10 +++---- Programs/bin_to_octal.cpp | 6 ++--- Programs/check_prime.cpp | 33 +++++++++++------------- Programs/complex_num_subtr.cpp | 6 ++--- Programs/convert_bin_to_dec.cpp | 8 +++--- Programs/fact_recur.cpp | 15 +++++++---- Programs/factorial.cpp | 9 +++++-- Programs/factors.cpp | 2 +- Programs/fibb.cpp | 10 +++---- Programs/gcd.cpp | 2 +- Programs/hello_world.cpp | 6 ++--- Programs/palindrom_num.cpp | 2 +- 14 files changed, 80 insertions(+), 67 deletions(-) diff --git a/Programs/armstrong.cpp b/Programs/armstrong.cpp index f29dc58..6223c8b 100644 --- a/Programs/armstrong.cpp +++ b/Programs/armstrong.cpp @@ -1,26 +1,28 @@ #include +#include using namespace std; -int main() { - int num, originalNum, remainder, result = 0; +int main(void) { + size_t originalNum, remainder, result = 0; + int input; cout << "Enter a three-digit integer: "; - cin >> num; - originalNum = num; + cin >> input; + originalNum = abs(input); while (originalNum != 0) { // remainder contains the last digit remainder = originalNum % 10; - result += remainder * remainder * remainder; + result += pow(remainder,3); // removing last digit from the orignal number originalNum /= 10; } - if (result == num) - cout << num << " is an Armstrong number."; + if (result == abs(input)) + cout << abs(input) << " is an Armstrong number."; else - cout << num << " is not an Armstrong number."; + cout << abs(input) << " is not an Armstrong number."; return 0; } \ No newline at end of file diff --git a/Programs/armstrong_between_intervals.cpp b/Programs/armstrong_between_intervals.cpp index f4c72df..e035fd7 100644 --- a/Programs/armstrong_between_intervals.cpp +++ b/Programs/armstrong_between_intervals.cpp @@ -1,9 +1,11 @@ #include +#include using namespace std; -int main() +int main(void) { - int num1, num2, i, num, digit, sum; + size_t start,end, i, currentDigit, digit, sum; + int num1,num2; cout << "Enter first number: "; cin >> num1; @@ -11,16 +13,18 @@ int main() cout << "Enter second number: "; cin >> num2; - cout << "Armstrong numbers between " << num1 << " and " << num2 << " are: " << endl; - for(i = num1; i <= num2; i++) + start = abs(num1);end = abs(num2); + cout << "Armstrong numbers between " << start << " and " << end << " are: " << endl; + for(i = start; i <= end; ++i) { sum = 0; - num = i; + currentDigit = i; - for(; num > 0; num /= 10) + while( currentDigit > 0 ) { - digit = num % 10; - sum = sum + digit * digit * digit; + digit = currentDigit % 10; + sum += pow(digit,3); + currentDigit /= 10; } if(sum == i) diff --git a/Programs/ascii.cpp b/Programs/ascii.cpp index 5af8134..1dc9588 100644 --- a/Programs/ascii.cpp +++ b/Programs/ascii.cpp @@ -3,9 +3,9 @@ using namespace std; int main() { - char c; - cout << "Enter a character: "; - cin >> c; - cout << "ASCII Value of " << c << " is " << int(c); - return 0; + char c; + cout << "Enter a character: "; + cin >> c; + cout << "ASCII Value of " << c << " is " << int(c)<> binaryNumber; - cout << binaryNumber << " in binary = " << convertBinarytoOctal(binaryNumber) << " in octal "; + cout << binaryNumber << " in binary = " << BinarytoOctal(binaryNumber) << " in octal "; return 0; } -int convertBinarytoOctal(long long binaryNumber) +int BinarytoOctal(long long binaryNumber) { int octalNumber = 0, decimalNumber = 0, i = 0; diff --git a/Programs/check_prime.cpp b/Programs/check_prime.cpp index 87beca8..c2e214f 100644 --- a/Programs/check_prime.cpp +++ b/Programs/check_prime.cpp @@ -1,35 +1,32 @@ #include using namespace std; -bool checkPrimeNumber(int); +bool isPrimeNumber(long long); -int main() { - int n; +int main(void) { + long long input; cout << "Enter a positive integer: "; - cin >> n; + cin >> input; - if (checkPrimeNumber(n)) - cout << n << " is a prime number."; + if (isPrimeNumber( input ) ) + cout << input << " is a prime number."; else - cout << n << " is not a prime number."; + cout << input << " is not a prime number."; return 0; } -bool checkPrimeNumber(int n) { - bool isPrime = true; +bool isPrimeNumber(long long n) { - // 0 and 1 are not prime numbers - if (n == 0 || n == 1) { - isPrime = false; + // 0 or 1 or negative numbers are not prime numbers + if (n == 0 || n == 1 || n < 0) { + return false; } - else { - for (int i = 2; i <= n / 2; ++i) { + + for (long long i = 2; i <= n / 2; ++i) { if (n % i == 0) { - isPrime = false; - break; + return false; } } - } - return isPrime; + return true; } \ No newline at end of file diff --git a/Programs/complex_num_subtr.cpp b/Programs/complex_num_subtr.cpp index 88fd46a..10ccd52 100644 --- a/Programs/complex_num_subtr.cpp +++ b/Programs/complex_num_subtr.cpp @@ -16,7 +16,7 @@ class Complex } // Operator overloading - Complex operator - (Complex c2) + Complex operator - (Complex const &c2) { Complex temp; temp.real = real - c2.real; @@ -38,10 +38,10 @@ int main() { Complex c1, c2, result; - cout<<"Enter first complex number:\n"; + cout<<"Enter first complex number\n"; c1.input(); - cout<<"Enter second complex number:\n"; + cout<<"Enter second complex number\n"; c2.input(); // In case of operator overloading of binary operators in C++ programming, diff --git a/Programs/convert_bin_to_dec.cpp b/Programs/convert_bin_to_dec.cpp index 1a1a6a9..7db9cb2 100644 --- a/Programs/convert_bin_to_dec.cpp +++ b/Programs/convert_bin_to_dec.cpp @@ -3,20 +3,20 @@ using namespace std; -int convertBinaryToDecimal(long long); +int BinaryToDecimal(long long); -int main() +int main(void) { long long n; cout << "Enter a binary number: "; cin >> n; - cout << n << " in binary = " << convertBinaryToDecimal(n) << "in decimal"; + cout << n << " in binary = " << BinaryToDecimal(n) << "in decimal"; return 0; } -int convertBinaryToDecimal(long long n) +int BinaryToDecimal(long long n) { int decimalNumber = 0, i = 0, remainder; while (n!=0) diff --git a/Programs/fact_recur.cpp b/Programs/fact_recur.cpp index ea9488c..bbbe2bc 100644 --- a/Programs/fact_recur.cpp +++ b/Programs/fact_recur.cpp @@ -1,21 +1,26 @@ +//working till 65 #include +#include using namespace std; -int factorial(int n); +unsigned long long factorial(unsigned long long n); int main() { - int n; + long long input; cout << "Enter a positive integer: "; - cin >> n; + cin >> input; - cout << "Factorial of " << n << " = " << factorial(n); + if(input <= 20) + cout << "Factorial of " << llabs(input) << " = " << factorial( llabs(input) ); + else + cout << "Results are too long to calculate!"; return 0; } -int factorial(int n) +unsigned long long factorial(unsigned long long n) { if(n > 1) return n * factorial(n - 1); diff --git a/Programs/factorial.cpp b/Programs/factorial.cpp index f606f25..97b85c6 100644 --- a/Programs/factorial.cpp +++ b/Programs/factorial.cpp @@ -3,13 +3,18 @@ using namespace std; int main() { - unsigned int n; + unsigned n; unsigned long long factorial = 1; cout << "Enter a positive integer: "; cin >> n; + + if(n > 20){ + cout << "Results are too long to calculate!"; + return 0; + } - for(int i = 1; i <=n; ++i) + for(unsigned i = 1; i <=n; ++i) { factorial *= i; } diff --git a/Programs/factors.cpp b/Programs/factors.cpp index 6e85286..64a538f 100644 --- a/Programs/factors.cpp +++ b/Programs/factors.cpp @@ -3,7 +3,7 @@ using namespace std; int main() { - int n, i; + unsigned long long n, i; cout << "Enter a positive integer: "; cin >> n; diff --git a/Programs/fibb.cpp b/Programs/fibb.cpp index 082171d..6fd8e29 100644 --- a/Programs/fibb.cpp +++ b/Programs/fibb.cpp @@ -3,16 +3,16 @@ using namespace std; int main() { - int n, t1 = 0, t2 = 1, nextTerm = 0; + unsigned long long n, t1 = 0, t2 = 1, nextTerm = 0; cout << "Enter the number of terms: "; cin >> n; cout << "Fibonacci Series: "; - + + for (int i = 1; i <= n; ++i) { - // Prints the first two terms. if(i == 1) { cout << " " << t1; @@ -20,7 +20,7 @@ int main() } if(i == 2) { - cout << t2 << " "; + cout <<" "<