diff --git a/ci_cd/.gitlab-ci.yml b/ci_cd/.gitlab-ci.yml index 53c5c5f20a9e23c916a57ea2edbec2ead325a00c..635fcf54148e4497cae4549c4e136af8711e69cc 100644 --- a/ci_cd/.gitlab-ci.yml +++ b/ci_cd/.gitlab-ci.yml @@ -2,9 +2,11 @@ stages: - labm1 - lab0 - lab1 + - lab2 - tests include: - local: 'ci_cd/labm1.yml' # Lab -1 - local: 'ci_cd/lab0.yml' # Lab 0 - - local: 'ci_cd/lab1.yml' # Lab 1 \ No newline at end of file + - local: 'ci_cd/lab1.yml' # Lab 1 + - local: 'ci_cd/lab2.yml' # Lab 2 \ No newline at end of file diff --git a/problems/LabTwo_ChapterSix.h b/problems/LabTwo_ChapterSix.h index 20a0ae9fe81b0a8f03a16844d67640c7671a439b..0f5d87d57bccedbe4d4d56738541728988a10358 100644 --- a/problems/LabTwo_ChapterSix.h +++ b/problems/LabTwo_ChapterSix.h @@ -8,7 +8,7 @@ * @param arr An array of [size] integers * @param size The number of integers stored in array [arr] * @return The sum of the following for [arr]: - * * Every element at even index. + * * Every element at even index or zero index * * Every even element. * * The product of the first and last element. * @@ -84,6 +84,6 @@ bool labTwo_pOne(int arr1[], int arr2[], int size); * 5 10 11 8 * 9 6 7 12 * 4 15 14 1 - * The sum of any row, column, or diagonal of the matrix equals 15. + * The sum of any row, column, or diagonal of the matrix equals 34. */ bool labTwo_pTwo(int arr[], int size); \ No newline at end of file diff --git a/tests/LabTwo.cpp b/tests/LabTwo.cpp index edd6dd281036f0bfaa514d7e9baa87b9190d09c5..00ed115434cf4ac0f0effcb1951f652dc32ce0e0 100644 --- a/tests/LabTwo.cpp +++ b/tests/LabTwo.cpp @@ -72,7 +72,6 @@ bool test_labOne_pTwo() { cout << "Test 2b failed" << endl; return false; } - //test 2 if (!labTwo_pTwo(arr2,16)){ cout << "Test 2c failed" << endl; @@ -96,7 +95,6 @@ bool test_labOne_pThree() { cout << "Test 3a failed" << endl; return false; } - //test 1 if (*test1 != 6){ cout << "Test 3b failed" << endl; @@ -125,7 +123,6 @@ bool test_labOne_pFour() { cout << "Test 4a failed" << endl; return false; } - //test 1 if (strcmp(result1,"BostonUniversity") != 0){ cout << "Test 4b failed" << endl;