dev: добавлена функция определения времени открытия
This commit is contained in:
parent
4ea88ac4db
commit
295e1f64ad
@ -25,6 +25,9 @@ class OptAlgorithm(AutoConfigClass):
|
|||||||
self.x1Contact = self.dist_open_start_1 + self.position_start_1
|
self.x1Contact = self.dist_open_start_1 + self.position_start_1
|
||||||
self.x2Contact = self.dist_open_start_2 + self.position_start_2
|
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):
|
def V1Close(self, t: float):
|
||||||
if t < self.Ts["tclose_1_acc"]:
|
if t < self.Ts["tclose_1_acc"]:
|
||||||
return self.a_max_1 * t
|
return self.a_max_1 * t
|
||||||
|
|||||||
2
UML.svg
2
UML.svg
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 22 KiB |
2
UML.txt
2
UML.txt
@ -71,6 +71,6 @@ ID is compression #yellow
|
|||||||
ID is {-}
|
ID is {-}
|
||||||
@91.55623055658612
|
@91.55623055658612
|
||||||
ID is opening #yellow
|
ID is opening #yellow
|
||||||
@276.6234655587717
|
@220.34565355083035
|
||||||
ID is {-}
|
ID is {-}
|
||||||
@enduml
|
@enduml
|
||||||
|
|||||||
4
main.py
4
main.py
@ -62,7 +62,7 @@ class Application:
|
|||||||
self._requestSVG(real, client, ideal, bool)
|
self._requestSVG(real, client, ideal, bool)
|
||||||
|
|
||||||
def updatePlots(self):
|
def updatePlots(self):
|
||||||
#self._plotRealData()
|
self._plotRealData()
|
||||||
times = np.arange(20000)/10
|
times = np.arange(20000)/10
|
||||||
self._plotIdealData(times)
|
self._plotIdealData(times)
|
||||||
|
|
||||||
@ -155,7 +155,7 @@ class Application:
|
|||||||
|
|
||||||
def _getIdealTimings(self):
|
def _getIdealTimings(self):
|
||||||
data = self.opt.Ts
|
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):
|
def _form_idealdatGraph(self, times):
|
||||||
self.idealPhase0 = (self.idealTime[0])*self.scaler #Подъезд
|
self.idealPhase0 = (self.idealTime[0])*self.scaler #Подъезд
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user