[opengm] 09/40: fix problems on 32bit systems

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository opengm.

commit 3acdc4fb91836caed705a81b8b9d4328078f3bda
Author: joergkappes <kappes at math.uni-heidelberg.de>
Date:   Fri Nov 27 15:00:55 2015 +0100

    fix problems on 32bit systems
---
 src/unittest/test_functions.cxx  | 10 +++++-----
 src/unittest/test_partitions.cxx | 13 +++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/unittest/test_functions.cxx b/src/unittest/test_functions.cxx
index b69f55f..eeea979 100644
--- a/src/unittest/test_functions.cxx
+++ b/src/unittest/test_functions.cxx
@@ -1278,26 +1278,26 @@ struct FunctionsTest {
             greaterEqualFunction.challengeRelaxed(violatedConstraintsGreaterEqualFunctionBegin, violatedConstraintsGreaterEqualFunctionEnd, violatedConstraintsWeightsGreaterEqualFunctionBegin, evalVecRelaxed.begin());
 
             for(size_t i = 0; i < numConstraints; i++) {
-               if(expectedValues[i] < bounds[i]) {
-                  OPENGM_TEST_EQUAL(bounds[i] - expectedValues[i], *violatedConstraintsWeightsEqualFunctionBegin);
+               if(expectedValues[i] < bounds[i]) {  
+                  OPENGM_TEST_EQUAL_TOLERANCE(bounds[i] - expectedValues[i], *violatedConstraintsWeightsEqualFunctionBegin, OPENGM_FLOAT_TOL);
                   OPENGM_TEST_EQUAL(bounds[i], violatedConstraintsEqualFunctionBegin->getBound());
                   OPENGM_TEST_EQUAL_SEQUENCE(constraints[i].indicatorVariablesBegin(), constraints[i].indicatorVariablesEnd(), violatedConstraintsEqualFunctionBegin->indicatorVariablesBegin());
                   ++violatedConstraintsEqualFunctionBegin;
                   ++violatedConstraintsWeightsEqualFunctionBegin;
 
-                  OPENGM_TEST_EQUAL(bounds[i] - expectedValues[i], *violatedConstraintsWeightsGreaterEqualFunctionBegin);
+                  OPENGM_TEST_EQUAL_TOLERANCE(bounds[i] - expectedValues[i], *violatedConstraintsWeightsGreaterEqualFunctionBegin, OPENGM_FLOAT_TOL);
                   OPENGM_TEST_EQUAL(bounds[i], violatedConstraintsGreaterEqualFunctionBegin->getBound());
                   OPENGM_TEST_EQUAL_SEQUENCE(constraints[i].indicatorVariablesBegin(), constraints[i].indicatorVariablesEnd(), violatedConstraintsGreaterEqualFunctionBegin->indicatorVariablesBegin());
                   ++violatedConstraintsGreaterEqualFunctionBegin;
                   ++violatedConstraintsWeightsGreaterEqualFunctionBegin;
                } else if(expectedValues[i] > bounds[i]) {
-                  OPENGM_TEST_EQUAL(expectedValues[i] - bounds[i], *violatedConstraintsWeightsEqualFunctionBegin);
+                  OPENGM_TEST_EQUAL_TOLERANCE(expectedValues[i] - bounds[i], *violatedConstraintsWeightsEqualFunctionBegin, OPENGM_FLOAT_TOL);
                   OPENGM_TEST_EQUAL(bounds[i], violatedConstraintsEqualFunctionBegin->getBound());
                   OPENGM_TEST_EQUAL_SEQUENCE(constraints[i].indicatorVariablesBegin(), constraints[i].indicatorVariablesEnd(), violatedConstraintsEqualFunctionBegin->indicatorVariablesBegin());
                   ++violatedConstraintsEqualFunctionBegin;
                   ++violatedConstraintsWeightsEqualFunctionBegin;
 
-                  OPENGM_TEST_EQUAL(expectedValues[i] - bounds[i], *violatedConstraintsWeightsLessEqualFunctionBegin);
+                  OPENGM_TEST_EQUAL_TOLERANCE(expectedValues[i] - bounds[i], *violatedConstraintsWeightsLessEqualFunctionBegin, OPENGM_FLOAT_TOL);
                   OPENGM_TEST_EQUAL(bounds[i], violatedConstraintsLessEqualFunctionBegin->getBound());
                   OPENGM_TEST_EQUAL_SEQUENCE(constraints[i].indicatorVariablesBegin(), constraints[i].indicatorVariablesEnd(), violatedConstraintsLessEqualFunctionBegin->indicatorVariablesBegin());
                   ++violatedConstraintsLessEqualFunctionBegin;
diff --git a/src/unittest/test_partitions.cxx b/src/unittest/test_partitions.cxx
index 4826c86..dca0e78 100644
--- a/src/unittest/test_partitions.cxx
+++ b/src/unittest/test_partitions.cxx
@@ -2,11 +2,12 @@
 #include <iostream>
 #include "opengm/utilities/partitions.hxx"
 #include <opengm/unittests/test.hxx>
+#include <stdint.h>
 
 
 void testPartition()
 {
-   opengm::Partitions<size_t,size_t> P;
+   opengm::Partitions<uint64_t,uint64_t> P;
    P.resize(3); 
    std::cout <<"Test BellNumber: ..."<<std::flush;
    OPENGM_TEST(P.BellNumber(2)==2);
@@ -20,8 +21,8 @@ void testPartition()
    OPENGM_TEST(P.getPartition(4)==7); 
    OPENGM_TEST(P.getPartition(5)>8);
 
-   std::vector<size_t> ltest(3);
-   for(size_t i=0; i<5; ++i){
+   std::vector<uint64_t> ltest(3);
+   for(uint64_t i=0; i<5; ++i){
       //const size_t el = P.getPartition(i);
       P.getPartition(i,ltest);
       //std::cout << P.label2Index(ltest) <<" ("<< el <<") "<<ltest[0]<<ltest[1]<<ltest[2]<<std::endl;
@@ -33,16 +34,16 @@ void testPartition()
 
    std::cout <<"Test label2Index: ..."<<std::flush;
    P.resize(3);
-   std::vector<size_t> l(3,0);
+   std::vector<uint64_t> l(3,0);
    OPENGM_TEST(P.label2Index(l)==4);
    l[0]=1;
    OPENGM_TEST(P.label2Index(l)==3);
    l[1]=2;
    OPENGM_TEST(P.label2Index(l)==0); 
 
-   for(size_t b=4;b<12;++b){
+   for(uint64_t b=4;b<12;++b){
       P.resize(b);
-      std::vector<size_t> l(b,0);
+      std::vector<uint64_t> l(b,0);
       OPENGM_TEST(P.label2Index(l)==P.BellNumber(b)-1);
    }
    std::cout <<"  OK!"<<std::endl;

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