Changeset 732d05 in git

Timestamp:

Dec 25, 2016, 4:12:33 PM (7 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

179432f06baa042df5efea4f8038b9e905b14a1f

Parents:

94e916463d1aac04a7b0f2dcb7d983b3215f1fc2

Message:

fix: removed wrong ring changes in interpreter for ring_cf rings

File:

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

Singular/iparith.cc

@@ -1871 +1871 @@
   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);
     ideal vid = (ideal)v->Data();
     int i = idPosConstant(vid);
@@ -1884 +1878 @@
       return FALSE;
     }
-    //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) */
@@ -1895 +1886 @@
     res->data = (char *)d;
     idDelete(&vv); idDelete(&ww);
-    //rChangeCurrRing(origR);
-    //rDelete(tempR);
     return FALSE;
   }
@@ -2309 +2298 @@
   if (rField_is_Ring_Z(currRing))
   {
-    ring origR = currRing;
-    ring tempR = rCopy(origR);
-    coeffs new_cf=nInitChar(n_Q,NULL);
-    nKillChar(tempR->cf);
-    tempR->cf=new_cf;
-    rComplete(tempR);
-    sleftv uAsLeftv; memset(&uAsLeftv, 0, sizeof(uAsLeftv));
-    uAsLeftv.rtyp=u->Typ();
-    uAsLeftv.data=u->CopyD();
-    rChangeCurrRing(tempR);
-    sleftv uuAsLeftv; memset(&uuAsLeftv, 0, sizeof(uuAsLeftv));
-    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);
     PrintS("// NOTE: computation of Hilbert series etc. is being\n");
     PrintS("//       performed for generic fibre, that is, over Q\n");
-    intvec *module_w=(intvec*)atGet(&uuAsLeftv,"isHomog",INTVEC_CMD);
-    intvec *iv=hFirstSeries(uu,module_w,currRing->qideal);
-    int returnWithTrue = 1;
-    switch((int)(long)v->Data())
-    {
-      case 1:
-        res->data=(void *)iv;
-        returnWithTrue = 0;
-      case 2:
-        res->data=(void *)hSecondSeries(iv);
-        delete iv;
-        returnWithTrue = 0;
-    }
-    if (returnWithTrue)
-    {
-      WerrorS(feNotImplemented);
-      delete iv;
-    }
-    uuAsLeftv.CleanUp(tempR);
-    rChangeCurrRing(origR);
-    uAsLeftv.CleanUp(origR);
-    rDelete(tempR);
-    if (returnWithTrue) return TRUE; else return FALSE;
   }
 #endif
@@ -3771 +3721 @@
 {
   SPrintStart();
+#ifdef HAVE_RINGS
   if (rField_is_Ring_Z(currRing))
   {
-    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();
-    rChangeCurrRing(tempR);
-    ideal vv = idrCopyR(vid, origR, currRing);
-    sleftv vvAsLeftv; memset(&vvAsLeftv, 0, sizeof(vvAsLeftv));
-    vvAsLeftv.rtyp = IDEAL_CMD;
-    vvAsLeftv.data = vv; vvAsLeftv.next = NULL;
-    if (hasFlag(v, FLAG_STD)) setFlag(&vvAsLeftv,FLAG_STD);
-    assumeStdFlag(&vvAsLeftv);
     PrintS("// NOTE: computation of degree is being performed for\n");
     PrintS("//       generic fibre, that is, over Q\n");
-    intvec *module_w=(intvec*)atGet(&vvAsLeftv,"isHomog",INTVEC_CMD);
-    scDegree(vv,module_w,currRing->qideal);
-    idDelete(&vv);
-    rChangeCurrRing(origR);
-    rDelete(tempR);
-  }
+  }
+#endif
   assumeStdFlag(v);
   intvec *module_w=(intvec*)atGet(v,"isHomog",INTVEC_CMD);
@@ -3921 +3854 @@
      Warn("dim(%s) may be wrong because the mixed monomial ordering",v->Name());
   }
+#ifdef HAVE_RINGS
   if (rField_is_Ring(currRing))
   {
@@ -3985 +3919 @@
     return FALSE;
   }
+#endif
   res->data = (char *)(long)scDimInt((ideal)(v->Data()),currRing->qideal);
   return FALSE;
@@ -4149 +4084 @@
 static BOOLEAN jjHILBERT(leftv, leftv v)
 {
+#ifdef HAVE_RINGS
   if (rField_is_Ring_Z(currRing))
   {
-    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();
-    rChangeCurrRing(tempR);
-    ideal vv = idrCopyR(vid, origR, currRing);
-    sleftv vvAsLeftv; memset(&vvAsLeftv, 0, sizeof(vvAsLeftv));
-    vvAsLeftv.rtyp = IDEAL_CMD;
-    vvAsLeftv.data = vv; vvAsLeftv.next = NULL;
-    if (hasFlag(v, FLAG_STD)) setFlag(&vvAsLeftv,FLAG_STD);
-    assumeStdFlag(&vvAsLeftv);
     PrintS("// NOTE: computation of Hilbert series etc. is being\n");
     PrintS("//       performed for generic fibre, that is, over Q\n");
-    intvec *module_w=(intvec*)atGet(&vvAsLeftv,"isHomog",INTVEC_CMD);
-    //scHilbertPoly(vv,currRing->qideal);
-    hLookSeries(vv,module_w,currRing->qideal);
-    idDelete(&vv);
-    rChangeCurrRing(origR);
-    rDelete(tempR);
-    return FALSE;
-  }
+  }
+#endif
   assumeStdFlag(v);
   intvec *module_w=(intvec*)atGet(v,"isHomog",INTVEC_CMD);
@@ -4183 +4099 @@
 static BOOLEAN jjHILBERT_IV(leftv res, leftv v)
 {
+#ifdef HAVE_RINGS
   if (rField_is_Ring_Z(currRing))
   {
@@ -4188 +4105 @@
     PrintS("//       performed for generic fibre, that is, over Q\n");
   }
+#endif
   res->data=(void *)hSecondSeries((intvec *)v->Data());
   return FALSE;
@@ -4296 +4214 @@
 {
   ideal result=kInterRed((ideal)(v->Data()), currRing->qideal);
+#ifdef HAVE_RINGS
   if(rField_is_Ring(currRing))
-    Warn("interred: this command is experimental over the integers");
+    WarnS("interred: this command is experimental over the integers");
+#endif
   if (TEST_OPT_PROT) { PrintLn(); mflush(); }
   res->data = result;
@@ -5785 +5705 @@
     return TRUE;
   }
+#ifdef HAVE_RINGS
   if (rField_is_Ring_Z(currRing))
   {
-    ring origR = currRing;
-    ring tempR = rCopy(origR);
-    coeffs new_cf=nInitChar(n_Q,NULL);
-    nKillChar(tempR->cf);
-    tempR->cf=new_cf;
-    rComplete(tempR);
-    sleftv uAsLeftv; memset(&uAsLeftv, 0, sizeof(uAsLeftv));
-    uAsLeftv.rtyp=u->Typ();
-    uAsLeftv.data=u->CopyD();
-    rChangeCurrRing(tempR);
-    nMapFunc nMap=n_SetMap(origR->cf,tempR->cf);
-    sleftv uuAsLeftv; memset(&uuAsLeftv, 0, sizeof(uuAsLeftv));
-    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);
     PrintS("// NOTE: computation of Hilbert series etc. is being\n");
     PrintS("//       performed for generic fibre, that is, over Q\n");
-    intvec *module_w=(intvec*)atGet(&uuAsLeftv,"isHomog",INTVEC_CMD);
-    intvec *iv=hFirstSeries(uu,module_w,currRing->qideal,wdegree);
-    int returnWithTrue = 1;
-    switch((int)(long)v->Data())
-    {
-      case 1:
-        res->data=(void *)iv;
-        returnWithTrue = 0;
-      case 2:
-        res->data=(void *)hSecondSeries(iv);
-        delete iv;
-        returnWithTrue = 0;
-    }
-    if (returnWithTrue)
-    {
-      WerrorS(feNotImplemented);
-      delete iv;
-    }
-    uuAsLeftv.CleanUp(tempR);
-    rChangeCurrRing(origR);
-    uAsLeftv.CleanUp(origR);
-    rDelete(tempR);
-    if (returnWithTrue) return TRUE; else return FALSE;
-  }
+  }
+#endif
   assumeStdFlag(u);
   intvec *module_w=(intvec *)atGet(u,"isHomog",INTVEC_CMD);
@@ -5842 +5725 @@
       return FALSE;
   }
+  delete iv;
   WerrorS(feNotImplemented);
-  delete iv;
   return TRUE;
 }
@@ -5929 +5812 @@
                                (matrix)v->CopyD());
   return FALSE;
-}
-static BOOLEAN currRingIsOverIntegralDomain ()
-{
-  /* true for fields and Z, false otherwise */
-  if (rField_is_Ring_PtoM(currRing)) return FALSE;
-  if (rField_is_Ring_2toM(currRing)) return FALSE;
-  if (rField_is_Ring_ModN(currRing)) return FALSE;
-  return TRUE;
 }
 static BOOLEAN jjMINOR_M(leftv res, leftv v)
@@ -6100 +5975 @@
   }
   if ((!noAlgorithm) && (strcmp(algorithm, "Bareiss") == 0)
-      && (!currRingIsOverIntegralDomain()))
+      && (!rField_is_Domain(currRing)))
   {
     Werror("Bareiss algorithm not defined over coefficient rings %s",
@@ -9167 +9042 @@
   }
   #endif
+#ifdef HAVE_RINGS
   if (rField_is_Ring(currRing))
   {
@@ -9187 +9063 @@
     }
   }
+#endif
   return FALSE;
 }