dcplusplus-commit

[Dcplusplus-commit] SF.net SVN: adchpp: [107] adchpp/trunk/plugins/Bloom/src/HashBloom.cpp

[<arn...@us...>]

Revision: 107
          http://adchpp.svn.sourceforge.net/adchpp/?rev=107&view=rev
Author:   arnetheduck
Date:     2007-12-19 01:35:58 -0800 (Wed, 19 Dec 2007)

Log Message:
-----------
Fix k assignment error

Modified Paths:
--------------
    adchpp/trunk/plugins/Bloom/src/HashBloom.cpp

Modified: adchpp/trunk/plugins/Bloom/src/HashBloom.cpp
===================================================================
--- adchpp/trunk/plugins/Bloom/src/HashBloom.cpp	2007-12-17 23:13:35 UTC (rev 106)
+++ adchpp/trunk/plugins/Bloom/src/HashBloom.cpp	2007-12-19 09:35:58 UTC (rev 107)
@@ -1,7 +1,6 @@
 #include "stdinc.h"
 #include "HashBloom.h"
 
-
 size_t HashBloom::get_k(size_t n) {
 	const size_t bits = TTHValue::SIZE * 8;
 	for(size_t k = static_cast<size_t>(sqrt(bits)); k > 1; --k) {
@@ -18,7 +17,8 @@
 
 uint64_t HashBloom::get_m(size_t n, size_t k) {
 	uint64_t m = (static_cast<uint64_t>(ceil(static_cast<double>(n) * k / log(2.))));
-	return ((m / 8) + 1) * 8;
+	// 64-bit boundary allows us to use a bitset based on uint64_t's
+	return ((m / 64) + 1) * 64;
 }
 
 void HashBloom::add(const TTHValue& tth) {
@@ -45,7 +45,7 @@
 
 void HashBloom::reset(size_t k_) {
 	bloom.resize(0);
-	k = k;
+	k = k_;
 }
 
 size_t HashBloom::pos(const TTHValue& tth, size_t n) const {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Dcplusplus-commit] SF.net SVN: adchpp: [128] adchpp/trunk/plugins/Bloom/src/HashBloom.cpp

[<arn...@us...>]

Revision: 128
          http://adchpp.svn.sourceforge.net/adchpp/?rev=128&view=rev
Author:   arnetheduck
Date:     2008-01-18 14:36:54 -0800 (Fri, 18 Jan 2008)

Log Message:
-----------
fix bloom loading

Modified Paths:
--------------
    adchpp/trunk/plugins/Bloom/src/HashBloom.cpp

Modified: adchpp/trunk/plugins/Bloom/src/HashBloom.cpp
===================================================================
--- adchpp/trunk/plugins/Bloom/src/HashBloom.cpp	2008-01-15 13:53:57 UTC (rev 127)
+++ adchpp/trunk/plugins/Bloom/src/HashBloom.cpp	2008-01-18 22:36:54 UTC (rev 128)
@@ -47,7 +47,7 @@
 	bloom.resize(v.size() * 8);
 	for(size_t i = 0; i < v.size(); ++i) {
 		for(size_t j = 0; j < 8; ++j) {
-			bloom[i*8 + j] = ((v[i] >> j) != 0);
+			bloom[i*8 + j] = (((v[i] >> j) & 1) != 0);
 		}
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Dcplusplus-commit] SF.net SVN: adchpp: [131] adchpp/trunk/plugins/Bloom/src/HashBloom.cpp

[<arn...@us...>]

Revision: 131
          http://adchpp.svn.sourceforge.net/adchpp/?rev=131&view=rev
Author:   arnetheduck
Date:     2008-02-11 11:20:52 -0800 (Mon, 11 Feb 2008)

Log Message:
-----------
cleanup  bloom pos

Modified Paths:
--------------
    adchpp/trunk/plugins/Bloom/src/HashBloom.cpp

Modified: adchpp/trunk/plugins/Bloom/src/HashBloom.cpp
===================================================================
--- adchpp/trunk/plugins/Bloom/src/HashBloom.cpp	2008-01-31 22:10:31 UTC (rev 130)
+++ adchpp/trunk/plugins/Bloom/src/HashBloom.cpp	2008-02-11 19:20:52 UTC (rev 131)
@@ -53,13 +53,14 @@
 }
 
 size_t HashBloom::pos(const TTHValue& tth, size_t n) const {
-	uint64_t x = 0;
-	
-	size_t start = n * h;
 	if((n+1)*h > TTHValue::BITS) {
 		return 0;
 	}
+
+	uint64_t x = 0;
 	
+	size_t start = n * h;
+	
 	for(size_t i = 0; i < h; ++i) {
 		size_t bit = start + i;
 		size_t byte = bit / 8;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.