trackler 2.1.0.0 → 2.1.0.1

data/tracks/cpp/exercises/clock/example.cpp

@@ -18,24 +18,14 @@ namespace date_independent
 clock& clock::plus(int minutes)
 {
     minute_ += minutes;
-    if (minute_ > minutes_per_hour) {
-        hour_ += (minute_/minutes_per_hour);
-        hour_ %= hours_per_day;
-        minute_ %= minutes_per_hour;
-    }
+    clean();
     return *this;
 }
 
 clock& clock::minus(int minutes)
 {
     minute_ -= minutes;
-    while (minute_ < 0) {
-        --hour_;
-        minute_ += minutes_per_hour;
-    }
-    while (hour_ < 0) {
-        hour_ += hours_per_day;
-    }
+    clean();
     return *this;
 }
 
@@ -50,6 +40,21 @@ clock::clock(int hour, int minute)
     : hour_(hour),
     minute_(minute)
 {
+    clean();
+}
+
+void clock::clean()
+{
+    if (minute_ < 0) {
+        int tmp = 1 + (minute_ / -minutes_per_hour);
+        hour_ -= tmp;
+        minute_ += minutes_per_hour * tmp;
+    }
+    if (hour_ < 0)
+        hour_ += hours_per_day*(1 + (hour_ / -hours_per_day));
+    hour_ += minute_ / minutes_per_hour;
+    hour_ %= hours_per_day;
+    minute_ %= minutes_per_hour;
 }
 
 clock clock::at(int hour, int minute /*= 0*/)

data/tracks/cpp/exercises/clock/example.h

@@ -20,6 +20,7 @@ public:
 
 private:
     clock(int hour, int minute);
+    void clean();
     int hour_;
     int minute_;
 };

data/tracks/cpp/exercises/crypto-square/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/difference-of-squares/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/etl/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/etl/etl_test.cpp

@@ -1,7 +1,7 @@
 #include "etl.h"
 #define BOOST_TEST_MAIN
+#include <map>
 #include <boost/test/unit_test.hpp>
-#include "require_equal_containers.h"
 
 BOOST_AUTO_TEST_CASE(transforms_one_value)
 {
@@ -10,7 +10,7 @@ BOOST_AUTO_TEST_CASE(transforms_one_value)
     const auto actual = etl::transform(old);
 
     const std::map<char, int> expected{{'a', 1}};
-    REQUIRE_EQUAL_CONTAINERS(expected, actual);
+    BOOST_TEST(expected == actual);
 }
 
 #if defined(EXERCISM_RUN_ALL_TESTS)
@@ -21,7 +21,7 @@ BOOST_AUTO_TEST_CASE(transforms_more_values)
     const auto actual = etl::transform(old);
 
     const std::map<char, int> expected{{'a', 1}, {'e', 1}, {'i', 1}, {'o', 1}, {'u', 1}};
-    REQUIRE_EQUAL_CONTAINERS(expected, actual);
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(transforms_more_keys)
@@ -31,7 +31,7 @@ BOOST_AUTO_TEST_CASE(transforms_more_keys)
     const auto actual = etl::transform(old);
 
     const std::map<char, int> expected{{'a', 1}, {'e', 1}, {'d', 2}, {'g', 2}};
-    REQUIRE_EQUAL_CONTAINERS(expected, actual);
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(transforms_a_full_dataset)
@@ -56,6 +56,6 @@ BOOST_AUTO_TEST_CASE(transforms_a_full_dataset)
         {'u', 1}, {'v', 4},  {'w', 4}, {'x', 8}, {'y', 4},
         {'z', 10}
     };
-    REQUIRE_EQUAL_CONTAINERS(expected, actual);
+    BOOST_TEST(expected == actual);
 }
 #endif

data/tracks/cpp/exercises/food-chain/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/gigasecond/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/gigasecond/example.cpp

@@ -3,13 +3,9 @@
 namespace gigasecond
 {
 
-boost::gregorian::date advance(const boost::gregorian::date& start)
+boost::posix_time::ptime advance(const boost::posix_time::ptime& start)
 {
-    const unsigned long long seconds_per_minute = 60;
-    const unsigned long long seconds_per_hour = 60*seconds_per_minute;
-    const unsigned long long seconds_per_day = 24*seconds_per_hour;
-    const unsigned long long one_giga_second = 1000000000;
-    return start + boost::gregorian::days(one_giga_second/seconds_per_day);
+    return start + boost::posix_time::seconds(1e9);
 }
 
 }

data/tracks/cpp/exercises/gigasecond/example.h

@@ -1,12 +1,12 @@
 #if !defined(GIGASECOND_H)
 #define GIGASECOND_H
 
-#include <boost/date_time/gregorian/gregorian.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
 
 namespace gigasecond
 {
 
-boost::gregorian::date advance(const boost::gregorian::date& start);
+boost::posix_time::ptime advance(const boost::posix_time::ptime& start);
 
 }
 

data/tracks/cpp/exercises/gigasecond/gigasecond_test.cpp

@@ -2,31 +2,49 @@
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
 
-// See <http://www.boost.org/doc/libs/1_55_0/doc/html/date_time.html>
-// for documentation on boost::gregorian::date
+// See <http://www.boost.org/doc/libs/1_59_0/doc/html/date_time/posix_time.html>
+// for documentation on boost::posix_time
+
+using namespace boost::posix_time;
 
 BOOST_AUTO_TEST_CASE(test_1)
 {
-    const auto actual = gigasecond::advance(boost::gregorian::date(2011, 4, 26));
+    const auto actual = gigasecond::advance(time_from_string("2011-04-25 00:00:00"));
 
-    const boost::gregorian::date expected(2043, 1, 2);
+    const ptime expected(time_from_string("2043-01-01 01:46:40"));
     BOOST_REQUIRE_EQUAL(expected, actual);
 }
 
 #if defined(EXERCISM_RUN_ALL_TESTS)
 BOOST_AUTO_TEST_CASE(test_2)
 {
-    const auto actual = gigasecond::advance(boost::gregorian::date(1977, 6, 14));
+    const auto actual = gigasecond::advance(time_from_string("1977-06-13 00:00:00"));
 
-    const boost::gregorian::date expected(2009, 2, 20);
+    const ptime expected(time_from_string("2009-02-19 01:46:40"));
     BOOST_REQUIRE_EQUAL(expected, actual);
 }
 
 BOOST_AUTO_TEST_CASE(test_3)
 {
-    const auto actual = gigasecond::advance(boost::gregorian::date(1959, 7, 20));
+    const auto actual = gigasecond::advance(time_from_string("1959-07-19 00:00:00"));
+
+    const ptime expected(time_from_string("1991-03-27 01:46:40"));
+    BOOST_REQUIRE_EQUAL(expected, actual);
+}
+
+BOOST_AUTO_TEST_CASE(test_4)
+{
+    const auto actual = gigasecond::advance(time_from_string("2015-01-24 22:00:00"));
+
+    const ptime expected(time_from_string("2046-10-02 23:46:40"));
+    BOOST_REQUIRE_EQUAL(expected, actual);
+}
+
+BOOST_AUTO_TEST_CASE(test_5)
+{
+    const auto actual = gigasecond::advance(time_from_string("2015-01-24 23:59:59"));
 
-    const boost::gregorian::date expected(1991, 3, 28);
+    const ptime expected(time_from_string("2046-10-03 01:46:39"));
     BOOST_REQUIRE_EQUAL(expected, actual);
 }
 #endif

data/tracks/cpp/exercises/grade-school/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/grade-school/grade_school_test.cpp

@@ -1,7 +1,6 @@
 #include "grade_school.h"
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include "require_equal_containers.h"
 
 using namespace std;
 
@@ -25,7 +24,7 @@ BOOST_AUTO_TEST_CASE(adding_a_student_adds_them_to_the_roster_for_the_given_grad
     const auto actual = school_.roster();
 
     const map<int, vector<string>> expected{{2, {"Aimee"}}};
-    REQUIRE_EQUAL_CONTAINERS(expected, actual);
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(adding_more_students_to_the_same_grade_adds_them_to_the_roster)
@@ -37,7 +36,7 @@ BOOST_AUTO_TEST_CASE(adding_more_students_to_the_same_grade_adds_them_to_the_ros
     const auto actual = school_.roster();
 
     const map<int, vector<string>> expected{{2, {"Blair", "James", "Paul"}}};
-    REQUIRE_EQUAL_CONTAINERS(expected, actual);
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(adding_students_to_different_grades_adds_them_to_the_roster)
@@ -48,7 +47,7 @@ BOOST_AUTO_TEST_CASE(adding_students_to_different_grades_adds_them_to_the_roster
     const auto actual = school_.roster();
 
     const map<int, vector<string>> expected{{3, {"Chelsea"}}, {7, {"Logan"}}};
-    REQUIRE_EQUAL_CONTAINERS(expected, actual);
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(grade_returns_the_students_in_that_grade_in_alphabetical_order)
@@ -60,7 +59,7 @@ BOOST_AUTO_TEST_CASE(grade_returns_the_students_in_that_grade_in_alphabetical_or
     const auto actual = school_.grade(5);
 
     const vector<string> expected{"Bradley", "Franklin"};
-    REQUIRE_EQUAL_CONTAINERS(expected, actual);
+    BOOST_TEST(expected == actual);
 }
 
 BOOST_AUTO_TEST_CASE(grade_returns_an_empty_array_if_there_are_no_students_in_that_grade)
@@ -84,7 +83,7 @@ BOOST_AUTO_TEST_CASE(the_student_names_in_each_grade_in_the_roster_are_sorted)
             {4, {"Christopher", "Jennifer"}},
             {6, {"Kareem"}}
         };
-    REQUIRE_EQUAL_CONTAINERS(expected, actual);
+    BOOST_TEST(expected == actual);
 }
 #endif
 

data/tracks/cpp/exercises/grains/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/hamming/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})