[clasp] 01/02: add patch to fix wrong number of optimal models

[Thomas Krennwallner]

This is an automated email from the git hooks/post-receive script.

tkren-guest pushed a commit to branch devel
in repository clasp.

commit 1df15cec0db21388f1e2a9a37ea96a5fb57a4de3
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Sun May 1 08:10:09 2016 +0200

    add patch to fix wrong number of optimal models
    
    clasp reports incorrect number of optimal models in parallel mode.
    
    Upstream bug 116: https://sourceforge.net/p/potassco/bugs/116/
---
 debian/patches/clasp-parallel-solve.patch | 17 +++++++++++++++++
 debian/patches/series                     |  1 +
 2 files changed, 18 insertions(+)

diff --git a/debian/patches/clasp-parallel-solve.patch b/debian/patches/clasp-parallel-solve.patch
new file mode 100644
index 0000000..df407bf
--- /dev/null
+++ b/debian/patches/clasp-parallel-solve.patch
@@ -0,0 +1,17 @@
+Author: Benjamin Kaufmann <kaufmann at cs.uni-potsdam.de>
+Description: fixes wrong number of optimal models in parallel mode
+Bug: https://sourceforge.net/p/potassco/bugs/116/
+Index: clasp-git-gbp/libclasp/src/parallel_solve.cpp
+===================================================================
+--- clasp-git-gbp.orig/libclasp/src/parallel_solve.cpp
++++ clasp-git-gbp/libclasp/src/parallel_solve.cpp
+@@ -360,6 +360,9 @@ void ParallelSolve::joinThreads() {
+ 		}
+ 		destroyThread(i);
+ 	}
++	if (shared_->complete()) {
++		enumerator().commitComplete();
++	}
+ 	// detach master only after all client threads are done
+ 	thread_[masterId]->detach(*shared_->ctx, shared_->interrupt());
+ 	thread_[masterId]->setError(!shared_->interrupt() ? thread_[masterId]->error() : ec);
diff --git a/debian/patches/series b/debian/patches/series
index b31f497..c78dfaa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 clasp-manpage.patch
+clasp-parallel-solve.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clasp.git