From 807ecc109a0087c804928daea5ec4dfe31ff304e Mon Sep 17 00:00:00 2001 From: Jiri Vlasak Date: Tue, 7 Jul 2020 15:04:06 +0200 Subject: [PATCH] Add (ccr, lf) x (p3, p4) computation --- src/psp.cc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/psp.cc b/src/psp.cc index 9b18fae..99f5d3d 100644 --- a/src/psp.cc +++ b/src/psp.cc @@ -545,7 +545,17 @@ void PSPlanner::fe_parallel() std::get<1>(cli2), std::get<2>(cli2), std::get<3>(cli2), std::get<4>(cli2) ); - // TODO (ccr, lf) x (p3, p4) + auto cli3 = ::intersect( + ccrx, ccry, ccr_lf, + this->ps().x3(), this->ps().y3(), + this->ps().x4(), this->ps().y4() + ); + double a3 = smaller_angle_of_two( + this->cc().lfx(), this->cc().lfy(), + ccrx, ccry, + std::get<1>(cli3), std::get<2>(cli3), + std::get<3>(cli3), std::get<4>(cli3) + ); { double rf = sqrt( pow(this->cc().lfy() - ccry, 2) -- 2.39.2