Changeset c723d80 in git

Timestamp:

Apr 11, 2012, 3:46:47 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

16a0dff5411888a4f70e800b97597f593dcdfb82

Parents:

a034968a1bff5f6e4e9ad126551a2e9a377d9f60

git-author:

Martin Lee <martinlee84@web.de>2012-04-11 15:46:47+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-05-07 14:11:30+02:00

Message:

chg: test divisibility of primitive part

File:

• factory/cf_gcd_smallp.cc (modified) (11 diffs)

factory/cf_gcd_smallp.cc

@@ -777 +777 @@
         //maybe it's better to test if ppH is an element of F(\alpha) before
         //mapping down
-        DEBOUTLN (cerr, "ppH before mapDown= " << ppH);
-        ppH= mapDown (ppH, prim_elem, im_prim_elem, alpha, u, v);
-        ppH /= Lc(ppH);
-        DEBOUTLN (cerr, "ppH after mapDown= " << ppH);
-        if (fdivides (ppH, A) && fdivides (ppH, B))
-        {
+        if (fdivides (ppH, ppA) && fdivides (ppH, ppB))
+        {
+          DEBOUTLN (cerr, "ppH before mapDown= " << ppH);
+          ppH= mapDown (ppH, prim_elem, im_prim_elem, alpha, u, v);
+          ppH /= Lc(ppH);
+          DEBOUTLN (cerr, "ppH after mapDown= " << ppH);
           if (substitute > 1)
           {
@@ -791 +791 @@
         }
       }
-      else if (fdivides (ppH, A) && fdivides (ppH, B))
+      else if (fdivides (ppH, ppA) && fdivides (ppH, ppB))
       {
         if (substitute > 1)
@@ -1066 +1066 @@
       if (inextension)
       {
-        if (fdivides(ppH, GFMapUp(A, k)) && fdivides(ppH, GFMapUp(B,k)))
+        if (fdivides(ppH, ppA) && fdivides(ppH, ppB))
         {
           DEBOUTLN (cerr, "ppH before mapDown= " << ppH);
@@ -1082 +1082 @@
       else
       {
-        if (fdivides (ppH, A) && fdivides (ppH, B))
+        if (fdivides (ppH, ppA) && fdivides (ppH, ppB))
         {
           if (substitute > 1)
@@ -1421 +1421 @@
       ppH /= Lc (ppH);
       DEBOUTLN (cerr, "ppH= " << ppH);
-      if (fdivides (ppH, A) && fdivides (ppH, B))
+      if (fdivides (ppH, ppA) && fdivides (ppH, ppB))
       {
         if (substitute > 1)
@@ -3060 +3060 @@
         //maybe it's better to test if ppH is an element of F(\alpha) before
         //mapping down
-        DEBOUTLN (cerr, "ppH before mapDown= " << ppH);
-        ppH= mapDown (ppH, prim_elem, im_prim_elem, alpha, u, v);
-        ppH /= Lc(ppH);
-        DEBOUTLN (cerr, "ppH after mapDown= " << ppH);
-        if (fdivides (ppH, A) && fdivides (ppH, B))
-        {
+        if (fdivides (ppH, ppA) && fdivides (ppH, ppB))
+        {
+          DEBOUTLN (cerr, "ppH before mapDown= " << ppH);
+          ppH= mapDown (ppH, prim_elem, im_prim_elem, alpha, u, v);
+          ppH /= Lc(ppH);
+          DEBOUTLN (cerr, "ppH after mapDown= " << ppH);
           if (substitute > 1)
           {
@@ -3074 +3074 @@
         }
       }
-      else if (fdivides (ppH, A) && fdivides (ppH, B))
+      else if (fdivides (ppH, ppA) && fdivides (ppH, ppB))
       {
         if (substitute > 1)
@@ -3250 +3250 @@
             //maybe it's better to test if ppH is an element of F(\alpha) before
             //mapping down
-            DEBOUTLN (cerr, "ppH before mapDown= " << ppH);
-            ppH= mapDown (ppH, prim_elem, im_prim_elem, alpha, u, v);
-            ppH /= Lc(ppH);
-            DEBOUTLN (cerr, "ppH after mapDown= " << ppH);
-            if (fdivides (ppH, A) && fdivides (ppH, B))
+            if (fdivides (ppH, ppA) && fdivides (ppH, ppB))
             {
+              DEBOUTLN (cerr, "ppH before mapDown= " << ppH);
+              ppH= mapDown (ppH, prim_elem, im_prim_elem, alpha, u, v);
+              ppH /= Lc(ppH);
+              DEBOUTLN (cerr, "ppH after mapDown= " << ppH);
               if (substitute > 1)
               {
@@ -3264 +3264 @@
             }
           }
-          else if (fdivides (ppH, A) && fdivides (ppH, B))
+          else if (fdivides (ppH, ppA) && fdivides (ppH, ppB))
           {
             if (substitute > 1)
@@ -3561 +3561 @@
       DEBOUTLN (cerr, "ppH= " << ppH);
 
-      if (fdivides (ppH, A) && fdivides (ppH, B))
+      if (fdivides (ppH, ppA) && fdivides (ppH, ppB))
       {
         if (substitute > 1)
@@ -3786 +3786 @@
           ppH /= Lc (ppH);
           DEBOUTLN (cerr, "ppH= " << ppH);
-          if (fdivides (ppH, A) && fdivides (ppH, B))
+          if (fdivides (ppH, ppA) && fdivides (ppH, ppB))
           {
             if (substitute > 1)