Changeset 70f96b in git

Timestamp:

Mar 30, 2010, 2:03:44 PM (14 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

bafaec06ad6c0ad7c4cfd41d9d18f7974282ddf3

Parents:

2e1b74af4c420fc8a67df76abb2cc0c8da9990db

Message:

enabled division 'poly / single-term poly' over coefficient rings which are domains, i.e., so far only over the ring Z

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

File:

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

Singular/iparith.cc

@@ -1306 +1306 @@
     return FALSE;
   }
-  if (pNext(q)!=NULL)
-  {
+  if ((pNext(q)!=NULL) && (!rField_is_Ring()))
+  { /* This means that q != 0 consists of at least two terms.
+       Moreover, currRing is over a field. */
 #ifdef HAVE_FACTORY
     if(pGetComp(p)==0)
@@ -1352 +1353 @@
   }
   else
-  {
+  { /* This means that q != 0 consists of just one term,
+       or that currRing is over a coefficient ring. */
+#ifdef HAVE_RINGS
+    if (!rField_is_Domain())
+    {
+      WerrorS("division only defined over coefficient domains");
+      return TRUE;
+    }
+    if (pNext(q)!=NULL)
+    {
+      WerrorS("division over a coefficient domain only implemented for terms");
+      return TRUE;
+    }
+#endif
     res->data = (char *)pDivideM(pCopy(p),pHead(q));
   }
@@ -3403 +3417 @@
 ,{jjTIMES_IV,  '*',            INTMAT_CMD,     INTVEC_CMD, INTMAT_CMD, ALLOW_PLURAL | ALLOW_RING}
 ,{jjDIV_N,     '/',            NUMBER_CMD,     NUMBER_CMD, NUMBER_CMD, ALLOW_PLURAL | ALLOW_RING}
-,{jjDIV_P,     '/',            POLY_CMD,       POLY_CMD,   POLY_CMD, ALLOW_PLURAL | NO_RING}
-,{jjDIV_P,     '/',            VECTOR_CMD,     VECTOR_CMD, POLY_CMD, ALLOW_PLURAL | NO_RING}
+,{jjDIV_P,     '/',            POLY_CMD,       POLY_CMD,   POLY_CMD, ALLOW_PLURAL | ALLOW_RING}
+,{jjDIV_P,     '/',            VECTOR_CMD,     VECTOR_CMD, POLY_CMD, ALLOW_PLURAL | ALLOW_RING}
 ,{jjDIV_Ma,    '/',            MATRIX_CMD,     MATRIX_CMD, POLY_CMD, ALLOW_PLURAL | NO_RING}
 ,{jjDIVMOD_I,  '/',            INT_CMD,        INT_CMD,    INT_CMD, ALLOW_PLURAL | ALLOW_RING}