} else {
cout << " failed ";
}
- cout << int(1000*jaeger_le_coultre.read())*0.001 << "s (total)" << endl;
+ cout << jaeger_le_coultre.read() << "s (total)" << endl;
} else {
cout << " disabled" << endl;
clog << "(no output)" << endl;
vector<double> times;
timer breitling;
- sizes.push_back(50);
sizes.push_back(100);
sizes.push_back(200);
sizes.push_back(400);
+ sizes.push_back(800);
for (vector<unsigned>::iterator i=sizes.begin(); i!=sizes.end(); ++i) {
breitling.start();
// print the report:
cout << endl << " size: ";
for (vector<unsigned>::iterator i=sizes.begin(); i!=sizes.end(); ++i)
- cout << '\t' << (*i);
+ cout << '\t' << *i;
cout << endl << " time/s:";
for (vector<double>::iterator i=times.begin(); i!=times.end(); ++i)
- cout << '\t' << int(1000*(*i))*0.001;
+ cout << '\t' << *i;
cout << endl;
return result;
} else {
cout << " failed ";
}
- cout << int(1000*(time/count))*0.001 << 's' << endl;
+ cout << time/count << 's' << endl;
return result;
}
vector<double> times;
timer omega;
- sizes.push_back(10);
- sizes.push_back(15);
sizes.push_back(20);
sizes.push_back(25);
+ sizes.push_back(30);
+ sizes.push_back(35);
for (vector<unsigned>::iterator i=sizes.begin(); i!=sizes.end(); ++i) {
omega.start();
// print the report:
cout << endl << " order: ";
for (vector<unsigned>::iterator i=sizes.begin(); i!=sizes.end(); ++i)
- cout << '\t' << (*i);
+ cout << '\t' << *i;
cout << endl << " time/s:";
for (vector<double>::iterator i=times.begin(); i!=times.end(); ++i)
- cout << '\t' << int(1000*(*i))*0.001;
+ cout << '\t' << *i;
cout << endl;
return result;
} else {
cout << " failed ";
}
- cout << int(1000*(time/count))*0.001 << 's' << endl;
+ cout << time/count << 's' << endl;
return result;
}
} else {
cout << " failed ";
}
- cout << int(1000*(time/count))*0.001 << 's' << endl;
+ cout << time/count << 's' << endl;
return result;
}
} else {
cout << " failed ";
}
- cout << int(1000*(time/count))*0.001 << 's' << endl;
+ cout << time/count << 's' << endl;
return result;
}
} else {
cout << " failed ";
}
- cout << int(1000*(time/count))*0.001 << 's' << endl;
+ cout << time/count << 's' << endl;
return result;
}
} else {
cout << " failed ";
}
- cout << int(1000*(time/count))*0.001 << 's' << endl;
+ cout << time/count << 's' << endl;
return result;
}
} else {
cout << " failed ";
}
- cout << int(1000*(time/count))*0.001 << 's' << endl;
+ cout << time/count << 's' << endl;
return result;
}
} else {
cout << " failed ";
}
- cout << int(1000*(time/count))*0.001 << 's' << endl;
+ cout << time/count << 's' << endl;
return result;
}
} else {
cout << " failed ";
}
- cout << int(1000*(time/count))*0.001 << 's' << endl;
+ cout << time/count << 's' << endl;
return result;
}
Hinv = H.inverse();
cout << ". passed ";
clog << "(no output)" << endl;
- cout << int(1000*cartier.read())*0.001 << 's' << endl;
+ cout << cartier.read() << 's' << endl;
// check result:
name = (n==40?'J':(n==70?'L':'?'));
cout << ". failed ";
++result;
}
- cout << int(1000*cartier.read())*0.001 << 's' << endl;
+ cout << cartier.read() << 's' << endl;
return result;
}
} else {
cout << " failed ";
}
- cout << int(1000*(time/count))*0.001 << 's' << endl;
+ cout << time/count << 's' << endl;
return result;
}
} else {
cout << " failed ";
}
- cout << int(1000*(time/count))*0.001 << 's' << endl;
+ cout << time/count << 's' << endl;
} else {
cout << " disabled" << endl;
clog << "(no output)" << endl;
} else {
cout << " failed ";
}
- cout << int(1000*(time/count))*0.001 << 's' << endl;
+ cout << time/count << 's' << endl;
} else {
cout << " disabled" << endl;
clog << "(no output)" << endl;
} else {
cout << " failed ";
}
- cout << int(1000*(time/(3*count)))*0.001 << "s (average)" << endl;
+ cout << time/(3*count) << "s (average)" << endl;
cout << "timing Lewis-Wester test O2 (Resultant)" << flush;
clog << "-------Lewis-Wester test O2 (Resultant):" << endl;
} else {
cout << " failed ";
}
- cout << int(1000*rolex.read())*0.001 << "s (combined)" << endl;
+ cout << rolex.read() << "s (combined)" << endl;
} else {
cout << " disabled" << endl;
clog << "(no output)" << endl;
} else {
cout << " failed ";
}
- cout << int(1000*(time/count))*0.001 << 's' << endl;
+ cout << time/count << 's' << endl;
return result;
}
} else {
cout << " failed ";
}
- cout << int(1000*(time/count))*0.001 << 's' << endl;
+ cout << time/count << 's' << endl;
return result;
}
} else {
cout << " failed ";
}
- cout << int(1000*(time/count))*0.001 << 's' << endl;
+ cout << time/count << 's' << endl;
} else {
cout << " disabled" << endl;
clog << "(no output)" << endl;
} else {
cout << " failed ";
}
- cout << int(1000*(time/count))*0.001 << 's' << endl;
+ cout << time/count << 's' << endl;
} else {
cout << " disabled" << endl;
clog << "(no output)" << endl;
{
unsigned result = 0;
const symbol a("a"), b("b");
- ex p[9] = {ex("a",lst(a,b)),
+ ex p[10] = {ex("a",lst(a,b)),
ex("b",lst(a,b)),
ex("a+b",lst(a,b)),
ex("a^2+a*b+b^2",lst(a,b)),
ex("a^4+a^3*b+a^2*b^2+a*b^3+b^4",lst(a,b)),
ex("a^5+a^4*b+a^3*b^2-a^2*b^3+a*b^4+b^5",lst(a,b)),
ex("a^6+a^5*b+a^4*b^2+a^3*b^3+a^2*b^4+a*b^5+b^6",lst(a,b)),
- ex("a^7+a^6*b+a^5*b^2+a^4*b^3-a^3*b^4+a^2*b^5+a*b^6+b^7",lst(a,b))
+ ex("a^7+a^6*b+a^5*b^2+a^4*b^3-a^3*b^4+a^2*b^5+a*b^6+b^7",lst(a,b)),
+ ex("a^8+a^7*b+a^6*b^2+a^5*b^3+a^4*b^4+a^3*b^5+a^2*b^6+a*b^7+b^8",lst(a,b))
};
// construct Toeplitz matrix (diagonal structure: [[x,y,z],[y,x,y],[z,y,x]]):
vector<double> times;
timer longines;
- sizes.push_back(6);
sizes.push_back(7);
sizes.push_back(8);
sizes.push_back(9);
+ sizes.push_back(10);
for (vector<unsigned>::iterator i=sizes.begin(); i!=sizes.end(); ++i) {
int count = 1;
cout << '\t' << *i << 'x' << *i;
cout << endl << " time/s:";
for (vector<double>::iterator i=times.begin(); i!=times.end(); ++i)
- cout << '\t' << int(1000*(*i))*0.001;
+ cout << '\t' << *i;
cout << endl;
return result;
vector<double> times;
timer swatch;
- sizes.push_back(6);
sizes.push_back(8);
sizes.push_back(10);
sizes.push_back(12);
+ sizes.push_back(14);
for (vector<unsigned>::iterator i=sizes.begin(); i!=sizes.end(); ++i) {
int count = 1;
cout << '\t' << *i << 'x' << *i;
cout << endl << " time/s:";
for (vector<double>::iterator i=times.begin(); i!=times.end(); ++i)
- cout << '\t' << int(1000*(*i))*0.001;
+ cout << '\t' << *i;
cout << endl;
return result;
#ifdef HAVE_RUSAGE
if (running())
getrusage(RUSAGE_SELF, &used2);
- elapsed = ((used2.ru_utime.tv_sec - used1.ru_utime.tv_sec) +
- (used2.ru_stime.tv_sec - used1.ru_stime.tv_sec) +
- (used2.ru_utime.tv_usec - used1.ru_utime.tv_usec) * 1e-6 +
- (used2.ru_stime.tv_usec - used1.ru_stime.tv_usec) * 1e-6);
+ return ((used2.ru_utime.tv_sec - used1.ru_utime.tv_sec) +
+ (used2.ru_stime.tv_sec - used1.ru_stime.tv_sec) +
+ (used2.ru_utime.tv_usec - used1.ru_utime.tv_usec) * 1e-6 +
+ (used2.ru_stime.tv_usec - used1.ru_stime.tv_usec) * 1e-6);
#else
if (running())
used2 = clock();
- elapsed = double(used2 - used1)/CLOCKS_PER_SEC;
+ return double(used2 - used1)/CLOCKS_PER_SEC;
#endif
- // Results more accurate than 10ms are pointless:
- return elapsed;
- return 0.01*int(elapsed*100+0.5);
}
bool timer::running()
*/
void randomify_symbol_serials()
{
- srand((unsigned)time(NULL));
+ srand(time(NULL));
const int m = rand() % 666;
for (int s=0; s<m; ++s ) {
- symbol* tmp = new symbol;
- delete tmp;
+ symbol("dummy");
}
}
randomify_symbol_serials();
unsigned result = 0;
+
+ // For all timings:
+ cout << setprecision(2) << showpoint;
#define TIME(which) \
try { \