- more logic on the trigonometric function stuff.

[ginac.git] / check / poly_gcd.cpp

diff --git a/check/poly_gcd.cpp b/check/poly_gcd.cpp
index 484eb2d27c93aebfd8e7224e14693ee8fe1f4aab..12de267c89548e2f463c127686e3e0213523ca49 100644 (file)
--- a/check/poly_gcd.cpp
+++ b/check/poly_gcd.cpp
@@ -22,7 +22,10 @@
  */
 
 #include <ginac/ginac.h>
+
+#ifndef NO_GINAC_NAMESPACE
 using namespace GiNaC;
+#endif // ndef NO_GINAC_NAMESPACE
 
 const int MAX_VARIABLES = 5;
 
@@ -43,7 +46,7 @@ static unsigned poly_gcd1(void)
                ex f = (e1 + 1) * (e1 + 2);
                ex g = e2 * (-pow(x, 2) * y[0] * 3 + pow(y[0], 2) - 1);
                ex r = gcd(f, g);
-               if (r != exONE()) {
+               if (r != 1) {
                        clog << "case 1, gcd(" << f << "," << g << ") = " << r << " (should be 1)" << endl;
                        return 1;
                }
@@ -66,10 +69,7 @@ static unsigned poly_gcd2(void)
                ex f = d * pow(e2 - 2, 2);
                ex g = d * pow(e1 + 2, 2);
                ex r = gcd(f, g);
-        ex re=r.expand();
-        ex df1=r-d;
-        ex df=(r-d).expand();
-               if ((r - d).expand().compare(exZERO()) != 0) {
+               if (!(r - d).expand().is_zero()) {
                        clog << "case 2, gcd(" << f << "," << g << ") = " << r << " (should be " << d << ")" << endl;
                        return 1;
                }
@@ -89,7 +89,7 @@ static unsigned poly_gcd3(void)
                ex f = d * (e1 - 2);
                ex g = d * (e1 + 2);
                ex r = gcd(f, g);
-               if ((r - d).expand().compare(exZERO()) != 0) {
+               if (!(r - d).expand().is_zero()) {
                        clog << "case 3, gcd(" << f << "," << g << ") = " << r << " (should be " << d << ")" << endl;
                        return 1;
                }
@@ -112,7 +112,7 @@ static unsigned poly_gcd3p(void)
                ex f = d * (e1 - 2);
                ex g = d * (e2 + 2);
                ex r = gcd(f, g);
-               if ((r - d).expand().compare(exZERO()) != 0) {
+               if (!(r - d).expand().is_zero()) {
                        clog << "case 3p, gcd(" << f << "," << g << ") = " << r << " (should be " << d << ")" << endl;
                        return 1;
                }
@@ -137,7 +137,7 @@ static unsigned poly_gcd4(void)
                ex f = d * (e2 - 1);
                ex g = d * pow(e3 + 2, 2);
                ex r = gcd(f, g);
-               if ((r - d).expand().compare(exZERO()) != 0) {
+               if (!(r - d).expand().is_zero()) {
                        clog << "case 4, gcd(" << f << "," << g << ") = " << r << " (should be " << d << ")" << endl;
                        return 1;
                }
@@ -162,7 +162,7 @@ static unsigned poly_gcd5(void)
                ex f = d * (e2 + 3);
                ex g = d * (e3 - 3);
                ex r = gcd(f, g);
-               if ((r - d).expand().compare(exZERO()) != 0) {
+               if (!(r - d).expand().is_zero()) {
                        clog << "case 5, gcd(" << f << "," << g << ") = " << r << " (should be " << d << ")" << endl;
                        return 1;
                }
@@ -182,7 +182,7 @@ static unsigned poly_gcd5p(void)
                ex f = d * (e1 + 3);
                ex g = d * (e1 - 3);
                ex r = gcd(f, g);
-               if ((r - d).expand().compare(exZERO()) != 0) {
+               if (!(r - d).expand().is_zero()) {
                        clog << "case 5p, gcd(" << f << "," << g << ") = " << r << " (should be " << d << ")" << endl;
                        return 1;
                }
@@ -200,7 +200,7 @@ static unsigned poly_gcd6(void)
                ex f = d * (pow(x, j) + pow(y, j + 1) * pow(z, j) + 1);
                ex g = d * (pow(x, j + 1) + pow(y, j) * pow(z, j + 1) - 7);
                ex r = gcd(f, g);
-               if ((r - d).expand().compare(exZERO()) != 0) {
+               if (!(r - d).expand().is_zero()) {
                        clog << "case 6, gcd(" << f << "," << g << ") = " << r << " (should be " << d << ")" << endl;
                        return 1;
                }
@@ -221,7 +221,7 @@ static unsigned poly_gcd7(void)
                        ex f = pow(p, j) * pow(q, k);
                        ex g = pow(p, k) * pow(q, j); 
                        ex r = gcd(f, g);
-                       if ((r - d).expand().compare(exZERO()) != 0 && (r + d).expand().compare(exZERO()) != 0) {
+                       if (!(r - d).expand().is_zero() && !(r + d).expand().is_zero()) {
                                clog << "case 7, gcd(" << f << "," << g << ") = " << r << " (should be " << d << ")" << endl;
                                return 1;
                        }