Commit cea088d2 authored by Ari Trachtenberg's avatar Ari Trachtenberg
Browse files

Merge branch 'master' into 'lab4tests' 

# Conflicts:
#   problems/LabFour_ChapterEleven.h
parents f76f605c d8b1bd1a

problems/LabFour_ChapterEleven.h

+7 −7
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ int labFour_pTwo_exchange(int dollars); 
 *    filter [filter].

 *

 * @example 1

 * labFour_pThree_genFib({1,1},n) produces the n+4-th Fibonacci numbers:

 *    n  |  labFour_pThree_genFib({1,1},n)

 * labFour_pFour_genFib({1,1},n) produces the n+4-th Fibonacci numbers:

 *    n  |  labFour_pFour_genFib({1,1},n)

 *    -2 |  1  // hard-coded

 *    -1 |  1  // hard-coded

 *    0  |  2 = 1+1
@@ -55,8 +55,8 @@ int labFour_pTwo_exchange(int dollars); 
 *    3  |  8 = 5*3

 *

 * @example 2

 * labFour_pThree_genFib({1,0,1},n) produces:

 *    n  |  labFour_pThree_genFib({1,0,1},n)

 * labFour_pFour_genFib({1,0,1},n) produces:

 *    n  |  labFour_pFour_genFib({1,0,1},n)

 *    -3 |  1  // hard-coded

 *    -2 |  1  // hard-coded

 *    -1 |  1  // hard-coded
@@ -67,8 +67,8 @@ int labFour_pTwo_exchange(int dollars); 
 *    4  |  9 = 6+3

 *

 * @example 3

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

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

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

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

 *    -4 |  1  // hard-coded

 *    -3 |  1  // hard-coded

 *    -2 |  1  // hard-coded
@@ -78,4 +78,4 @@ int labFour_pTwo_exchange(int dollars); 
 *    2  |  2.125 =  0.25+ 0.25+  0.75+   0.875

 *    3  |  2.5625 = 0.25+ 0.375+ 0.875+  1.0625

 */

float labFour_pThree_genFib(vector<float> filter, int nn);
 
 No newline at end of file
 
float labFour_pFour_genFib(vector<float> filter, int nn);
 
 No newline at end of file