trackler 2.1.0.0 → 2.1.0.1

data/tracks/cpp/docs/ABOUT.md

@@ -10,8 +10,8 @@ C++ supports [procedural](https://en.wikipedia.org/wiki/Procedural_programming),
 [object-oriented](https://en.wikipedia.org/wiki/Object-oriented_programming),
 [functional](https://en.wikipedia.org/wiki/Functional_programming)
 and [generic](https://en.wikipedia.org/wiki/Generic_programming)
-programming. C++ runs on a variety of platforms, such as Windows,
-Mac OS, and the various versions of UNIX.
+programming. Compilers for C++ are available for essentially every platform,
+including Windows, Mac OS, and Linux.
 
 Key Benefits:
 - Type safety

data/tracks/cpp/docs/INSTALLATION.md

@@ -55,8 +55,8 @@ MacOS users can install gcc 4.8 with [Homebrew](http://brew.sh/) via
 #### Windows
 
 Windows users can get
-[Visual Studio Community 2013](http://www.visualstudio.com/en-us/products/visual-studio-community-vs),
-a free download that will give you the Visual Studio 2013 IDE and the
+[Visual Studio Community](https://www.visualstudio.com/vs/community/),
+a free download that will give you the Visual Studio IDE and the
 latest version of the Microsoft Visual C++ compiler.
 
 ### Prerequisite: CMake
@@ -83,7 +83,7 @@ improve the CMake support.
 
 [CMake 2.8.11 or later](http://www.cmake.org/) is required to use the provided build recipe.
 
-### Prerequisite: Boost
+### Prerequisite: Boost 1.59+
 
 The unit tests use Boost.Test, the unit testing framework included with
 [Boost](http://www.boost.org/index.html).  You may find other libraries
@@ -91,7 +91,7 @@ in Boost useful to you as you work through the exercises.  In particular,
 gcc 4.8 does not have a proper implementation of the standard regular
 expression library, but you can find a compatible library in Boost.
 You will need to download and install Boost.  As of this writing Boost
-1.55 is the current version.  You will need a compiled version of the
+1.59+ is the required version.  You will need a compiled version of the
 boost libraries Boost.Test, Boost.DateTime and Boost.Regex, or you will
 need to download from source and build the library yourself.
 
@@ -100,33 +100,27 @@ If you are having difficulties installing Boost for use with exercism,
 
 #### Linux
 
-Linux users can get pre-built packages with the following recipe:
+Linux users can usually get Boost from your distribution's package manager.
+If a pre-built package is unavailable for your linux distribution, try
+[installing Boost from source](http://www.boost.org/doc/libs/release/more/getting_started/index.html).
 
-```bash
-$ sudo add-apt-repository -y ppa:boost-latest/ppa
-$ sudo apt-get -qq -d update
-$ sudo apt-get -qq install libboost1.55-all-dev
-```
+Alternately, there may be some other way to install Boost for your
+distribution without installing from source. For example, you can install
+Boost 1.60 for Ubuntu 16.04 LTS by using a PPA.
 
-Note: These prepackaged Linux binaries are not compiled with gcc 4.8 and
-some libraries may have issues as a result.  If a pre-built package is
-unavailable for your linux distribution, try
-[installing Boost from source](http://www.boost.org/doc/libs/release/more/getting_started/index.html).
+```
+$ sudo add-apt-repository -y ppa:samuel-bachmann/boost
+$ sudo apt-get install boost1.60
+```
 
 #### Windows
 
-Windows users can download compiled binaries from [sourceforge](http://sourceforge.net/projects/boost/files/boost-binaries/1.55.0-build2/).
-You must download the version appropriate for your compiler.  For recent
-versions of Visual Studio, the direct links are provided below:
-
-| Compiler | Download |
-|----------|----------|
-| Visual Studio Express 2013 for Windows Desktop (32-bit) | [boost_1_55_0-msvc-12.0-32.exe](http://sourceforge.net/projects/boost/files/boost-binaries/1.55.0-build2/boost_1_55_0-msvc-12.0-32.exe/download) |
-| Visual Studio 2013 (32-bit) | [boost_1_55_0-msvc-12.0-32.exe](http://sourceforge.net/projects/boost/files/boost-binaries/1.55.0-build2/boost_1_55_0-msvc-12.0-32.exe/download) |
-| Visual Studio 2012 (32-bit) | [boost_1_55_0-msvc-11.0-32.exe](http://sourceforge.net/projects/boost/files/boost-binaries/1.55.0-build2/boost_1_55_0-msvc-11.0-32.exe/download) |
-| Visual Studio 2010 (32-bit) | [boost_1_55_0-msvc-10.0-32.exe](http://sourceforge.net/projects/boost/files/boost-binaries/1.55.0-build2/boost_1_55_0-msvc-10.0-32.exe/download) |
+Windows users can download compiled binaries from [sourceforge](https://sourceforge.net/projects/boost/files/boost-binaries/).
+You must download the version appropriate for your compiler. Note that
+the version number is different from your Visual Studio version; the
+compiler version in Visual Studio 2015 is MSVC 14.0.
 
-In this table, 32-bit refers to the kind of code generated by your
+In the descriptions, 32-bit refers to the kind of code generated by your
 compiler and not the operating system.  Code compiled for 32-bit will run
 on both 32-bit and 64-bit versions of Windows.  Code compiled for 64-bit
 will only run on 64-bit versions of Windows.  The CMake recipes used in
@@ -141,7 +135,7 @@ libraries.  If you don't rename the directory you will see an error
 like this when you run CMake:
 
 ```
-> cmake -DBOOST_INCLUDEDIR:PATH=D:/tmp/boost_1_55_0 ..
+> cmake -DBOOST_INCLUDEDIR:PATH=D:/tmp/boost_1_59_0 ..
 -- Building for: Visual Studio 12
 -- The CXX compiler identification is MSVC 18.0.30723.0
 -- Check for working CXX compiler using: Visual Studio 12
@@ -151,9 +145,9 @@ like this when you run CMake:
 CMake Error at C:/Program Files (x86)/CMake 2.8/share/cmake-2.8/Modules/FindBoost.cmake:1106 (message):
   Unable to find the requested Boost libraries.
 
-  Boost version: 1.55.0
+  Boost version: 1.59.0
 
-  Boost include path: D:/tmp/boost_1_55_0
+  Boost include path: D:/tmp/boost_1_59_0
 
   The following Boost libraries could not be found:
 

data/tracks/cpp/docs/TESTS.md

@@ -101,7 +101,7 @@ setting the `BOOST_INCLUDEDIR` variable on the command-line.  Here is an
 example using the Visual Studio 2013 generator:
 
 ```
-> cmake -G "Visual Studio 12" -DBOOST_INCLUDEDIR:PATH=D:/Code/boost/boost_1_55_0 ..
+> cmake -G "Visual Studio 12" -DBOOST_INCLUDEDIR:PATH=D:/Code/boost/boost_1_59_0 ..
 ```
 
 **Note:** Path locations passed to CMake always use slash (`/`) as the

data/tracks/cpp/exercises/anagram/CMakeLists.txt

@@ -11,7 +11,7 @@ project(${exercise} CXX)
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
-find_package(Boost 1.55 REQUIRED COMPONENTS unit_test_framework date_time regex)
+find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework date_time regex)
 
 # Enable C++11 features on gcc/clang
 if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(GNU|Clang)")
@@ -33,15 +33,8 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Include a test helper header if it exists
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/require_equal_containers.h)
-    set(test_helper require_equal_containers.h)
-else()
-    set(test_helper "")
-endif()
-
 # Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${test_helper} ${exercise_cpp} ${file}.h)
+add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h)
 
 # We need boost includes
 target_include_directories(${exercise} PRIVATE ${Boost_INCLUDE_DIRS})

data/tracks/cpp/exercises/beer-song/CMakeLists.txt

@@ -11,7 +11,7 @@ project(${exercise} CXX)
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
-find_package(Boost 1.55 REQUIRED COMPONENTS unit_test_framework date_time regex)
+find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework date_time regex)
 
 # Enable C++11 features on gcc/clang
 if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(GNU|Clang)")
@@ -33,15 +33,8 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Include a test helper header if it exists
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/require_equal_containers.h)
-    set(test_helper require_equal_containers.h)
-else()
-    set(test_helper "")
-endif()
-
 # Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${test_helper} ${exercise_cpp} ${file}.h)
+add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h)
 
 # We need boost includes
 target_include_directories(${exercise} PRIVATE ${Boost_INCLUDE_DIRS})

data/tracks/cpp/exercises/binary/CMakeLists.txt

@@ -11,7 +11,7 @@ project(${exercise} CXX)
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
-find_package(Boost 1.55 REQUIRED COMPONENTS unit_test_framework date_time regex)
+find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework date_time regex)
 
 # Enable C++11 features on gcc/clang
 if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(GNU|Clang)")
@@ -33,15 +33,8 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Include a test helper header if it exists
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/require_equal_containers.h)
-    set(test_helper require_equal_containers.h)
-else()
-    set(test_helper "")
-endif()
-
 # Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${test_helper} ${exercise_cpp} ${file}.h)
+add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h)
 
 # We need boost includes
 target_include_directories(${exercise} PRIVATE ${Boost_INCLUDE_DIRS})

data/tracks/cpp/exercises/bob/CMakeLists.txt

@@ -11,7 +11,7 @@ project(${exercise} CXX)
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
-find_package(Boost 1.55 REQUIRED COMPONENTS unit_test_framework date_time regex)
+find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework date_time regex)
 
 # Enable C++11 features on gcc/clang
 if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(GNU|Clang)")
@@ -33,15 +33,8 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Include a test helper header if it exists
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/require_equal_containers.h)
-    set(test_helper require_equal_containers.h)
-else()
-    set(test_helper "")
-endif()
-
 # Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${test_helper} ${exercise_cpp} ${file}.h)
+add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h)
 
 # We need boost includes
 target_include_directories(${exercise} PRIVATE ${Boost_INCLUDE_DIRS})

data/tracks/cpp/exercises/clock/CMakeLists.txt

@@ -11,7 +11,7 @@ project(${exercise} CXX)
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
-find_package(Boost 1.55 REQUIRED COMPONENTS unit_test_framework date_time regex)
+find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework date_time regex)
 
 # Enable C++11 features on gcc/clang
 if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(GNU|Clang)")
@@ -33,15 +33,8 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Include a test helper header if it exists
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/require_equal_containers.h)
-    set(test_helper require_equal_containers.h)
-else()
-    set(test_helper "")
-endif()
-
 # Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${test_helper} ${exercise_cpp} ${file}.h)
+add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h)
 
 # We need boost includes
 target_include_directories(${exercise} PRIVATE ${Boost_INCLUDE_DIRS})

data/tracks/cpp/exercises/clock/clock_test.cpp

@@ -4,81 +4,205 @@
 
 using namespace std;
 
-BOOST_AUTO_TEST_CASE(prints_the_hour)
+struct timeTest {
+    int hour;
+    int minute;
+    string expected;
+    string msg;
+};
+
+vector<timeTest> timeCases = {
+    {8, 0, "08:00",        "on the hour"},
+    {11, 9, "11:09",       "past the hour"},
+    {24, 0, "00:00",       "midnight is zero hours"},
+    {25, 0, "01:00",       "hour rolls over"},
+    {100, 0, "04:00",      "hour rolls over continuously"},
+    {1, 60, "02:00",       "sixty minutes is next hour"},
+    {0, 160, "02:40",      "minutes roll over"},
+    {0, 1723, "04:43",     "minutes roll over continuously"},
+    {25, 160, "03:40",     "hour and minutes roll over"},
+    {201, 3001, "11:01",   "hour and minutes roll over continuously"},
+    {72, 8640, "00:00",    "hour and minutes roll over to exactly midnight"},
+    {-1, 15, "23:15",      "negative hour"},
+    {-25, 0, "23:00",      "negative hour rolls over"},
+    {-91, 0, "05:00",      "negative hour rolls over continuously"},
+    {1, -40, "00:20",      "negative minutes"},
+    {1, -160, "22:20",     "negative minutes roll over"},
+    {1, -4820, "16:40",    "negative minutes roll over continuously"},
+    {-25, -160, "20:20",   "negative hour and minutes both roll over"},
+    {-121, -5810, "22:10", "negative hour and minutes both roll over continuously"},
+};
+
+struct addTest {
+    int hour;
+    int minute;
+    int add;
+    string expected;
+    string msg;
+};
+
+vector<addTest> addCases = {
+    {10, 0, 3, "10:03",     "add minutes"},
+    {6, 41, 0, "06:41",     "add no minutes"},
+    {0, 45, 40, "01:25",    "add to next hour"},
+    {10, 0, 61, "11:01",    "add more than one hour"},
+    {0, 45, 160, "03:25",   "add more than two hours with carry"},
+    {23, 59, 2, "00:01",    "add across midnight"},
+    {5, 32, 1500, "06:32",  "add more than one day (1500 min = 25 hrs)"},
+    {1, 1, 3500, "11:21",   "add more than two days"},
+    {10, 3, -3, "10:00",    "subtract minutes"},
+    {10, 3, -30, "09:33",   "subtract to previous hour"},
+    {10, 3, -70, "08:53",   "subtract more than an hour"},
+    {0, 3, -4, "23:59",     "subtract across midnight"},
+    {0, 0, -160, "21:20",   "subtract more than two hours"},
+    {6, 15, -160, "03:35",  "subtract more than two hours with borrow"},
+    {5, 32, -1500, "04:32", "subtract more than one day (1500 min = 25 hrs)"},
+    {2, 20, -3000, "00:20", "subtract more than two days"},
+};
+
+// Construct two separate clocks, set times, test if they are equal.
+struct hm {
+    int hour;
+    int minute;
+};
+
+struct equalTest {
+    string msg;
+    hm c1;
+    hm c2;
+    bool expected;
+};
+
+vector<equalTest> equalCases = {
+    {
+        "clocks with same time",
+        hm{15, 37},
+        hm{15, 37},
+        true,
+    },
+    {
+        "clocks a minute apart",
+        hm{15, 36},
+        hm{15, 37},
+        false,
+    },
+    {
+        "clocks an hour apart",
+        hm{14, 37},
+        hm{15, 37},
+        false,
+    },
+    {
+        "clocks with hour overflow",
+        hm{10, 37},
+        hm{34, 37},
+        true,
+    },
+    {
+        "clocks with hour overflow by several days",
+        hm{3, 11},
+        hm{99, 11},
+        true,
+    },
+    {
+        "clocks with negative hour",
+        hm{22, 40},
+        hm{-2, 40},
+        true,
+    },
+    {
+        "clocks with negative hour that wraps",
+        hm{17, 3},
+        hm{-31, 3},
+        true,
+    },
+    {
+        "clocks with negative hour that wraps multiple times",
+        hm{13, 49},
+        hm{-83, 49},
+        true,
+    },
+    {
+        "clocks with minute overflow",
+        hm{0, 1},
+        hm{0, 1441},
+        true,
+    },
+    {
+        "clocks with minute overflow by several days",
+        hm{2, 2},
+        hm{2, 4322},
+        true,
+    },
+    {
+        "clocks with negative minute",
+        hm{2, 40},
+        hm{3, -20},
+        true,
+    },
+    {
+        "clocks with negative minute that wraps",
+        hm{4, 10},
+        hm{5, -1490},
+        true,
+    },
+    {
+        "clocks with negative minute that wraps multiple times",
+        hm{6, 15},
+        hm{6, -4305},
+        true,
+    },
+    {
+        "clocks with negative hours and minutes",
+        hm{7, 32},
+        hm{-12, -268},
+        true,
+    },
+    {
+        "clocks with negative hours and minutes that wrap",
+        hm{18, 7},
+        hm{-54, -11513},
+        true,
+    },
+};
+
+string errorMsg(string expected, string actual, string test)
 {
-    BOOST_REQUIRE_EQUAL("08:00", string(date_independent::clock::at(8)));
-    BOOST_REQUIRE_EQUAL("09:00", string(date_independent::clock::at(9)));
+    stringstream ret;
+    ret << "[" << expected << " != " << actual << "] test case: " << test;
+    return ret.str();
 }
 
-#if defined(EXERCISM_RUN_ALL_TESTS)
-BOOST_AUTO_TEST_CASE(prints_past_the_hour)
-{
-    BOOST_REQUIRE_EQUAL("11:09", string(date_independent::clock::at(11, 9)));
-    BOOST_REQUIRE_EQUAL("11:19", string(date_independent::clock::at(11, 19)));
-}
-
-BOOST_AUTO_TEST_CASE(can_add_minutes)
-{
-    const auto clock = date_independent::clock::at(10).plus(3);
-
-    BOOST_REQUIRE_EQUAL("10:03", string(clock));
-}
-
-BOOST_AUTO_TEST_CASE(can_add_over_an_hour)
-{
-    const auto clock = date_independent::clock::at(10).plus(61);
-
-    BOOST_REQUIRE_EQUAL("11:01", string(clock));
-}
-
-BOOST_AUTO_TEST_CASE(wraps_around_midnight)
-{
-    const auto clock = date_independent::clock::at(23, 59).plus(2);
-
-    BOOST_REQUIRE_EQUAL("00:01", string(clock));
-}
-
-BOOST_AUTO_TEST_CASE(can_subtract_minutes)
-{
-    const auto clock = date_independent::clock::at(10, 3).minus(3);
-
-    BOOST_REQUIRE_EQUAL("10:00", string(clock));
-}
-
-BOOST_AUTO_TEST_CASE(can_subtract_to_previous_hour)
+BOOST_AUTO_TEST_CASE(time_tests)
 {
-    const auto clock = date_independent::clock::at(10, 3).minus(30);
+    for (timeTest t : timeCases) {
+        const auto actual = string(date_independent::clock::at(t.hour, t.minute));
 
-    BOOST_REQUIRE_EQUAL("09:33", string(clock));
+        BOOST_REQUIRE_MESSAGE(t.expected == actual, errorMsg(t.expected, actual, t.msg));
+    }
 }
 
-BOOST_AUTO_TEST_CASE(can_subtract_over_an_hour)
-{
-    const auto clock = date_independent::clock::at(10, 3).minus(70);
-
-    BOOST_REQUIRE_EQUAL("08:53", string(clock));
-}
-
-BOOST_AUTO_TEST_CASE(can_know_if_its_equal_to_another_clock)
-{
-    const auto clock1 = date_independent::clock::at(10, 3);
-    const auto clock2 = date_independent::clock::at(10, 3);
-
-    BOOST_REQUIRE(clock1 == clock2);
-}
-
-BOOST_AUTO_TEST_CASE(can_know_if_its_not_equal_to_another_clock)
+#if defined(EXERCISM_RUN_ALL_TESTS)
+BOOST_AUTO_TEST_CASE(add_tests)
 {
-    const auto clock1 = date_independent::clock::at(10, 3);
-    const auto clock2 = date_independent::clock::at(10, 4);
+    for (addTest a : addCases) {
+        const auto actual = string(date_independent::clock::at(a.hour, a.minute).plus(a.add));
 
-    BOOST_REQUIRE(clock1 != clock2);
+        BOOST_REQUIRE_MESSAGE(a.expected == actual, errorMsg(a.expected, actual, a.msg));
+    }
 }
 
-BOOST_AUTO_TEST_CASE(wraps_around_midnight_backwards)
+BOOST_AUTO_TEST_CASE(equal_tests)
 {
-    const auto clock = date_independent::clock::at(0, 3).minus(4);
-
-    BOOST_REQUIRE_EQUAL("23:59", string(clock));
+    for (equalTest e : equalCases) {
+        const auto clock1 = date_independent::clock::at(e.c1.hour, e.c1.minute);
+        const auto clock2 = date_independent::clock::at(e.c2.hour, e.c2.minute);
+
+        if (e.expected)
+            BOOST_REQUIRE_MESSAGE(clock1 == clock2, errorMsg(string(clock1), string(clock2), e.msg));
+        else
+            BOOST_REQUIRE_MESSAGE(clock1 != clock2,
+                    "[" << string(clock1) << " == " << string(clock2) << "] test case: " << e.msg);
+    }
 }
 #endif