Commit 7dc1f5f9 authored by Ari Trachtenberg's avatar Ari Trachtenberg
Browse files

Merge branch 'updating-instructions' into 'master'

make instructions more clear

See merge request !11
parents 84855a1f 9acb61d0
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -14,10 +14,13 @@ using namespace std;
 * number of at least one denomination of bills.  So $8 = $1+$2+$5
 * is the same as $8 = $5+$2+1, but different from $5 + 3*$1.
 * 
 * You may use a helper function so long as you solver the problem in a recursive manner.
 *
 * @param dollars The amount of dollars to exchange
 * @return the number of different ways of generating [dollars]
 *    dollars with the permitted bills
 * 
 *
 * @example labFour_pTwo_exchange(8) = 7 corresponding to the
 *   following ways to exchange $8:
 *    1. 8*$1
+14 −2
Original line number Diff line number Diff line
@@ -16,9 +16,21 @@ using namespace std;
 * 2. labFour_pZero_Instructor derives from labFour_pZero_Person and has
 *    a salary.
 * Complete the class definitions and implementations, including constructors,
 * destructors, and an external override of stream operator<< and operator>>
 * destructors, setters, getters, and an external override of stream operator<< and operator>>
 * to input and output each object.
 * 
 * When overloading the ostream operators, the output should be formatted such that it includes all fields of the object.
 * @example
 * labFour_pZero_Person James("James");
 * Jim.setBirthday("2010-02-28"); 
 * cout << James; // outputs "James, 2010-02-28"
 * 
 * When overloading the instream operators, the input should be formatted such that it includes all fields of the object.
 * @example
 * labFour_pZero_Person James;
 * std::stringstream input("James, 2010-02-28");
 * input >> James; // inputs "James, 2010-02-28"
 *
 * @example
 * labFour_pZero_Person Jim("James");
 * Jim.setBirthday("2010-02-28"); // Jim's birthday is on February 28, 2010
@@ -39,7 +51,7 @@ class labFour_pZero_Instructor;
 * * labFour_pOne_Rectangle - a concrete class representing a rectangle
 * * labFour_pOne_Square - a concrete class representing a square
 * * labFour_pOne_Rhombus - a concrete class representing a rhombus
 * * labFour_pOne_Circle - a concrete class representing a cicle
 * * labFour_pOne_Circle - a concrete class representing a circle
 * FEEL FREE to modify the inheritance structure, as you see fit.
 *
 * EACH concrete class must at least have methods with the signatures noted below