Updated to be more standardized

This commit is contained in:
2019-02-27 18:09:16 -05:00
parent 84cbf6d5af
commit bb8810326f
2 changed files with 79 additions and 75 deletions

View File

@@ -114,14 +114,14 @@ bool testIsFound(){
bool correctAnswer = true;
std::vector<uint64_t> testVector = mee::getPrimes((uint64_t)100);
uint64_t searchFor = 79;
bool answer = mee::isFound(searchFor, testVector);
bool answer = mee::isFound(testVector, searchFor);
if(answer != correctAnswer){
std::cout << "isFound() is failed at test 1" << std::endl;
return false;
}
searchFor = 97;
answer = mee::isFound(searchFor, testVector);
answer = mee::isFound(testVector, searchFor);
if(answer != correctAnswer){
std::cout << "isFound() is failed at test 2" << std::endl;
return false;
@@ -129,7 +129,7 @@ bool testIsFound(){
searchFor = 88;
correctAnswer = false;
answer = mee::isFound(searchFor, testVector);
answer = mee::isFound(testVector, searchFor);
if(answer != correctAnswer){
std::cout << "isFound() is failed at test 3" << std::endl;
return false;
@@ -171,19 +171,19 @@ bool testGetFib(){
//Test the gmp integer function
number = 12;
mpz_class mpzNumber = 12;
mpz_class longCorrectAnswer = 144;
mpz_class longAnswer = mee::getMpzFib(number);
mpz_class longAnswer = mee::getFib(mpzNumber);
if(longCorrectAnswer != longAnswer){
std::cout << "getMpzFib() failed at test 3" << std::endl;
std::cout << "getFib() for mpz failed at test 3" << std::endl;
return false;
}
number = 4782;
mpzNumber = 4782;
longCorrectAnswer = "1070066266382758936764980584457396885083683896632151665013235203375314520604694040621889147582489792657804694888177591957484336466672569959512996030461262748092482186144069433051234774442750273781753087579391666192149259186759553966422837148943113074699503439547001985432609723067290192870526447243726117715821825548491120525013201478612965931381792235559657452039506137551467837543229119602129934048260706175397706847068202895486902666185435124521900369480641357447470911707619766945691070098024393439617474103736912503231365532164773697023167755051595173518460579954919410967778373229665796581646513903488154256310184224190259846088000110186255550245493937113651657039447629584714548523425950428582425306083544435428212611008992863795048006894330309773217834864543113205765659868456288616808718693835297350643986297640660000723562917905207051164077614812491885830945940566688339109350944456576357666151619317753792891661581327159616877487983821820492520348473874384736771934512787029218636250627816";
longAnswer = mee::getMpzFib(number);
longAnswer = mee::getFib(mpzNumber);
if(longCorrectAnswer != longAnswer){
std::cout << "getMpzFib() failed at test 4" << std::endl;
std::cout << "getFib() for mpzfailed at test 4" << std::endl;
return false;
}
@@ -210,6 +210,7 @@ bool testBubbleSort(){
for(int cnt = 1;cnt < nums.size();++cnt){
if(nums.at(cnt) < nums.at(cnt - 1)){
return false;
std::cout << "nums.size() " << nums.size() << "\ncnt " << cnt << std::endl;
}
}
@@ -243,7 +244,7 @@ bool testQuickSort(){
}
bool testSearch(){
bool found = false;
int64_t found = -1;
//Create a vector of numbers
std::vector<int> nums {1, 20, 3, 40, 5, 60, 7, 80, 9};
//Search for one that is in the vector