X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2Fstress%2Fsequential%2Fsequential-map%2Ffind_string%2Fmap_find_string.cpp;h=b4c4c3753baa377af6c9816ee4a89144a5d230c5;hb=2f8bc17e37a31d7eea67e4dc40a10a47ff63bb75;hp=7da0e8dd335a1a65dc12738f93aa583d6839993b;hpb=3a3e05a161168102d2666e4f606178ee0b4a37c5;p=libcds.git

diff --git a/test/stress/sequential/sequential-map/find_string/map_find_string.cpp b/test/stress/sequential/sequential-map/find_string/map_find_string.cpp
index 7da0e8dd..b4c4c375 100644
--- a/test/stress/sequential/sequential-map/find_string/map_find_string.cpp
+++ b/test/stress/sequential/sequential-map/find_string/map_find_string.cpp
@@ -38,6 +38,11 @@ namespace map {
     size_t Map_find_string::s_nMaxLoadFactor = 8;
     size_t Map_find_string::s_nPercentExists = 50;
     size_t Map_find_string::s_nPassCount = 2;
+    size_t Map_find_string::s_nFeldmanPassCount = 100;
+    size_t Map_find_string::s_nBronsonAVLTreeMapPassCount = 100;
+    size_t Map_find_string::s_nEllenBinTreeMapPassCount = 100;
+    size_t Map_find_string::s_nMichaelMapPassCount = 100;
+    size_t Map_find_string::s_nSkipListMapPassCount = 100;
 
     size_t Map_find_string::s_nCuckooInitialSize = 1024;
     size_t Map_find_string::s_nCuckooProbesetSize = 16;
@@ -53,45 +58,80 @@ namespace map {
 
     void Map_find_string::setup_test_case()
     {
-        cds_test::config const& cfg = get_config( "map_find_string" );
-
-        s_nMapSize = cfg.get_size_t( "MapSize", s_nMapSize );
-        if ( s_nMapSize < 1000 )
-            s_nMapSize = 1000;
-
-        s_nThreadCount = cfg.get_size_t( "ThreadCount", s_nThreadCount );
-        if ( s_nThreadCount == 0 )
-            s_nThreadCount = 1;
-
-        s_nPercentExists = cfg.get_size_t( "PercentExists", s_nPercentExists );
-        if ( s_nPercentExists > 100 )
-            s_nPercentExists = 100;
-        else if ( s_nPercentExists < 1 )
-            s_nPercentExists = 1;
-
-        s_nMaxLoadFactor = cfg.get_size_t( "MaxLoadFactor", s_nMaxLoadFactor );
-        if ( s_nMaxLoadFactor == 0 )
-            s_nMaxLoadFactor = 1;
-
-        s_nCuckooInitialSize = cfg.get_size_t( "CuckooInitialSize", s_nCuckooInitialSize );
-        if ( s_nCuckooInitialSize < 256 )
-            s_nCuckooInitialSize = 256;
-
-        s_nCuckooProbesetSize = cfg.get_size_t( "CuckooProbesetSize", s_nCuckooProbesetSize );
-        if ( s_nCuckooProbesetSize < 8 )
-            s_nCuckooProbesetSize = 8;
-
-        s_nCuckooProbesetThreshold = cfg.get_size_t( "CuckooProbesetThreshold", s_nCuckooProbesetThreshold );
-
-        s_nFeldmanMap_HeadBits = cfg.get_size_t( "FeldmanMapHeadBits", s_nFeldmanMap_HeadBits );
-        if ( s_nFeldmanMap_HeadBits == 0 )
-            s_nFeldmanMap_HeadBits = 2;
-
-        s_nFeldmanMap_ArrayBits = cfg.get_size_t( "FeldmanMapArrayBits", s_nFeldmanMap_ArrayBits );
-        if ( s_nFeldmanMap_ArrayBits == 0 )
-            s_nFeldmanMap_ArrayBits = 2;
-
-        s_arrString = load_dictionary();
+      cds_test::config const &cfg =
+          get_config("sequential_real_map_find_string");
+
+      s_nMapSize = cfg.get_size_t("MapSize", s_nMapSize);
+      if (s_nMapSize < 1000)
+        s_nMapSize = 1000;
+
+      s_nThreadCount = cfg.get_size_t("ThreadCount", s_nThreadCount);
+      if (s_nThreadCount == 0)
+        s_nThreadCount = 1;
+
+      s_nPassCount = cfg.get_size_t("PassCount", s_nPassCount);
+      if (s_nPassCount == 0)
+        s_nPassCount = 100;
+
+      s_nFeldmanPassCount =
+          cfg.get_size_t("FeldmanPassCount", s_nFeldmanPassCount);
+      if (s_nFeldmanPassCount == 0)
+        s_nFeldmanPassCount = 500;
+
+      s_nBronsonAVLTreeMapPassCount = cfg.get_size_t(
+          "BronsonAVLTreeMapPassCount", s_nBronsonAVLTreeMapPassCount);
+      if (s_nBronsonAVLTreeMapPassCount == 0)
+        s_nBronsonAVLTreeMapPassCount = 500;
+
+      s_nEllenBinTreeMapPassCount = cfg.get_size_t("EllenBinTreeMapPassCount",
+                                                   s_nEllenBinTreeMapPassCount);
+      if (s_nEllenBinTreeMapPassCount == 0)
+        s_nEllenBinTreeMapPassCount = 500;
+
+      s_nMichaelMapPassCount =
+          cfg.get_size_t("MichaelMapPassCount", s_nMichaelMapPassCount);
+      if (s_nMichaelMapPassCount == 0)
+        s_nMichaelMapPassCount = 500;
+
+      s_nSkipListMapPassCount =
+          cfg.get_size_t("SkipListMapPassCount", s_nSkipListMapPassCount);
+      if (s_nSkipListMapPassCount == 0)
+        s_nSkipListMapPassCount = 500;
+
+      s_nPercentExists = cfg.get_size_t("PercentExists", s_nPercentExists);
+      if (s_nPercentExists > 100)
+        s_nPercentExists = 100;
+      else if (s_nPercentExists < 1)
+        s_nPercentExists = 1;
+
+      s_nMaxLoadFactor = cfg.get_size_t("MaxLoadFactor", s_nMaxLoadFactor);
+      if (s_nMaxLoadFactor == 0)
+        s_nMaxLoadFactor = 1;
+
+      s_nCuckooInitialSize =
+          cfg.get_size_t("CuckooInitialSize", s_nCuckooInitialSize);
+      if (s_nCuckooInitialSize < 256)
+        s_nCuckooInitialSize = 256;
+
+      s_nCuckooProbesetSize =
+          cfg.get_size_t("CuckooProbesetSize", s_nCuckooProbesetSize);
+      if (s_nCuckooProbesetSize < 8)
+        s_nCuckooProbesetSize = 8;
+
+      s_nCuckooProbesetThreshold =
+          cfg.get_size_t("CuckooProbesetThreshold", s_nCuckooProbesetThreshold);
+
+      s_nFeldmanMap_HeadBits =
+          cfg.get_size_t("FeldmanMapHeadBits", s_nFeldmanMap_HeadBits);
+      if (s_nFeldmanMap_HeadBits == 0)
+        s_nFeldmanMap_HeadBits = 2;
+
+      s_nFeldmanMap_ArrayBits =
+          cfg.get_size_t("FeldmanMapArrayBits", s_nFeldmanMap_ArrayBits);
+      if (s_nFeldmanMap_ArrayBits == 0)
+        s_nFeldmanMap_ArrayBits = 2;
+
+      s_arrString = load_dictionary();
     }
 
     void Map_find_string::TearDownTestCase()