Changeset c81a40 in git for Singular/ipshell.cc

Timestamp:

Jul 16, 2008, 2:41:33 PM (16 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c88c2ba361f5b914ed9b192a055274f0a74cdf04

Parents:

e3164c057b351ebc7de36b8955221b4cb648bdbe

Message:

Maps für Bigint
Modul bei Z/m wird nun als GMP gespeichert


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

File:

• Singular/ipshell.cc (modified) (5 diffs)

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.186 2008-07-07 12:21:43 wienand Exp $ */
+/* $Id: ipshell.cc,v 1.187 2008-07-16 12:41:32 wienand Exp $ */
 /*
 * ABSTRACT:
@@ -1608 +1608 @@
 }
 
+#ifdef HAVE_RINGS
+void rDecomposeRing(leftv h,const ring R)
+/* field is R or C */
+{
+  lists L=(lists)omAlloc0Bin(slists_bin);
+  if (rField_is_Ring_Z(R)) L->Init(1);
+  else                L->Init(2);
+  h->rtyp=LIST_CMD;
+  h->data=(void *)L;
+  // 0: char/ cf - ring
+  // 1: list (module)
+  // ----------------------------------------
+  // 0: char/ cf - ring
+  L->m[0].rtyp=STRING_CMD;
+  L->m[0].data=(void *)omStrDup("integer");
+  // ----------------------------------------
+  // 1: module
+  if (rField_is_Ring_Z(R)) return;
+  lists LL=(lists)omAlloc0Bin(slists_bin);
+  LL->Init(2);
+  LL->m[0].rtyp=BIGINT_CMD;
+  LL->m[0].data=nlMapGMP((number) R->ringflaga);
+  LL->m[1].rtyp=INT_CMD;
+  LL->m[1].data=(void *) R->ringflagb;
+  L->m[1].rtyp=LIST_CMD;
+  L->m[1].data=(void *)LL;
+}
+#endif
+
+
 lists rDecompose(const ring r)
 {
@@ -1640 +1670 @@
     rDecomposeC(&(L->m[0]),r);
   }
+#ifdef HAVE_RINGS
+  else if (rField_is_Ring(r))
+  {
+    rDecomposeRing(&(L->m[0]),r);
+  }
+#endif
   else if (rIsExtension(r))
   {
@@ -4456 +4492 @@
 #ifdef HAVE_RINGS
   unsigned int ringtype = 0;
-  unsigned long long ringflaga = 0;
-  unsigned int ringflagb = 0;
+  int_number ringflaga = (int_number) omAlloc(sizeof(MP_INT));
+  mpz_init_set_si(ringflaga, 0);
+  unsigned int ringflagb = 1;
 #endif
   int float_len=0;
@@ -4501 +4538 @@
     if ((pn->next!=NULL) && (pn->next->Typ()==INT_CMD))
     {
-      ringflaga = (unsigned long long) pn->next->Data();
+      mpz_set_ui(ringflaga, (unsigned int) pn->next->Data());
       pn=pn->next;
-      ringflagb = 1;
       if ((pn->next!=NULL) && (pn->next->Typ()==INT_CMD))
       {
-        ringflagb = (unsigned int) (unsigned long) pn->next->Data();
+        ringflagb = (unsigned int) pn->next->Data();
         pn=pn->next;
       }
       while ((pn->next!=NULL) && (pn->next->Typ()==INT_CMD))
       {
-        ringflaga *= (unsigned long long) pn->next->Data();
+        mpz_mul_ui(ringflaga, ringflaga, (unsigned int) pn->next->Data());
         pn=pn->next;
       }
-      if (ringflaga < 2)
-      {
-        Werror("Wrong ground ring specification (module smallet than 2)");
-        goto rInitError;
-      }
-      if (ringflagb < 1)
-      {
-        Werror("Wrong ground ring specification (exponent smaller than 1");
-        goto rInitError;
-      }
-      if (ringflagb > 1)
-      {
-        ch = ringflagb;
-        if ((ringflaga == 2) && (ringflagb + 2 <= 8*sizeof(NATNUMBER)))
-        {
-          ringtype = 1;       // Use Z/2^ch
-        }
-        else
-        {
-          ringtype = 3;
-        }
-      }
-      else
-      {
-        ringtype = 2;
-        ch = ringflaga;
-      }
-    }
-    else
+    }
+    if ((mpz_cmp_ui(ringflaga, 1) == 0) && (mpz_cmp_ui(ringflaga, 0) < 0))
+    {
+      Werror("Wrong ground ring specification (module is 1)");
+      goto rInitError;
+    }
+    if (ringflagb < 1)
+    {
+      Werror("Wrong ground ring specification (exponent smaller than 1");
+      goto rInitError;
+    }
+    // module is 0 ---> integers
+    if (mpz_cmp_ui(ringflaga, 0) == 0)
     {
       ch = 0;
       ringtype = 4;
+    }
+    // we have an exponent
+    else if (ringflagb > 1)
+    {
+      ch = ringflagb;
+      if ((mpz_cmp_ui(ringflaga, 2) == 0) && (ringflagb + 2 <= 8*sizeof(NATNUMBER)))
+      {
+        ringtype = 1;       // Use Z/2^ch
+      }
+      else
+      {
+        ringtype = 3;
+      }
+    }
+    // just a module m > 1
+    else
+    {
+      ringtype = 2;
+      ch = mpz_get_ui(ringflaga);
     }
   }