Commit 355be542 authored by Julien Balette-Pape's avatar Julien Balette-Pape

fix join in rebase

parent d916b72c
......@@ -31,16 +31,8 @@ bool ExistHitPrevODomain::equals(const t& acss, const t& bcss) const
void ExistHitPrevODomain::join(t& dcss, const t& scss)
{
for (int i = 0; i < _n; i++){
int newsize = dcss[i].size()+scss[i].size();
Bag<Address> newbag = Bag<Address>(newsize);
for (int j = 0; j < newsize; j++) {
if (j < dcss[i].size())
newbag[j]=dcss[i][j];
else
newbag[j]=scss[i][j - dcss[i].size()];
}
dcss[i] = Bag<Address>(newbag);
for (int i = 0; i < _n; i++) {
dcss[i].insert(scss[i].begin(), scss[i].end());
}
}
......
Markdown is supported
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