[med-svn] [Git][med-team/freebayes][master] 2 commits: d/ext/multichoose: update to...

[Michael R. Crusoe (@crusoe)]

Michael R. Crusoe pushed to branch master at Debian Med / freebayes


Commits:
9202d902 by Michael R. Crusoe at 2025-02-15T12:08:31+01:00
d/ext/multichoose: update to https://github.com/vcflib/multichoose/commit/255192edd49cfe36557f7f4 f0d2d6ee1c702ffbb

- - - - -
3d848289 by Michael R. Crusoe at 2025-02-15T19:22:27+01:00
d/clean: added more entries

- - - - -


4 changed files:

- debian/changelog
- debian/clean
- + debian/ext/multichoose/Makefile
- debian/ext/multichoose/multichoose.h


Changes:

=====================================
debian/changelog
=====================================
@@ -4,6 +4,10 @@ freebayes (1.3.8-1) UNRELEASED; urgency=medium
   * d/watch: mangle pre-release tags appropriately
   * d/control: pkg-config → pkgconf
   * d/ext/multichoose: bundle in library missing from tarball.
+  * d/ext/multichoose: update to
+    https://github.com/vcflib/multichoose/commit/255192edd49cfe36557f7f4
+    f0d2d6ee1c702ffbb
+  * d/clean: added more entries
 
  -- Michael R. Crusoe <crusoe at debian.org>  Fri, 07 Jun 2024 11:15:45 +0200
 


=====================================
debian/clean
=====================================
@@ -1 +1,3 @@
 test/regression/NA12878.chr22.tiny.vcf
+test/bash-tap/
+test/test-simple-bash/


=====================================
debian/ext/multichoose/Makefile
=====================================
@@ -0,0 +1,22 @@
+
+CC ?=	gcc
+CXX ?=	g++
+
+all: multichoose multipermute
+
+#multichoose_recursive: multichoose_recursive.cpp
+#	${CXX} $(LDFLAGS) $(CPPFLAGS) $(CXXFLAGS) multichoose_recursive.cpp -o multichoose_recursive
+
+multichoose: multichoose.cpp multichoose.h
+	${CXX} $(LDFLAGS) $(CPPFLAGS) $(CXXFLAGS) multichoose.cpp -o multichoose
+
+multipermute: multipermute.cpp multipermute.h
+	${CXX} $(LDFLAGS) $(CPPFLAGS) $(CXXFLAGS) multipermute.cpp -o multipermute
+
+cmultichoose: multichoose.c
+	${CC} $(LDFLAGS) $(CPPFLAGS) $(CXXFLAGS) multichoose.c -o cmultichoose
+
+clean:
+	rm -f cmultichoose
+	rm -f multichoose
+	rm -f multipermute


=====================================
debian/ext/multichoose/multichoose.h
=====================================
@@ -1,7 +1,7 @@
 #ifndef __MULTICHOOSE_H
 #define __MULTICHOOSE_H
 
-/* 
+/*
 
 multichoose.h  -- n multichoose k for generic vectors
 
@@ -58,7 +58,10 @@ std::vector< std::vector<T> > multichoose(int k, std::vector<T>& objects) {
             multiset.push_back(*a[i]);
         choices.push_back(multiset);
         j=k;
-        do { j--; } while(a[j]==b[j]);
+        do {
+	    j--;
+	    if (j<0) break;
+	} while(a[j]==b[j]);
         if (j<0) break;
         j_1=j;
         while(j_1<=k-1){
@@ -72,7 +75,7 @@ std::vector< std::vector<T> > multichoose(int k, std::vector<T>& objects) {
             j_1=q;
         }
     }
-    
+
     return choices;
 }
 



View it on GitLab: https://salsa.debian.org/med-team/freebayes/-/compare/9de9fb53e85c9d4aee04d6554973ca2ac11f71ab...3d8482897ab85f98cfe1b18b70fff2ef41219360

-- 
View it on GitLab: https://salsa.debian.org/med-team/freebayes/-/compare/9de9fb53e85c9d4aee04d6554973ca2ac11f71ab...3d8482897ab85f98cfe1b18b70fff2ef41219360
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/20250215/72e673b6/attachment-0001.htm>