Changeset 94e916 in git

Timestamp:

Dec 23, 2016, 9:38:27 PM (7 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '98550b669234b32be762076c32b3be2c35188ac4')

Children:

732d05565d5b05937605afdc45b78b61f264118c

Parents:

589e8eab0d5415b844ad43ec150a72e4004e1114

Message:

fix: prCopy cannot be used for iring with different cf (hilb for ZZ)

File:

• Singular/iparith.cc (modified) (4 diffs)

Singular/iparith.cc

@@ -2315 +2315 @@
     tempR->cf=new_cf;
     rComplete(tempR);
-    ideal uid = (ideal)u->Data();
+    sleftv uAsLeftv; memset(&uAsLeftv, 0, sizeof(uAsLeftv));
+    uAsLeftv.rtyp=u->Typ();
+    uAsLeftv.data=u->CopyD();
     rChangeCurrRing(tempR);
-    ideal uu = idrCopyR(uid, origR, currRing);
     sleftv uuAsLeftv; memset(&uuAsLeftv, 0, sizeof(uuAsLeftv));
-    uuAsLeftv.rtyp = IDEAL_CMD;
-    uuAsLeftv.data = uu; uuAsLeftv.next = NULL;
+    nMapFunc nMap=n_SetMap(origR->cf,tempR->cf);
+    maApplyFetch(FETCH_CMD,NULL,&uuAsLeftv,&uAsLeftv,origR,NULL,NULL,0,nMap);
+    ideal uu=(ideal)uuAsLeftv.data;
     if (hasFlag(u, FLAG_STD)) setFlag(&uuAsLeftv,FLAG_STD);
     assumeStdFlag(&uuAsLeftv);
@@ -2343 +2345 @@
       delete iv;
     }
-    idDelete(&uu);
+    uuAsLeftv.CleanUp(tempR);
     rChangeCurrRing(origR);
+    uAsLeftv.CleanUp(origR);
     rDelete(tempR);
     if (returnWithTrue) return TRUE; else return FALSE;
@@ -5790 +5793 @@
     tempR->cf=new_cf;
     rComplete(tempR);
-    ideal uid = (ideal)u->Data();
+    sleftv uAsLeftv; memset(&uAsLeftv, 0, sizeof(uAsLeftv));
+    uAsLeftv.rtyp=u->Typ();
+    uAsLeftv.data=u->CopyD();
     rChangeCurrRing(tempR);
-    ideal uu = idrCopyR(uid, origR, currRing);
+    nMapFunc nMap=n_SetMap(origR->cf,tempR->cf);
     sleftv uuAsLeftv; memset(&uuAsLeftv, 0, sizeof(uuAsLeftv));
-    uuAsLeftv.rtyp = IDEAL_CMD;
-    uuAsLeftv.data = uu; uuAsLeftv.next = NULL;
+    maApplyFetch(FETCH_CMD,NULL,&uuAsLeftv,&uAsLeftv,origR,NULL,NULL,0,nMap);
+    ideal uu=(ideal)uuAsLeftv.data;
     if (hasFlag(u, FLAG_STD)) setFlag(&uuAsLeftv,FLAG_STD);
     assumeStdFlag(&uuAsLeftv);
@@ -5818 +5823 @@
       delete iv;
     }
-    idDelete(&uu);
+    uuAsLeftv.CleanUp(tempR);
     rChangeCurrRing(origR);
+    uAsLeftv.CleanUp(origR);
     rDelete(tempR);
     if (returnWithTrue) return TRUE; else return FALSE;