Changeset 994197 in git

Timestamp:

Mar 2, 2009, 4:43:24 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

19a0637d5afa08bfef5ba5ad9b199cd5ee3ab1e4

Parents:

4a1764827ceed5ebcbbce2b9e29ff72366b509ed

Message:

*hannes: poly-bigint, facstd(0)


git-svn-id: file:///usr/local/Singular/svn/trunk@11507 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

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

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.498 2009-03-02 15:30:17 Singular Exp $ */
+/* $Id: iparith.cc,v 1.499 2009-03-02 15:43:24 Singular Exp $ */
 
 /*
@@ -3844 +3844 @@
   ideal_list p,h;
   h=kStdfac((ideal)v->Data(),NULL,testHomog,NULL);
-  p=h;
-  int l=0;
-  while (p!=NULL) { p=p->next;l++; }
   lists L=(lists)omAllocBin(slists_bin);
-  L->Init(l);
-  l=0;
-  while(h!=NULL)
-  {
-    L->m[l].data=(char *)h->d;
-    L->m[l].rtyp=IDEAL_CMD;
-    p=h->next;
-    omFreeSize(h,sizeof(*h));
-    h=p;
-    l++;
+  if (h==NULL)
+  {
+    L->Init(1);
+    L->m[0].data=(char *)idInit(0,1);
+    L->m[0].rtyp=IDEAL_CMD;
+  }
+  else
+  {
+    p=h;
+    int l=0;
+    while (p!=NULL) { p=p->next;l++; }
+    L->Init(l);
+    l=0;
+    while(h!=NULL)
+    {
+      L->m[l].data=(char *)h->d;
+      L->m[l].rtyp=IDEAL_CMD;
+      p=h->next;
+      omFreeSize(h,sizeof(*h));
+      h=p;
+      l++;
+    }
   }
   res->data=(void *)L;
@@ -4374 +4383 @@
   }
   return FALSE;
+}
+static BOOLEAN jjP2BI(leftv res, leftv v)
+{
+  poly p=(poly)v->Data();
+  if (p==NULL) { res->data=(char *)nlInit(0); return FALSE; }
+  if ((pNext(p)!=NULL)|| (!pIsConstant(p)))
+  {
+    WerrorS("poly must be constant");
+    return TRUE;
+  }
+  number i=pGetCoeff(p);
+  number n;
+  if (rField_is_Zp())
+  {
+     if (((long)i)>(npPrimeM>>1))
+       n=nlInit((int)(((long)i)-npPrimeM));
+     else
+       n=nlInit((int)(long)i);
+  }
+  else if (rField_is_Q()) n=nlBigInt(i);
+#ifdef HAVE_RINGS
+  else if (rField_is_Ring_Z() || rField_is_Ring_ModN() || rField_is_Ring_PtoM()) n=nlMapGMP(i);
+  else if (rField_is_Ring_2toM()) n=nlInit((unsigned long) i);
+#endif
+  else goto err;
+  res->data=(void *)n;
+  return FALSE;
+err:
+  WerrorS("cannot convert to bigint"); return TRUE;
 }
 static BOOLEAN jjP2I(leftv res, leftv v)
@@ -5059 +5097 @@
 ,{jjDUMMY,      BIGINT_CMD,      BIGINT_CMD,     BIGINT_CMD     ALLOW_PLURAL}
 ,{jjN2BI,       BIGINT_CMD,      BIGINT_CMD,     NUMBER_CMD     ALLOW_PLURAL}
+,{jjP2BI,       BIGINT_CMD,      BIGINT_CMD,     POLY_CMD       ALLOW_PLURAL}
 ,{jjCHAR,       CHARACTERISTIC_CMD, INT_CMD,     RING_CMD       ALLOW_PLURAL}
 ,{jjCHAR,       CHARACTERISTIC_CMD, INT_CMD,     QRING_CMD      ALLOW_PLURAL}