[Boost-commit] svn:boost r72354 - sandbox/bloom_filter/trunk/libs/bloom_filter/test

Subject: [Boost-commit] svn:boost r72354 - sandbox/bloom_filter/trunk/libs/bloom_filter/test
From: cpp.cabrera_at_[hidden]
Date: 2011-06-02 18:31:35

Author: alejandro
Date: 2011-06-02 18:31:33 EDT (Thu, 02 Jun 2011)
New Revision: 72354
URL: http://svn.boost.org/trac/boost/changeset/72354

Log:
Removed c++0x requirement (cstdint). Renamed primary test suite. Changed Jamfile to use statically linked boost_unit_test_framework.
Added:
   sandbox/bloom_filter/trunk/libs/bloom_filter/test/regression.cpp   (contents, props changed)
      - copied, changed from r72353, /sandbox/bloom_filter/trunk/libs/bloom_filter/test/boost_test.cpp
Removed:
   sandbox/bloom_filter/trunk/libs/bloom_filter/test/boost_test.cpp
Text files modified: 
   sandbox/bloom_filter/trunk/libs/bloom_filter/test/Jamfile.v2     |     5 +++--                                   
   sandbox/bloom_filter/trunk/libs/bloom_filter/test/regression.cpp |     7 ++++---                                 
   2 files changed, 7 insertions(+), 5 deletions(-)

Modified: sandbox/bloom_filter/trunk/libs/bloom_filter/test/Jamfile.v2
==============================================================================
--- sandbox/bloom_filter/trunk/libs/bloom_filter/test/Jamfile.v2	(original)
+++ sandbox/bloom_filter/trunk/libs/bloom_filter/test/Jamfile.v2	2011-06-02 18:31:33 EDT (Thu, 02 Jun 2011)
@@ -13,13 +13,14 @@
 
 project
     : requirements
-	<library>../../test/build//boost_unit_test_framework/<link>shared
+	<library>../test/build//boost_unit_test_framework/<link>static
+	#<library>../../../../libs/test/build//boost_unit_test_framework/<link>static
         <define>BOOST_ENABLE_WARNINGS
         <warnings>all
     ;
 
     test-suite "basic"
         :
-	[ run boost_test.cpp ]
+	[ run regression.cpp ]
         ;
 

Deleted: sandbox/bloom_filter/trunk/libs/bloom_filter/test/boost_test.cpp
==============================================================================
--- sandbox/bloom_filter/trunk/libs/bloom_filter/test/boost_test.cpp	2011-06-02 18:31:33 EDT (Thu, 02 Jun 2011)
+++ (empty file)
@@ -1,233 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Alejandro Cabrera 2011.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/bloom_filter for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-#define BOOST_TEST_MODULE "Boost Bloom Filter" 1
-#include <iostream>
-
-#include <boost/bloom_filter/bloom.hpp>
-#include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
-
-using boost::bloom_filter::bloom_filter;
-using boost::bloom_filter::boost_hash;
-
-BOOST_AUTO_TEST_CASE(defaultConstructor) {
-  typedef boost::mpl::vector<
-    boost_hash<int, 13>,
-    boost_hash<int, 17>,
-    boost_hash<int, 19>> BoostHashFunctions;
-  
-  bloom_filter<int, 8> bloom1;
-  bloom_filter<int, 8, BoostHashFunctions> bloom2;
-}
-
-BOOST_AUTO_TEST_CASE(assignment)
-{
-  bloom_filter<int, 8> bloom1;
-  bloom_filter<int, 8> bloom2;
-
-  for (size_t i = 0; i < 200; ++i) {
-    bloom1.insert(i);
-    BOOST_CHECK_EQUAL(bloom1.contains(i), true);
-  }
-
-  bloom2 = bloom1;
-
-  for (size_t i = 0; i < 200; ++i) {
-    BOOST_CHECK_EQUAL(bloom2.contains(i), true);
-  }
-}
-
-BOOST_AUTO_TEST_CASE(size) {
-  bloom_filter<size_t, 8> bloom_8;
-  bloom_filter<size_t, 256> bloom_256;
-  bloom_filter<size_t, 2048> bloom_2048;
-  
-  BOOST_CHECK_EQUAL(bloom_8.size(), 8ul);
-  BOOST_CHECK_EQUAL(bloom_256.size(), 256ul);
-  BOOST_CHECK_EQUAL(bloom_2048.size(), 2048ul);
-}
-
-BOOST_AUTO_TEST_CASE(numHashFunctions) {
-  bloom_filter<size_t, 8> bloom_3;
-  bloom_filter<size_t, 8, boost::mpl::vector<
-    boost_hash<size_t, 1>,
-    boost_hash<size_t, 2>>> bloom_2;
-  bloom_filter<size_t, 8, boost::mpl::vector<
-    boost_hash<size_t, 1>,
-    boost_hash<size_t, 2>,
-    boost_hash<size_t, 3>,
-    boost_hash<size_t, 4>,
-    boost_hash<size_t, 5>,
-    boost_hash<size_t, 6>,
-    boost_hash<size_t, 7>>> bloom_7;
-
-  BOOST_CHECK_EQUAL(bloom_3.num_hash_functions(), 3ul);
-  BOOST_CHECK_EQUAL(bloom_2.num_hash_functions(), 2ul);
-  BOOST_CHECK_EQUAL(bloom_7.num_hash_functions(), 7ul);
-}
-
-BOOST_AUTO_TEST_CASE(falsePositiveRate) {
-  bloom_filter<size_t, 64> bloom;
-
-  BOOST_CHECK_EQUAL(bloom.false_positive_rate(), 0.0);
-
-  bloom.insert(1);
-  BOOST_CHECK_CLOSE(bloom.false_positive_rate(), 0.002257625907, 0.0001);
-
-  bloom.insert(2);
-  BOOST_CHECK_LT(bloom.false_positive_rate(), 0.014736);
-
-  bloom.insert(3);
-  BOOST_CHECK_LT(bloom.false_positive_rate(), 0.040773);
-
-  bloom.insert(4);
-  BOOST_CHECK_LT(bloom.false_positive_rate(), 0.0796276);
-
-  bloom.insert(5);
-  BOOST_CHECK_LT(bloom.false_positive_rate(), 0.12877);
-
-  bloom.insert(6);
-  BOOST_CHECK_LT(bloom.false_positive_rate(), 0.185102);
-
-  for (size_t i = 7; i < 5000; ++i)
-    bloom.insert(i);
-  BOOST_CHECK_LE(bloom.false_positive_rate(), 1.0);
-}
-
-BOOST_AUTO_TEST_CASE(contains) {
-  bloom_filter<size_t, 8> bloom;
-
-  bloom.insert(1);
-  BOOST_CHECK_EQUAL(bloom.contains(1), true);
-  BOOST_CHECK_LE(bloom.count(), 3ul);
-  BOOST_CHECK_GE(bloom.count(), 1ul);
-}
-
-BOOST_AUTO_TEST_CASE(doesNotContain) {
-  bloom_filter<size_t, 8> bloom;
-
-  BOOST_CHECK_EQUAL(bloom.contains(1), false);
-}
-
-BOOST_AUTO_TEST_CASE(insertNoFalseNegatives) {
-  bloom_filter<size_t, 2048> bloom;
-
-  for (size_t i = 0; i < 100; ++i) {
-    bloom.insert(i);
-    BOOST_CHECK_EQUAL(bloom.contains(i), true);
-  }
-}
-
-BOOST_AUTO_TEST_CASE(clear) {
-  bloom_filter<size_t, 8> bloom;
-
-  for (size_t i = 0; i < 1000; ++i)
-    bloom.insert(i);
-
-  bloom.clear();
-  BOOST_CHECK_EQUAL(bloom.contains(1), false);
-  BOOST_CHECK_EQUAL(bloom.count(), 0ul);
-}
-
-BOOST_AUTO_TEST_CASE(testUnion) {
-  bloom_filter<size_t, 32> bloom_1;
-  bloom_filter<size_t, 32> bloom_2;
-  bloom_filter<size_t, 32> bloom_union;
-
-  for (size_t i = 0; i < 100; ++i)
-    bloom_1.insert(i);
-
-  for (size_t i = 100; i < 200; ++i)
-    bloom_2.insert(i);
-
-  bloom_union = bloom_1 | bloom_2;
-
-  for (size_t i = 0; i < 200; ++i)
-    BOOST_CHECK_EQUAL(bloom_union.contains(i), true);
-  BOOST_CHECK_GE(bloom_union.count(), bloom_1.count());
-  BOOST_CHECK_GE(bloom_union.count(), bloom_2.count());
-}
-
-BOOST_AUTO_TEST_CASE(testUnionAssign) {
-  bloom_filter<size_t, 32> bloom_1;
-  bloom_filter<size_t, 32> bloom_union;
-
-  for (size_t i = 0; i < 100; ++i) 
-    bloom_1.insert(i);
-
-  bloom_union |= bloom_1;
-
-  for (size_t i = 0; i < 100; ++i)
-    BOOST_CHECK_EQUAL(bloom_union.contains(i), true);
-  BOOST_CHECK_EQUAL(bloom_union.count(), bloom_1.count());
-}
-
-BOOST_AUTO_TEST_CASE(testIntersect) {
-  bloom_filter<size_t, 32> bloom_1;
-  bloom_filter<size_t, 32> bloom_2;
-  bloom_filter<size_t, 32> bloom_intersect;
-
-  // overlap at 100
-  for (size_t i = 0; i < 101; ++i) 
-    bloom_1.insert(i);
-  
-  for (size_t i = 100; i < 200; ++i) 
-    bloom_2.insert(i);
-
-  bloom_intersect = bloom_1 & bloom_2;
-
-  BOOST_CHECK_LE(bloom_intersect.count(), bloom_1.count());
-  BOOST_CHECK_LE(bloom_intersect.count(), bloom_2.count());
-  BOOST_CHECK_EQUAL(bloom_intersect.contains(100), true);
-}
-
-BOOST_AUTO_TEST_CASE(testIntersectAssign) {
-  bloom_filter<size_t, 32> bloom_1;
-  bloom_filter<size_t, 32> bloom_intersect;
-
-  for (size_t i = 0; i < 100; ++i) 
-    bloom_1.insert(i);
-  
-  bloom_intersect &= bloom_1;
-
-  for (size_t i = 0; i < 100; ++i)
-    BOOST_CHECK_EQUAL(bloom_intersect.contains(i), false);
-}
-
-/*
-BOOST_AUTO_TEST_CASE(collisionBenchmark) {
-  typedef boost::mpl::vector<
-    OHash <size_t, 2>,
-    OHash<size_t, 3>,
-    OHash<size_t, 5>,
-    OHash<size_t, 7>,
-    OHash<size_t, 11>,
-    OHash<size_t, 13>,
-    OHash<size_t, 17>,
-    OHash<size_t, 19>> EightHashFunctions_O;
-
-  static const size_t INSERT_VAL = 100;
-  static const size_t SEARCH_SPACE = 10000000;
-  static const size_t FILTER_SIZE = 64; 
-  size_t collisions = 0;
-  bloom_filter<size_t, FILTER_SIZE, EightHashFunctions_O> bloom;
-
-  std::cout << "bloom size " << bloom.size() << std::endl;
-  bloom.insert(INSERT_VAL);
-  for (size_t i = 0; i < SEARCH_SPACE; ++i) {
-    if (bloom.contains(i) && i != INSERT_VAL) ++collisions;
-  }
-
-  std::cout << collisions << " collisions" << std::endl;
-  bloom.clear();
-}
-*/

Copied: sandbox/bloom_filter/trunk/libs/bloom_filter/test/regression.cpp (from r72353, /sandbox/bloom_filter/trunk/libs/bloom_filter/test/boost_test.cpp)
==============================================================================
--- /sandbox/bloom_filter/trunk/libs/bloom_filter/test/boost_test.cpp	(original)
+++ sandbox/bloom_filter/trunk/libs/bloom_filter/test/regression.cpp	2011-06-02 18:31:33 EDT (Thu, 02 Jun 2011)
@@ -9,6 +9,7 @@
 // See http://www.boost.org/libs/bloom_filter for documentation.
 //
 //////////////////////////////////////////////////////////////////////////////
+
 #define BOOST_TEST_MODULE "Boost Bloom Filter" 1
 #include <iostream>
 
@@ -23,7 +24,7 @@
   typedef boost::mpl::vector<
     boost_hash<int, 13>,
     boost_hash<int, 17>,
-    boost_hash<int, 19>> BoostHashFunctions;
+    boost_hash<int, 19> > BoostHashFunctions;
   
   bloom_filter<int, 8> bloom1;
   bloom_filter<int, 8, BoostHashFunctions> bloom2;
@@ -60,7 +61,7 @@
   bloom_filter<size_t, 8> bloom_3;
   bloom_filter<size_t, 8, boost::mpl::vector<
     boost_hash<size_t, 1>,
-    boost_hash<size_t, 2>>> bloom_2;
+    boost_hash<size_t, 2> > > bloom_2;
   bloom_filter<size_t, 8, boost::mpl::vector<
     boost_hash<size_t, 1>,
     boost_hash<size_t, 2>,
@@ -68,7 +69,7 @@
     boost_hash<size_t, 4>,
     boost_hash<size_t, 5>,
     boost_hash<size_t, 6>,
-    boost_hash<size_t, 7>>> bloom_7;
+    boost_hash<size_t, 7> > > bloom_7;
 
   BOOST_CHECK_EQUAL(bloom_3.num_hash_functions(), 3ul);
   BOOST_CHECK_EQUAL(bloom_2.num_hash_functions(), 2ul);