Commit 262cd748 authored by Ari Trachtenberg's avatar Ari Trachtenberg
Browse files

Merge remote-tracking branch 'origin/master'

parents 3716fc26 c89b0082

ci_cd/lab3.yml

+11 −11
Original line number Diff line number Diff line
@@ -85,14 +85,14 @@ test_lab_3: 
    - if: '$CI_COMMIT_REF_NAME == "lab3"'

  tags: [c++-17]



## trigger internal tests only upon a merge request into master

#internal_tests_lab_3:

#  stage: tests

#  script:

#    - git clone https://trachten-gitlab:$INTERNAL_LAB_TESTS@agile.bu.edu/gitlab/ec337/ec337-staff/lab-tests.git

#    - cp -f lab3.cpp lab-tests/internal_tests/

#    - cd lab-tests/internal_tests

#    - make lab3

#  rules:

#    - if: '$CI_COMMIT_REF_NAME == "lab3" && $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'

#  tags: [ c++-17 ]
 
# trigger internal tests only upon a merge request into master

internal_tests_lab_3:

 stage: tests

 script:

   - git clone https://trachten-gitlab:$INTERNAL_LAB_TESTS@agile.bu.edu/gitlab/ec327/ec327-staff/lab-tests.git

   - cp -f lab3.cpp lab-tests/internal_tests/

   - cd lab-tests/internal_tests

   - make lab3

 rules:

   - if: '$CI_COMMIT_REF_NAME == "lab3" && $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'

 tags: [ c++-17 ]

problems/LabFour_ChapterEleven.h

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ using namespace std; 


/**

 * Recursively count the number of different ways of exchanging

 * [dollars] dollars for the following bills: $1, $5, $20, $100.

 * [dollars] dollars for the following bills: $1, $2, $5, $20, $100.

 *

 * Two approaches are different if and only if they differ in the

 * number of at least one denomination of bills.  So $8 = $1+$2+$5
@@ -66,7 +66,7 @@ int labFour_pTwo_exchange(int dollars); 
 *    4  |  9 = 6+3

 *

 * @example 3

 * labFour_pThree_genFib({0.25 ,0.25 ,0.25, 0.25},n) produces:

 * labFour_pThree_genFib({0.25 ,0.25 ,5, 0.5},n) produces:

 *    n  |  labFour_pThree_genFib({0.25 ,0.25 ,0.5, 0.5},n)

 *    -4 |  1  // hard-coded

 *    -3 |  1  // hard-coded

problems/LabFour_ChapterTen.h

+2 −4
Original line number Diff line number Diff line
@@ -29,9 +29,7 @@ using namespace std; 
 * Gabi.setSalary(100000); // $100,000 per year

 */

class labFour_pZero_Person;



class labFour_pZero_Student;



class labFour_pZero_Instructor;



/**
@@ -62,8 +60,8 @@ class labFour_pZero_Instructor; 
 *

 *  vector<labFour_pOne_GeometricThing *> things = {&re1, &s1, &rh1, &c1};

 *

 *  labFour_pOne_GeometricThing::sumAreas(things); // returns 2+9+sqrt(2)/2+pi = 14.8487...

 *  labFour_pOne_GeometricThing::sumPerimeters(things); // returns 6+12+4+2*pi = 28.2832...

 *  labFour_pOne_GeometricThing::sumAreas(things);      // returns 1+2+9+sqrt(2)/2+pi = 15.8487...

 *  labFour_pOne_GeometricThing::sumPerimeters(things); // returns 4+6+12+4+2*pi = 32.2832...

 *

 */

class labFour_pOne_GeometricThing {