Fixed bug with Leiden algorithm always running with default parameters.

refresh-bio · Oct 5, 2024 · 5503c50 · 5503c50
1 parent 6ac12c7
commit 5503c50
Show file tree

Hide file tree

Showing 5 changed files with 8,472 additions and 7 deletions.
diff --git a/.github/workflows/self-hosted.yml b/.github/workflows/self-hosted.yml
@@ -239,4 +239,8 @@ jobs:
       run: |
         ./clusty-leiden-${{matrix.compiler}} --algo ${{matrix.algo}} --objects-file ./test/ictv.list --similarity --min ani 0.${{matrix.threshold}} ./test/ictv.num ictv.${{matrix.algo}}.${{matrix.threshold}}.reps.num --out-representatives --numeric-ids
         cmp ictv.${{matrix.algo}}.${{matrix.threshold}}.reps.num ./test/ictv.${{matrix.algo}}.${{matrix.threshold}}.reps.csv
-  
+     
+    - name: ${{matrix.algo}}, ${{matrix.threshold}} (non-default params)
+      run: |
+        ./clusty-leiden-${{matrix.compiler}} --algo ${{matrix.algo}} --objects-file ./test/ictv.list --similarity --min ani 0.${{matrix.threshold}} --leiden-resolution 1.0 --leiden-beta 0.03 --leiden-iterations 3 ./test/ictv.ani ictv.${{matrix.algo}}-params.${{matrix.threshold}}.reps.csv --out-representatives 
+        cmp ictv.${{matrix.algo}}-params.${{matrix.threshold}}.reps.csv ./test/ictv.${{matrix.algo}}-params.${{matrix.threshold}}.reps.csv
diff --git a/src/console.cpp b/src/console.cpp
@@ -166,13 +166,13 @@ void Console::doClustering(
 	int n_clusters = 0;
 
 	if (needDistances(params.algo)) {
-		auto clustering = createClusteringAlgo<dist_t>(params.algo);
+		auto clustering = createClusteringAlgo<dist_t>(params);
 		IMatrix& mat = graph.getMatrix();
 		SparseMatrix<dist_t>& distances = static_cast<SparseMatrix<dist_t>&>(mat);
 		n_clusters = (*clustering)(distances, objects, threshold, assignments);
 	}
 	else {
-		auto clustering = createClusteringAlgo<mini_dist_t>(params.algo);
+		auto clustering = createClusteringAlgo<mini_dist_t>(params);
 		IMatrix& mat = graph.getMatrix();
 		SparseMatrix<mini_dist_t>& distances = static_cast<SparseMatrix<mini_dist_t>&>(mat);
 		n_clusters = (*clustering)(distances, objects, threshold, assignments);

diff --git a/src/console.h b/src/console.h
@@ -53,11 +53,11 @@ class Console {
 	}
 
 	template <class Distance>
-	std::unique_ptr<IClustering<Distance>> createClusteringAlgo(Algo algo) {
+	std::unique_ptr<IClustering<Distance>> createClusteringAlgo(const Params& params) {
 
 		std::unique_ptr<IClustering<Distance>> clustering;
 
-		switch (algo)
+		switch (params.algo)
 		{
 
 		case Algo::SingleLinkage:

diff --git a/src/version.h b/src/version.h
@@ -8,12 +8,15 @@
 //
 // *******************************************************************************************
 
-#define VERSION		"1.1.0"
-#define DATE		"2024-09-30"
+#define VERSION		"1.1.1"
+#define DATE		"2024-10-05"
 
 
 /********* Version history *********
 
+ 1.1.1 (2024-10-05)
+Fixed bug with Leiden algorithm always running with default parameters.
+
  1.1.0 (2024-09-30)
  Memory optimizatons:
 * Row identifier removed from dist_t structure.