Update MP2

This commit is contained in:
2024-03-11 08:50:33 -05:00
parent 53268a2dc0
commit debcca3729
69 changed files with 4175 additions and 7723 deletions

View File

@@ -59,31 +59,32 @@ int main(){
endwin();
cout << "\033[2J\033[1;1H"; // Clear screen unicode sequence
highlightTuple.clear();
vector = random2DArray(10, 10);
vector = random2DArray(10, 100);
std::sort(vector.begin(), vector.end());
printf("Binary search is being used to locate the tuples to highlight!\n");
//printf("2D Vector: %s \n", printVector(vector).c_str());
printf("Linear search is being used to locate the tuples to highlight!\n");
printf("getAverage: %i\n", getAverage(vector));
printf("getRowTotal 0: %i\n", getRowTotal(vector, 0));
printf("getColumnTotal 0: %i\n", getColumnTotal(vector, 0));
currentResult = getHighestInRow(vector, 0);
highlightTuple.push_back(binarySearch(vector, currentResult));
highlightTuple.emplace_back(linearSearch(vector, currentResult));
printf("getHighestInRow 0: %i\n", currentResult);
printf("tuple result: %i, %i\n", get<0>(highlightTuple[0]), get<1>(highlightTuple[0]));
currentResult = getHighestInColumn(vector, 0);
highlightTuple.push_back(binarySearch(vector, currentResult));
highlightTuple.emplace_back(linearSearch(vector, currentResult));
printf("getHighestInColumn 0: %i\n", currentResult);
printf("tuple result: %i, %i\n", get<0>(highlightTuple[1]), get<1>(highlightTuple[1]));
currentResult = getLowestInRow(vector, 3);
highlightTuple.push_back(binarySearch(vector, currentResult));
highlightTuple.emplace_back(linearSearch(vector, currentResult));
printf("getLowestInRow 3: %i\n", getLowestInRow(vector, 3));
printf("tuple result: %i, %i\n", get<0>(highlightTuple[2]), get<1>(highlightTuple[2]));
currentResult = getLowestInColumn(vector, 3);
highlightTuple.push_back(binarySearch(vector, currentResult));
highlightTuple.emplace_back(linearSearch(vector, currentResult));
printf("getLowestInColumn 3: %i\n", getLowestInColumn(vector, 3));
printf("tuple result: %i, %i\n", get<0>(highlightTuple[3]), get<1>(highlightTuple[3]));
@@ -111,9 +112,9 @@ int main(){
endwin();
cout << "\033[2J\033[1;1H"; // Clear screen unicode sequence
printf("Highlighting every other tuple...\n");
vector = random2DArray(10, 10);
vector = random2DArray(10, 100);
std::sort(vector.begin(), vector.end());
highlightTuple = highlightEveryOther(10, 10);
highlightTuple = highlightEveryOther(10, 100);
printf("2D Vector:\n%s\n", printVector(vector, highlightTuple).c_str());
cout << "Press Enter to Continue";
getchar();
@@ -146,7 +147,7 @@ std::string printMenu(int* selection) {
const int ARRAY_SIZE = 4;
std::string outputString = "";
std::string cursor[ARRAY_SIZE] = {"> ", " ", " ", " "};
std::string menu[ARRAY_SIZE] = {"Rock Paper Scissors", "2D Arrays (demonstrates binary search, too!)", "Binary Search", "Test color highlighting"};
std::string menu[ARRAY_SIZE] = {"Rock Paper Scissors", "2D Arrays (demonstrates linear search, too!)", "Binary Search", "Test color highlighting"};
//printf("%i", *selection);
/*
if (*selection >= ARRAY_SIZE - 1) {