From a71ab74a9c0545a15f8efc5ec582d5f6b7a42601 Mon Sep 17 00:00:00 2001
From: Anna Wiggins <annabunches@gmail.com>
Date: Fri, 24 Jun 2011 11:37:56 -0400
Subject: [PATCH] Fixed strength calculation, yay

---
 gamedata.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gamedata.cpp b/gamedata.cpp
index c0e77db..ae8d95a 100644
--- a/gamedata.cpp
+++ b/gamedata.cpp
@@ -3,6 +3,7 @@
 #include "debug.h"
 #include <list>
 #include <algorithm>
+#include <cassert>
 
 using std::list;
 
@@ -109,6 +110,8 @@ float GameData::calculate_strength_r(Vertex* node, unsigned int depth, list<Vert
     list<Edge> es = get_vertex_edges(node);
     list<Vertex*> to_visit;
 
+    visited.push_back(node);
+
     for (list<Edge>::iterator cursor = es.begin(); cursor != es.end();
 	 cursor++)
     {
@@ -120,19 +123,17 @@ float GameData::calculate_strength_r(Vertex* node, unsigned int depth, list<Vert
 	{
 	    to_visit.push_back(e.b);
 	}
-	else if (e.a == node &&
-		 find(visited.begin(), visited.end(), e.b) == visited.end())
+	else if (e.b == node &&
+		 find(visited.begin(), visited.end(), e.a) == visited.end())
 	{
 	    to_visit.push_back(e.a);
 	}
     }
 
-    visited.push_back(node);
-
     // This is the base case - this node has no unvisited neighbors
     if (to_visit.empty())
     {
-	fprintf(stderr, "At a leaf, and score=%f, depth=%d\n", (float)node->score, depth);
+	assert(depth > 0);
 	return (float)(node->score) / depth;
     }