Skip to content
This repository was archived by the owner on Dec 21, 2023. It is now read-only.

Fixed angle plumbing for theta, phi, and gamma. #2285

Merged
shantanuchhabra merged 2 commits into from
Sep 16, 2019
Merged

Fixed angle plumbing for theta, phi, and gamma. #2285

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a183e11
Fixed angle plumbing for theta, phi, and gamma.
shantanuchhabra Sep 6, 2019
873cce1
remove deg_to_rad calls in getters
shantanuchhabra Sep 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/toolkits/object_detection/one_shot_object_detection/util/parameter_sampler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ double deg_to_rad(double angle) { return angle * M_PI / 180.0; }
* transform: The transformation matrix built from the above parameters
* warped_corners: The four corners of the object in the warped image
*/
double ParameterSampler::get_theta() { return deg_to_rad(theta_); }
double ParameterSampler::get_theta() { return theta_; }

double ParameterSampler::get_phi() { return deg_to_rad(phi_); }
double ParameterSampler::get_phi() { return phi_; }

double ParameterSampler::get_gamma() { return deg_to_rad(gamma_); }
double ParameterSampler::get_gamma() { return gamma_; }

size_t ParameterSampler::get_dz() { return dz_; }

Expand Down Expand Up @@ -78,11 +78,11 @@ void ParameterSampler::sample(long seed) {
std::normal_distribution<double> focal_distribution((double)width_,
focal_stdev_);
theta_generator_.seed(seed + 3);
theta_ = theta_distribution(theta_generator_);
theta_ = deg_to_rad(theta_distribution(theta_generator_));
phi_generator_.seed(seed + 4);
phi_ = phi_distribution(phi_generator_);
phi_ = deg_to_rad(phi_distribution(phi_generator_));
gamma_generator_.seed(seed + 5);
gamma_ = gamma_distribution(gamma_generator_);
gamma_ = deg_to_rad(gamma_distribution(gamma_generator_));
focal_generator_.seed(seed + 6);
focal_ = focal_distribution(focal_generator_);
std::uniform_int_distribution<int> dz_distribution(std::max(width_, height_),
Expand Down