refactor gcd() a little bit (no functional changes).

GiNaC tries to avoid expanding expressions while computing GCDs and applies
a number of heuristics. Usually this improves performance, but in some cases
it doesn't. Allow user to switch off heuristics.

Part 4:

refactor gcd() a little bit, so subsequent patch(es) won't be so big and ugly.

diff --git a/ginac/normal.cpp b/ginac/normal.cpp
index 0cb91001a01ff427bdb353590a3a29210c99c597..0227f4e3fa0c08efd83ec491a9a3ed3189f7cf1f 100644 (file)
--- a/ginac/normal.cpp
+++ b/ginac/normal.cpp
@@ -1602,33 +1602,36 @@ ex gcd(const ex &a, const ex &b, ex *ca, ex *cb, bool check_args, unsigned optio
        // Try heuristic algorithm first, fall back to PRS if that failed
        ex g;
        bool found = heur_gcd(g, aex, bex, ca, cb, var);
-       if (!found) {
-#if STATISTICS
-               heur_gcd_failed++;
-#endif
-               g = sr_gcd(aex, bex, var);
-               if (g.is_equal(_ex1)) {
-                       // Keep cofactors factored if possible
-                       if (ca)
-                               *ca = a;
-                       if (cb)
-                               *cb = b;
-               } else {
-                       if (ca)
-                               divide(aex, g, *ca, false);
-                       if (cb)
-                               divide(bex, g, *cb, false);
-               }
-       } else {
+       if (found) {
+               // heur_gcd have already computed cofactors...
                if (g.is_equal(_ex1)) {
-                       // Keep cofactors factored if possible
+                       // ... but we want to keep them factored if possible.
                        if (ca)
                                *ca = a;
                        if (cb)
                                *cb = b;
                }
+               return g;
        }
+#if STATISTICS
+       else {
+               heur_gcd_failed++;
+       }
+#endif
 
+       g = sr_gcd(aex, bex, var);
+       if (g.is_equal(_ex1)) {
+               // Keep cofactors factored if possible
+               if (ca)
+                       *ca = a;
+               if (cb)
+                       *cb = b;
+       } else {
+               if (ca)
+                       divide(aex, g, *ca, false);
+               if (cb)
+                       divide(bex, g, *cb, false);
+       }
        return g;
 }