Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix a bug in cncom.h & speed up AddVMerged(const TVec&) #224

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix a bug in cncom.h & speed up AddVMerged(const TVec&) #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6383a44
improve the efficiency of AddVMerged(const TVec<TVal>&) in snap-core/…
zhaolu996 Jul 4, 2021
d4ee1a8
fix bug in IsNIdIn(const TInt&) in snap-core/cncom.h; test codes are …
zhaolu996 Jul 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion glib-core/ds.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,7 +1059,18 @@ template <class TVal, class TSizeTy>
TSizeTy TVec<TVal, TSizeTy>::AddVMerged(const TVec<TVal, TSizeTy>& ValV){
EAssertR(!(IsShM && (MxVals == -1)), "Cannot write to shared memory");
AssertR(MxVals!=-1, "This vector was obtained from TVecPool. Such vectors cannot change its size!");
for (TSizeTy ValN=0; ValN<ValV.Vals; ValN++){AddMerged(ValV[ValN]);}
TVec<TVal> ValV2;
for (TSizeTy ValN=0; ValN<ValV.Len(); ValN++){if (!IsInBin(ValV[ValN])) {ValV2.Add(ValV[ValN]);}} ValV2.Merge();
TVec<TSizeTy> ValNV; TSizeTy ValN=0;
for (TSizeTy ValN2 = 0; ValN2 < ValV2.Len(); ValN2++){
for (; ValN<Len(); ValN++){if (GetVal(ValN) > ValV2[ValN2]){ValNV.Add(ValN); break;}}}
TSizeTy EndValN = Len()-1; TSizeTy OutValN = ValV2.Len() - ValNV.Len();
for (TSizeTy N = 0; N < ValV2.Len() - OutValN; N++){Add();}
for (TSizeTy N = 0; N < OutValN; N++){Add(ValV2[ValNV.Len()+N]);}
for (TSizeTy ValN2 = ValNV.Len()-1; ValN2 >= 0; ValN2--) {
const TSizeTy & BegValN = ValNV[ValN2]; const TSizeTy OffSet = ValN2+1;
for (; EndValN >= BegValN; EndValN--){GetVal(EndValN+OffSet) = GetVal(EndValN);}
EndValN = BegValN + OffSet - 1; GetVal(EndValN) = ValV2[ValN2]; EndValN = BegValN - 1;}
return Len();
}

Expand Down
2 changes: 1 addition & 1 deletion snap-core/cncom.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class TCnCom {
TIntV& operator () () { return NIdV; }
const TInt& GetVal(const int& NIdN) const { return operator[](NIdN); }
void Sort(const bool& Asc = true) { NIdV.Sort(Asc); }
bool IsNIdIn(const int& NId) const { return NIdV.SearchBin(NId) != -1; }
bool IsNIdIn(const int& NId) const { return NIdV.IsIn(NId); }
const TInt& GetRndNId() const { return NIdV[TInt::Rnd.GetUniDevInt(Len())]; }
static void Dump(const TCnComV& CnComV, const TStr& Desc=TStr());
static void SaveTxt(const TCnComV& CnComV, const TStr& FNm, const TStr& Desc=TStr());
Expand Down
4 changes: 4 additions & 0 deletions test/test-cncom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ TEST(CnComTest, UndirectedDisconnected) {
EXPECT_TRUE(SCnComV[1].Len() == 2);
EXPECT_TRUE(SCnComV[2].Len() == 2);

for(TInt ValN = 0; ValN < SCnComV[2].Len(); ValN++) {
EXPECT_TRUE(SCnComV[2].IsNIdIn(SCnComV[2].GetVal(ValN)));
}

double MxSccSz = GetMxSccSz(G);
EXPECT_TRUE(MxSccSz > 0.86667 - EPSILON && MxSccSz < 0.86667 + EPSILON);

Expand Down