From 4b25d25132cf4f5a74563634c1a75e06231f005b Mon Sep 17 00:00:00 2001 From: James Knee Date: Mon, 21 Oct 2024 18:17:04 -0400 Subject: [PATCH 1/4] added lab2 to gitlab ci pipeline --- ci_cd/.gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci_cd/.gitlab-ci.yml b/ci_cd/.gitlab-ci.yml index 53c5c5f..635fcf5 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 -- GitLab From 8058d6d8f71434759b3c5e2287c6ad849c57c469 Mon Sep 17 00:00:00 2001 From: James Knee Date: Mon, 21 Oct 2024 19:40:43 -0400 Subject: [PATCH 2/4] update on .h file --- problems/LabTwo_ChapterSix.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/problems/LabTwo_ChapterSix.h b/problems/LabTwo_ChapterSix.h index 20a0ae9..dd19d1d 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. * -- GitLab From 3a555cd5f124eadb5ff7e17af150e9ca5b331a3c Mon Sep 17 00:00:00 2001 From: James Knee Date: Mon, 21 Oct 2024 20:10:51 -0400 Subject: [PATCH 3/4] more bug fixes in .h --- problems/LabTwo_ChapterSix.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/problems/LabTwo_ChapterSix.h b/problems/LabTwo_ChapterSix.h index dd19d1d..0f5d87d 100644 --- a/problems/LabTwo_ChapterSix.h +++ b/problems/LabTwo_ChapterSix.h @@ -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 -- GitLab From 43f7e2217db90ae76f4e194437fadfdfa36df73c Mon Sep 17 00:00:00 2001 From: James Knee Date: Mon, 21 Oct 2024 20:12:40 -0400 Subject: [PATCH 4/4] updated spacing --- tests/LabTwo.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/LabTwo.cpp b/tests/LabTwo.cpp index edd6dd2..00ed115 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; -- GitLab