Changeset f7286a in git for Singular/iparith.cc

Timestamp:

Oct 31, 2012, 3:12:54 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

880433df635f3b50ff607d57901f88cba3333ebd

Parents:

6a05fd20a1813f28c0b8400fef5f3d7026c6334c

Message:

fix: idrCopyR need equal coeffs, fixed dim(i),dim(i,j) for ring-cf

File:

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

Singular/iparith.cc

@@ -1867 +1867 @@
   if (rField_is_Ring(currRing))
   {
-    ring origR = currRing;
-    ring tempR = rCopy(origR);
-    coeffs new_cf=nInitChar(n_Q,NULL);
-    nKillChar(tempR->cf);
-    tempR->cf=new_cf;
-    rComplete(tempR);
+    //ring origR = currRing;
+    //ring tempR = rCopy(origR);
+    //coeffs new_cf=nInitChar(n_Q,NULL);
+    //nKillChar(tempR->cf);
+    //tempR->cf=new_cf;
+    //rComplete(tempR);
     ideal vid = (ideal)v->Data();
     int i = idPosConstant(vid);
@@ -1880 +1880 @@
       return FALSE;
     }
-    rChangeCurrRing(tempR);
-    ideal vv = idrCopyR(vid, origR, currRing);
-    ideal ww = idrCopyR((ideal)w->Data(), origR, currRing);
+    //rChangeCurrRing(tempR);
+    //ideal vv = idrCopyR(vid, origR, currRing);
+    ideal vv = id_Copy(vid, currRing);
+    //ideal ww = idrCopyR((ideal)w->Data(), origR, currRing);
+    ideal ww = id_Copy((ideal)w->Data(), currRing);
     /* drop degree zero generator from vv (if any) */
     if (i != -1) pDelete(&vv->m[i]);
     long d = (long)scDimInt(vv, ww);
-    if (rField_is_Ring_Z(origR) && (i == -1)) d++;
+    if (rField_is_Ring_Z(currRing) && (i == -1)) d++;
     res->data = (char *)d;
     idDelete(&vv); idDelete(&ww);
-    rChangeCurrRing(origR);
-    rDelete(tempR);
+    //rChangeCurrRing(origR);
+    //rDelete(tempR);
     return FALSE;
   }
@@ -3901 +3903 @@
   if (rField_is_Ring(currRing))
   {
-    ring origR = currRing;
-    ring tempR = rCopy(origR);
-    coeffs new_cf=nInitChar(n_Q,NULL);
-    nKillChar(tempR->cf);
-    tempR->cf=new_cf;
-    rComplete(tempR);
+    //ring origR = currRing;
+    //ring tempR = rCopy(origR);
+    //coeffs new_cf=nInitChar(n_Q,NULL);
+    //nKillChar(tempR->cf);
+    //tempR->cf=new_cf;
+    //rComplete(tempR);
     ideal vid = (ideal)v->Data();
     int i = idPosConstant(vid);
@@ -3914 +3916 @@
       return FALSE;
     }
-    rChangeCurrRing(tempR);
-    ideal vv = idrCopyR(vid, origR, currRing);
+    //rChangeCurrRing(tempR);
+    //ideal vv = idrCopyR(vid, origR, currRing);
+    ideal vv = id_Head(vid,currRing);
     /* drop degree zero generator from vv (if any) */
     if (i != -1) pDelete(&vv->m[i]);
     long d = (long)scDimInt(vv, currQuotient);
-    if (rField_is_Ring_Z(origR) && (i == -1)) d++;
+    if (rField_is_Ring_Z(currRing) && (i == -1)) d++;
     res->data = (char *)d;
     idDelete(&vv);
-    rChangeCurrRing(origR);
-    rDelete(tempR);
+    //rChangeCurrRing(origR);
+    //rDelete(tempR);
     return FALSE;
   }