added ex::const_iterator, ex::begin(), ex::end()

[ginac.git] / check / exam_polygcd.cpp

diff --git a/check/exam_polygcd.cpp b/check/exam_polygcd.cpp
index 34aea62abf03e112b3dc0cf88c78fb64962b8825..4b8bd440d0a98eec71bcd81b3eb75c151779b92f 100644 (file)
--- a/check/exam_polygcd.cpp
+++ b/check/exam_polygcd.cpp
@@ -4,7 +4,7 @@
  *  rational function normalization in normalization.cpp. */
 
 /*
- *  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
@@ -29,7 +29,7 @@ static symbol x("x"), z("z");
 static symbol y[MAX_VARIABLES];
 
 // GCD = 1
-static unsigned poly_gcd1(void)
+static unsigned poly_gcd1()
 {
        for (int v=1; v<=MAX_VARIABLES; v++) {
                ex e1 = x;
@@ -51,7 +51,7 @@ static unsigned poly_gcd1(void)
 }
 
 // Linearly dense quartic inputs with quadratic GCDs
-static unsigned poly_gcd2(void)
+static unsigned poly_gcd2()
 {
        for (int v=1; v<=MAX_VARIABLES; v++) {
                ex e1 = x;
@@ -74,7 +74,7 @@ static unsigned poly_gcd2(void)
 }
 
 // Sparse GCD and inputs where degrees are proportional to the number of variables
-static unsigned poly_gcd3(void)
+static unsigned poly_gcd3()
 {
        for (int v=1; v<=MAX_VARIABLES; v++) {
                ex e1 = pow(x, v + 1);
@@ -94,7 +94,7 @@ static unsigned poly_gcd3(void)
 }
 
 // Variation of case 3; major performance degradation with PRS
-static unsigned poly_gcd3p(void)
+static unsigned poly_gcd3p()
 {
        for (int v=1; v<=MAX_VARIABLES; v++) {
                ex e1 = pow(x, v + 1);
@@ -117,7 +117,7 @@ static unsigned poly_gcd3p(void)
 }
 
 // Quadratic non-monic GCD; f and g have other quadratic factors
-static unsigned poly_gcd4(void)
+static unsigned poly_gcd4()
 {
        for (int v=1; v<=MAX_VARIABLES; v++) {
                ex e1 = pow(x, 2) * pow(y[0], 2);
@@ -142,7 +142,7 @@ static unsigned poly_gcd4(void)
 }
 
 // Completely dense non-monic quadratic inputs with dense non-monic linear GCDs
-static unsigned poly_gcd5(void)
+static unsigned poly_gcd5()
 {
        for (int v=1; v<=MAX_VARIABLES; v++) {
                ex e1 = x + 1;
@@ -167,7 +167,7 @@ static unsigned poly_gcd5(void)
 }
 
 // Sparse non-monic quadratic inputs with linear GCDs
-static unsigned poly_gcd5p(void)
+static unsigned poly_gcd5p()
 {
        for (int v=1; v<=MAX_VARIABLES; v++) {
                ex e1 = x;
@@ -187,7 +187,7 @@ static unsigned poly_gcd5p(void)
 }
 
 // Trivariate inputs with increasing degrees
-static unsigned poly_gcd6(void)
+static unsigned poly_gcd6()
 {
        symbol y("y");
 
@@ -205,7 +205,7 @@ static unsigned poly_gcd6(void)
 }
 
 // Trivariate polynomials whose GCD has common factors with its cofactors
-static unsigned poly_gcd7(void)
+static unsigned poly_gcd7()
 {
        symbol y("y");
        ex p = x - y * z + 1;
@@ -226,29 +226,29 @@ static unsigned poly_gcd7(void)
        return 0;
 }
 
-unsigned exam_polygcd(void)
+unsigned exam_polygcd()
 {
-    unsigned result = 0;
-    
+       unsigned result = 0;
+       
        cout << "examining polynomial GCD computation" << flush;
        clog << "----------polynomial GCD computation:" << endl;
-    
+       
        result += poly_gcd1();  cout << '.' << flush;
        result += poly_gcd2();  cout << '.' << flush;
        result += poly_gcd3();  cout << '.' << flush;
-    result += poly_gcd3p();     cout << '.' << flush; // takes extremely long (PRS "worst" case)
+       result += poly_gcd3p();  cout << '.' << flush; // PRS "worst" case
        result += poly_gcd4();  cout << '.' << flush;
        result += poly_gcd5();  cout << '.' << flush;
        result += poly_gcd5p();  cout << '.' << flush;
        result += poly_gcd6();  cout << '.' << flush;
        result += poly_gcd7();  cout << '.' << flush;
-    
+       
        if (!result) {
                cout << " passed " << endl;
-        clog << "(no output)" << endl;
-    } else {
+               clog << "(no output)" << endl;
+       } else {
                cout << " failed " << endl;
-    }
-    
+       }
+       
        return result;
 }