Changeset dd668f in git for libpolys/polys/clapsing.cc

Timestamp:

Mar 21, 2012, 6:48:05 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

bcfd11a55d73c58524f3c5043376c6d7147cb690

Parents:

f630e4e0ae481c82576fce09c99655b85d5e04e8

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-21 18:48:05+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-23 16:06:34+01:00

Message:

use minideal (instead of qideal) in rCompose

chg: use qideal instead of minideal for alg_ext

TODO: remove direct access to extRing from outside

File:

• libpolys/polys/clapsing.cc (modified) (13 diffs)

libpolys/polys/clapsing.cc

@@ -75 +75 @@
     if ( rField_is_Q_a(r)) setCharacteristic( 0 );
     else                   setCharacteristic( rChar(r) );
-    if (r->cf->extRing->minideal!=NULL)
+    if (r->cf->extRing->qideal!=NULL)
     {
       bool b1=isOn(SW_USE_QGCD);
@@ -81 +81 @@
       if ( rField_is_Q_a(r) ) On(SW_USE_QGCD);
       else                   On(SW_USE_fieldGCD);
-      CanonicalForm mipo=convSingPFactoryP(r->cf->extRing->minideal->m[0],
+      CanonicalForm mipo=convSingPFactoryP(r->cf->extRing->qideal->m[0],
                                            r->cf->extRing);
       Variable a=rootOf(mipo);
@@ -160 +160 @@
     else               setCharacteristic( rChar(r) );
     Variable X(i+rPar(r));
-    if (r->cf->extRing->minideal!=NULL)
+    if (r->cf->extRing->qideal!=NULL)
     {
       //Variable X(i);
-      CanonicalForm mipo=convSingPFactoryP(r->cf->extRing->minideal->m[0],
+      CanonicalForm mipo=convSingPFactoryP(r->cf->extRing->qideal->m[0],
                                            r->cf->extRing);
       Variable a=rootOf(mipo);
@@ -306 +306 @@
     else                 setCharacteristic( rChar(r) );
     CanonicalForm Fa,Gb;
-    if (r->cf->extRing->minideal!=NULL)
-    {
-      CanonicalForm mipo=convSingPFactoryP(r->cf->extRing->minideal->m[0],
+    if (r->cf->extRing->qideal!=NULL)
+    {
+      CanonicalForm mipo=convSingPFactoryP(r->cf->extRing->qideal->m[0],
                                            r->cf->extRing);
       Variable a=rootOf(mipo);
@@ -374 +374 @@
     if (rField_is_Q_a(r)) setCharacteristic( 0 );
     else               setCharacteristic( rChar(r) );
-    if (r->cf->extRing->minideal!=NULL)
-    {
-      CanonicalForm mipo=convSingPFactoryP(r->cf->extRing->minideal->m[0],
+    if (r->cf->extRing->qideal!=NULL)
+    {
+      CanonicalForm mipo=convSingPFactoryP(r->cf->extRing->qideal->m[0],
                                                  r->cf->extRing);
       Variable a=rootOf(mipo);
@@ -530 +530 @@
     else if (rField_is_Extension(r))
     {
-      if (r->cf->extRing->minideal!=NULL)
-      {
-        CanonicalForm mipo=convSingPFactoryP(r->cf->extRing->minideal->m[0],
+      if (r->cf->extRing->qideal!=NULL)
+      {
+        CanonicalForm mipo=convSingPFactoryP(r->cf->extRing->qideal->m[0],
                                     r->cf->extRing);
         a=rootOf(mipo);
@@ -563 +563 @@
         else if (rField_is_Extension(r))
         {
-          if (r->cf->extRing->minideal!=NULL)
+          if (r->cf->extRing->qideal!=NULL)
           {
             q= convFactoryAPSingAP( Q,r );
@@ -733 +733 @@
     if (rField_is_Q_a (r)) setCharacteristic (0);
     else                   setCharacteristic( rChar(r) );
-    if (r->cf->extRing->minideal!=NULL)
-    {
-      CanonicalForm mipo=convSingPFactoryP(r->cf->extRing->minideal->m[0],
+    if (r->cf->extRing->qideal!=NULL)
+    {
+      CanonicalForm mipo=convSingPFactoryP(r->cf->extRing->qideal->m[0],
                                            r->cf->extRing);
       Variable a=rootOf(mipo);
@@ -795 +795 @@
         intvec *w=NULL;
         if (v!=NULL) w=*v;
-        if (r->cf->extRing->minideal==NULL)
+        if (r->cf->extRing->qideal==NULL)
         {
           if(!count_Factors(res,w,j,ff,convFactoryPSingTrP( J.getItem().factor(),r ),r))
@@ -927 +927 @@
     }
   }
-  if (rField_is_Q_a(r) && (r->cf->extRing->minideal!=NULL))
+  if (rField_is_Q_a(r) && (r->cf->extRing->qideal!=NULL))
   {
     int i=IDELEMS(res)-1;
@@ -1091 +1091 @@
     if (rField_is_Q_a (r)) setCharacteristic (0);
     else                   setCharacteristic( rChar(r) );
-    if (r->cf->extRing->minideal!=NULL)
-    {
-      CanonicalForm mipo=convSingPFactoryP(r->cf->extRing->minideal->m[0],
+    if (r->cf->extRing->qideal!=NULL)
+    {
+      CanonicalForm mipo=convSingPFactoryP(r->cf->extRing->qideal->m[0],
                                            r->cf->extRing);
       Variable a=rootOf(mipo);
@@ -1153 +1153 @@
       else if (rField_is_Extension(r))     /* Q(a), Fp(a) */
       {
-        if (r->cf->extRing->minideal==NULL)
+        if (r->cf->extRing->qideal==NULL)
           res->m[j]=convFactoryPSingTrP( J.getItem().factor(),r );
         else
@@ -1170 +1170 @@
     }
   }
-  if (rField_is_Q_a(r) && (r->cf->extRing->minideal!=NULL))
+  if (rField_is_Q_a(r) && (r->cf->extRing->qideal!=NULL))
   {
     int i=IDELEMS(res)-1;