diff --git a/src/controller/__pycache__/passportFormer.cpython-310.pyc b/src/controller/__pycache__/passportFormer.cpython-310.pyc index 6d74626..66f156d 100644 Binary files a/src/controller/__pycache__/passportFormer.cpython-310.pyc and b/src/controller/__pycache__/passportFormer.cpython-310.pyc differ diff --git a/src/controller/passportFormer.py b/src/controller/passportFormer.py index 4561aa8..f90279f 100644 --- a/src/controller/passportFormer.py +++ b/src/controller/passportFormer.py @@ -23,7 +23,7 @@ class idealDataBuilder(BaseIdealDataBuilder): def get_ideal_timings(self) -> list[float]: data = self.Ts - ideal_timings = [data['tclose'], data['tgrow'], self.welding_time, self.getMarkOpen()] # TODO: add data['tmovement'], Oncoming не учитывается в производительности + ideal_timings = [data['tclose'], data['tgrow'], self.welding_time, self.getMarkOpen(), data['tmovement']] # TODO: add data['tmovement'], Oncoming не учитывается в производительности return ideal_timings class PassportFormer(BasePointPassportFormer): diff --git a/src/utils/base/__pycache__/base.cpython-310.pyc b/src/utils/base/__pycache__/base.cpython-310.pyc index fc1ef8d..12a9215 100644 Binary files a/src/utils/base/__pycache__/base.cpython-310.pyc and b/src/utils/base/__pycache__/base.cpython-310.pyc differ diff --git a/src/utils/base/base.py b/src/utils/base/base.py index 2908f17..da61e93 100644 --- a/src/utils/base/base.py +++ b/src/utils/base/base.py @@ -338,7 +338,8 @@ class BasePointPassportFormer: "Closing", "Squeeze", "Welding", - "Relief" + "Relief", + "Oncomming" ] def _find_indexes(self, diff --git a/weldingSpotPerformance.7z b/weldingSpotPerformance.7z new file mode 100644 index 0000000..6f95a2b Binary files /dev/null and b/weldingSpotPerformance.7z differ