2009-05-06 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Moved piece statistics stuff to new PieceStatMan class.
	Refactored PieceSelector interface.
	* src/DefaultPieceStorage.cc
	* src/DefaultPieceStorage.h
	* src/LongestSequencePieceSelector.cc
	* src/LongestSequencePieceSelector.h
	* src/Makefile.am
	* src/PieceSelector.h
	* src/PieceStatMan.cc
	* src/PieceStatMan.h
	* src/RarestPieceSelector.cc
	* src/RarestPieceSelector.h
	* src/RequestGroup.cc
	* test/DefaultPieceStorageTest.cc
	* test/InOrderPieceSelector.h
	* test/Makefile.am
	* test/PieceStatManTest.cc
	* test/RarestPieceSelectorTest.cc

1 files changed, 5 insertions, 169 deletions

diff --git a/test/RarestPieceSelectorTest.cc b/test/RarestPieceSelectorTest.cc
index 0549aca9..87cd84ef 100644
--- a/test/RarestPieceSelectorTest.cc
+++ b/test/RarestPieceSelectorTest.cc
@@ -1,23 +1,15 @@
 #include "RarestPieceSelector.h"
 
-#include <cstring>
-#include <iostream>
-
 #include <cppunit/extensions/HelperMacros.h>
 
-#include "Exception.h"
-#include "Util.h"
 #include "BitfieldMan.h"
+#include "PieceStatMan.h"
 
 namespace aria2 {
 
 class RarestPieceSelectorTest:public CppUnit::TestFixture {
 
   CPPUNIT_TEST_SUITE(RarestPieceSelectorTest);
-  CPPUNIT_TEST(testAddPieceStats_index);
-  CPPUNIT_TEST(testAddPieceStats_bitfield);
-  CPPUNIT_TEST(testUpdatePieceStats);
-  CPPUNIT_TEST(testSubtractPieceStats);
   CPPUNIT_TEST(testSelect);
   CPPUNIT_TEST_SUITE_END();
 public:
@@ -35,177 +27,21 @@ public:
 
 CPPUNIT_TEST_SUITE_REGISTRATION(RarestPieceSelectorTest);
 
-void RarestPieceSelectorTest::testAddPieceStats_index()
-{
-  RarestPieceSelector selector(10, false);
-  selector.addPieceStats(1);
-  {
-    size_t indexes[] = { 0, 2, 3, 4, 5, 6, 7, 8, 9, 1 };
-    size_t counts[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };
-    
-    const std::vector<size_t>& statsidx(selector.getSortedPieceStatIndexes());
-    const std::vector<SharedHandle<PieceStat> >& stats(selector.getPieceStats());
-    CPPUNIT_ASSERT_EQUAL((size_t)10, stats.size());
-    
-    for(size_t i = 0; i < 10; ++i) {
-      CPPUNIT_ASSERT_EQUAL(indexes[i], statsidx[i]);
-      CPPUNIT_ASSERT_EQUAL(counts[i], stats[statsidx[i]]->getCount());
-    }
-  }
-
-  selector.addPieceStats(1);
-
-  {
-    size_t indexes[] = { 0, 2, 3, 4, 5, 6, 7, 8, 9, 1 };
-    size_t counts[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 2 };
-
-    const std::vector<size_t>& statsidx(selector.getSortedPieceStatIndexes());
-    const std::vector<SharedHandle<PieceStat> >& stats(selector.getPieceStats());
-
-    for(size_t i = 0; i < 10; ++i) {
-      CPPUNIT_ASSERT_EQUAL(indexes[i], statsidx[i]);
-      CPPUNIT_ASSERT_EQUAL(counts[i], stats[statsidx[i]]->getCount());
-    }
-  }
-
-  selector.addPieceStats(3);
-  selector.addPieceStats(9);
-  selector.addPieceStats(3);
-  selector.addPieceStats(0);
-
-  {
-    size_t indexes[] = { 2, 4, 5, 6, 7, 8, 0, 9, 1, 3 };
-    size_t counts[] = {  0, 0, 0, 0, 0, 0, 1, 1, 2, 2 };
-
-    const std::vector<size_t>& statsidx(selector.getSortedPieceStatIndexes());
-    const std::vector<SharedHandle<PieceStat> >& stats(selector.getPieceStats());
-
-    for(size_t i = 0; i < 10; ++i) {
-      CPPUNIT_ASSERT_EQUAL(indexes[i], statsidx[i]);
-      CPPUNIT_ASSERT_EQUAL(counts[i], stats[statsidx[i]]->getCount());
-    }
-  }
-
-}
-
-void RarestPieceSelectorTest::testAddPieceStats_bitfield()
-{
-  RarestPieceSelector selector(10, false);
-  const unsigned char bitfield[] = { 0xaa, 0x80 };
-  selector.addPieceStats(bitfield, sizeof(bitfield));
-  {
-    size_t indexes[] = { 1, 3, 5, 7, 9, 0, 2, 4, 6, 8 };
-    size_t counts[] = { 0, 0, 0, 0, 0, 1, 1, 1, 1, 1 };
-
-    const std::vector<size_t>& statsidx(selector.getSortedPieceStatIndexes());
-    const std::vector<SharedHandle<PieceStat> >& stats(selector.getPieceStats());
-
-    CPPUNIT_ASSERT_EQUAL((size_t)10, stats.size());
-    
-    for(size_t i = 0; i < 10; ++i) {
-      CPPUNIT_ASSERT_EQUAL(indexes[i], statsidx[i]);
-      CPPUNIT_ASSERT_EQUAL(counts[i], stats[statsidx[i]]->getCount());
-    }
-  }
-
-  selector.addPieceStats(bitfield, sizeof(bitfield));
-
-  {
-    size_t indexes[] = { 1, 3, 5, 7, 9, 0, 2, 4, 6, 8 };
-    size_t counts[] = { 0, 0, 0, 0, 0, 2, 2, 2, 2, 2 };
-
-    const std::vector<size_t>& statsidx(selector.getSortedPieceStatIndexes());
-    const std::vector<SharedHandle<PieceStat> >& stats(selector.getPieceStats());
-
-    CPPUNIT_ASSERT_EQUAL((size_t)10, stats.size());
-    
-    for(size_t i = 0; i < 10; ++i) {
-      CPPUNIT_ASSERT_EQUAL(indexes[i], statsidx[i]);
-      CPPUNIT_ASSERT_EQUAL(counts[i], stats[statsidx[i]]->getCount());
-    }
-  }
-}
-
-void RarestPieceSelectorTest::testUpdatePieceStats()
-{
-  RarestPieceSelector selector(10, false);
-
-  const unsigned char bitfield[] = { 0xff, 0xc0 };
-  selector.addPieceStats(bitfield, sizeof(bitfield));
-
-  const unsigned char oldBitfield[] = { 0xf0, 0x00 };
-  const unsigned char newBitfield[] = { 0x1f, 0x00 };
-
-  selector.updatePieceStats(newBitfield, sizeof(newBitfield), oldBitfield);
-  {
-    // idx: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
-    // bf : 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
-    // old: 1, 1, 1, 1, 0, 0, 0, 0, 0, 0
-    // new: 0, 0, 0, 1, 1, 1, 1, 1, 0, 0
-    // ---------------------------------
-    // res: 0, 0, 0, 1, 2, 2, 2, 2, 1, 1
-
-    size_t indexes[] = { 0, 1, 2, 3, 8, 9, 4, 5, 6, 7 };
-    size_t counts[] =  { 0, 0, 0, 1, 1, 1, 2, 2, 2, 2 };
-
-    const std::vector<size_t>& statsidx(selector.getSortedPieceStatIndexes());
-    const std::vector<SharedHandle<PieceStat> >& stats(selector.getPieceStats());
-
-    CPPUNIT_ASSERT_EQUAL((size_t)10, stats.size());
-    
-    for(size_t i = 0; i < 10; ++i) {
-      CPPUNIT_ASSERT_EQUAL(indexes[i], statsidx[i]);
-      CPPUNIT_ASSERT_EQUAL(counts[i], stats[statsidx[i]]->getCount());
-    }
-  }
-}
-
-void RarestPieceSelectorTest::testSubtractPieceStats()
-{
-  RarestPieceSelector selector(10, false);
-
-  const unsigned char bitfield[] = { 0xf0, 0x00 };
-  selector.addPieceStats(bitfield, sizeof(bitfield));
-
-  const unsigned char newBitfield[] = { 0x3f, 0x00 };
-
-  selector.subtractPieceStats(newBitfield, sizeof(newBitfield));
-  {
-    // idx: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
-    // bf : 1, 1, 1, 1, 0, 0, 0, 0, 0, 0
-    // new: 0, 0, 1, 1, 1, 1, 1, 1, 0, 0
-    // ---------------------------------
-    // res: 1, 1, 0, 0, 0, 0, 0, 0, 0, 0
-
-    size_t indexes[] = { 2, 3, 4, 5, 6, 7, 8, 9, 0, 1 };
-    size_t counts[] =  { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1 };
-
-    const std::vector<size_t>& statsidx(selector.getSortedPieceStatIndexes());
-    const std::vector<SharedHandle<PieceStat> >& stats(selector.getPieceStats());
-
-    CPPUNIT_ASSERT_EQUAL((size_t)10, stats.size());
-    
-    for(size_t i = 0; i < 10; ++i) {
-      CPPUNIT_ASSERT_EQUAL(indexes[i], statsidx[i]);
-      CPPUNIT_ASSERT_EQUAL(counts[i], stats[statsidx[i]]->getCount());
-    }
-  }
-}
-
 void RarestPieceSelectorTest::testSelect()
 {
-  RarestPieceSelector selector(10, false);
+  SharedHandle<PieceStatMan> pieceStatMan(new PieceStatMan(10, false));
+  RarestPieceSelector selector(pieceStatMan);
   BitfieldMan bf(1024, 10*1024);
   bf.setBitRange(0, 2);
   size_t index;
 
-  selector.addPieceStats(0);
+  pieceStatMan->addPieceStats(0);
 
   CPPUNIT_ASSERT(selector.select(index, bf.getBitfield(),
 				 bf.countBlock()));
   CPPUNIT_ASSERT_EQUAL((size_t)1, index);
 
-  selector.addPieceStats(1);
+  pieceStatMan->addPieceStats(1);
 
   CPPUNIT_ASSERT(selector.select(index, bf.getBitfield(),
 				 bf.countBlock()));