X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Ftime_lw_O.cpp;h=79ea61933e08990981d0d3205e7e77abd73cbc6e;hp=5ae917a5a066de1fdcfa9c7bcac8eef862223032;hb=1185da6b5c369a018bcb9597674c49e64eabf106;hpb=5b44febe31956b36b62cd3650f7c5249bbe8100c diff --git a/check/time_lw_O.cpp b/check/time_lw_O.cpp index 5ae917a5..79ea6193 100644 --- a/check/time_lw_O.cpp +++ b/check/time_lw_O.cpp @@ -4,7 +4,7 @@ * Lewis and Michael Wester. */ /* - * GiNaC Copyright (C) 1999-2005 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2016 Johannes Gutenberg University Mainz, Germany * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,9 +21,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "times.h" +#include "ginac.h" +#include "timer.h" +using namespace GiNaC; -static const bool do_test2 = false; // set to true in order to run this beast +#include +#include +using namespace std; + +constexpr bool do_test2 = false; // set to true in order to run this beast static const symbol a1("a1"), a2("a2"), a3("a3"), a4("a4"), a5("a5"), a6("a6"); static const symbol b1("b1"), b2("b2"), b3("b3"), b4("b4"), b5("b5"), b6("b6"); @@ -31,66 +37,63 @@ static const symbol c1("c1"), c2("c2"), c3("c3"), c4("c4"), c5("c5"), c6("c6"); static const ex det1() { - matrix d1(15,15); - d1 = a6, a5, a4, a3, a2, a1, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, a6, 0, a5, a4, 0, a3, a2, a1, 0, 0, 0, 0, 0, - 0, a6, 0, a5, a4, 0, a3, a2, a1, 0, 0, 0, 0, 0, 0, - 0, 0, 0, a6, 0, 0, a5, a4, 0, 0, a3, a2, a1, 0, 0, - 0, 0, 0, 0, a6, 0, 0, a5, a4, 0, 0, a3, a2, a1, 0, - 0, 0, 0, 0, 0, a6, 0, 0, a5, a4, 0, 0, a3, a2, a1, - 0, 0, 0, b6, 0, 0, b5, b4, 0, 0, b3, b2, b1, 0, 0, - 0, 0, 0, 0, b6, 0, 0, b5, b4, 0, 0, b3, b2, b1, 0, - 0, b6, 0, b5, b4, 0, b3, b2, b1, 0, 0, 0, 0, 0, 0, - 0, 0, b6, 0, b5, b4, 0, b3, b2, b1, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, b6, 0, 0, b5, b4, 0, 0, b3, b2, b1, - 0, 0, 0, 0, 0, c6, 0, 0, c5, c4, 0, 0, c3, c2, c1, - 0, 0, c6, 0, c5, c4, 0, c3, c2, c1, 0, 0, 0, 0, 0, - 0, c6, 0, c5, c4, 0, c3, c2, c1, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, c6, 0, 0, c5, c4, 0, 0, c3, c2, c1, 0; + matrix d1 = {{a6, a5, a4, a3, a2, a1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + {0, 0, a6, 0, a5, a4, 0, a3, a2, a1, 0, 0, 0, 0, 0}, + {0, a6, 0, a5, a4, 0, a3, a2, a1, 0, 0, 0, 0, 0, 0}, + {0, 0, 0, a6, 0, 0, a5, a4, 0, 0, a3, a2, a1, 0, 0}, + {0, 0, 0, 0, a6, 0, 0, a5, a4, 0, 0, a3, a2, a1, 0}, + {0, 0, 0, 0, 0, a6, 0, 0, a5, a4, 0, 0, a3, a2, a1}, + {0, 0, 0, b6, 0, 0, b5, b4, 0, 0, b3, b2, b1, 0, 0}, + {0, 0, 0, 0, b6, 0, 0, b5, b4, 0, 0, b3, b2, b1, 0}, + {0, b6, 0, b5, b4, 0, b3, b2, b1, 0, 0, 0, 0, 0, 0}, + {0, 0, b6, 0, b5, b4, 0, b3, b2, b1, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, b6, 0, 0, b5, b4, 0, 0, b3, b2, b1}, + {0, 0, 0, 0, 0, c6, 0, 0, c5, c4, 0, 0, c3, c2, c1}, + {0, 0, c6, 0, c5, c4, 0, c3, c2, c1, 0, 0, 0, 0, 0}, + {0, c6, 0, c5, c4, 0, c3, c2, c1, 0, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, c6, 0, 0, c5, c4, 0, 0, c3, c2, c1, 0}}; return d1.determinant(); } static const ex det2() { - matrix d2(15,15); - d2 = b6, b5, b4, b3, b2, b1, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, b6, 0, b5, b4, 0, b3, b2, b1, 0, 0, 0, 0, 0, - 0, b6, 0, b5, b4, 0, b3, b2, b1, 0, 0, 0, 0, 0, 0, - 0, 0, 0, b6, 0, 0, b5, b4, 0, 0, b3, b2, b1, 0, 0, - 0, 0, 0, 0, b6, 0, 0, b5, b4, 0, 0, b3, b2, b1, 0, - 0, 0, 0, 0, 0, b6, 0, 0, b5, b4, 0, 0, b3, b2, b1, - 0, 0, 0, c6, 0, 0, c5, c4, 0, 0, c3, c2, c1, 0, 0, - 0, 0, 0, 0, c6, 0, 0, c5, c4, 0, 0, c3, c2, c1, 0, - 0, c6, 0, c5, c4, 0, c3, c2, c1, 0, 0, 0, 0, 0, 0, - 0, 0, c6, 0, c5, c4, 0, c3, c2, c1, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, c6, 0, 0, c5, c4, 0, 0, c3, c2, c1, - 0, 0, 0, 0, 0, a6, 0, 0, a5, a4, 0, 0, a3, a2, a1, - 0, 0, a6, 0, a5, a4, 0, a3, a2, a1, 0, 0, 0, 0, 0, - 0, a6, 0, a5, a4, 0, a3, a2, a1, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, a6, 0, 0, a5, a4, 0, 0, a3, a2, a1, 0; + matrix d2 = {{b6, b5, b4, b3, b2, b1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + {0, 0, b6, 0, b5, b4, 0, b3, b2, b1, 0, 0, 0, 0, 0}, + {0, b6, 0, b5, b4, 0, b3, b2, b1, 0, 0, 0, 0, 0, 0}, + {0, 0, 0, b6, 0, 0, b5, b4, 0, 0, b3, b2, b1, 0, 0}, + {0, 0, 0, 0, b6, 0, 0, b5, b4, 0, 0, b3, b2, b1, 0}, + {0, 0, 0, 0, 0, b6, 0, 0, b5, b4, 0, 0, b3, b2, b1}, + {0, 0, 0, c6, 0, 0, c5, c4, 0, 0, c3, c2, c1, 0, 0}, + {0, 0, 0, 0, c6, 0, 0, c5, c4, 0, 0, c3, c2, c1, 0}, + {0, c6, 0, c5, c4, 0, c3, c2, c1, 0, 0, 0, 0, 0, 0}, + {0, 0, c6, 0, c5, c4, 0, c3, c2, c1, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, c6, 0, 0, c5, c4, 0, 0, c3, c2, c1}, + {0, 0, 0, 0, 0, a6, 0, 0, a5, a4, 0, 0, a3, a2, a1}, + {0, 0, a6, 0, a5, a4, 0, a3, a2, a1, 0, 0, 0, 0, 0}, + {0, a6, 0, a5, a4, 0, a3, a2, a1, 0, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, a6, 0, 0, a5, a4, 0, 0, a3, a2, a1, 0}}; return d2.determinant(); } static const ex det3() { - matrix d3(15,15); - d3 = c6, c5, c4, c3, c2, c1, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, c6, 0, c5, c4, 0, c3, c2, c1, 0, 0, 0, 0, 0, - 0, c6, 0, c5, c4, 0, c3, c2, c1, 0, 0, 0, 0, 0, 0, - 0, 0, 0, c6, 0, 0, c5, c4, 0, 0, c3, c2, c1, 0, 0, - 0, 0, 0, 0, c6, 0, 0, c5, c4, 0, 0, c3, c2, c1, 0, - 0, 0, 0, 0, 0, c6, 0, 0, c5, c4, 0, 0, c3, c2, c1, - 0, 0, 0, a6, 0, 0, a5, a4, 0, 0, a3, a2, a1, 0, 0, - 0, 0, 0, 0, a6, 0, 0, a5, a4, 0, 0, a3, a2, a1, 0, - 0, a6, 0, a5, a4, 0, a3, a2, a1, 0, 0, 0, 0, 0, 0, - 0, 0, a6, 0, a5, a4, 0, a3, a2, a1, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, a6, 0, 0, a5, a4, 0, 0, a3, a2, a1, - 0, 0, 0, 0, 0, b6, 0, 0, b5, b4, 0, 0, b3, b2, b1, - 0, 0, b6, 0, b5, b4, 0, b3, b2, b1, 0, 0, 0, 0, 0, - 0, b6, 0, b5, b4, 0, b3, b2, b1, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, b6, 0, 0, b5, b4, 0, 0, b3, b2, b1, 0; + matrix d3 = {{c6, c5, c4, c3, c2, c1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + {0, 0, c6, 0, c5, c4, 0, c3, c2, c1, 0, 0, 0, 0, 0}, + {0, c6, 0, c5, c4, 0, c3, c2, c1, 0, 0, 0, 0, 0, 0}, + {0, 0, 0, c6, 0, 0, c5, c4, 0, 0, c3, c2, c1, 0, 0}, + {0, 0, 0, 0, c6, 0, 0, c5, c4, 0, 0, c3, c2, c1, 0}, + {0, 0, 0, 0, 0, c6, 0, 0, c5, c4, 0, 0, c3, c2, c1}, + {0, 0, 0, a6, 0, 0, a5, a4, 0, 0, a3, a2, a1, 0, 0}, + {0, 0, 0, 0, a6, 0, 0, a5, a4, 0, 0, a3, a2, a1, 0}, + {0, a6, 0, a5, a4, 0, a3, a2, a1, 0, 0, 0, 0, 0, 0}, + {0, 0, a6, 0, a5, a4, 0, a3, a2, a1, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, a6, 0, 0, a5, a4, 0, 0, a3, a2, a1}, + {0, 0, 0, 0, 0, b6, 0, 0, b5, b4, 0, 0, b3, b2, b1}, + {0, 0, b6, 0, b5, b4, 0, b3, b2, b1, 0, 0, 0, 0, 0}, + {0, b6, 0, b5, b4, 0, b3, b2, b1, 0, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, b6, 0, 0, b5, b4, 0, 0, b3, b2, b1, 0}}; return d3.determinant(); } @@ -133,7 +136,6 @@ unsigned time_lw_O() double time = .0; cout << "timing Lewis-Wester test O1 (three 15x15 dets)" << flush; - clog << "-------Lewis-Wester test O1 (three 15x15 dets):" << endl; rolex.start(); // correct for very small times: @@ -142,32 +144,30 @@ unsigned time_lw_O() ++count; } while ((time=rolex.read())<0.1 && !result); - if (!result) { - cout << " passed "; - clog << "(no output)" << endl; - } else { - cout << " failed "; - } + if (result) + return result; + cout << time/(3*count) << "s (average)" << endl; cout << "timing Lewis-Wester test O2 (Resultant)" << flush; - clog << "-------Lewis-Wester test O2 (Resultant):" << endl; if (do_test2) { rolex.reset(); result += test_O2(); - if (!result) { - cout << " passed "; - clog << "(no output)" << endl; - } else { - cout << " failed "; - } cout << rolex.read() << "s (combined)" << endl; } else { cout << " disabled" << endl; - clog << "(no output)" << endl; } return result; } + +extern void randomify_symbol_serials(); + +int main(int argc, char** argv) +{ + randomify_symbol_serials(); + cout << setprecision(2) << showpoint; + return time_lw_O(); +}