Commit d4144f3f authored by edrezen's avatar edrezen
Browse files

Use Kmer structure instead of direct kmer code => allow to have kmer

abundance in Node structure (for solid kmers)
parent c3ee6a0f
......@@ -202,7 +202,7 @@ public:
dsk.execute();
/** We iterate the solid kmers. */
Iterator<NativeInt64>* iter = dsk.getSolidKmers()->iterator();
Iterator<Kmer<NativeInt64> >* iter = dsk.getSolidKmers()->iterator();
LOCAL (iter);
/** The following values have been computed with the original DSK.
......@@ -221,10 +221,10 @@ public:
size_t idx=0;
for (iter->first(); !iter->isDone(); iter->next(), idx++)
{
set<NativeInt64>::iterator lookup = okValues.find (iter->item());
set<NativeInt64>::iterator lookup = okValues.find (iter->item().value);
CPPUNIT_ASSERT (lookup != okValues.end());
checkValues.insert (iter->item());
checkValues.insert (iter->item().value);
}
CPPUNIT_ASSERT (checkValues.size() == okValues.size());
......
......@@ -80,14 +80,14 @@ public:
CPPUNIT_ASSERT (hash.get (badKey) == false);
/** We iterate the map. */
Iterator <pair<T,u_int32_t> >* it = hash.iterator();
Iterator <Abundance<T> >* it = hash.iterator();
LOCAL (it);
size_t nbItems = 0;
for (it->first(); !it->isDone(); it->next(), nbItems++)
{
/** All abundances should be one. */
CPPUNIT_ASSERT (it->item().second == 1);
CPPUNIT_ASSERT (it->item().abundance == 1);
}
CPPUNIT_ASSERT (nbItems == hash.getMaxNbItems());
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment