Fixed MapReduce build

Author: PayasR

.gitignore

@@ -0,0 +1 @@
+Lesson4/build

Lesson4/Activity10/mapreduce/include/detail/intermediates/in_memory.hpp

@@ -257,23 +257,22 @@ class in_memory : detail::noncopyable
     }
 
     template<typename T>
-    bool const insert(T const &key, typename reduce_task_type::value_type const &value)
+    bool const insert(T const &key, const typename reduce_task_type::value_type &value)
     {
         return insert(make_intermediate_key<key_type>(key), value);
     }
 
     // receive final result
-    template<typename StoreResult>
-    bool const insert(typename reduce_task_type::key_type   const &key,
-                      typename reduce_task_type::value_type const &value,
+    bool const insert(const typename reduce_task_type::key_type   &key,
+                      const typename reduce_task_type::value_type &value,
                       StoreResult &store_result)
     {
         return store_result(key, value)  &&  insert(key, value);
     }
 
     // receive intermediate result
-    bool const insert(typename key_type                     const &key,
-                      typename reduce_task_type::value_type const &value)
+    bool const insert(const key_type                     &key,
+                      const typename reduce_task_type::value_type &value)
     {
         size_t const  partition = (num_partitions_ == 1)? 0 : partitioner_(key, num_partitions_);
         auto         &map       = intermediates_[partition];

Lesson4/Activity10/mapreduce/include/detail/intermediates/local_disk.hpp

@@ -15,6 +15,14 @@ struct null_combiner;
 
 namespace detail {
 
+	template<typename T> uintmax_t    const length(T const &str);
+
+template<>
+inline uintmax_t const length(std::string const &str)
+{
+    return str.length();
+}
+
 struct file_lines_comp
 {
     template<typename T>
@@ -481,17 +489,17 @@ class local_disk : detail::noncopyable
 
     // receive final result
     template<typename StoreResult>
-    bool const insert(typename reduce_task_type::key_type   const &key,
-                      typename reduce_task_type::value_type const &value,
-                      StoreResult                                 &store_result)
+    bool const insert(typename reduce_task_type::key_type   &key,
+                      typename reduce_task_type::value_type &value,
+                      StoreResult                           &store_result)
     {
         store_result(key, value);
         return true;
     }
 
     // receive intermediate result
-    bool const insert(typename key_type                     const &key,
-                      typename reduce_task_type::value_type const &value)
+    bool const insert(key_type                     &key,
+                      typename reduce_task_type::value_type &value)
     {
         size_t const partition = partitioner_(key, num_partitions_);
 

Lesson4/Activity10/mapreduce/include/mapreduce.hpp

@@ -146,7 +146,9 @@ void run(mapreduce::specification &spec, mapreduce::results &result)
 {
     typename Job::datasource_type datasource(spec);
     Job job(datasource, spec);
-    job.run<mapreduce::schedule_policy::cpu_parallel<Job> >(result);
+	job.run(result);
+
+    //job.run<mapreduce::schedule_policy::cpu_parallel<Job> >(result);
 }
 
 }   // namespace mapreduce

Lesson4/CMakeLists.txt

@@ -0,0 +1,45 @@
+# CMakeList.txt : CMake project for Chapter4, include source and define
+# project specific logic here.
+#
+cmake_minimum_required (VERSION 3.8)
+
+# Look for boost installation
+find_package(Boost 1.65 COMPONENTS filesystem iostreams)
+find_package(Threads REQUIRED)
+
+# Add source to this project's executable.
+add_executable (binary_search "Exercise18/binary_search.cpp")
+set_property (TARGET binary_search PROPERTY CXX_STANDARD 14)
+
+add_executable (merge_sort "Exercise19/merge_sort.cpp") 
+set_property (TARGET merge_sort PROPERTY CXX_STANDARD 14)
+
+add_executable (quick_sort "Exercise20/quick_sort.cpp") 
+set_property (TARGET quick_sort PROPERTY CXX_STANDARD 14)
+
+add_executable (linear_time_select "Exercise21/linear_time_select.cpp") 
+set_property (TARGET linear_time_select PROPERTY CXX_STANDARD 14)
+
+add_executable (transform_accumulate "Exercise22/transform_accumulate.cpp") 
+set_property (TARGET transform_accumulate PROPERTY CXX_STANDARD 14)
+
+if(Boost_FOUND)
+	add_executable (mapreduce_wordcount "Activity10/mapreduce_wordcount.cpp")
+	target_include_directories (mapreduce_wordcount PUBLIC Activity10/mapreduce/include ${Boost_INCLUDE_DIRS})
+	set_property (TARGET mapreduce_wordcount PROPERTY CXX_STANDARD 14)
+	target_link_libraries (mapreduce_wordcount Boost::filesystem Boost::iostreams Threads::Threads)
+
+	add_executable (mapreduce_primecheck "Exercise23/mapreduce_primecheck.cpp")
+	target_include_directories (mapreduce_primecheck PUBLIC Activity10/mapreduce/include ${Boost_INCLUDE_DIRS})
+	set_property (TARGET mapreduce_primecheck PROPERTY CXX_STANDARD 14)
+	target_link_libraries (mapreduce_primecheck Boost::filesystem Boost::iostreams Threads::Threads)
+
+	add_executable (mapreduce_wordcount_skeleton "Activity10/mapreduce_wordcount_skeleton.cpp")
+	target_include_directories (mapreduce_wordcount_skeleton PUBLIC Activity10/mapreduce/include ${Boost_INCLUDE_DIRS})
+	set_property (TARGET mapreduce_wordcount_skeleton PROPERTY CXX_STANDARD 14)
+	target_link_libraries (mapreduce_wordcount_skeleton Boost::filesystem Boost::iostreams Threads::Threads)
+else()
+	message("Boost libraries not found! Please install them and try to build again")
+endif()
+
+# TODO: Add tests and install targets if needed.

Lesson4/Exercise18/Chapter4.h

@@ -0,0 +1,11 @@
+// Chapter4.h : Include file for standard system include files,
+// or project specific include files.
+
+#pragma once
+
+#include <iostream>
+#include <vector>
+#include <chrono>
+#include <random>
+#include <algorithm>
+#include <numeric>