From 304a2f99bab11aeea308acf4c91645390f83c952 Mon Sep 17 00:00:00 2001 From: juanvallejo Date: Mon, 8 Feb 2016 20:52:24 -0500 Subject: [PATCH 1/4] print obst goal / location --- src/communication.cpp | 2 +- src/main.cpp | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/communication.cpp b/src/communication.cpp index 46a149a..9cacf3b 100644 --- a/src/communication.cpp +++ b/src/communication.cpp @@ -332,7 +332,7 @@ pplx::task communicator::get_grid() //Obstacles to grid std::for_each(obstacles.begin(), obstacles.end(), [this, tmp_inf_params, height, width](obstacle_t obs) { - //Look through all the points in one quadrant of the circlep + //Look through all the points in one quadrant of the circle for(int x = obs.x - obs.radius - tmp_inf_params.radius; x <= obs.x; x++) { for(int y = obs.y - obs.radius - tmp_inf_params.radius; y <= obs.y; y++) { unsigned char cost = calculate_cost(obs, x, y, tmp_inf_params); diff --git a/src/main.cpp b/src/main.cpp index c879ae0..96e56d2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -69,9 +69,17 @@ int main(int argc, char *argv[]) env_data_t my_env_data = my_communicator.get_env_data(); - std::cout << "Height: " << my_env_data.height << std::endl; - std::cout << "Width: " << my_env_data.width << std::endl; + std::cout << "Height: " << my_env_data.height << std::endl; + std::cout << "Width: " << my_env_data.width << std::endl; + std::cout << "Goal_x: " << my_env_data.end_x << std::endl; + std::cout << "Goal_y: " << my_env_data.end_y << std::endl; + std::cout << "Goal_theta: " << my_env_data.end_theta << std::endl; + std::cout << "Location_x: " << my_env_data.start_y << std::endl; + std::cout << "Location_y: " << my_env_data.start_y << std::endl; + std::cout << "Location_theta: " << my_env_data.start_theta << std::endl; std::cout << "Time(ms): " << std::chrono::duration_cast(elapsed).count() << std::endl; + // print_env(my_env_data); + return 0; } From 3c419e73befe5fc30f097826c7ff2167db646105 Mon Sep 17 00:00:00 2001 From: juanvallejo Date: Mon, 8 Feb 2016 22:33:08 -0500 Subject: [PATCH 2/4] more threads; fix path to cmakelists --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8394e76..7948882 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ cache: - /usr/lib/ccache - lib/cpprestsdk/Release/tests - lib/cpprestsdk/Release/tests/CMakeFiles + - lib/cpprestsdk/Release/CMakeFiles - lib/cpprestsdk/Release/samples addons: apt: @@ -40,7 +41,7 @@ before_install: - mkdir -p build.release - cd build.release - CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Release -- make -j 2 +- make -j 4 - sudo make install - cd ../../../../ notifications: From 7ccc43bc04bb557dadee0e4d52df4c38ffaa7900 Mon Sep 17 00:00:00 2001 From: juanvallejo Date: Tue, 8 Mar 2016 00:05:00 -0500 Subject: [PATCH 3/4] cleanup stdout --- .travis.yml | 5 ++--- src/main.cpp | 6 ------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7948882..807b1d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ cache: - /usr/lib/ccache - lib/cpprestsdk/Release/tests - lib/cpprestsdk/Release/tests/CMakeFiles - - lib/cpprestsdk/Release/CMakeFiles - lib/cpprestsdk/Release/samples addons: apt: @@ -41,7 +40,7 @@ before_install: - mkdir -p build.release - cd build.release - CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Release -- make -j 4 +- make -j 2 - sudo make install - cd ../../../../ notifications: @@ -53,4 +52,4 @@ notifications: slack: "suas:oeGJ8juXQ75A5cBqj51vLRBB" env: global: - - LANG="en_US.UTF-8" \ No newline at end of file + - LANG="en_US.UTF-8" diff --git a/src/main.cpp b/src/main.cpp index 9738cf3..4e60f05 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -149,12 +149,6 @@ int main(int argc, char *argv[]) std::cout << "Height: " << my_env_data.height << std::endl; std::cout << "Width: " << my_env_data.width << std::endl; - std::cout << "Goal_x: " << my_env_data.end_x << std::endl; - std::cout << "Goal_y: " << my_env_data.end_y << std::endl; - std::cout << "Goal_theta: " << my_env_data.end_theta << std::endl; - std::cout << "Location_x: " << my_env_data.start_y << std::endl; - std::cout << "Location_y: " << my_env_data.start_y << std::endl; - std::cout << "Location_theta: " << my_env_data.start_theta << std::endl; std::cout << "Time(ms): " << std::chrono::duration_cast(elapsed).count() << std::endl; print_env_const(my_env_const); From 803f4142f4995a18af38311a207886f54a4fc566 Mon Sep 17 00:00:00 2001 From: juanvallejo Date: Tue, 8 Mar 2016 00:07:42 -0500 Subject: [PATCH 4/4] checkout UPSTREAM src/main.cpp into master --- .travis.yml | 2 +- src/main.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 807b1d0..8394e76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,4 +52,4 @@ notifications: slack: "suas:oeGJ8juXQ75A5cBqj51vLRBB" env: global: - - LANG="en_US.UTF-8" + - LANG="en_US.UTF-8" \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 4e60f05..d770c00 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -147,8 +147,8 @@ int main(int argc, char *argv[]) env_constants_t my_env_const = my_communicator.get_const_data(); point_char_map moveing_obs_pts = my_communicator.get_updated_points(); - std::cout << "Height: " << my_env_data.height << std::endl; - std::cout << "Width: " << my_env_data.width << std::endl; + std::cout << "Height: " << my_env_data.height << std::endl; + std::cout << "Width: " << my_env_data.width << std::endl; std::cout << "Time(ms): " << std::chrono::duration_cast(elapsed).count() << std::endl; print_env_const(my_env_const);