diff options
4 files changed, 5 insertions, 5 deletions
| -rw-r--r-- | Utils/k_2_SI/task2/Event/EventTypeC.cpp | 2 | ||||
| -rw-r--r-- | Utils/k_2_SI/task2/Event/EventTypeC.h | 2 | ||||
| -rw-r--r-- | Utils/k_2_SI/task2/EventManager/EventManager.cpp | 4 | ||||
| -rw-r--r-- | Utils/k_2_SI/task2/EventManager/EventManager.h | 2 |
diff --git a/Utils/k_2_SI/task2/Event/EventTypeC.cpp b/Utils/k_2_SI/task2/Event/EventTypeC.cpp index b8f3980..9624bce 100644 --- a/Utils/k_2_SI/task2/Event/EventTypeC.cpp +++ b/Utils/k_2_SI/task2/Event/EventTypeC.cpp @@ -1,6 +1,6 @@ #include "EventTypeC.h" -EventTypeC::EventTypeC(size_t startH, size_t startM, size_t endH, size_t endM, size_t break1H, size_t break1M, size_t break2H, size_t break2M) : Event(type, startH, startM, endH, endM), break1(break1H, break1M), break2(break2H, break2M) +EventTypeC::EventTypeC(size_t startH, size_t startM, size_t break1H, size_t break1M, size_t break2H, size_t break2M) : Event(type, startH, startM, 23, 59), break1(break1H, break1M), break2(break2H, break2M) {} bool EventTypeC::duringTime(const Time& time) const diff --git a/Utils/k_2_SI/task2/Event/EventTypeC.h b/Utils/k_2_SI/task2/Event/EventTypeC.h index b3833fb..d94fa28 100644 --- a/Utils/k_2_SI/task2/Event/EventTypeC.h +++ b/Utils/k_2_SI/task2/Event/EventTypeC.h @@ -7,7 +7,7 @@ class EventTypeC : public Event public: - EventTypeC(size_t startH, size_t startM, size_t endH, size_t endM, size_t break1H, size_t break1M, size_t break2H, size_t break2M); + EventTypeC(size_t startH, size_t endM, size_t break1H, size_t break1M, size_t break2H, size_t break2M); bool duringTime(const Time& time) const override; Time getLength() const override; diff --git a/Utils/k_2_SI/task2/EventManager/EventManager.cpp b/Utils/k_2_SI/task2/EventManager/EventManager.cpp index 2d56ec5..78a22c6 100644 --- a/Utils/k_2_SI/task2/EventManager/EventManager.cpp +++ b/Utils/k_2_SI/task2/EventManager/EventManager.cpp @@ -79,10 +79,10 @@ void EventManager::addEventTypeB(size_t startH, size_t startM, size_t breakH, si addEvent(new EventTypeB(startH, startM, endH, endM, breakH, breakM)); } -void EventManager::addEventTypeC(size_t startH, size_t startM, size_t break1H, size_t break1M, size_t break2H, size_t break2M, size_t endH, size_t endM) +void EventManager::addEventTypeC(size_t startH, size_t startM, size_t break1H, size_t break1M, size_t break2H, size_t break2M) { //validation - addEvent(new EventTypeC(startH, startM, endH, endM, break1H, break1M, break2H, break2M)); + addEvent(new EventTypeC(startH, startM, break1H, break1M, break2H, break2M)); } Time EventManager::getDuration(size_t ind) const diff --git a/Utils/k_2_SI/task2/EventManager/EventManager.h b/Utils/k_2_SI/task2/EventManager/EventManager.h index 8582265..781ea96 100644 --- a/Utils/k_2_SI/task2/EventManager/EventManager.h +++ b/Utils/k_2_SI/task2/EventManager/EventManager.h @@ -22,7 +22,7 @@ public: void addEventTypeA(size_t startH, size_t startM, size_t endH, size_t endM, const char* name); void addEventTypeB(size_t startH, size_t startM, size_t breakH, size_t breakM, size_t endH, size_t endM); - void addEventTypeC(size_t startH, size_t startM, size_t break1H, size_t break1M, size_t break2H, size_t break2M, size_t endH, size_t endM); + void addEventTypeC(size_t startH, size_t startM, size_t break1H, size_t break1M, size_t break2H, size_t break2M); Time getDuration(size_t ind) const; size_t getEventsCountDuringTime(size_t hours, size_t mins); |