X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Ftime_lw_O.cpp;h=bfa049a3b69a349bfb507e3be129c3835ab5529a;hp=6b87885a01f8ba57336dd877aa9a9dc5dd124a83;hb=45ca93fc48c14f733de73ffbbfef0834be731b08;hpb=286b0d93528e35957a50c51343e0b4a9bc623bce diff --git a/check/time_lw_O.cpp b/check/time_lw_O.cpp index 6b87885a..bfa049a3 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-2011 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2018 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 @@ -29,7 +29,7 @@ using namespace GiNaC; #include using namespace std; -static const bool do_test2 = false; // set to true in order to run this beast +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"); @@ -37,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(); }