From 295e1f64ad4fb807cb106f4ac9a60142c4dc0299 Mon Sep 17 00:00:00 2001 From: andrei Date: Fri, 1 Nov 2024 13:34:28 +0300 Subject: [PATCH] =?UTF-8?q?dev:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8=20=D0=BE?= =?UTF-8?q?=D1=82=D0=BA=D1=80=D1=8B=D1=82=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OptAlgorithm/OptAlgorithm.py | 3 +++ UML.svg | 2 +- UML.txt | 2 +- main.py | 6 +++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/OptAlgorithm/OptAlgorithm.py b/OptAlgorithm/OptAlgorithm.py index 43cb9f4..700a32d 100644 --- a/OptAlgorithm/OptAlgorithm.py +++ b/OptAlgorithm/OptAlgorithm.py @@ -24,6 +24,9 @@ class OptAlgorithm(AutoConfigClass): self.x1Contact = self.dist_open_start_1 + self.position_start_1 self.x2Contact = self.dist_open_start_2 + self.position_start_2 + + def getMarkOpen(self): + return max(self.Ts["topen_2_mark"], self.Ts["topen_1_mark"]) def V1Close(self, t: float): if t < self.Ts["tclose_1_acc"]: diff --git a/UML.svg b/UML.svg index ab0a161..ce20333 100644 --- a/UML.svg +++ b/UML.svg @@ -1 +1 @@ -Electrode Closing Algorithm DoneElectrode Closing Algorithm ExecuteSTEP 1: ME Move to S1STEP 1: ME Move to S1 CompleteSTEP 2: ME Move to P2STEP 2: ME Move to P2 CompleteSTEP 3: ME Hold P2STEP 3: ME Hold P2 AND Condition Start Force ControlSTEP 4: ME Force ControlReal dataclosurecompressionClient dataclosurecompressionopeningIdeal dataclosurecompressionopening05691106157164165166176191210276300 \ No newline at end of file +Electrode Closing Algorithm DoneElectrode Closing Algorithm ExecuteSTEP 1: ME Move to S1STEP 1: ME Move to S1 CompleteSTEP 2: ME Move to P2STEP 2: ME Move to P2 CompleteSTEP 3: ME Hold P2STEP 3: ME Hold P2 AND Condition Start Force ControlSTEP 4: ME Force ControlReal dataclosurecompressionClient dataclosurecompressionopeningIdeal dataclosurecompressionopening05691106157164165166176191210220300 \ No newline at end of file diff --git a/UML.txt b/UML.txt index d6a314a..3b74a7d 100644 --- a/UML.txt +++ b/UML.txt @@ -71,6 +71,6 @@ ID is compression #yellow ID is {-} @91.55623055658612 ID is opening #yellow -@276.6234655587717 +@220.34565355083035 ID is {-} @enduml diff --git a/main.py b/main.py index f53639a..c00d181 100644 --- a/main.py +++ b/main.py @@ -62,7 +62,7 @@ class Application: self._requestSVG(real, client, ideal, bool) def updatePlots(self): - #self._plotRealData() + self._plotRealData() times = np.arange(20000)/10 self._plotIdealData(times) @@ -155,8 +155,8 @@ class Application: def _getIdealTimings(self): data = self.opt.Ts - self.idealTime = [data['tclose'], data['tgrow'], data['topen']] - + self.idealTime = [data['tclose'], data['tgrow'], self.opt.getMarkOpen()] + def _form_idealdatGraph(self, times): self.idealPhase0 = (self.idealTime[0])*self.scaler #Подъезд self.idealPhase1 = (self.idealTime[0]+ self.idealTime[1])*self.scaler #Сжатие