Changeset f7286a in git

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

880433df635f3b50ff607d57901f88cba3333ebd

Parents:

6a05fd20a1813f28c0b8400fef5f3d7026c6334c

Message:

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

Files:

• Singular/iparith.cc (modified) (4 diffs)
• libpolys/polys/ext_fields/transext.cc (modified) (2 diffs)
• libpolys/polys/polys0.cc (modified) (1 diff)
• libpolys/polys/prCopy.cc (modified) (6 diffs)
• libpolys/polys/prCopyTemplate.cc (modified) (2 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;
   }

libpolys/polys/ext_fields/transext.cc

@@ -158 +158 @@
   const poly num = NUM(t);
   assume(num != NULL);   /**< t != 0 ==> numerator(t) != 0 */
-  assume( p_Test(num, ntRing) );
+  assume( _p_Test(num, ntRing,1) );
 
   const poly den = DEN(t);
@@ -164 +164 @@
   if (den != NULL) // !DENIS1(f)
   {
-    assume( p_Test(den, ntRing) );
+    assume( _p_Test(den, ntRing,1) );
 
     if(p_IsConstant(den, ntRing) && (n_IsOne(pGetCoeff(den), ntRing->cf)))

libpolys/polys/polys0.cc

@@ -150 +150 @@
     while (p!=NULL)
     {
+      assume(!n_IsZero(p->coef,tailRing->cf));
       if ((p->coef==NULL)||n_GreaterZero(p->coef,tailRing->cf))
         StringAppendS("+");

libpolys/polys/prCopy.cc

@@ -144 +144 @@
 {
   if (id == NULL) return NULL;
+  assume(src_r->cf==dest_r->cf);
   poly p;
   ideal res = idInit(IDELEMS(id), id->rank);
@@ -159 +160 @@
 ideal idrCopyR(ideal id, ring src_r, ring dest_r)
 {
+  assume(src_r->cf==dest_r->cf);
   ideal res;
   prCopyProc_t prproc;
@@ -171 +173 @@
 ideal idrCopyR_NoSort(ideal id, ring src_r, ring dest_r)
 {
+  assume(src_r->cf==dest_r->cf);
   ideal res;
   prCopyProc_t prproc;
@@ -198 +201 @@
 idrMove(ideal &id, ring src_r, ring dest_r, prCopyProc_t prproc)
 {
+  assume(src_r->cf==dest_r->cf);
   if (id == NULL) return NULL;
   ideal res = id;
@@ -210 +214 @@
 ideal idrMoveR(ideal &id, ring src_r, ring dest_r)
 {
+  assume(src_r->cf==dest_r->cf);
   prCopyProc_t prproc;
   ideal res;
@@ -222 +227 @@
 ideal idrMoveR_NoSort(ideal &id, ring src_r, ring dest_r)
 {
+  assume(src_r->cf==dest_r->cf);
   prCopyProc_t prproc;
   ideal res;

libpolys/polys/prCopyTemplate.cc

@@ -10 +10 @@
 (poly &src, ring r_src, ring r_dest)
 {
+  if (src==NULL) return NULL;
   spolyrec dest_s;
   poly dest = &dest_s;
@@ -30 +31 @@
   p_Test(dest, r_dest);
   return dest;
-  (void)(r_src);
 }