added invoker virtual class and made timer inherit from it

src/sorters.hpp

@@ -6,6 +6,7 @@
 #include <string>
 #include <vector>
 
+#include "Invoker.hpp"
 #include "steppable.hpp"
 
 //ground truth domain data
@@ -40,4 +41,10 @@ public:
 	bool step();
 };
 
+struct SortBinding {
+	std::shared_ptr<SortInput> input;
+	std::unique_ptr<Steppable> sort;
+	std::unique_ptr<Invoker> invoker;
+};
+
 #endif

src/timer.cpp

@@ -16,7 +16,7 @@ void Timer::add_time(milliseconds deltatime) {
 	accumulator += deltatime;
 	if (accumulator >= triggerinterval) {
 		accumulator -= triggerinterval;
-		callback();
+		request();
 		triggercount++;
 		if (!isinfinite && triggercount >= triggeramount){
 			isexpired=true;
@@ -24,6 +24,10 @@ void Timer::add_time(milliseconds deltatime) {
 	}
 };
 
+void Timer::request() {
+		callback();	
+}
+
 void TimerManager::add_timer(size_t triggeramount, function<bool()> myaction, std::chrono::milliseconds triggerinterval) {
 	Timer mynewtimer(triggeramount, myaction, triggerinterval);
 	timers.push_back(std::move(mynewtimer));

src/timer.hpp

@@ -7,8 +7,9 @@
 #include <chrono>
 #include <vector>
 
+#include "Invoker.hpp"
 //check if the timer is still valid, check if enough time has passed and if so, actuate action
-class Timer {
+class Timer: public Invoker {
 public:
 	size_t triggeramount;
 	bool isexpired = false;
@@ -18,9 +19,11 @@ public:
 	std::function<bool()> callback;
 
 	Timer(size_t triggeramount, std::function<bool()> myaction, std::chrono::milliseconds triggerinterval);
-
+	
 	void add_time(std::chrono::milliseconds deltatime);
 
+	void request();
+
 private:
 	std::chrono::milliseconds accumulator = std::chrono::milliseconds(0);
 	std::chrono::milliseconds triggerinterval = std::chrono::milliseconds(1000); //default to 1 sec