From be293853da068b28143f75bb19c59b3915fd35e6 Mon Sep 17 00:00:00 2001
From: Sam Anthony <sam@samanthony.xyz>
Date: Wed, 9 Oct 2024 09:52:58 -0400
Subject: remove dead code

---
 Makefile      |  2 +-
 balls.h       | 16 +-------------
 layers.cpp    | 67 ---------------------------------------------------------
 partition.cpp | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 71 insertions(+), 83 deletions(-)
 delete mode 100644 layers.cpp
 create mode 100644 partition.cpp

diff --git a/Makefile b/Makefile
index 7a26099..94a8553 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ CC = g++
 CFLAGS = -Wall -pedantic
 LDFLAGS = -ltbb -lglut -lGLU -lGL
 
-balls: balls.o collision.o point.o vec.o layers.o
+balls: balls.o collision.o point.o vec.o partition.o
 	${CC} -o $@ $^ ${LDFLAGS}
 	@echo done
 
diff --git a/balls.h b/balls.h
index b908183..63d5278 100644
--- a/balls.h
+++ b/balls.h
@@ -33,9 +33,6 @@ typedef struct {
 	Color color;
 } Ball;
 
-typedef continue_node<continue_msg> node_t;
-typedef const continue_msg & msg_t;
-
 class Collision {
 public:
 	Ball *b1, *b2;
@@ -53,22 +50,11 @@ public:
 		return a.b1 == b.b1 && a.b2 == b.b2;
 	}
 
-	friend ostream &operator<<(ostream& os, Collision const & c) {
+	friend ostream& operator<<(ostream& os, Collision const & c) {
 		return os << "(" << c.b1 << ", " << c.b2 << ")";
 	}
 };
 
-class CollisionGraph {
-private:
-	graph g;
-	node_t root;
-	vector<vector<reference_wrapper<node_t>>> layers;
-
-public:
-	CollisionGraph(void);
-	void run();
-};
-
 vector<vector<Collision>> partitionCollisions(vector<Ball *> balls);
 
 Point addPt(Point p, Point q);
diff --git a/layers.cpp b/layers.cpp
deleted file mode 100644
index f8b3afd..0000000
--- a/layers.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-#include "balls.h"
-
-static vector<Collision> completeGraph(vector<Ball *> balls);
-static vector<Collision> matching(vector<Collision> edges);
-static vector<Collision> diff(vector<Collision> a, vector<Collision> b);
-
-vector<vector<Collision>>
-partitionCollisions(vector<Ball *> balls) {
-	vector<vector<Collision>> layers;
-
-	vector<Collision> collisions = completeGraph(balls);
-	while (!collisions.empty()) {
-		cout << "\nadd layer\n";
-		cout << "layers.size(): " << layers.size() << "\n";
-
-		vector<Collision> layerCollisions = matching(collisions);
-		cout << "layer collisions: ";
-		for (Collision c : layerCollisions)
-			cout << c << " ";
-		cout << "\n";
-		collisions = diff(collisions, layerCollisions);
-
-		vector<Collision> thisLayer;
-		for (Collision c : layerCollisions) {
-			cout << "create node with " << c << "\n";
-			thisLayer.push_back(c);
-		}
-		cout << "thisLayer.size(): " << thisLayer.size() << "\n";
-		layers.push_back(thisLayer);
-	}
-	return layers;
-}
-
-static vector<Collision>
-completeGraph(vector<Ball *> balls) {
-	vector<Collision> edges;
-	size_t i, j;
-
-	for (i = 0; i < balls.size(); i++)
-		for (j = i+1; j < balls.size(); j++)
-			edges.push_back(Collision(balls.at(i), balls.at(j)));
-	return edges;
-}
-
-static vector<Collision>
-matching(vector<Collision> edges) {
-	vector<Collision> matching;
-	size_t i;
-
-	for (Collision e : edges) {
-		for (i = 0; i < matching.size(); i++)
-			if (e.b1 == matching[i].b1 || e.b1 == matching[i].b2 || e.b2 == matching[i].b1 || e.b2 == matching[i].b2)
-				break;
-		if (i == matching.size()) /* no shared vertices */
-			matching.push_back(e);
-	}
-	return matching;
-}
-
-static vector<Collision>
-diff(vector<Collision> a, vector<Collision> b) {
-	vector<Collision> diff;
-	set_difference(a.begin(), a.end(),
-		b.begin(), b.end(),
-		inserter(diff, diff.begin()));
-	return diff;
-}
diff --git a/partition.cpp b/partition.cpp
new file mode 100644
index 0000000..971c74f
--- /dev/null
+++ b/partition.cpp
@@ -0,0 +1,69 @@
+#include "balls.h"
+
+static vector<Collision> completeGraph(vector<Ball *> balls);
+static vector<Collision> matching(vector<Collision> edges);
+static vector<Collision> diff(vector<Collision> a, vector<Collision> b);
+
+
+
+vector<vector<Collision>>
+partitionCollisions(vector<Ball *> balls) {
+	vector<vector<Collision>> layers;
+
+	vector<Collision> collisions = completeGraph(balls);
+	while (!collisions.empty()) {
+		cout << "\nadd layer\n";
+		cout << "layers.size(): " << layers.size() << "\n";
+
+		vector<Collision> layerCollisions = matching(collisions);
+		cout << "layer collisions: ";
+		for (Collision c : layerCollisions)
+			cout << c << " ";
+		cout << "\n";
+		collisions = diff(collisions, layerCollisions);
+
+		vector<Collision> thisLayer;
+		for (Collision c : layerCollisions) {
+			cout << "create node with " << c << "\n";
+			thisLayer.push_back(c);
+		}
+		cout << "thisLayer.size(): " << thisLayer.size() << "\n";
+		layers.push_back(thisLayer);
+	}
+	return layers;
+}
+
+static vector<Collision>
+completeGraph(vector<Ball *> balls) {
+	vector<Collision> edges;
+	size_t i, j;
+
+	for (i = 0; i < balls.size(); i++)
+		for (j = i+1; j < balls.size(); j++)
+			edges.push_back(Collision(balls.at(i), balls.at(j)));
+	return edges;
+}
+
+static vector<Collision>
+matching(vector<Collision> edges) {
+	vector<Collision> matching;
+	size_t i;
+
+	for (Collision e : edges) {
+		for (i = 0; i < matching.size(); i++)
+			if (e.b1 == matching[i].b1 || e.b1 == matching[i].b2 || e.b2 == matching[i].b1 || e.b2 == matching[i].b2)
+				break;
+		if (i == matching.size()) /* no shared vertices */
+			matching.push_back(e);
+	}
+	return matching;
+}
+
+static vector<Collision>
+diff(vector<Collision> a, vector<Collision> b) {
+	vector<Collision> diff;
+	set_difference(a.begin(), a.end(),
+		b.begin(), b.end(),
+		inserter(diff, diff.begin()));
+	return diff;
+}
-- 
cgit v1.2.3