chizeta/cnorxz
chizeta/cnorxz
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

correct unit test

Browse source
This commit is contained in:
Christian Zimmermann 2017-11-15 17:40:31 +01:00
parent 2e4a0be76a
commit 650b41967e
3 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/block.cc
View file

@ -32,7 +32,6 @@ namespace MultiArrayHelper
static OpFunc f; static OpFunc f;
if(mRes.size() == 0) { mRes.assign(arg.size(), static_cast<T>(0)); } if(mRes.size() == 0) { mRes.assign(arg.size(), static_cast<T>(0)); }
assert(mRes.size() == arg.size()); assert(mRes.size() == arg.size());
VCHECK(arg);
for(size_t i = 0; i != arg.size(); ++i){ for(size_t i = 0; i != arg.size(); ++i){
mRes[i] = f(mRes[i], arg[i]); mRes[i] = f(mRes[i], arg[i]);
} }

1
src/multi_array_operation.cc
View file

@ -357,7 +357,6 @@ namespace MultiArrayTools
{ {
BlockBinaryOpSelf<T,std::plus<T>,decltype(mOp.get())> f(mRes); BlockBinaryOpSelf<T,std::plus<T>,decltype(mOp.get())> f(mRes);
for(*mInd = 0; mInd->pos() != mInd->max(); ++(*mInd)){ for(*mInd = 0; mInd->pos() != mInd->max(); ++(*mInd)){
VCHECK(mInd->pos());
f(mOp.get()); f(mOp.get());
} }
return mRes; return mRes;

2
src/op_unit_test.cc
View file

@ -182,9 +182,9 @@ namespace {
std::cout << "MultiArray time: " << static_cast<double>( end - begin ) / CLOCKS_PER_SEC std::cout << "MultiArray time: " << static_cast<double>( end - begin ) / CLOCKS_PER_SEC
<< std::endl; << std::endl;
std::vector<double> res2(vs1*vs2);
std::clock_t begin2 = std::clock(); std::clock_t begin2 = std::clock();
std::vector<double> res2(vs1*vs2);
for(size_t i = 0; i != vs2; ++i){ for(size_t i = 0; i != vs2; ++i){
for(size_t j = 0; j != vs1; ++j){ for(size_t j = 0; j != vs1; ++j){
res2[i*vs1 + j] = cv1[j] * cv2[i*vs1 + j]; res2[i*vs1 + j] = cv1[j] * cv2[i*vs1 + j];