X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Ftime_lw_M1.cpp;h=cfba9fce8219573c8964f4f71078bad706fa2623;hp=f515cf03821118a33e501c857dee92ce71cb01d2;hb=1d07d8ac9fb47c51aa19a84df6c8c5fee5dd5105;hpb=c64de9c030fcc6d1df7ffbfb91c64dd0dc83b45a;ds=sidebyside diff --git a/check/time_lw_M1.cpp b/check/time_lw_M1.cpp index f515cf03..cfba9fce 100644 --- a/check/time_lw_M1.cpp +++ b/check/time_lw_M1.cpp @@ -4,7 +4,7 @@ * Lewis and Michael Wester. */ /* - * GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2003 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 @@ -25,79 +25,79 @@ static unsigned test(void) { - // Determinant of a sparse matrix that comes up in graph theory: - symbol x1("x1"), x2("x2"), x3("x3"), x4("x4"), x5("x5"); - static ex w[26][11] = { - { 1, 1, 1, 7, x4, 12, x3, 17, x2, 22, x1}, - { 2, 2, 1, 8, x4, 13, x3, 18, x2, 23, x1}, - { 3, 3, 1, 9, x4, 14, x3, 19, x2, 24, x1}, - { 4, 4, 1, 10, x4, 15, x3, 20, x2, 25, x1}, - { 5, 5, 1, 26, 1, 1, 0, 1, 0, 1, 0 }, - { 6, 2, x5, 6, 1, 12, x3, 17, x2, 22, x1}, - { 7, 3, x5, 7, 1, 13, x3, 18, x2, 23, x1}, - { 8, 4, x5, 8, 1, 14, x3, 19, x2, 24, x1}, - { 9, 5, x5, 9, 1, 15, x3, 20, x2, 25, x1}, - {10, 10, 1, 26, 1, 1, 0, 1, 0, 1, 0 }, - {11, 2, x5, 7, x4, 11, 1, 17, x2, 22, x1}, - {12, 3, x5, 8, x4, 12, 1, 18, x2, 23, x1}, - {13, 4, x5, 9, x4, 13, 1, 19, x2, 24, x1}, - {14, 5, x5, 10, x4, 14, 1, 20, x2, 25, x1}, - {15, 15, 1, 26, 1, 1, 0, 1, 0, 1, 0 }, - {16, 2, x5, 7, x4, 12, x3, 16, 1, 22, x1}, - {17, 3, x5, 8, x4, 13, x3, 17, 1, 23, x1}, - {18, 4, x5, 9, x4, 14, x3, 18, 1, 24, x1}, - {19, 5, x5, 10, x4, 15, x3, 19, 1, 25, x1}, - {20, 20, 1, 26, 1, 1, 0, 1, 0, 1, 0 }, - {21, 2, x5, 7, x4, 12, x3, 17, x2, 21, 1 }, - {22, 3, x5, 8, x4, 13, x3, 18, x2, 22, 1 }, - {23, 4, x5, 9, x4, 14, x3, 19, x2, 23, 1 }, - {24, 5, x5, 10, x4, 15, x3, 20, x2, 24, 1 }, - {25, 25, 1, 26, 1, 1, 0, 1, 0, 1, 0 }, - {26, 1, x5, 6, x4, 11, x3, 16, x2, 21, x1} - }; - matrix m(26,26); - for (unsigned r=0; r<26; ++r) { - for (unsigned c=0; c<5; ++c) { - m.set(r, - unsigned(ex_to_numeric(w[r][2*c+1]).to_int()-1), - w[r][2*c+2]); - } - } - ex det = m.determinant(); - // The result should have been: - ex cmp("-12*x2^2*x5^2*x4-12*x1*x5^2*x3^2-x5^3*x4^2-12*x1*x5^2*x4^2-12*x2*x5^2*x4^2-12*x3*x5^2*x4^2-x4^3*x5^2-36*x3*x1*x5^2*x4-36*x3*x1*x4^2*x5-36*x3*x2*x5^2*x4-36*x3*x2*x4^2*x5-2*x5^3*x4*x2-12*x3^2*x5^2*x4-12*x3^2*x4^2*x5-2*x5^3*x4*x3-2*x4^3*x5*x3-12*x1*x5^2*x2^2-36*x1*x5*x3^2*x4-36*x2*x5*x3^2*x4-x3^3*x5^2-x3^3*x4^2-2*x3^3*x5*x4-12*x2^2*x4^2*x5-12*x2*x5^2*x3^2-12*x2*x4^2*x3^2-12*x1*x4^2*x3^2-x3^2*x5^3-x3^2*x4^3-2*x4^3*x5*x2-2*x3*x5^3*x2-2*x3*x4^3*x2-2*x3^3*x5*x2-2*x3^3*x4*x2-2*x2^3*x5*x4-2*x2^3*x5*x3-2*x2^3*x4*x3-36*x2^2*x5*x4*x3-36*x2*x1*x5^2*x4-36*x2*x1*x4^2*x5-120*x2*x1*x5*x4*x3-36*x2*x1*x5^2*x3-36*x2*x1*x4^2*x3-36*x2*x1*x3^2*x5-36*x2*x1*x3^2*x4-12*x2^2*x5^2*x3-12*x2^2*x4^2*x3-12*x2^2*x3^2*x5-12*x2^2*x3^2*x4-2*x1^3*x4*x3-2*x1^3*x4*x2-2*x1^3*x3*x2-2*x1^3*x5*x2-36*x1^2*x5*x4*x3-36*x2*x1^2*x5*x4-36*x2*x3*x1^2*x5-36*x2*x3*x1^2*x4-x1^3*x5^2-x1^3*x4^2-x1^3*x3^2-x1^3*x2^2-x2^2*x5^3-x2^2*x4^3-x2^2*x3^3-12*x1*x4^2*x2^2-12*x1*x3^2*x2^2-12*x1^2*x5^2*x4-12*x1^2*x4^2*x5-12*x1^2*x5^2*x3-12*x1^2*x4^2*x3-12*x1^2*x3^2*x5-12*x1^2*x3^2*x4-12*x1^2*x5^2*x2-12*x1^2*x4^2*x2-12*x1^2*x3^2*x2-12*x1^2*x2^2*x5-12*x1^2*x2^2*x4-12*x1^2*x2^2*x3-2*x5^3*x4*x1-2*x4^3*x5*x1-2*x3*x5^3*x1-2*x3*x4^3*x1-2*x3^3*x5*x1-2*x3^3*x4*x1-2*x2*x5^3*x1-2*x2*x4^3*x1-2*x2*x3^3*x1-2*x2^3*x5*x1-2*x2^3*x4*x1-2*x2^3*x3*x1-2*x1^3*x5*x4-2*x1^3*x5*x3-36*x1*x5*x2^2*x4-36*x1*x5*x2^2*x3-36*x1*x4*x2^2*x3-x1^2*x5^3-x1^2*x4^3-x1^2*x3^3-x2^3*x5^2-x2^3*x4^2-x2^3*x3^2-x1^2*x2^3",lst(x1,x2,x3,x4,x5)); - if (det!=cmp) { - clog << "The determinant was miscalculated" << endl; - return 1; - } - return 0; + // Determinant of a sparse matrix that comes up in graph theory: + symbol x1("x1"), x2("x2"), x3("x3"), x4("x4"), x5("x5"); + ex w[26][11] = { + { 1, 1, 1, 7, x4, 12, x3, 17, x2, 22, x1}, + { 2, 2, 1, 8, x4, 13, x3, 18, x2, 23, x1}, + { 3, 3, 1, 9, x4, 14, x3, 19, x2, 24, x1}, + { 4, 4, 1, 10, x4, 15, x3, 20, x2, 25, x1}, + { 5, 5, 1, 26, 1, 1, 0, 1, 0, 1, 0 }, + { 6, 2, x5, 6, 1, 12, x3, 17, x2, 22, x1}, + { 7, 3, x5, 7, 1, 13, x3, 18, x2, 23, x1}, + { 8, 4, x5, 8, 1, 14, x3, 19, x2, 24, x1}, + { 9, 5, x5, 9, 1, 15, x3, 20, x2, 25, x1}, + {10, 10, 1, 26, 1, 1, 0, 1, 0, 1, 0 }, + {11, 2, x5, 7, x4, 11, 1, 17, x2, 22, x1}, + {12, 3, x5, 8, x4, 12, 1, 18, x2, 23, x1}, + {13, 4, x5, 9, x4, 13, 1, 19, x2, 24, x1}, + {14, 5, x5, 10, x4, 14, 1, 20, x2, 25, x1}, + {15, 15, 1, 26, 1, 1, 0, 1, 0, 1, 0 }, + {16, 2, x5, 7, x4, 12, x3, 16, 1, 22, x1}, + {17, 3, x5, 8, x4, 13, x3, 17, 1, 23, x1}, + {18, 4, x5, 9, x4, 14, x3, 18, 1, 24, x1}, + {19, 5, x5, 10, x4, 15, x3, 19, 1, 25, x1}, + {20, 20, 1, 26, 1, 1, 0, 1, 0, 1, 0 }, + {21, 2, x5, 7, x4, 12, x3, 17, x2, 21, 1 }, + {22, 3, x5, 8, x4, 13, x3, 18, x2, 22, 1 }, + {23, 4, x5, 9, x4, 14, x3, 19, x2, 23, 1 }, + {24, 5, x5, 10, x4, 15, x3, 20, x2, 24, 1 }, + {25, 25, 1, 26, 1, 1, 0, 1, 0, 1, 0 }, + {26, 1, x5, 6, x4, 11, x3, 16, x2, 21, x1} + }; + matrix m(26,26); + for (unsigned r=0; r<26; ++r) { + for (unsigned c=0; c<5; ++c) { + m.set(r, + unsigned(ex_to(w[r][2*c+1]).to_int()-1), + w[r][2*c+2]); + } + } + ex det = m.determinant(); + // The result should have been: + ex cmp("-12*x2^2*x5^2*x4-12*x1*x5^2*x3^2-x5^3*x4^2-12*x1*x5^2*x4^2-12*x2*x5^2*x4^2-12*x3*x5^2*x4^2-x4^3*x5^2-36*x3*x1*x5^2*x4-36*x3*x1*x4^2*x5-36*x3*x2*x5^2*x4-36*x3*x2*x4^2*x5-2*x5^3*x4*x2-12*x3^2*x5^2*x4-12*x3^2*x4^2*x5-2*x5^3*x4*x3-2*x4^3*x5*x3-12*x1*x5^2*x2^2-36*x1*x5*x3^2*x4-36*x2*x5*x3^2*x4-x3^3*x5^2-x3^3*x4^2-2*x3^3*x5*x4-12*x2^2*x4^2*x5-12*x2*x5^2*x3^2-12*x2*x4^2*x3^2-12*x1*x4^2*x3^2-x3^2*x5^3-x3^2*x4^3-2*x4^3*x5*x2-2*x3*x5^3*x2-2*x3*x4^3*x2-2*x3^3*x5*x2-2*x3^3*x4*x2-2*x2^3*x5*x4-2*x2^3*x5*x3-2*x2^3*x4*x3-36*x2^2*x5*x4*x3-36*x2*x1*x5^2*x4-36*x2*x1*x4^2*x5-120*x2*x1*x5*x4*x3-36*x2*x1*x5^2*x3-36*x2*x1*x4^2*x3-36*x2*x1*x3^2*x5-36*x2*x1*x3^2*x4-12*x2^2*x5^2*x3-12*x2^2*x4^2*x3-12*x2^2*x3^2*x5-12*x2^2*x3^2*x4-2*x1^3*x4*x3-2*x1^3*x4*x2-2*x1^3*x3*x2-2*x1^3*x5*x2-36*x1^2*x5*x4*x3-36*x2*x1^2*x5*x4-36*x2*x3*x1^2*x5-36*x2*x3*x1^2*x4-x1^3*x5^2-x1^3*x4^2-x1^3*x3^2-x1^3*x2^2-x2^2*x5^3-x2^2*x4^3-x2^2*x3^3-12*x1*x4^2*x2^2-12*x1*x3^2*x2^2-12*x1^2*x5^2*x4-12*x1^2*x4^2*x5-12*x1^2*x5^2*x3-12*x1^2*x4^2*x3-12*x1^2*x3^2*x5-12*x1^2*x3^2*x4-12*x1^2*x5^2*x2-12*x1^2*x4^2*x2-12*x1^2*x3^2*x2-12*x1^2*x2^2*x5-12*x1^2*x2^2*x4-12*x1^2*x2^2*x3-2*x5^3*x4*x1-2*x4^3*x5*x1-2*x3*x5^3*x1-2*x3*x4^3*x1-2*x3^3*x5*x1-2*x3^3*x4*x1-2*x2*x5^3*x1-2*x2*x4^3*x1-2*x2*x3^3*x1-2*x2^3*x5*x1-2*x2^3*x4*x1-2*x2^3*x3*x1-2*x1^3*x5*x4-2*x1^3*x5*x3-36*x1*x5*x2^2*x4-36*x1*x5*x2^2*x3-36*x1*x4*x2^2*x3-x1^2*x5^3-x1^2*x4^3-x1^2*x3^3-x2^3*x5^2-x2^3*x4^2-x2^3*x3^2-x1^2*x2^3",lst(x1,x2,x3,x4,x5)); + if (det!=cmp) { + clog << "The determinant was miscalculated" << endl; + return 1; + } + return 0; } unsigned time_lw_M1(void) { - unsigned result = 0; - unsigned count = 0; - timer rolex; - double time = .0; - - cout << "timing Lewis-Wester test M1 (26x26 sparse, det)" << flush; - clog << "-------Lewis-Wester test M1 (26x26 sparse, det)" << endl; - - rolex.start(); - // correct for very small times: - do { - result = test(); - ++count; - } while ((time=rolex.read())<0.1 && !result); - cout << '.' << flush; - - if (!result) { - cout << " passed "; - clog << "(no output)" << endl; - } else { - cout << " failed "; - } - cout << int(1000*(time/count))*0.001 << 's' << endl; - - return result; + unsigned result = 0; + unsigned count = 0; + timer rolex; + double time = .0; + + cout << "timing Lewis-Wester test M1 (26x26 sparse, det)" << flush; + clog << "-------Lewis-Wester test M1 (26x26 sparse, det):" << endl; + + rolex.start(); + // correct for very small times: + do { + result = test(); + ++count; + } while ((time=rolex.read())<0.1 && !result); + cout << '.' << flush; + + if (!result) { + cout << " passed "; + clog << "(no output)" << endl; + } else { + cout << " failed "; + } + cout << int(1000*(time/count))*0.001 << 's' << endl; + + return result; }