diff --git a/tests/extraTestsProb0.cpp b/tests/extraTestsProb0.cpp index 587167ea8114fb6aa7bfff1ef30d265743cb540b..377c0f56575028c57754af4215930ff09b5665d6 100644 --- a/tests/extraTestsProb0.cpp +++ b/tests/extraTestsProb0.cpp @@ -10,7 +10,7 @@ int Hamming(unsigned long aa, unsigned long bb); long tau(long nn); int primorial(int nn); -int test_0a(){ +float test_0a(){ float total = PROB_0A; @@ -37,12 +37,12 @@ int test_0a(){ } if (case3 != 32){ - cout << "-1: Hamming(4294967295,0) = 32, but your function returned Hamming(4294967295,0) = " << case3 << endl; + cout << "-2.5: Hamming(4294967295,0) = 32, but your function returned Hamming(4294967295,0) = " << case3 << endl; total -= 2.5; } - if (case4 != 9){ - cout << "-1: Hamming(3725,845) = 59, but your function returned Hamming(3725,845) = " << case4 << endl; + if (case4 != 59){ + cout << "-2.5: Hamming(3725,845) = 59, but your function returned Hamming(3725,845) = " << case4 << endl; total -= 2.5; } @@ -62,27 +62,27 @@ float test_0b() { int case4 = tau(69300); // = 38 if (case0 != 7){ - cout << "-1: tau(7) = 7, but your function returned tau(7) = " << case0 << endl; + cout << "-2: tau(7) = 7, but your function returned tau(7) = " << case0 << endl; total -= 2; } if (case1 != 113){ - cout << "-1: tau(113) = 113, but your function returned tau(113) = " << case1 << endl; + cout << "-3: tau(113) = 113, but your function returned tau(113) = " << case1 << endl; total -= 2; } if (case2 != 8){ - cout << "-1: tau(15) = 8, but your function returned tau(15) = " << case2 << endl; + cout << "-2: tau(15) = 8, but your function returned tau(15) = " << case2 << endl; total -= 2; } if (case3 != 42){ - cout << "-1: tau(117649) = 42, but your function returned tau(117649) = " << case3 << endl; + cout << "-3: tau(117649) = 42, but your function returned tau(117649) = " << case3 << endl; total -= 3; } if (case4 != 38){ - cout << "-1: tau(69300) = 38, but your function returned tau(69300) = " << case4 << endl; + cout << "-3: tau(69300) = 38, but your function returned tau(69300) = " << case4 << endl; total -= 3; } @@ -100,27 +100,27 @@ float test_0c() { int case4 = primorial(100); // = 56070 if (case0 != 2){ - cout << "-1: primorial(2) = 2, but your function returned primorial(2) = " << case0 << endl; + cout << "-3: primorial(2) = 2, but your function returned primorial(2) = " << case0 << endl; total -= 3; } if (case1 != 30){ - cout << "-1: primorial(5) = 30, but your function returned primorial(5) = " << case1 << endl; + cout << "-3: primorial(5) = 30, but your function returned primorial(5) = " << case1 << endl; total -= 3; } if (case2 != 2310){ - cout << "-1: primorial(12) = 2310, but your function returned primorial(12) = " << case2 << endl; + cout << "-3: primorial(12) = 2310, but your function returned primorial(12) = " << case2 << endl; total -= 3; } if (case3 != 92870){ - cout << "-1: primorial(25) = 92870, but your function returned primorial(25) = " << case3 << endl; + cout << "-3: primorial(25) = 92870, but your function returned primorial(25) = " << case3 << endl; total -= 3; } if (case4 != 56070){ - cout << "-1: primorial(100) = 56070, but your function returned primorial(100) = " << case4 << endl; + cout << "-3: primorial(100) = 56070, but your function returned primorial(100) = " << case4 << endl; total -= 3; } @@ -133,14 +133,13 @@ int main() { float t0c = test_0c(); cout << "Score problem 0a: " << t0a << "/8.0" << endl; - cout << "Score problem 0b: " << t0c << "/12.0" << endl; - cout << "Score problem 0c: " << t0a << "/12.0" << endl; + cout << "Score problem 0b: " << t0b << "/12.0" << endl; + cout << "Score problem 0c: " << t0c << "/12.0" << endl; - if (t0a && t0b && t0c) { + if ((t0a != PROB_0A) && (t0b != PROB_0B) && (t0c != PROB_0C)){ // all tests passed exit(0); - } - else { + } else { // at least one test was failed exit (-1); }