Hello, Dan. I made it function

mikelikespie · Sep 30, 2008 · 8cc5b67 · 8cc5b67
1 parent 6075548
commit 8cc5b67
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/DataSet.cpp b/src/DataSet.cpp
@@ -56,7 +56,7 @@ FloatKeyVec DataSet::getTopKSimilar(ObjectValueMap *a, int k, DistanceFunction d
 
 	for(ActorObjectMap::iterator i = myMap.begin(); i != myMap.end(); i++) {
 		float val = df(a, i->second);
-
+		std::cout << "returned " << val << std::endl;
 		if(!used_min)
 			min = val;
 #if 0

diff --git a/src/DistanceFunctions.cpp b/src/DistanceFunctions.cpp
@@ -27,19 +27,17 @@ float pearsonDistanceOrdered(ObjectValueMap *p1, ObjectValueMap *p2) {
 //	return 1.0;
 	while(true) {
 
-		int n1=0, n2=0;
+		int  n2=0;
 
 		while(i != p1->end() && i2 != p2->end() && i->first != i2->first) {
 			if(i->first < i2->first) {
 				++i;
-				n1++;
 			} else {
 				++i2;
 				n2++;
 			}
 		}
 		if(i->first == i2->first) {
-			n1++;
 			n2++;
 		}
 
@@ -49,7 +47,7 @@ float pearsonDistanceOrdered(ObjectValueMap *p1, ObjectValueMap *p2) {
 			break;
 		}
 
-		std::cout << n1 << " - " << n2 << std::endl;
+		std::cout << i->second << ","  <<i2->second << " - " << n2 << std::endl;
 
 		n++;