Version up

TimoLassmann · Dec 10, 2023 · 0541d96 · 0541d96
1 parent 6e3bc07
commit 0541d96
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,8 +12,8 @@ include(CMakePackageConfigHelpers)
 include(GenerateExportHeader)
 
 set(KALIGN_LIBRARY_VERSION_MAJOR 3)
-set(KALIGN_LIBRARY_VERSION_MINOR 3)
-set(KALIGN_LIBRARY_VERSION_PATCH 5)
+set(KALIGN_LIBRARY_VERSION_MINOR 4)
+set(KALIGN_LIBRARY_VERSION_PATCH 0)
 set(KALIGN_LIBRARY_VERSION_STRING ${KALIGN_LIBRARY_VERSION_MAJOR}.${KALIGN_LIBRARY_VERSION_MINOR}.${KALIGN_LIBRARY_VERSION_PATCH})
 
 

diff --git a/lib/src/sequence_distance.c b/lib/src/sequence_distance.c
@@ -141,6 +141,9 @@ float** d_estimation(struct msa* msa, int* samples, int num_samples,int pair)
                                 s2 = s[samples[j]]->s;
                                 l2 = s[samples[j]]->len;
                                 dm[i][j] = calc_distance(s1,s2,l1,l2);
+                                int s = (l1 + l2) / 2;
+                                float add = MACRO_MIN(10000.0, s) / 10000.0;
+                                dm[i][j] += add;
                                 /* fprintf(stdout,"%f ",dm[i][j]); */
                                 /* dm[i][j] += (float)MACRO_MIN(l1, l2) / (float)MACRO_MAX(l1, l2); */
                                 /* dm[i][j] = dm[i][j] / (float) MACRO_MIN(l1, l2); */

diff --git a/src/run_kalign.c b/src/run_kalign.c
@@ -113,7 +113,7 @@ int print_kalign_header(void)
         fprintf(stdout,"\n");
         fprintf(stdout,"Kalign (%s)\n", KALIGN_PACKAGE_VERSION);
         fprintf(stdout,"\n");
-        fprintf(stdout,"Copyright (C) 2006,2019,2020,2021 Timo Lassmann\n");
+        fprintf(stdout,"Copyright (C) 2006,2019,2020,2021,2023 Timo Lassmann\n");
         fprintf(stdout,"\n");
         fprintf(stdout,"This program comes with ABSOLUTELY NO WARRANTY; for details type:\n");
         fprintf(stdout,"`kalign -showw'.\n");