Dep/minor changes

cmake/headers.cmake

@@ -46,8 +46,6 @@ include/warthog/scenario/grid_patch_set.h
 include/warthog/scenario/scenario_manager.h
 include/warthog/scenario/scenario_runner.h
 
-include/warthog/search/dummy_filter.h
-include/warthog/search/dummy_listener.h
 include/warthog/search/expansion_policy.h
 include/warthog/search/gridmap_expansion_policy.h
 include/warthog/search/noop_search.h
@@ -64,13 +62,10 @@ include/warthog/search/vl_gridmap_expansion_policy.h
 include/warthog/util/cast.h
 include/warthog/util/cost_table.h
 include/warthog/util/dimacs_parser.h
-include/warthog/util/file_utils.h
 include/warthog/util/helpers.h
 include/warthog/util/intrin.h
-include/warthog/util/macros.h
 include/warthog/util/pqueue.h
 include/warthog/util/string.h
 include/warthog/util/template.h
 include/warthog/util/timer.h
-include/warthog/util/vec_io.h
 )

include/warthog/geometry/geom.h

@@ -166,9 +166,23 @@ struct rectangle
 } // namespace warthog::geometry
 
 std::ostream&
-operator<<(std::ostream& out, warthog::geometry::rectangle& rect);
+operator<<(std::ostream& out, warthog::geometry::rectangle& rect)
+{
+	out.write((char*)(&rect.x1), sizeof(rect.x1));
+	out.write((char*)(&rect.x2), sizeof(rect.x2));
+	out.write((char*)(&rect.y1), sizeof(rect.y1));
+	out.write((char*)(&rect.y2), sizeof(rect.y2));
+	return out;
+}
 
 std::istream&
-operator>>(std::istream& in, warthog::geometry::rectangle& rect);
+operator>>(std::istream& in, warthog::geometry::rectangle& rect)
+{
+	in.read((char*)(&rect.x1), sizeof(rect.x1));
+	in.read((char*)(&rect.x2), sizeof(rect.x2));
+	in.read((char*)(&rect.y1), sizeof(rect.y1));
+	in.read((char*)(&rect.y2), sizeof(rect.y2));
+	return in;
+}
 
 #endif // WARTHOG_GEOMETRY_GEOM_H

include/warthog/search/unidirectional_search.h

@@ -20,7 +20,6 @@
 #include <warthog/io/observer.h>
 #include <warthog/memory/cpool.h>
 #include <warthog/util/timer.h>
-#include <warthog/util/vec_io.h>
 
 #include <functional>
 #include <iostream>

include/warthog/util/helpers.h

@@ -47,36 +47,6 @@ load_integer_labels_dimacs(
 void
 value_index_swap_array(std::vector<uint32_t>& vec);
 
-struct thread_params
-{
-	// thread data
-	uint32_t thread_id_;
-	uint32_t max_threads_;
-	bool thread_finished_;
-	void* (*fn_worker_)(void*);
-
-	// task data
-	uint32_t nprocessed_;
-	uint32_t first_id_;
-	uint32_t last_id_;
-	void* shared_;
-};
-
-// helper code for simple parallel computations.
-// simple in this case means no synchronisation between threads.
-// @param fn_worker: the actual precompute function:
-//          - it takes as input a pointer whose actual type is
-//          warthog::label::thread_params
-//          - it returns a (possibly null) pointer to a result
-// @param shared_data:
-//         a pointer to data which will be shared among all worker
-//         threads
-// @param task_total: the total number of tasks in the workload
-// @return: 0 (the function always succeeds)
-void*
-parallel_compute(
-    void* (*fn_worker)(void*), void* shared_data, uint32_t task_total);
-
 } // namespace warthog::util
 
 #endif // WARTHOG_UTIL_HELPERS_H