clang formatting

Invoker is now an object that we attach to the sortbinding rather than
the HasInvoker.
we now create a binding in main, then pass it on to App.
Timer now has a weak ptr to its invoker, so it could clean itself up.

src/Invoker.hpp

@@ -0,0 +1,18 @@
+#ifndef INVOKER_HPP
+#define INVOKER_HPP
+
+#include "steppable.hpp"
+#include <memory>
+class Invoker {
+  public:
+  std::weak_ptr<Steppable> target;
+
+  Invoker(std::shared_ptr<Steppable> t) { target = t; }
+  void request() {
+    if (auto sp = target.lock()) {
+      sp->step();
+    }
+  }
+};
+
+#endif

src/core/app.cpp

@@ -1,4 +1,5 @@
 #include <SFML/Graphics/Font.hpp>
+#include <chrono>
 #include <iostream>
 #include <memory>
 #include <thread>
@@ -8,61 +9,55 @@
 using namespace std;
 
 bool displaySortInput(shared_ptr<SortInput> input) {
-	cout << "name: " + input->name + " values: ";
-	for (size_t i = 0; i < input->values.size(); ++i) {
-		printf("%d | ", input->values[i]);
-	}
-	printf("\n");
-	return false;
+  cout << "name: " + input->name + " values: ";
+
+  for (size_t i = 0; i < input->values.size(); ++i) {
+    printf("%d | ", input->values[i]);
+  }
+  printf("\n");
+  return false;
 }
 
 string arraytostr(shared_ptr<SortInput> input) {
-	string myoutput;
-	ostringstream stringrep;
-	for (size_t i = 0; i < input->values.size(); ++i) {
-		stringrep << input->values[i] << " | ";
-	}
-	return stringrep.str();
+  string myoutput;
+  ostringstream stringrep;
+  for (size_t i = 0; i < input->values.size(); ++i) {
+    stringrep << input->values[i] << " | ";
+  }
+  return stringrep.str();
 }
 
-App::App(unique_ptr<ViewSession> myviewsession)
-		: viewsession(std::move(myviewsession)) {}
+App::App(unique_ptr<ViewSession> myviewsession, unique_ptr<TimerManager> mytimermanager)
+    : viewsession(std::move(myviewsession)), timermanager(std::move(mytimermanager)) {}
 
-//connects data with logic and invoker
-void App::setup_session(shared_ptr<SortInput> myinput, string sorttype) {
-	cout << "adding sort " << sorttype << "\n";
-	//push data to app
-	inputs.push_back(myinput);
-	//connect data to logic
-	if (sorttype == "bsort") {
-		sortsession.add_session(myinput, sorttype);
-	}
-	//connect logic to timer (should not be hardcoded to timers)
-	auto prs = sortsession.sortsessions.back().get();
-	timermanager.add_timer(
-			0, [prs]() { return prs->step(); }, std::chrono::milliseconds(250));
+// just pushes to App for now
+void App::add_sort(shared_ptr<SortInput> myinput, SortBinding mysortbinding) {
+  cout << "adding sort " << myinput->name << "\n";
+  // insert data
+  inputs.push_back(myinput);
+  // move the sort into app
+  sortbindings.push_back(mysortbinding);
 }
 
 void App::run() {
-	// set up ui
-	while (viewsession->mywindow.isOpen()) {
-		while (const optional event = viewsession->mywindow.pollEvent()) {
-			if (event->is<sf::Event::Closed>())
-				viewsession->mywindow.close();
-		}
+  // set up ui
+  while (viewsession->mywindow.isOpen()) {
+    while (const optional event = viewsession->mywindow.pollEvent()) {
+      if (event->is<sf::Event::Closed>()) viewsession->mywindow.close();
+    }
 
-		//draw
-		viewsession->mywindow.clear(sf::Color::Black);
-		viewsession->mywindow.draw(viewsession->text);
-		viewsession->text.setString(arraytostr(inputs[0]));
+    // draw
+    viewsession->mywindow.clear(sf::Color::Black);
+    viewsession->mywindow.draw(viewsession->text);
+    viewsession->text.setString(arraytostr(inputs[0]));
 
-		for (shared_ptr<SortInput> input : inputs) {
-			displaySortInput(input);
-		}
-		viewsession->mywindow.display();
+    for (shared_ptr<SortInput> input : inputs) {
+      displaySortInput(input);
+    }
+    viewsession->mywindow.display();
 
-		//update logic
-		timermanager.update_timers();
-		this_thread::sleep_for(std::chrono::milliseconds(250));
-	}
+    // update logic
+    timermanager->update_timers();
+    this_thread::sleep_for(std::chrono::milliseconds(250));
+  }
 }

src/core/app.hpp

@@ -1,28 +1,28 @@
 #ifndef APP_HPP
 #define APP_HPP
 
-
 #include <SFML/Graphics/Font.hpp>
 #include <SFML/Graphics/RenderWindow.hpp>
 #include <SFML/Graphics/Text.hpp>
 #include <memory>
+#include <vector>
 
-#include "../timer.hpp"
-#include "../sorters.hpp"
 #include "../sessions.hpp"
+#include "../sorters.hpp"
+#include "../timer.hpp"
 
-//should connect the different parts
-//for now data, mutation, and rendering
-struct App{
-	std::vector<std::shared_ptr<SortInput>> inputs;
-	SortSession sortsession;
-	std::unique_ptr<ViewSession> viewsession;
-	TimerManager timermanager;
+// should connect the different parts
+// for now data, mutation, and rendering
+struct App {
+  std::vector<std::shared_ptr<SortInput>> inputs;
+  std::vector<SortBinding> sortbindings;
+  std::unique_ptr<ViewSession> viewsession;
+  std::unique_ptr<TimerManager> timermanager;
 
-	App(std::unique_ptr<ViewSession> myviewsession);
+  App(std::unique_ptr<ViewSession> myviewsession, std::unique_ptr<TimerManager> mytimermanager);
 
-	void setup_session(std::shared_ptr<SortInput> myinput, std::string sorttype);
-	void run();
+  void add_sort(std::shared_ptr<SortInput> myinput, SortBinding mysortbinding);
+  void run();
 };
 
 #endif

src/sessions.cpp

@@ -2,19 +2,19 @@
 
 using namespace std;
 
-ViewSession::ViewSession(): mywindow(sf::VideoMode({800,600}), "mywindow"), myfont(load_font("assets/NS-R.ttf")), text(myfont)
-{
-	text.setFont(myfont);
-	text.setString("Hello world");
-	text.setCharacterSize(24);
-	text.setFillColor(sf::Color::Red);
+ViewSession::ViewSession()
+    : mywindow(sf::VideoMode({800, 600}), "mywindow"), myfont(load_font("assets/NS-R.ttf")), text(myfont) {
+  text.setFont(myfont);
+  text.setString("Hello world");
+  text.setCharacterSize(24);
+  text.setFillColor(sf::Color::Red);
 };
 
-sf::Font ViewSession::load_font(const std::string &filename){
-	sf::Font font;
-	if (!font.openFromFile(filename)){
-		fprintf(stderr, "failed to load font");
-		std::exit(1);
-	}
-	return font;
+sf::Font ViewSession::load_font(const std::string &filename) {
+  sf::Font font;
+  if (!font.openFromFile(filename)) {
+    fprintf(stderr, "failed to load font");
+    std::exit(1);
+  }
+  return font;
 }

src/sessions.hpp

@@ -8,29 +8,16 @@
 
 #include "sorters.hpp"
 
-//owns and manages the sorters that mutate data, but does not own the data itself
-struct SortSession {
-	std::vector<std::unique_ptr<Steppable>> sortsessions;
+// owns and manages the sorters that mutate data, but does not own the data itself
 
-	SortSession(){
-	}
+// sfml/render
+struct ViewSession {
+  sf::RenderWindow mywindow;
+  sf::Font myfont;
+  sf::Text text;
 
-	//connects data with a sorter and controls it through a timer
-	void add_session(std::shared_ptr<SortInput> input, std::string sorttype){
-		if(sorttype == "bsort"){
-			sortsessions.push_back(make_unique<SteppedBsort>(input));
-		};
-	}
-};
-
-//sfml/render
-struct ViewSession{
-	sf::RenderWindow mywindow;
-	sf::Font myfont;
-	sf::Text text;
-
-	ViewSession();
-	sf::Font load_font(const std::string &filename);
+  ViewSession();
+  sf::Font load_font(const std::string &filename);
 };
 
 #endif

src/sorters.cpp

@@ -1,30 +1,39 @@
+#include "sorters.hpp"
 #include <cstdio>
+#include <iostream>
 #include <memory>
 #include <utility>
-#include "sorters.hpp"
 using namespace std;
 
+SteppedBsort::SteppedBsort(shared_ptr<SortInput> input) : data(input) {};
 
-SteppedBsort::SteppedBsort(shared_ptr<SortInput> input): data(input) {};
+void SteppedBsort::step() {
+  cout << "step in SteppedBsort\n";
+  if (is_finished) {
+    printf("finished");
+  }
+  if (data->values[j] > data->values[j + 1]) {
+    swap(data->values[j], data->values[j + 1]);
+  }
+  j++;
+  if (j >= data->values.size() - 1 - i) {
+    j = 0;
+    i++;
+  }
 
-bool SteppedBsort:: step(){
-	if(is_finished==true) {
-		printf("finished");
-		return true;
-			}
-	if(data->values[j]>data->values[j+1])
-		{
-			swap(data->values[j], data->values[j+1]);
-		}
-	j++;
-	if(j>=data->values.size()-1 -i){
-		j=0;
-		i++;
-	}
-
-	if (i==data->values.size()-1){
-		is_finished=true;
-	}
-
-	return false;
+  if (i == data->values.size() - 1) {
+    is_finished = true;
+  }
+}
+
+SortBinding::SortBinding(
+    std::shared_ptr<SortInput> input, std::shared_ptr<Steppable> sort, std::shared_ptr<Invoker> invoker)
+    : input(std::move(input)), sort(std::move(sort)), invoker(std::move(invoker)) {}
+
+// connects data with the correct sort
+std::shared_ptr<Steppable> make_sort(std::shared_ptr<SortInput> input, std::string sorttype) {
+  if (sorttype == "bsort") {
+    return make_shared<SteppedBsort>(input);
+  }
+  return nullptr;
 }

src/sorters.hpp

@@ -6,38 +6,48 @@
 #include <string>
 #include <vector>
 
+#include "Invoker.hpp"
 #include "steppable.hpp"
 
-//ground truth domain data
+// ground truth domain data
 struct SortInput {
-	std::string name;
-	std::vector<int> values;
+  std::string name;
+  std::vector<int> values;
 
-	SortInput(std::string name, std::vector<int> data)
-		: name(name), values(data) {}
+  SortInput(std::string name, std::vector<int> data) : name(name), values(data) {}
 };
 
-//ro rendering of data
+// ro rendering of data
 struct SortView {
-	std::shared_ptr<const SortInput> values;
-	size_t currenttarget = 0;
-	int x,y;
-	int color;
-	SortView(std::shared_ptr<const SortInput> in): values(in) {}
+  std::shared_ptr<const SortInput> values;
+  size_t currenttarget = 0;
+  int x, y;
+  int color;
+  SortView(std::shared_ptr<const SortInput> in) : values(in) {}
 };
 
-//mutates the domain data
-class SteppedBsort: public Steppable {
-public:
-	std::shared_ptr<SortInput> data;
-	size_t stepcount = 0;
-	size_t i = 0;
-	size_t j = 0;
-	bool is_finished = false;
+// mutates the domain data
+class SteppedBsort : public Steppable {
+  public:
+  std::shared_ptr<SortInput> data;
+  size_t stepcount = 0;
+  size_t i         = 0;
+  size_t j         = 0;
+  bool is_finished = false;
 
-	SteppedBsort(std::shared_ptr<SortInput> data);
+  SteppedBsort(std::shared_ptr<SortInput> data);
 
-	bool step();
+  void step();
 };
 
+// working unit
+struct SortBinding {
+  std::shared_ptr<SortInput> input;
+  std::shared_ptr<Steppable> sort;
+  std::shared_ptr<Invoker> invoker;
+  SortBinding(std::shared_ptr<SortInput> input, std::shared_ptr<Steppable> sort, std::shared_ptr<Invoker> invoker);
+};
+
+std::shared_ptr<Steppable> make_sort(std::shared_ptr<SortInput> input, std::string sorttype);
+
 #endif

src/sortui.cpp

@@ -1,38 +1,50 @@
 // for now juist CLI, print an arr, then print each it
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
+#include <SFML/Graphics.hpp>
 #include <SFML/Graphics/Color.hpp>
 #include <SFML/Graphics/Font.hpp>
 #include <SFML/Graphics/RenderWindow.hpp>
 #include <SFML/Graphics/Text.hpp>
-#include <SFML/Window/Window.hpp>
 #include <SFML/Window.hpp>
-#include <SFML/Graphics.hpp>
+#include <SFML/Window/Window.hpp>
 
 #include "core/app.hpp"
 #include "sessions.hpp"
 #include "sorters.hpp"
+#include "steppable.hpp"
+#include "timer.hpp"
 
 using namespace std::chrono;
 using namespace std;
 
-vector<int> dataprovider(){
-	return vector<int> {9,8,1,2,7,3,6,4,5};
-}
+vector<int> dataprovider() { return vector<int>{9, 8, 1, 2, 7, 3, 6, 4, 5}; }
 
 int main() {
-	//create data
-	auto myinput = make_shared<SortInput>("arr1", dataprovider());
-	auto myinput2 = make_shared<SortInput>("arr2", dataprovider());
+  // create data
+  auto myinput  = make_shared<SortInput>("arr1", dataprovider());
+  auto myinput2 = make_shared<SortInput>("arr2", dataprovider());
 
-	auto myviewsession = make_unique<ViewSession>();
+  auto myviewsession  = make_unique<ViewSession>();
+  auto mytimermanager = make_unique<TimerManager>();
 
-	//create app with initialized dependencies
-	App myapp(std::move(myviewsession));
-	//add and connect data
-	myapp.setup_session(myinput, "bsort");
-	//actually start the app
-	myapp.run();
+  // create app with initialized dependencies
+  App myapp(std::move(myviewsession), std::move(mytimermanager));
+
+  // create binding
+  shared_ptr<Steppable> asort   = make_sort(myinput, "bsort");
+  shared_ptr<Invoker> myinvoker = make_shared<Invoker>(asort);
+  SortBinding mysortbinding(myinput, asort, myinvoker);
+
+  Timer timer(0, myinvoker, chrono::milliseconds(250));
+  myapp.timermanager->add_timer(std::move(timer));
+
+  // add data and binding
+  myapp.add_sort(myinput, mysortbinding);
+
+  // actually start the app
+  myapp.run();
 }

src/steppable.hpp

@@ -4,11 +4,11 @@
 #include <cstddef>
 
 class Steppable {
-public:
-	virtual ~Steppable() = default;
-	bool is_finished = 0;
-	size_t stepcount = 0;
-	virtual bool step() = 0;
+  public:
+  virtual ~Steppable() = default;
+  bool is_finished     = 0;
+  size_t stepcount     = 0;
+  virtual void step()  = 0;
 };
 
 #endif

src/timer.cpp

@@ -1,40 +1,38 @@
 #include <chrono>
-#include <functional>
-#include <utility>
+#include <iostream>
+#include <memory>
 
+#include "Invoker.hpp"
 #include "timer.hpp"
 
 using namespace std::chrono;
 using namespace std;
 
-Timer::Timer(size_t triggeramount, function<bool()> myaction, milliseconds triggerinterval)
-	:triggeramount(triggeramount)
-	, callback(myaction)
-	, triggerinterval(triggerinterval) {}
+Timer::Timer(size_t triggeramount, std::weak_ptr<Invoker> invoker, milliseconds triggerinterval)
+    : triggeramount(triggeramount), invoker(invoker), triggerinterval(triggerinterval) {}
 
 void Timer::add_time(milliseconds deltatime) {
-	accumulator += deltatime;
-	if (accumulator >= triggerinterval) {
-		accumulator -= triggerinterval;
-		callback();
-		triggercount++;
-		if (!isinfinite && triggercount >= triggeramount){
-			isexpired=true;
-		}
-	}
-};
+  accumulator += deltatime;
+  if (accumulator >= triggerinterval) {
+    accumulator -= triggerinterval;
+    cout << "request in timer\n";
+    if (auto sp = invoker.lock()) {
+      sp->request();
+    }
+    triggercount++;
+    if (triggeramount != 0 && triggercount >= triggeramount) {
+      isexpired = true;
+    }
+  }
+}
 
-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));
-};
+void TimerManager::add_timer(Timer timer) { timers.push_back(std::move(timer)); }
 
 void TimerManager::update_timers() {
-	steady_clock::time_point currenttime =
-		steady_clock::now();
-	milliseconds deltatime = duration_cast<milliseconds>(currenttime-previoustime);
-	for(Timer &mytimer: timers){
-		mytimer.add_time(deltatime);
-	}
-	previoustime = currenttime;
+  steady_clock::time_point currenttime = steady_clock::now();
+  milliseconds deltatime               = duration_cast<milliseconds>(currenttime - previoustime);
+  for (Timer &mytimer : timers) {
+    mytimer.add_time(deltatime);
+  }
+  previoustime = currenttime;
 }

src/timer.hpp

@@ -1,43 +1,41 @@
 #ifndef TIMER_HPP
 #define TIMER_HPP
 
+#include <chrono>
 #include <cstddef>
 #include <ctime>
-#include <functional>
-#include <chrono>
+#include <memory>
 #include <vector>
 
-//check if the timer is still valid, check if enough time has passed and if so, actuate action
+#include "Invoker.hpp"
+// check if the timer is still valid, check if enough time has passed and if so, actuate action
 class Timer {
-public:
-	size_t triggeramount;
-	bool isexpired = false;
-	bool isinfinite = false;
-	size_t triggercount = 0;
+  public:
+  size_t triggeramount;
+  bool isexpired      = false;
+  size_t triggercount = 0;
+  std::weak_ptr<Invoker> invoker; // if no longer exists, then should clean up timer
 
-	std::function<bool()> callback;
+  Timer(size_t triggeramount, std::weak_ptr<Invoker> invoker, std::chrono::milliseconds triggerinterval);
+  void add_time(std::chrono::milliseconds deltatime);
 
-	Timer(size_t triggeramount, std::function<bool()> myaction, std::chrono::milliseconds triggerinterval);
-
-	void add_time(std::chrono::milliseconds deltatime);
-
-private:
-	std::chrono::milliseconds accumulator = std::chrono::milliseconds(0);
-	std::chrono::milliseconds triggerinterval = std::chrono::milliseconds(1000); //default to 1 sec
+  private:
+  std::chrono::milliseconds accumulator     = std::chrono::milliseconds(0);
+  std::chrono::milliseconds triggerinterval = std::chrono::milliseconds(1000); // default to 1 sec
 };
 
-
-//CRUD timers and give them dt on update
+// CRUD timers and give them dt on update
 class TimerManager {
-public:
-	std::vector<Timer> timers;
-	TimerManager(){previoustime = std::chrono::steady_clock::now();}
-	void add_timer(size_t triggeramount, std::function<bool()> myaction, std::chrono::milliseconds triggerinterval);
-	void delete_timer();
-	void update_timers();
+  public:
+  std::vector<Timer> timers;
+  TimerManager() { previoustime = std::chrono::steady_clock::now(); }
+  // void add_timer(size_t triggeramount, std::function<bool()> myaction, std::chrono::milliseconds triggerinterval);
+  void add_timer(Timer timer);
+  void delete_timer();
+  void update_timers();
 
-private:
-	std::chrono::steady_clock::time_point previoustime;
+  private:
+  std::chrono::steady_clock::time_point previoustime;
 };
 
 #endif