Changeset 1b420fd in git

Timestamp:

Aug 3, 2011, 7:29:37 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

f218a7daf5f60792a940256fb8358b13d4d85ef3

Parents:

36dd348c07984f48c3bf7582c5f05be7aa4ea52e

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-03 19:29:37+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:14:21+01:00

Message:

FIX: ideal/polynomial projections

Location:

kernel

Files:

• syz.cc (modified) (2 diffs)
• syz0.cc (modified) (3 diffs)
• syz1.cc (modified) (5 diffs)
• syz2.cc (modified) (1 diff)
• syz3.cc (modified) (2 diffs)

kernel/syz.cc

@@ -424 +424 @@
   if (syz_ring != origR)
   {
-    res[0] = idrCopyR_NoSort(arg, origR);
+    rChangeCurrRing(syz_ring);
+    res[0] = idrCopyR_NoSort(arg, origR, syz_ring);
   }
   else
@@ -605 +606 @@
   if (origR != syz_ring)
   {
-    rChangeCurrRing(origR);
+    rChangeCurrRing(origR); // should not be needed now?
     for (i=0; i<=syzIndex; i++)
     {
-      res[i] = idrMoveR_NoSort(res[i], syz_ring);
+      res[i] = idrMoveR_NoSort(res[i], syz_ring, origR);
     }
     rKill(syz_ring);

kernel/syz0.cc

@@ -918 +918 @@
           for (i=0; i<IDELEMS(res[1]); i++)
           {
-            res[1]->m[i] = prMoveR( res[1]->m[i], origR);
+            res[1]->m[i] = prMoveR( res[1]->m[i], origR, syRing);
           }
         }
@@ -931 +931 @@
           for (i=0; i<IDELEMS(res[0]); i++)
           {
-            res[0]->m[i] = prMoveR( res[0]->m[i], origR);
+            res[0]->m[i] = prMoveR( res[0]->m[i], origR, syRing);
           }
         }
@@ -970 +970 @@
         if (res[syzIndex]->m[i])
         {
-          res[syzIndex]->m[i] = prMoveR( res[syzIndex]->m[i], syRing);
+          res[syzIndex]->m[i] = prMoveR( res[syzIndex]->m[i], syRing, origR);
         }
       }

kernel/syz1.cc

@@ -1687 +1687 @@
             {
               if (origR!=NULL)
-                tq = prHeadR(p,origR);
+                tq = prHeadR(p,origR, currRing);
               else
                 tq = pHead(p);
@@ -1700 +1700 @@
                 pIter(p);
                 pNext(pp)=NULL;
-                tq = prMoveR(pp, origR);
+                tq = prMoveR(pp, origR, currRing);
               }
               else
@@ -1734 +1734 @@
           {
             if (toCopy)
-              fullres[i-1]->m[j] = prCopyR(res[i]->m[j], origR);
+              fullres[i-1]->m[j] = prCopyR(res[i]->m[j], origR, currRing);
             else
             {
-              fullres[i-1]->m[j] = prMoveR(res[i]->m[j], origR);
+              fullres[i-1]->m[j] = prMoveR(res[i]->m[j], origR, currRing);
               res[i]->m[j] = NULL;
             }
@@ -2485 +2485 @@
   for (i=0;i<IDELEMS(arg);i++)
   {
-    temp->m[i] = prCopyR( arg->m[i], origR);
+    temp->m[i] = prCopyR( arg->m[i], origR, syzstr->syRing);
     if (temp->m[i]!=NULL)
     {
@@ -2627 +2627 @@
   for (i=0;i<IDELEMS(arg);i++)
   {
-    temp->m[i] = prCopyR( arg->m[i], origR);
+    temp->m[i] = prCopyR( arg->m[i], origR, currRing);
     if (temp->m[i]!=NULL)
     {

kernel/syz2.cc

@@ -1002 +1002 @@
   {
     if (origR != syzstr->syRing)
-      temp->m[i] = prCopyR( arg->m[i], origR);
+      temp->m[i] = prCopyR( arg->m[i], origR, syzstr->syRing);
     else
       temp->m[i] = pCopy( arg->m[i]);

kernel/syz3.cc

@@ -1771 +1771 @@
   syzstr->regularity = -1;
   if (origR!=syzstr->syRing)
-    temp = idrCopyR(arg,origR);
+    temp = idrCopyR(arg, origR, syzstr->syRing);
   else
     temp = idCopy(arg);
@@ -2016 +2016 @@
     while ((index<=*length) && (syzstr->fullres[index]!=NULL))
     {
-      syzstr->fullres[index] = idrMoveR(syzstr->fullres[index],syzstr->syRing);
+      syzstr->fullres[index] = idrMoveR(syzstr->fullres[index],syzstr->syRing, origR);
       index++;
     }