Merge pull request #495 from gsomix/CSet

CHashSet -> CSet
shogun-toolbox · May 3, 2012 · 392ab41 · 392ab41
2 parents 786790d + 84311ca
commit 392ab41
Show file tree

Hide file tree

Showing 5 changed files with 305 additions and 353 deletions.
diff --git a/examples/undocumented/libshogun/library_hashset.cpp b/examples/undocumented/libshogun/library_hashset.cpp
@@ -1,4 +1,4 @@
-#include <shogun/lib/HashSet.h>
+#include <shogun/lib/Set.h>
 #include <stdio.h>
 
 using namespace shogun;
@@ -8,10 +8,13 @@ int main(int argc, char** argv)
 	init_shogun();
 	double v[8] = {0.0,0.0,0.1,0.1,0.2,0.2,0.3,0.3};
 
-	CHashSet* set = new CHashSet(8);
+	CSet<double>* set = new CSet<double>(2, 8);
 
 	for (int i=0; i<8; i++)
-		set->insert_key(i,v[i]);
+		set->add(v[i]);
+
+	set->remove(0.1);
+	set->add(0.4);
 
 	delete set;
 	exit_shogun();

diff --git a/src/shogun/base/init.cpp b/src/shogun/base/init.cpp
@@ -54,7 +54,7 @@ namespace shogun
 			sg_math = new shogun::CMath();
 #ifdef TRACE_MEMORY_ALLOCS
 		if (!sg_mallocs)
-			sg_mallocs = new shogun::CSet<MemoryBlock>(false);
+			sg_mallocs = new shogun::CSet<MemoryBlock>(631, 1024);
 
 		SG_REF(sg_mallocs);
 #endif

diff --git a/src/shogun/lib/HashSet.cpp b/src/shogun/lib/HashSet.cpp
diff --git a/src/shogun/lib/HashSet.h b/src/shogun/lib/HashSet.h