Solve rotate todo

[hubacji1/psp.git] / src / psp.cc

diff --git a/src/psp.cc b/src/psp.cc
index 31c71c3d044854dd7e07629a91f04182041ee7cc..8bc3ac2ba06791c56f4a860d3d5faaafce4cafbb 100644 (file)
--- a/src/psp.cc
+++ b/src/psp.cc
@@ -370,6 +370,38 @@ void PSPlanner::fe_parallel()
                             std::get<3>(cli1), std::get<4>(cli1)
                         );
                         double a1 = std::min(a11, a12);
+{
+        double rf = edist(cclx, ccly, this->ps().x1(), this->ps().y1());
+        if (
+                edist(cclx, ccly, this->cc().lrx(), this->cc().lry()) < rf
+                && rf < edist(cclx, ccly, this->cc().rrx(), this->cc().rry())
+        ) {
+                auto clif = ::intersect(
+                        cclx, ccly, rf,
+                        this->cc().lrx(), this->cc().lry(),
+                        this->cc().rrx(), this->cc().rry()
+                );
+                double xf = std::get<1>(clif);
+                double yf = std::get<2>(clif);
+                if (
+                        edist(
+                                std::get<3>(clif), std::get<4>(clif),
+                                this->cc().x(), this->cc().y()
+
+                        )
+                        < edist(xf, yf, this->cc().x(), this->cc().y())
+                ) {
+                        xf = std::get<3>(clif);
+                        yf = std::get<4>(clif);
+                }
+                double af = ::intersection(
+                        xf, yf,
+                        cclx, ccly,
+                        this->ps().x1(), this->ps().y1()
+                );
+                a1 = af;
+        }
+}
 
                         double r2 = sqrt(
                             pow(this->cc().rry() - ccly, 2)
@@ -437,12 +469,76 @@ void PSPlanner::fe_parallel()
                         } else {
                             continue;
                         }
-                        // TODO if cc.h < ps.h --> continue
+                        if (::right_side_of_line(
+                            this->cc().x(), this->cc().y(),
+                            this->cc().x() + cos(this->ps().heading()),
+                            this->cc().y() + sin(this->ps().heading()),
+                            this->cc().x() + cos(this->cc().h()),
+                            this->cc().y() + sin(this->cc().h())
+                        ))
+                            continue;
                 } else if (this->ps().right() && this->cc().sp() > 0) {
                         double ccrx = this->cc().ccr().x();
                         double ccry = this->cc().ccr().y();
-
-                        // TODO can I park by moving forward?
+{
+        double rf = sqrt(
+                pow(this->cc().lfy() - ccry, 2)
+                + pow(this->cc().lfx() - ccrx, 2)
+        );
+        auto clif = ::intersect(
+                ccrx, ccry, rf,
+                this->ps().x1(), this->ps().y1(),
+                this->ps().x4(), this->ps().y4()
+        );
+        if (std::get<0>(clif)) {
+                double xf = std::get<1>(clif);
+                double yf = std::get<2>(clif);
+                if (
+                        edist(
+                                this->ps().x4(),
+                                this->ps().y4(),
+                                std::get<3>(clif),
+                                std::get<4>(clif)
+                        ) < edist(
+                                this->ps().x4(),
+                                this->ps().y4(),
+                                xf, yf
+                        )
+                ) {
+                        xf = std::get<3>(clif);
+                        yf = std::get<4>(clif);
+                }
+                auto af = ::angle_between_three_points(
+                        this->cc().lfx(),
+                        this->cc().lfy(),
+                        ccrx, ccry,
+                        xf, yf
+                );
+                auto tmp_cc = BicycleCar(this->cc());
+                this->cc().rotate(ccrx, ccry, -af);
+                if (
+                        !this->collide()
+                        && (edist(
+                                this->ps().x1(), this->ps().y1(),
+                                xf, yf
+                        ) < edist(
+                                this->ps().x1(), this->ps().y1(),
+                                this->ps().x4(), this->ps().y4()
+                        ))
+                ) {
+                        this->cc().sp(-0.01);
+                        this->cc().set_max_steer();
+                        this->cc().st(this->cc().st() * -1);
+                        this->gc() = BicycleCar(this->cc());
+                        goto successfinish;
+                } else {
+                        this->cc() = BicycleCar(tmp_cc);
+                }
+        } else {
+                // should be parked and found in
+                // previous iteration
+        }
+}
                         double r1 = sqrt(
                             pow(this->cc().rfy() - ccry, 2)
                             + pow(this->cc().rfx() - ccrx, 2)