]> rtime.felk.cvut.cz Git - hubacji1/psp.git/commitdiff
Rename angle between closer point function
authorJiri Vlasak <hubacji1@fel.cvut.cz>
Wed, 8 Jul 2020 09:38:42 +0000 (11:38 +0200)
committerJiri Vlasak <hubacji1@fel.cvut.cz>
Wed, 8 Jul 2020 09:38:42 +0000 (11:38 +0200)
See: d2fa58e

src/psp.cc

index 1888db6e8f4af90de40bfead796bc3e99a28d1f1..23217588faf20cf10226122c3edf05484f876fc6 100644 (file)
@@ -299,7 +299,7 @@ void PSPlanner::fe()
         }
 }
 
-double smaller_angle_of_two(
+double angle_between_closer_point(
         double sx, double sy, // common start point
         double cx, double cy, // common middle point
         double x1, double y1, // first ending point
@@ -383,7 +383,7 @@ void PSPlanner::fe_parallel()
                                         this->cc().lrx(), this->cc().lry(),
                                         this->cc().rrx(), this->cc().rry()
                                 );
-                                double a1 = ::smaller_angle_of_two(
+                                double a1 = ::angle_between_closer_point(
                                         this->ps().x1(), this->ps().y1(),
                                         cclx, ccly,
                                         std::get<1>(cli1), std::get<2>(cli1),
@@ -394,7 +394,7 @@ void PSPlanner::fe_parallel()
                                         this->ps().x2(), this->ps().y2(),
                                         this->ps().x3(), this->ps().y3()
                                 );
-                                double a2 = smaller_angle_of_two(
+                                double a2 = angle_between_closer_point(
                                         this->cc().rrx(), this->cc().rry(),
                                         cclx, ccly,
                                         std::get<1>(cli2), std::get<2>(cli2),
@@ -435,7 +435,7 @@ void PSPlanner::fe_parallel()
                                         this->ps().x1(), this->ps().y1(),
                                         this->ps().x2(), this->ps().y2()
                                 );
-                                double a1 = smaller_angle_of_two(
+                                double a1 = angle_between_closer_point(
                                         this->cc().lrx(), this->cc().lry(),
                                         cclx, ccly,
                                         std::get<1>(cli1), std::get<2>(cli1),
@@ -446,7 +446,7 @@ void PSPlanner::fe_parallel()
                                         this->ps().x2(), this->ps().y2(),
                                         this->ps().x3(), this->ps().y3()
                                 );
-                                double a2 = smaller_angle_of_two(
+                                double a2 = angle_between_closer_point(
                                         this->cc().rrx(), this->cc().rry(),
                                         cclx, ccly,
                                         std::get<1>(cli2), std::get<2>(cli2),
@@ -560,7 +560,7 @@ void PSPlanner::fe_parallel()
                                 this->ps().x3(), this->ps().y3(),
                                 this->ps().x4(), this->ps().y4()
                         );
-                        double a1 = smaller_angle_of_two(
+                        double a1 = angle_between_closer_point(
                                 this->cc().rfx(), this->cc().rfy(),
                                 ccrx, ccry,
                                 std::get<1>(cli1), std::get<2>(cli1),
@@ -571,7 +571,7 @@ void PSPlanner::fe_parallel()
                                 this->ps().x2(), this->ps().y2(),
                                 this->ps().x3(), this->ps().y3()
                         );
-                        double a2 = smaller_angle_of_two(
+                        double a2 = angle_between_closer_point(
                                 this->cc().rfx(), this->cc().rfy(),
                                 ccrx, ccry,
                                 std::get<1>(cli2), std::get<2>(cli2),
@@ -582,7 +582,7 @@ void PSPlanner::fe_parallel()
                                 this->ps().x3(), this->ps().y3(),
                                 this->ps().x4(), this->ps().y4()
                         );
-                        double a3 = smaller_angle_of_two(
+                        double a3 = angle_between_closer_point(
                                 this->cc().lfx(), this->cc().lfy(),
                                 ccrx, ccry,
                                 std::get<1>(cli3), std::get<2>(cli3),