jiri/LA_library
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tiny change in graph

Browse Source
This commit is contained in:
Jiri Pittner 2023-07-30 13:44:59 +02:00
parent a439e0be94
commit 3c572e212d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
graph.cc
View File

@ -112,12 +112,12 @@ return r;
//found cliques releatedly until the whole graph is covered //found cliques releatedly until the whole graph is covered
//could be recursive but we made it iterative //could be recursive but we made it iterative
template<typename G> template<typename G>
NRVec<int> cliquecover(const G &adjacency) NRVec<int> cliquecover(const G &adjacency, int *ncliques)
{ {
int n=adjacency.nrows(); int n=adjacency.nrows();
NRVec<int> r(n); r.clear(); NRVec<int> r(n); r.clear();
G graph = adjacency; G graph = adjacency;
int cliquenumber=1; int cliquenumber=0;
int remaining=n; int remaining=n;
NRVec<int> cliques(0); NRVec<int> cliques(0);
NRVec<int> notincliques(n); NRVec<int> notincliques(n);
@ -128,8 +128,8 @@ while(remaining)
NRVec<int> cliqueorignum(clique.size()); NRVec<int> cliqueorignum(clique.size());
for(int i=0; i<clique.size(); ++i) cliqueorignum[i] = notincliques[clique[i]]; for(int i=0; i<clique.size(); ++i) cliqueorignum[i] = notincliques[clique[i]];
cliques.concatme(cliqueorignum); cliques.concatme(cliqueorignum);
for(int i=0; i<clique.size(); ++i) r[cliqueorignum[i]] = cliquenumber;
++cliquenumber; ++cliquenumber;
for(int i=0; i<clique.size(); ++i) r[cliqueorignum[i]] = cliquenumber;
notincliques = complement(adjacency,cliques); notincliques = complement(adjacency,cliques);
remaining=notincliques.size(); remaining=notincliques.size();
if(remaining) if(remaining)
@ -137,6 +137,7 @@ while(remaining)
graph= adjacency.submatrix(notincliques); graph= adjacency.submatrix(notincliques);
} }
} }
if(ncliques) *ncliques = cliquenumber;
return r; return r;
} }
@ -147,7 +148,7 @@ template NRVec<int> neighbors(const NRSMat<T> &adjacency, const int v); \
template NRVec<int> nonneighbors(const NRSMat<T> &adjacency, const int v); \ template NRVec<int> nonneighbors(const NRSMat<T> &adjacency, const int v); \
template NRVec<int> findclique(const NRSMat<T> &adjacency, const int v); \ template NRVec<int> findclique(const NRSMat<T> &adjacency, const int v); \
template NRVec<int> complement(const NRSMat<T> &adjacency, const NRVec<int> & vertexlist); \ template NRVec<int> complement(const NRSMat<T> &adjacency, const NRVec<int> & vertexlist); \
template NRVec<int> cliquecover(const NRSMat<T> &adjacency); \ template NRVec<int> cliquecover(const NRSMat<T> &adjacency, int *ncliques); \

2
graph.h
View File

@ -46,7 +46,7 @@ template<typename G>
NRVec<int> complement(const G &adjacency, const NRVec<int> & vertexlist); NRVec<int> complement(const G &adjacency, const NRVec<int> & vertexlist);
template<typename G> template<typename G>
NRVec<int> cliquecover(const G &adjacency); NRVec<int> cliquecover(const G &adjacency, int *ncliques=NULL);