dev: добавлена функция определения времени открытия
This commit is contained in:
parent
4ea88ac4db
commit
295e1f64ad
@ -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"]:
|
||||
|
||||
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 {-}
|
||||
@91.55623055658612
|
||||
ID is opening #yellow
|
||||
@276.6234655587717
|
||||
@220.34565355083035
|
||||
ID is {-}
|
||||
@enduml
|
||||
|
||||
6
main.py
6
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 #Сжатие
|
||||
|
||||
Loading…
Reference in New Issue
Block a user