This commit is contained in:
David St-Onge 2017-01-30 17:10:07 -05:00
parent a7f1b0903d
commit f77f6ebe1a
2 changed files with 3 additions and 3 deletions

View File

@ -423,8 +423,8 @@ namespace rosbzz_node{
z = cartesian_pos_payload[2]; z = cartesian_pos_payload[2];
try { try {
out[0]=sqrt(pow(x,2.0)+pow(y,2.0)+pow(z,2.0)); out[0]=sqrt(pow(x,2.0)+pow(y,2.0)+pow(z,2.0));
out[1]=atan2(y,x); out[1]=atan2(x,y);
out[2]=atan2((sqrt(pow(x,2.0)+pow(y,2.0))),z); out[2]=atan2(z,(sqrt(pow(x,2.0)+pow(y,2.0))));
} catch (std::overflow_error e) { } catch (std::overflow_error e) {
std::cout << e.what() << " Error in convertion to spherical coordinate system "<<endl; std::cout << e.what() << " Error in convertion to spherical coordinate system "<<endl;
} }

View File

@ -17,7 +17,7 @@ TARGET_ALTITUDE = 10.1
# Lennard-Jones parameters # Lennard-Jones parameters
TARGET = 5 #0.000001001 TARGET = 5 #0.000001001
EPSILON = 800 #0.001 EPSILON = 200 #0.001
# Lennard-Jones interaction magnitude # Lennard-Jones interaction magnitude
function lj_magnitude(dist, target, epsilon) { function lj_magnitude(dist, target, epsilon) {