[gringo] 04/06: gringo-translate-minmax.patch: regenerated from gbp pq

[Thomas Krennwallner]

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

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

commit 1072e09fe559d3e1b61e7dbbfbb560d1113c9a0e
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Wed Dec 7 08:21:54 2016 +0100

    gringo-translate-minmax.patch: regenerated from gbp pq
---
 debian/patches/gringo-translate-minmax.patch | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/debian/patches/gringo-translate-minmax.patch b/debian/patches/gringo-translate-minmax.patch
index bda6d15..140c239 100644
--- a/debian/patches/gringo-translate-minmax.patch
+++ b/debian/patches/gringo-translate-minmax.patch
@@ -1,16 +1,26 @@
-Author: Roland Kaminski <kaminski at cs.uni-potsdam.de>
-Description: fixes translation bug of #min/#max aggregates
+From: Roland Kaminski <kaminski at cs.uni-potsdam.de>
+Date: Wed, 7 Dec 2016 07:50:31 +0100
+Subject: fixes translation bug of #min/#max aggregates
 Bug: https://sourceforge.net/p/potassco/bugs/119/
-Index: gringo-git-gbp/libgringo/src/output/aggregates.cc
+
 ===================================================================
---- gringo-git-gbp.orig/libgringo/src/output/aggregates.cc
-+++ gringo-git-gbp/libgringo/src/output/aggregates.cc
-@@ -192,13 +192,15 @@ ULit MinMaxTranslator::translate(LparseT
+---
+ libgringo/src/output/aggregates.cc | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/libgringo/src/output/aggregates.cc b/libgringo/src/output/aggregates.cc
+index 93c1a01..82b07c1 100644
+--- a/libgringo/src/output/aggregates.cc
++++ b/libgringo/src/output/aggregates.cc
+@@ -192,13 +192,15 @@ ULit MinMaxTranslator::translate(LparseTranslator &x, AggregateAnalyzer &res, bo
          ULitVec antecedent;
          ULitVec consequent;
          for (auto &elem : elems) {
 -            if (bound.first.contains(elem.second)) {
 -                if (isMin) { consequent.emplace_back(get_clone(elem.first)); }
+-            }
+-            else if (bound.second.contains(elem.second)) {
+-                if (!isMin) { consequent.emplace_back(get_clone(elem.first)); }
 +            if (res.range.contains(elem.second)) {
 +                if (bound.first.contains(elem.second)) {
 +                    if (isMin) { consequent.emplace_back(get_clone(elem.first)); }
@@ -20,9 +30,6 @@ Index: gringo-git-gbp/libgringo/src/output/aggregates.cc
 +                }
 +                else if (hasAntecedent) { antecedent.emplace_back(get_clone(elem.first)); }
              }
--            else if (bound.second.contains(elem.second)) {
--                if (!isMin) { consequent.emplace_back(get_clone(elem.first)); }
--            }
 -            else if (hasAntecedent) { antecedent.emplace_back(get_clone(elem.first)); }
          }
          if (hasAntecedent) {

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