From 172a952faf527d035103b91159ddc48ec41ceff0 Mon Sep 17 00:00:00 2001 From: David St-Onge Date: Mon, 30 Jan 2017 22:22:59 -0500 Subject: [PATCH] lj test --- src/roscontroller.cpp | 3 ++- src/test1.bzz | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/roscontroller.cpp b/src/roscontroller.cpp index 8319e3d..0b63b2a 100644 --- a/src/roscontroller.cpp +++ b/src/roscontroller.cpp @@ -1,4 +1,3 @@ - #include "roscontroller.h" @@ -20,7 +19,9 @@ namespace rosbzz_node{ double temp_car[3], temp2_car[3]; double out[3], dif[3], out2[3]; cvt_cartesian_coordinates(temp_gps,temp_car); + printf("TEST FIRST: %.7f,%.7f,%.7f\n",temp_car[0],temp_car[1],temp_car[2]); cvt_cartesian_coordinates(temp2_gps,temp2_car); + printf("TEST THIRD: %.7f,%.7f,%.7f\n",temp2_car[0],temp2_car[1],temp2_car[2]); for(int i=0;i<3;i++) dif[i]=temp2_car[i]-temp_car[i]; cvt_spherical_coordinates(dif,out); diff --git a/src/test1.bzz b/src/test1.bzz index f115b3a..993eca4 100644 --- a/src/test1.bzz +++ b/src/test1.bzz @@ -15,8 +15,8 @@ neighbors.broadcast(updated, update_no) TARGET_ALTITUDE = 10.01 # Lennard-Jones parameters -TARGET = 5.0 #0.000001001 -EPSILON = 20.0 #0.001 +TARGET = 50.0 #0.000001001 +EPSILON = 80.0 #0.001 # Lennard-Jones interaction magnitude function lj_magnitude(dist, target, epsilon) {