From fd0a514282dd0ce2e86aa74468ab60cd1c73494b Mon Sep 17 00:00:00 2001 From: ermolaev_p Date: Thu, 5 Dec 2024 19:06:48 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BE=D0=B3=D1=80=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=20=D1=81=D0=BA?= =?UTF-8?q?=D0=BE=D1=80=D0=BE=D1=81=D1=82=D0=B8=20=D0=B2=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D1=85=D0=BE=D0=B4=D0=B5=20Closing|Grow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/OptAlgorithm/OptTimeCalculator.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/OptAlgorithm/OptTimeCalculator.py b/src/OptAlgorithm/OptTimeCalculator.py index 0cf738e..87d0e8c 100644 --- a/src/OptAlgorithm/OptTimeCalculator.py +++ b/src/OptAlgorithm/OptTimeCalculator.py @@ -204,8 +204,10 @@ class OptTimeCalculator(AutoConfigClass): self.allTimes["tmovement"] = T def calcFirstClose(self, T : float, s : float) -> tuple[float, float]: + v0q = min(sqrt(2 * self.a_max_1 * s), self.v_max_1) + v0 = min(v0q, sqrt(1/(self.k_hardness_1*self.mass_1))* self.Ftogrow) t1 = T - sqrt(max(0, T**2 - 2 * s / self.a_max_1)) - t1 = min(t1, self.v_max_1 / self.a_max_1) + t1 = min(t1, v0 / self.a_max_1) t2 = sqrt(max(0, T**2 - 2 * s / self.a_max_1)) return t1, t2