[opengm] 43/50: change assert to OPENGM_TEST in unittests
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Sun Nov 1 17:14:49 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository opengm.
commit dff9cf98628ca069e9dcbe80a2f33704fbd85554
Author: joergkappes <kappes at math.uni-heidelberg.de>
Date: Mon Oct 26 15:02:31 2015 +0100
change assert to OPENGM_TEST in unittests
---
src/unittest/test_memoryinfo.cxx | 15 +++++------
src/unittest/test_operations.cxx | 54 ++++++++++++++++++++--------------------
2 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/src/unittest/test_memoryinfo.cxx b/src/unittest/test_memoryinfo.cxx
index 70a2341..3d9f941 100644
--- a/src/unittest/test_memoryinfo.cxx
+++ b/src/unittest/test_memoryinfo.cxx
@@ -3,7 +3,8 @@
#include <iostream>
#include <stdexcept>
#include <assert.h>
-#include "opengm/utilities/meminfo.hxx"
+#include <opengm/utilities/meminfo.hxx>
+#include <opengm/unittests/test.hxx>
int main(int argc, char** argv) {
sys::MemoryInfo memInfo;
@@ -16,9 +17,9 @@ int main(int argc, char** argv) {
std::cout << "New physical memory usage : "<<memInfo.usedPhysicalMem() << " kB" <<std::endl;
std::cout << "New virtual memory usage : "<<memInfo.usedVirtualMem() << " kB"<<std::endl;
- assert(memInfo.usedPhysicalMem()>80000);
- assert(memInfo.usedVirtualMem()>80000);
- assert(memInfo.usedPhysicalMem()<100000);
+ OPENGM_TEST(memInfo.usedPhysicalMem()>80000);
+ OPENGM_TEST(memInfo.usedVirtualMem()>80000);
+ OPENGM_TEST(memInfo.usedPhysicalMem()<100000);
// assert(memInfo.usedVirtualMem()<100000);
@@ -28,9 +29,9 @@ int main(int argc, char** argv) {
std::cout << "New physical memory usage : "<<memInfo.usedPhysicalMem() << " kB"<<std::endl;
std::cout << "New virtual memory usage : "<<memInfo.usedVirtualMem() << " kB"<<std::endl;
- assert(memInfo.usedPhysicalMem()>160000);
- assert(memInfo.usedVirtualMem()>160000);
- assert(memInfo.usedPhysicalMem()<180000);
+ OPENGM_TEST(memInfo.usedPhysicalMem()>160000);
+ OPENGM_TEST(memInfo.usedVirtualMem()>160000);
+ OPENGM_TEST(memInfo.usedPhysicalMem()<180000);
// assert(memInfo.usedVirtualMem()<180000);
std::cout << "<-- free first doubles" <<std::endl;
diff --git a/src/unittest/test_operations.cxx b/src/unittest/test_operations.cxx
index c301542..10a03f4 100644
--- a/src/unittest/test_operations.cxx
+++ b/src/unittest/test_operations.cxx
@@ -24,24 +24,24 @@ struct OperationTest
marray::Marray<T> B(shape.begin(),shape.end(),6);
marray::Marray<T> C(shape.begin(),shape.end(),1);
- {d = OP::neutral<T>(); assert(d==0);}
- {d=1;OP::neutral(d); assert(d==0);}
- {d = OP::ineutral<T>(); assert(d==0);}
- {d=1;OP::ineutral(d); assert(d==0);}
- {d=b;OP::op(a,d); assert(a==5 && d==11);}
- {d=0;OP::op(a,b,d); assert(a==5 && b==6 && d==11);}
- {a=5;OP::op(a,A); assert(a==5 && A(0,0)==7 && A(3,3)==7);}
- {OP::op(A,C); assert(A(0,0)==7 && A(3,3)==7 && C(0,0)==8&& C(3,3)==8);}
- {OP::op(A,B,C); assert(C(0,0)==13 && C(3,3)==13);}
- {d=b;OP::iop(a,d); assert(a==5 && d==1);}
- {a=5;OP::iop(a,A); assert(a==5 && A(0,0)==2 && A(3,3)==2);}
- {d=0;OP::iop(a,b,d); assert(a==5 && b==6 && d==-1);}
- {assert(!OP::hasbop());}
- {b=6;OP::hop(b,A); assert(A(0,0)==12 && A(3,3)==12);}
- {b=6;OP::hop(c,b); assert(c==2 && b==12);}
- {b=6;OP::hop(a,b,c); assert(a==5 && b==6 && c==30);}
- {b=4;a=2;OP::ihop(a,b); assert(a==2 && b==2);}
- {a=8,b=2;OP::ihop(a,b,c); assert(a==8 && b==2 && c==4);}
+ {d = OP::neutral<T>(); OPENGM_TEST(d==0);}
+ {d=1;OP::neutral(d); OPENGM_TEST(d==0);}
+ {d = OP::ineutral<T>(); OPENGM_TEST(d==0);}
+ {d=1;OP::ineutral(d); OPENGM_TEST(d==0);}
+ {d=b;OP::op(a,d); OPENGM_TEST(a==5 && d==11);}
+ {d=0;OP::op(a,b,d); OPENGM_TEST(a==5 && b==6 && d==11);}
+ {a=5;OP::op(a,A); OPENGM_TEST(a==5 && A(0,0)==7 && A(3,3)==7);}
+ {OP::op(A,C); OPENGM_TEST(A(0,0)==7 && A(3,3)==7 && C(0,0)==8&& C(3,3)==8);}
+ {OP::op(A,B,C); OPENGM_TEST(C(0,0)==13 && C(3,3)==13);}
+ {d=b;OP::iop(a,d); OPENGM_TEST(a==5 && d==1);}
+ {a=5;OP::iop(a,A); OPENGM_TEST(a==5 && A(0,0)==2 && A(3,3)==2);}
+ {d=0;OP::iop(a,b,d); OPENGM_TEST(a==5 && b==6 && d==-1);}
+ {OPENGM_TEST(!OP::hasbop());}
+ {b=6;OP::hop(b,A); OPENGM_TEST(A(0,0)==12 && A(3,3)==12);}
+ {b=6;OP::hop(c,b); OPENGM_TEST(c==2 && b==12);}
+ {b=6;OP::hop(a,b,c); OPENGM_TEST(a==5 && b==6 && c==30);}
+ {b=4;a=2;OP::ihop(a,b); OPENGM_TEST(a==2 && b==2);}
+ {a=8,b=2;OP::ihop(a,b,c); OPENGM_TEST(a==8 && b==2 && c==4);}
};
void testMultiplier() {
@@ -52,15 +52,15 @@ struct OperationTest
T c=2;
T d=4;
- {d = OP::neutral<T>(); assert(d==1);}
- {OP::neutral(d); assert(d==1);}
- {d = OP::ineutral<T>(); assert(d==1);}
- {OP::ineutral(d); assert(d==1);}
- {a=5;b=6;c=2;OP::op(a,b); assert(a==5 && b==30);}
- {a=5;b=6;c=2;OP::op(a,b,c); assert(a==5 && b==6 &&c==30);}
- {a=3;b=6;c=2;OP::iop(a,b); assert(a==3 && b==2);}
- {a=6;b=2;c=2;OP::iop(a,b,c);assert(a==6 && b==2 && c==3);}
- {assert(!OP::hasbop());}
+ {d = OP::neutral<T>(); OPENGM_TEST(d==1);}
+ {OP::neutral(d); OPENGM_TEST(d==1);}
+ {d = OP::ineutral<T>(); OPENGM_TEST(d==1);}
+ {OP::ineutral(d); OPENGM_TEST(d==1);}
+ {a=5;b=6;c=2;OP::op(a,b); OPENGM_TEST(a==5 && b==30);}
+ {a=5;b=6;c=2;OP::op(a,b,c); OPENGM_TEST(a==5 && b==6 &&c==30);}
+ {a=3;b=6;c=2;OP::iop(a,b); OPENGM_TEST(a==3 && b==2);}
+ {a=6;b=2;c=2;OP::iop(a,b,c);OPENGM_TEST(a==6 && b==2 && c==3);}
+ {OPENGM_TEST(!OP::hasbop());}
//{OP::hop(a,b);}
//{OP::hop(a,b,c);}
//{OP::ihop(a,b);}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opengm.git
More information about the debian-science-commits
mailing list