From 3c572e212d6e2903f29a2ca9f8d6c5f8e93b2d63 Mon Sep 17 00:00:00 2001
From: Jiri Pittner <jiri@pittnerovi.com>
Date: Sun, 30 Jul 2023 13:44:59 +0200
Subject: [PATCH] tiny change in graph

---
 graph.cc | 9 +++++----
 graph.h  | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/graph.cc b/graph.cc
index 419221e..60f41c4 100644
--- a/graph.cc
+++ b/graph.cc
@@ -112,12 +112,12 @@ return r;
 //found cliques releatedly until the whole graph is covered
 //could be recursive but we made it iterative
 template<typename G>
-NRVec<int> cliquecover(const G &adjacency)
+NRVec<int> cliquecover(const G &adjacency, int *ncliques)
 {
 int n=adjacency.nrows();
 NRVec<int> r(n); r.clear();
 G graph = adjacency;
-int cliquenumber=1;
+int cliquenumber=0;
 int remaining=n;
 NRVec<int> cliques(0);
 NRVec<int> notincliques(n);
@@ -128,8 +128,8 @@ while(remaining)
 	NRVec<int> cliqueorignum(clique.size());
 	for(int i=0; i<clique.size(); ++i)  cliqueorignum[i] = notincliques[clique[i]];
 	cliques.concatme(cliqueorignum);
-	for(int i=0; i<clique.size(); ++i) r[cliqueorignum[i]] = cliquenumber;
 	++cliquenumber;
+	for(int i=0; i<clique.size(); ++i) r[cliqueorignum[i]] = cliquenumber;
 	notincliques = complement(adjacency,cliques);
 	remaining=notincliques.size();
 	if(remaining)
@@ -137,6 +137,7 @@ while(remaining)
 		graph= adjacency.submatrix(notincliques);
 		}
 	}
+if(ncliques) *ncliques = cliquenumber;
 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> findclique(const NRSMat<T> &adjacency, const int v); \
 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); \
 
 
 
diff --git a/graph.h b/graph.h
index d8a583c..a0e3123 100644
--- a/graph.h
+++ b/graph.h
@@ -46,7 +46,7 @@ template<typename G>
 NRVec<int> complement(const G &adjacency, const NRVec<int> & vertexlist);
 
 template<typename G>
-NRVec<int> cliquecover(const G &adjacency);
+NRVec<int> cliquecover(const G &adjacency, int *ncliques=NULL);