[med-svn] [Git][med-team/kma][master] 4 commits: routine-update: New upstream version

[Nilesh Patra]

Nilesh Patra pushed to branch master at Debian Med / kma


Commits:
6ad1fa9b by Nilesh Patra at 2020-10-18T11:46:37+05:30
routine-update: New upstream version

- - - - -
51a0802d by Nilesh Patra at 2020-10-18T11:46:38+05:30
New upstream version 1.3.5
- - - - -
148042af by Nilesh Patra at 2020-10-18T11:46:39+05:30
Update upstream source from tag 'upstream/1.3.5'

Update to upstream version '1.3.5'
with Debian dir 9f0281d6c1dde597c9b18edbda759bdc73ce1dc6
- - - - -
2daa16aa by Nilesh Patra at 2020-10-18T11:46:53+05:30
routine-update: Ready to upload to unstable

- - - - -


5 changed files:

- debian/changelog
- kma.c
- runkma.c
- spltdb.c
- version.h


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+kma (1.3.5-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream version
+
+ -- Nilesh Patra <npatra974 at gmail.com>  Sun, 18 Oct 2020 11:46:53 +0530
+
 kma (1.3.4-1) unstable; urgency=medium
 
   * Team upload.


=====================================
kma.c
=====================================
@@ -530,6 +530,7 @@ int kma_main(int argc, char *argv[]) {
 				alnToMatPtr = alnToMatDense;
 			} else if(strcmp(argv[args], "-sasm") == 0) {
 				assembly_KMA_Ptr = &skip_assemble_KMA;
+				ID_t = 0.0;
 			} else if(strcmp(argv[args], "-matrix") == 0) {
 				print_matrix = 1;
 			} else if(strcmp(argv[args], "-a") == 0) {
@@ -635,7 +636,7 @@ int kma_main(int argc, char *argv[]) {
 				if(args < argc) {
 					bcd = strtol(argv[args], &exeBasic, 10);
 					if(*exeBasic != 0) {
-						fprintf(stderr, "Invalid argument at \"-ID\".\n");
+						fprintf(stderr, "Invalid argument at \"-bcd\".\n");
 						exit(1);
 					}
 				}


=====================================
runkma.c
=====================================
@@ -2385,14 +2385,19 @@ int runKMA_MEM(char *templatefilename, char *outputfilename, char *exePrev, int
 					cover = 100.0 * aln_len / t_len;
 					q_cover = 100.0 * t_len / aln_len;
 				} else {
-					aln_len = 0;
 					id = 0;
+					q_id = 0;
+					depth = aligned_assem->depth;
+					depth /= t_len;
+					aln_len = aligned_assem->aln_len;
+					cover = 100.0 * aln_len / t_len;
+					q_cover = 0;
 				}
 				
 				if(xml) {
 					capIterXML(xml_out, DB_size, seqin_size, t_len, readCounts[template], p_value, read_score, aligned_assem->q, aln_len);
 				}
-				if(ID_t <= id && 0 < id) {
+				if(ID_t <= id) {
 					/* Output result */
 					fprintf(res_out, "%-12s\t%8ld\t%8u\t%8d\t%8.2f\t%8.2f\t%8.2f\t%8.2f\t%8.2f\t%8.2f\t%4.1e\n",
 						thread->template_name, read_score, (unsigned) expected, t_len, id, cover, q_id, q_cover, (double) depth, (double) q_value, p_value);
@@ -2427,7 +2432,7 @@ int runKMA_MEM(char *templatefilename, char *outputfilename, char *exePrev, int
 						depth /= t_len;
 						aln_len = aligned_assem->aln_len;
 						cover = 100.0 * aln_len / t_len;
-						q_cover = 100.0 * t_len / aln_len;
+						q_cover = 0;
 						fprintf(res_out, "%-12s\t%8ld\t%8u\t%8d\t%8.2f\t%8.2f\t%8.2f\t%8.2f\t%8.2f\t%8.2f\t%4.1e\n",
 							thread->template_name, read_score, (unsigned) expected, t_len, 0.0, cover, 0.0, q_cover, (double) depth, (double) q_value, p_value);
 						if(extendedFeatures) {


=====================================
spltdb.c
=====================================
@@ -1633,14 +1633,19 @@ int runKMA_spltDB(char **templatefilenames, int targetNum, char *outputfilename,
 					q_cover = 100.0 * t_len / aln_len;
 				} else {
 					id = 0;
-					aln_len = 0;
+					q_id = 0;
+					depth = aligned_assem->depth;
+					depth /= t_len;
+					aln_len = aligned_assem->aln_len;
+					cover = 100.0 * aln_len / t_len;
+					q_cover = 0;
 				}
 				
 				if(xml) {
 					capIterXML(xml_out, DB_size, seqin_size, t_len, readCounts[template], p_value, read_score, aligned_assem->q, aln_len);
 				}
 				
-				if(ID_t <= id && 0 < id) {
+				if(ID_t <= id) {
 					/* Output result */
 					fprintf(res_out, "%-12s\t%8ld\t%8u\t%8d\t%8.2f\t%8.2f\t%8.2f\t%8.2f\t%8.2f\t%8.2f\t%4.1e\n",
 						thread->template_name, read_score, (unsigned) expected, t_len, id, cover, q_id, q_cover, (double) depth, (double) q_value, p_value);


=====================================
version.h
=====================================
@@ -17,4 +17,4 @@
  * limitations under the License.
 */
 
-#define KMA_VERSION "1.3.4"
+#define KMA_VERSION "1.3.5"



View it on GitLab: https://salsa.debian.org/med-team/kma/-/compare/e171acafe77507a366fd399ce51ab14c69664822...2daa16aa15b17f0954258dfabd86db2b27cefce7

-- 
View it on GitLab: https://salsa.debian.org/med-team/kma/-/compare/e171acafe77507a366fd399ce51ab14c69664822...2daa16aa15b17f0954258dfabd86db2b27cefce7
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20201018/820416cd/attachment-0001.html>