Skip to content

Commit 7f105a7

Browse files
author
cobot
committed
dead code xxx
1 parent 3c924b3 commit 7f105a7

File tree

4 files changed

+0
-28
lines changed

4 files changed

+0
-28
lines changed

src/navigation/linear_evaluator.cc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,4 @@ shared_ptr<PathRolloutBase> LinearEvaluator::FindBest(const vector<shared_ptr<Pa
121121
return best;
122122
}
123123

124-
void LinearEvaluator::SetClearanceWeight(const float &weight) { FLAGS_cw = weight; }
125-
126-
void LinearEvaluator::SetDistanceWeight(const float &weight) { FLAGS_dw = weight; }
127-
128-
void LinearEvaluator::SetFreePathWeight(const float &weight) { FLAGS_fw = weight; }
129-
130-
void LinearEvaluator::SetSubOpt(const float &threshold) { FLAGS_subopt = threshold; }
131-
132124
} // namespace motion_primitives

src/navigation/linear_evaluator.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ namespace motion_primitives {
3131
struct LinearEvaluator : PathEvaluatorBase {
3232
// Return the best path rollout from the provided set of paths.
3333
std::shared_ptr<PathRolloutBase> FindBest(const std::vector<std::shared_ptr<PathRolloutBase>>& paths) override;
34-
void SetClearanceWeight(const float& weight);
35-
void SetDistanceWeight(const float& weight);
36-
void SetFreePathWeight(const float& weight);
37-
void SetSubOpt(const float& threshold);
3834
};
3935

4036
} // namespace motion_primitives

src/navigation/motion_primitives.cc

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@ float Run1DTimeOptimalControl(const MotionLimits& limits, const float x_now, con
5151
const float v_final, const float dt) {
5252
// Non-zero final vel not yet implemented.
5353
CHECK_EQ(v_final, 0.0f) << "Non-zero final vel not yet implemented!";
54-
static FILE* fid = nullptr;
55-
const bool kTest = false;
56-
const string kTestLogFile = "1DTOC.txt";
57-
if (kTest && fid == nullptr) {
58-
fid = fopen(kTestLogFile.c_str(), "w");
59-
}
6054
const float dist_left = x_final - x_now;
6155
float velocity_cmd = 0;
6256
const float speed = fabs(v_now);
@@ -87,15 +81,6 @@ float Run1DTimeOptimalControl(const MotionLimits& limits, const float x_now, con
8781
phase = 'X';
8882
velocity_cmd = max<float>(0, speed - dv_d);
8983
}
90-
if (kTest) {
91-
printf("%c x:%f dist_left:%f a_dist:%f c_dist:%f v:%f cmd:%f\n", phase, x_now, dist_left, accel_stopping_dist,
92-
cruise_stopping_dist, v_now, velocity_cmd);
93-
if (fid != nullptr) {
94-
fprintf(fid, "%f %f %f %f %f %f\n", x_now, dist_left, accel_stopping_dist, cruise_stopping_dist, v_now,
95-
velocity_cmd);
96-
fflush(fid);
97-
}
98-
}
9984
return velocity_cmd;
10085
}
10186

src/navigation/omnidirectional_motion_primitives.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ struct OmnidirectionalMovePath : PathRolloutBase {
5151
float length; // Distance to travel
5252
float fpl; // Free path length
5353
float clearance; // Minimum clearance to obstacles
54-
Eigen::Vector2f obstruction; // Location of closest obstacle
5554
};
5655

5756
// Omnidirectional path rollout sampler

0 commit comments

Comments
 (0)