From 9b88171cbfde3f0cdb71753bcbf90bb320584fcc Mon Sep 17 00:00:00 2001
From: Rene Milk <rene.milk@uni-muenster.de>
Date: Wed, 30 Nov 2011 10:32:41 +0100
Subject: [PATCH] fix colonProduct loops
---
stuff/math.hh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/stuff/math.hh b/stuff/math.hh
index 434b18815..d5a7a62c7 100644
--- a/stuff/math.hh
+++ b/stuff/math.hh
@@ -35,12 +35,13 @@ static double colonProduct(const SomeRangeType& arg1, const OtherRangeType& arg2
ConstRowIteratorType arg1RowItEnd = arg1.end();
ConstRowIteratorType arg2RowItEnd = arg2.end();
ConstRowIteratorType arg2RowIt = arg2.begin();
- for (ConstRowIteratorType arg1RowIt = arg1.begin(); arg1RowIt != arg1RowItEnd, arg2RowIt != arg2RowItEnd;
+ for (ConstRowIteratorType arg1RowIt = arg1.begin(); arg1RowIt != arg1RowItEnd && arg2RowIt != arg2RowItEnd;
++arg1RowIt, ++arg2RowIt) {
ConstIteratorType row1ItEnd = arg1RowIt->end();
ConstIteratorType row2ItEnd = arg2RowIt->end();
ConstIteratorType row2It = arg2RowIt->begin();
- for (ConstIteratorType row1It = arg1RowIt->begin(); row1It != row1ItEnd, row2It != row2ItEnd; ++row1It, ++row2It) {
+ for (ConstIteratorType row1It = arg1RowIt->begin(); row1It != row1ItEnd && row2It != row2ItEnd;
+ ++row1It, ++row2It) {
ret += *row1It * *row2It;
}
}
--
GitLab