Changeset b44622 in git

Timestamp:

May 3, 2007, 3:52:26 PM (16 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

a6fa234b0f9f5f9e77a17cde6e450e3a0f8505dc

Parents:

bf64c41bd9346d70ecaaab3ee59f58f5d9d766e8

Message:

Neuer Koeffbereich
Neue Ringdeklaration

ring r = (modnat, 25), x, dp;  ==> Z/25[x]
ring r = (modpow, 2, 12), x, dp; ==> Z/2^12[x]

modpow noch nicht für base != 2 iimplementiert


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

Location:

Singular

Files:

• ipshell.cc (modified) (5 diffs)
• misc.cc (modified) (2 diffs)

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.155 2007-04-04 14:13:31 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.156 2007-05-03 13:52:25 wienand Exp $ */
 /*
 * ABSTRACT:
@@ -4366 +4366 @@
 {
   int ch;
-#ifdef HAVE_RING2TOM
+#if defined(HAVE_RING2TOM)|| defined(HAVE_RINGMODN)
   int cring = 0;
 #endif
@@ -4406 +4406 @@
     }
   }
+#ifdef HAVE_RINGMODN
+  else if ((pn->name != NULL)
+  && (strcmp(pn->name,"modnat")==0))
+  {
+    long module = 0;
+    if ((pn->next!=NULL) && (pn->next->Typ()==INT_CMD))
+    {
+      module =(unsigned long) pn->next->Data();
+      pn=pn->next;
+    }
+    if ((module < 2))
+    {
+      Werror("Wrong ground ring specification");
+      goto rInitError;
+    }
+    ch = module;
+    cring = 2;
+  }
+#endif
+#ifdef HAVE_RING2TOM
+  else if ((pn->name != NULL)
+  && (strcmp(pn->name,"modpow")==0))
+  {
+    long base = 0;
+    long exp = 0;
+    if ((pn->next!=NULL) && (pn->next->Typ()==INT_CMD))
+    {
+      base =(unsigned long) pn->next->Data();
+      pn=pn->next;
+      if ((pn->next!=NULL) && (pn->next->Typ()==INT_CMD))
+      {
+        exp = (unsigned long) pn->next->Data();
+        pn=pn->next;
+      }
+    }
+    if ((base < 2) || (exp < 1))
+    {
+      Werror("Wrong ground ring specification");
+      goto rInitError;
+    }
+    ch = exp;
+    if (base == 2)
+    {
+      cring = 1; // Use Z/2^ch
+      Print("Beta: using Z/2^%d", ch);
+      PrintLn();
+    }
+    else
+    {
+      cring = base;
+      Werror("p^n not yet implemented");
+      goto rInitError;
+    }
+  }
+#endif
   else
   {
@@ -4427 +4482 @@
    *         q    q : GF(q=p^n)       *names         TRUE
   */
-  if (ch!=-1)
+  if ((ch!=-1)
+#if defined(HAVE_RING2TOM)|| defined(HAVE_RINGMODN)
+       && (cring == 0)
+#endif
+     )
   {
     int l = 0;
@@ -4455 +4514 @@
     else
     {
-#ifdef HAVE_RING2TOM
-      int blupp = Is2toM(ch);
-      if (blupp != 0)
-      {
-        cring = 1; // Use Z/2^ch
-        ch = blupp;
-        Print("Beta: using Z/2^%d", ch);
-        PrintLn();
-      }
-      else
-#endif
-        ch = IsPrime(ch);
+      ch = IsPrime(ch);
     }
   }

Singular/misc.cc

@@ -299 +299 @@
         && !rField_is_Ring_2toM(currRing)
 #endif
+#ifdef HAVE_RINGMODN
+        && !rField_is_Ring_ModN(currRing)
+#endif
         ) {
           test &=~Sy_bit(OPT_INTSTRATEGY);
@@ -330 +333 @@
 #ifdef HAVE_RING2TOM
         && !rField_is_Ring_2toM(currRing)
+#endif
+#ifdef HAVE_RINGMODN
+        && !rField_is_Ring_ModN(currRing)
 #endif
         ) {