[med-svn] [Git][med-team/lambda-align2][master] 2 commits: fix 32bit compatibility

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch master at Debian Med / lambda-align2


Commits:
5ff8ca5e by Michael R. Crusoe at 2019-01-20T09:15:53Z
fix 32bit compatibility

- - - - -
f51d1e08 by Michael R. Crusoe at 2019-01-20T09:15:53Z
return correct result of autopkgtests

- - - - -


3 changed files:

- + debian/patches/32bit
- debian/patches/series
- debian/tests/run-tests


Changes:

=====================================
debian/patches/32bit
=====================================
@@ -0,0 +1,23 @@
+From: Michael R. Crusoe <michael.crusoe at gmail.com>
+Subject: fix 32bit compatibility
+Forwarded: https://github.com/seqan/lambda/pull/123
+--- lambda-align2.orig/src/search_algo.hpp
++++ lambda-align2/src/search_algo.hpp
+@@ -1058,7 +1058,7 @@
+                 desiredOccs = (length(lH.matches) - oldTotalMatches) >= lH.options.maxMatches
+                             ? minResults
+                             : (lH.options.maxMatches - (length(lH.matches) - oldTotalMatches)) * seedHeurFactor /
+-                                std::max((needlesSum - needlesPos - seedBegin) / lH.options.seedOffset, 1ul);
++                                std::max((needlesSum - needlesPos - seedBegin) / lH.options.seedOffset, static_cast<size_t>(1));
+ 
+                 if (desiredOccs == 0)
+                     desiredOccs = minResults;
+@@ -1127,7 +1127,7 @@
+                     desiredOccs = (length(lH.matches) - oldTotalMatches) >= lH.options.maxMatches
+                                 ? minResults
+                                 : (lH.options.maxMatches - (length(lH.matches) - oldTotalMatches)) * seedHeurFactor /
+-                                    std::max((needlesSum - needlesPos - seedBegin) / lH.options.seedOffset, 1ul);
++                                    std::max((needlesSum - needlesPos - seedBegin) / lH.options.seedOffset, static_cast<size_t>(1));
+ 
+                     if (desiredOccs == 0)
+                         desiredOccs = minResults;


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 enable_tests
+32bit
 set-seqan-cmake-dir.patch
 force-link-rt-pthread.patch


=====================================
debian/tests/run-tests
=====================================
@@ -11,7 +11,7 @@ cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON \
 for binary in $(dpkg -L lambda-align2 | grep bin/); do ln -s ${binary} bin/; done
 cd tests
 set +e
-ctest  --parallel $(nproc) -I 1,10 && RESULT=$?
+ctest  --parallel $(nproc) -I 1,10 ; RESULT=$?
 if ls tests/*~ 1> /dev/null 2>&1; then \
   for backup in tests/*~; do mv $${backup} $${backup%\~}; done; \
 fi



View it on GitLab: https://salsa.debian.org/med-team/lambda-align2/compare/d3f174cc3d09fc5c5fc00da3c69dea1b8a6f4728...f51d1e08750897ad96d6c502753437aafae2d6ba

-- 
View it on GitLab: https://salsa.debian.org/med-team/lambda-align2/compare/d3f174cc3d09fc5c5fc00da3c69dea1b8a6f4728...f51d1e08750897ad96d6c502753437aafae2d6ba
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/20190120/2b2cb17d/attachment-0001.html>