refactor: Update CMake build system and streamline Core object serialization and property handling.
This commit is contained in:
@@ -23,88 +23,90 @@
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////*/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "Math/Accumulator.h"
|
||||
#include "testing-prototype.h"
|
||||
|
||||
#include <TRandom.h>
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
|
||||
|
||||
//#include <boost/accumulators/framework/accumulator_set.hpp>
|
||||
//#include <boost/accumulators/statistics/count.hpp>
|
||||
//#include <boost/accumulators/accumulators.hpp>
|
||||
// #include <boost/accumulators/framework/accumulator_set.hpp>
|
||||
// #include <boost/accumulators/statistics/count.hpp>
|
||||
// #include <boost/accumulators/accumulators.hpp>
|
||||
|
||||
using namespace uLib;
|
||||
|
||||
int test_ABTrim() {
|
||||
|
||||
Accumulator_ABTrim<float> acc;
|
||||
Accumulator_ABTrim<float> acc;
|
||||
|
||||
acc.SetABTrim(1,1);
|
||||
acc.SetABTrim(1, 1);
|
||||
|
||||
std::vector<float> v;
|
||||
for(float tmpf : {1,5,5,5,300}) v.push_back(tmpf);
|
||||
//v << 1,5,5,5,300;
|
||||
std::vector<float> v;
|
||||
for (float tmpf : {1, 5, 5, 5, 300})
|
||||
v.push_back(tmpf);
|
||||
// v << 1,5,5,5,300;
|
||||
|
||||
for(std::vector<float>::iterator itr=v.begin(); itr<v.end(); itr++)
|
||||
acc += *itr;
|
||||
for (std::vector<float>::iterator itr = v.begin(); itr < v.end(); itr++)
|
||||
acc += *itr;
|
||||
|
||||
// TODO missing operator <<
|
||||
//std::cout << "Accumulating Trim(1,1) vector: "
|
||||
// << v << " ... out = " << acc() << "\n";
|
||||
|
||||
return( acc() == 15.0 );
|
||||
// TODO missing operator <<
|
||||
// std::cout << "Accumulating Trim(1,1) vector: "
|
||||
// << v << " ... out = " << acc() << "\n";
|
||||
|
||||
return (acc() == 15.0);
|
||||
}
|
||||
|
||||
|
||||
int test_Mean() {
|
||||
Accumulator_Mean<float> mean;
|
||||
TRandom rnd;
|
||||
const int c = 10000000;
|
||||
std::vector<float> v;
|
||||
v.reserve(c);
|
||||
for(int i=0;i<c;++i) v.push_back( rnd.Gaus(2000,5) );
|
||||
|
||||
float m = 0;
|
||||
for(int i=0;i<c;++i) m += v[i];
|
||||
m /= c;
|
||||
std::cout << "simple mean: " << m << "\n";
|
||||
|
||||
for(int i=0;i<c;++i) mean(v[i]);
|
||||
std::cout << "mean pass: " << mean() << "\n";
|
||||
mean.AddPass();
|
||||
for(int i=0;i<c;++i) mean(v[i]);
|
||||
std::cout << "mean pass: " << mean() << "\n";
|
||||
mean.AddPass();
|
||||
for(int i=0;i<c;++i) mean(v[i]);
|
||||
std::cout << "mean pass: " << mean() << "\n";
|
||||
mean.AddPass();
|
||||
for(int i=0;i<c;++i) mean(v[i]);
|
||||
std::cout << "mean pass: " << mean() << "\n";
|
||||
mean.AddPass();
|
||||
for(int i=0;i<c;++i) mean(v[i]);
|
||||
std::cout << "mean pass: " << mean() << "\n";
|
||||
mean.AddPass();
|
||||
for(int i=0;i<c;++i) mean(v[i]);
|
||||
std::cout << "mean pass: " << mean() << "\n";
|
||||
mean.AddPass();
|
||||
for(int i=0;i<c;++i) mean(v[i]);
|
||||
std::cout << "mean pass: " << mean() << "\n";
|
||||
Accumulator_Mean<float> mean;
|
||||
TRandom rnd;
|
||||
const int c = 10000000;
|
||||
std::vector<float> v;
|
||||
v.reserve(c);
|
||||
for (int i = 0; i < c; ++i)
|
||||
v.push_back(rnd.Gaus(2000, 5));
|
||||
|
||||
float m = 0;
|
||||
for (int i = 0; i < c; ++i)
|
||||
m += v[i];
|
||||
m /= c;
|
||||
std::cout << "simple mean: " << m << "\n";
|
||||
|
||||
for (int i = 0; i < c; ++i)
|
||||
mean(v[i]);
|
||||
std::cout << "mean pass: " << mean() << "\n";
|
||||
mean.AddPass();
|
||||
for (int i = 0; i < c; ++i)
|
||||
mean(v[i]);
|
||||
std::cout << "mean pass: " << mean() << "\n";
|
||||
mean.AddPass();
|
||||
for (int i = 0; i < c; ++i)
|
||||
mean(v[i]);
|
||||
std::cout << "mean pass: " << mean() << "\n";
|
||||
mean.AddPass();
|
||||
for (int i = 0; i < c; ++i)
|
||||
mean(v[i]);
|
||||
std::cout << "mean pass: " << mean() << "\n";
|
||||
mean.AddPass();
|
||||
for (int i = 0; i < c; ++i)
|
||||
mean(v[i]);
|
||||
std::cout << "mean pass: " << mean() << "\n";
|
||||
mean.AddPass();
|
||||
for (int i = 0; i < c; ++i)
|
||||
mean(v[i]);
|
||||
std::cout << "mean pass: " << mean() << "\n";
|
||||
mean.AddPass();
|
||||
for (int i = 0; i < c; ++i)
|
||||
mean(v[i]);
|
||||
std::cout << "mean pass: " << mean() << "\n";
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
int main(void) {
|
||||
BEGIN_TESTING(Accumulator);
|
||||
BEGIN_TESTING(Accumulator);
|
||||
|
||||
//TEST1( test_ABTrim() );
|
||||
test_Mean();
|
||||
// TEST1( test_ABTrim() );
|
||||
test_Mean();
|
||||
|
||||
END_TESTING;
|
||||
END_TESTING;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user