This commit is contained in:
David St-Onge 2017-01-30 22:22:59 -05:00
parent bc9b04b9c7
commit 172a952faf
2 changed files with 4 additions and 3 deletions

View File

@ -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);

View File

@ -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) {