From 175721a63b426355274fa9e8063f762020ab8362 Mon Sep 17 00:00:00 2001 From: RossTheRoss Date: Thu, 30 Jan 2020 16:55:04 -0600 Subject: R E A R R A N G E --- ee1301/wk3/lab3/RootBabylon2.cpp | 40 --------------- ee1301/wk3/lab3/RootBabylonOG.cpp | 34 ------------- ee1301/wk3/lab3/fib.cpp | 21 -------- ee1301/wk3/lab3/gcd.cpp | 36 -------------- ee1301/wk3/lab3/multTable.cpp | 18 ------- ee1301/wk3/lab3/mysteryBox.cpp | 12 ----- ee1301/wk3/lab3/primeFactor.cpp | 26 ---------- .../wk3/lab3/strap012_lab3_decimal_roman_conv.cpp | 58 ---------------------- 8 files changed, 245 deletions(-) delete mode 100644 ee1301/wk3/lab3/RootBabylon2.cpp delete mode 100644 ee1301/wk3/lab3/RootBabylonOG.cpp delete mode 100644 ee1301/wk3/lab3/fib.cpp delete mode 100644 ee1301/wk3/lab3/gcd.cpp delete mode 100644 ee1301/wk3/lab3/multTable.cpp delete mode 100644 ee1301/wk3/lab3/mysteryBox.cpp delete mode 100644 ee1301/wk3/lab3/primeFactor.cpp delete mode 100644 ee1301/wk3/lab3/strap012_lab3_decimal_roman_conv.cpp (limited to 'ee1301/wk3/lab3') diff --git a/ee1301/wk3/lab3/RootBabylon2.cpp b/ee1301/wk3/lab3/RootBabylon2.cpp deleted file mode 100644 index 1053cab..0000000 --- a/ee1301/wk3/lab3/RootBabylon2.cpp +++ /dev/null @@ -1,40 +0,0 @@ -#include -#include -#include -using namespace std; - -double gennewGuess(double n, double old_guess) { - double real, old; - real=sqrt(n); - double new_guess = ( old_guess + n / old_guess ) / 2; - old=new_guess; - if (((new_guess-real)/real)>0.01) { //This will be true if the difference between the real root and guess is more than 1%. - // cout << old << endl; - return gennewGuess(n, old); - } else { - // cout << old << endl; - return new_guess; - } -} -int main () { - double temp; - char cont; - do { - cout << "enter a value: "; - cin >> temp; - int n=temp; - if (temp<=0) { - cout << "Please enter a valid input(Positive Integer)." << endl; - return sqrt(-1); - } - //cout << "Guessing..." << endl; - temp = gennewGuess(temp, 1.0); - cout << fixed << setprecision(0) << "square root of " << n << " is " << temp << endl - << "continue? (y/n): "; - cin >> cont; - if (cont!='n'&&cont!='y') { - return -1; - } -} while (cont!='n'); - // << "Actual Value: " << real << endl; -} diff --git a/ee1301/wk3/lab3/RootBabylonOG.cpp b/ee1301/wk3/lab3/RootBabylonOG.cpp deleted file mode 100644 index 530a1bf..0000000 --- a/ee1301/wk3/lab3/RootBabylonOG.cpp +++ /dev/null @@ -1,34 +0,0 @@ -#include -#include -using namespace std; - -double gennewGuess(double n, double old_guess) { - double new_guess = ( old_guess + ( n / old_guess ) ) / 2; - return new_guess; - } - -double BabylonRoot(double n) { - double real, guess=1; //Initial guess is set to 1 - real=sqrt(n); - do { - guess = gennewGuess(n,guess); - cout << guess << endl; - } while (abs(guess-real)/real>0.01); //Keep guessing unitl within 1% of the actual square root - return guess; -} - -int main () { - double n, guess; - cout << "Enter the Number to find square root: "; - cin >> n; - if (n<=0) { - cout << "Please enter a valid input(Positive Integer)." << endl; - return 2; - } - cout << "Guessing..." << endl; - double real=sqrt(n); - guess = BabylonRoot(n); - cout << "The Final Guess: " << guess << endl - << "Actual Value: " << real << endl; - return 0; -} \ No newline at end of file diff --git a/ee1301/wk3/lab3/fib.cpp b/ee1301/wk3/lab3/fib.cpp deleted file mode 100644 index 57be3a2..0000000 --- a/ee1301/wk3/lab3/fib.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include -using namespace std; -int main() -{ - unsigned long long fib1=0, fib2=1, count, fib3=1; - cout << "How many Fibonacci numbers should be computed? "; - cin >> count; - bool firstRun=true; - for (int i=1; i<(count+1); i++) { - if (!firstRun) { //The contents are run when i is not 1. - fib3=fib1+fib2; - fib1=fib2; - fib2=fib3; - } - firstRun=false; - cout << fib3 << " "; - if (i%10==0 && i!=0) - cout << endl; - } - cout << endl; -} diff --git a/ee1301/wk3/lab3/gcd.cpp b/ee1301/wk3/lab3/gcd.cpp deleted file mode 100644 index 4e127d9..0000000 --- a/ee1301/wk3/lab3/gcd.cpp +++ /dev/null @@ -1,36 +0,0 @@ -#include -#include -using namespace std; - -int GCD(int a, int b) { - int gcd=1; - a=abs(a); b=abs(b); - if (a>b) { - //do nothing - } else { - if (b>a) { - int foo=a; a=b; b=foo; - } else { - return -1; - } - } - gcd=(a%b); - while (gcd!=0) { - return GCD(b,gcd); - } - return b; - -} -int main () { - int a=0, b=0; - char cont; - do { - cout << "enter two integer values: "; - cin >> a >> b; - cout << "greatest common divisor is: " << GCD(a,b) << endl; - cout << "continue? (y/n): "; - cin >> cont; - cout << endl; - } while (cont!='n'); - -} diff --git a/ee1301/wk3/lab3/multTable.cpp b/ee1301/wk3/lab3/multTable.cpp deleted file mode 100644 index 4253980..0000000 --- a/ee1301/wk3/lab3/multTable.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include -using namespace std; -int main() { - int r=1, c=1; - for (r; r<=10; r++) { - for (c=10; c>0; c--) { - int ans = r*c; - if (ans!=100) { - cout << " "; - } - if (ans<10) { - cout << " "; - } - cout << ans; - } - cout << endl; - } -} diff --git a/ee1301/wk3/lab3/mysteryBox.cpp b/ee1301/wk3/lab3/mysteryBox.cpp deleted file mode 100644 index c1aefee..0000000 --- a/ee1301/wk3/lab3/mysteryBox.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include -using namespace std; - -int main () { - int sum = 0; - for(int i=0; i<=100; i++) - { - if(i % 7 == 0) - sum++; - } -cout << sum; -} diff --git a/ee1301/wk3/lab3/primeFactor.cpp b/ee1301/wk3/lab3/primeFactor.cpp deleted file mode 100644 index 093a0be..0000000 --- a/ee1301/wk3/lab3/primeFactor.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include -#include -using namespace std; - -void factorFinder (unsigned long long n) { - unsigned long long i=2; - while (pow(i,2)<=n) { - if (n%i==0) { - cout << i << "*"; - n/=i; - } else { - i++; - } - } - if (n>1) { - cout << n << endl; - } -} - -int main () { - unsigned long long n; - cout << "Input a positive integer: "; - cin >> n; - cout << "Factors: "; - factorFinder(n); -} diff --git a/ee1301/wk3/lab3/strap012_lab3_decimal_roman_conv.cpp b/ee1301/wk3/lab3/strap012_lab3_decimal_roman_conv.cpp deleted file mode 100644 index f6aa568..0000000 --- a/ee1301/wk3/lab3/strap012_lab3_decimal_roman_conv.cpp +++ /dev/null @@ -1,58 +0,0 @@ -//Matthew Strapp -//5449340 -//20 February 2018 -//Lab 3 Workout - -#include -using namespace std; -int main () { - int decimal; - cout << "Enter an integer value from 1 to 999: "; - cin >> decimal; - if (decimal<1 || decimal>999) { - cout << " Invalid Input. Program terminated." << endl; - return 1453; - } else { - cout << "Roman numeral equivalent: "; - while (decimal!=0) { - if (decimal>900 && decimal<1000) { - cout << "CM"; decimal-=900; - } - if (decimal>=500 && decimal<900) { - cout << "D"; decimal-=500; - } - if (decimal>=400 && decimal<500) { - cout << "CD"; decimal-=400; - } - if (decimal>=100 && decimal<400) { - cout << "C"; decimal-=100; - } - if (decimal>=90 && decimal<100) { - cout << "XC"; decimal-=90; - } - if (decimal>=50 && decimal<90) { - cout << "L"; decimal-=50; - } - if (decimal>=40 && decimal<50) { - cout << "XL"; decimal-=40; - } - if (decimal>=10 && decimal<40) { - cout << "X"; decimal-=10; - } - if (decimal==9) { - cout << "IX"; decimal-=9; - } - if (decimal>=5 && decimal<9) { - cout << "V"; decimal-=5; - } - if (decimal==4) { - cout << "IV"; decimal-=4; - } - if (decimal>=1 && decimal<4) { - cout << "I"; decimal-= 1; - } - } - } - cout << endl; - return 0; -} -- cgit v1.2.3