Changeset 57e95ce in git

Timestamp:

Apr 19, 2000, 5:45:00 PM (23 years ago)

Author:

Wilfred Pohl <pohl@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

13d076b1deb4bfd0d554b81f02cd622c8b6b5f6d

Parents:

c78e8bf1856fddae986219c7747c226eb90cb1c7

Message:

special division without negative exponent


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

Location:

Singular

Files:

• sparsmat.cc (modified) (9 diffs)
• sparsmat.h (modified) (2 diffs)

Singular/sparsmat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sparsmat.cc,v 1.25 2000-02-09 08:15:09 pohl Exp $ */
+/* $Id: sparsmat.cc,v 1.26 2000-04-19 15:45:00 pohl Exp $ */
 
 /*
@@ -42 +42 @@
 static BOOLEAN smCheckLead(const poly, const poly);
 static poly smDMult(poly, const poly);
-static void smPolyDivN(poly a, const number);
+static void smComplete(poly, const poly, const poly);
+static void smPolyDivN(poly, const number);
 static BOOLEAN smSmaller(poly, poly);
 static void smCombineChain(poly *, poly);
@@ -1860 +1861 @@
       lead = smCheckLead(a, e);
       r = smDMult(a, e);
+      smComplete(r, b, c);
     }
     else
@@ -1894 +1896 @@
     {
       r = smDMult(a, e);
+      smComplete(r, b, c);
       if (smCheckLead(a, e))
         smCombineChain(&pa, r);
@@ -1941 +1944 @@
     pSetCoeff0(e,yn);
     if (smIsNegQuot(e, a, b))
+    {
       h = smDMult(tail, e);
+      smComplete(h, a, b);
+    }
     else
       h = smEMult(tail, e);
@@ -1954 +1960 @@
   int i;
 
-  for (i=pVariables; i; i--)
-  {
-    pSetExp(a,i,pGetExp(b,i)-pGetExp(c,i));
-    if (pGetExp(a,i) < 0)
-    {
-      while(--i) pSetExp(a,i,pGetExp(b,i)-pGetExp(c,i));
-      return TRUE;
-    }
-  }
-  return FALSE;
+  i=pVariables;
+  while (i&&(pGetExp(b,i)<pGetExp(c,i))) i--;
+  if(i)
+  {
+    for (i=pVariables; i; i--)
+    {
+      if(pGetExp(b,i)<pGetExp(c,i))
+        pSetExp(a,i,pGetExp(c,i)-pGetExp(b,i));
+      else
+        pSetExp(a,i,0);
+    }
+    return TRUE;
+  }
+  else
+  {
+    for (i=pVariables; i; i--)
+    {
+      pSetExp(a,i,pGetExp(b,i)-pGetExp(c,i));
+    }
+    return FALSE;
+  }
 }
 
@@ -1972 +1989 @@
   int i;
 
-  h = res = pInit();
+  h = res = pNew();
   loop
   {
-    //pSetComp(h,0);
+    pCopy2(h,t);
     for (i=pVariables; i; i--)
-      pSetExp(h,i,pGetExp(e,i)+pGetExp(t,i));
+      pAddExp(h,i,pGetExp(e,i));
     pSetm(h);
     pSetCoeff0(h,nMult(y,pGetCoeff(t)));
@@ -1986 +2003 @@
       return res;
     }
-    h = pNext(h) = pInit();
+    h = pNext(h) = pNew();
   }
 }
@@ -1992 +2009 @@
 static BOOLEAN smCheckLead(const poly t, const poly e)
 {
-  int i;
-  for (i=pVariables; i; i--)
-  {
-    if ((pGetExp(e,i)+pGetExp(t,i)) < 0)
-      return FALSE;
-  }
-  return TRUE;
-}
-
-static poly smDMult(poly t, const poly e)
-{
-  const number y = pGetCoeff(e);
-  poly r = NULL;
-  poly res, h;
   int i;
   Exponent_t w;
-
-  h = res = pInit();
+  for (i=pVariables; i; i--)
+  {
+    w = pGetExp(e,i);
+    if (w&&(w>pGetExp(t,i)))
+      return FALSE;
+  }
+  return TRUE;
+}
+
+static poly smDMult(poly t, const poly e)
+{
+  const number y = pGetCoeff(e);
+  poly res, h;
+
   loop
   {
-    i=pVariables;
+    if(smCheckLead(t,e)) break;
+    pIter(t);
+    if(t==NULL) return NULL;
+  }
+  h = res = pNew();
+  loop
+  {
+    pCopy2(h,t);
+    pSetCoeff0(h,nMult(y,pGetCoeff(t)));
     loop
     {
-      w = pGetExp(e,i)+pGetExp(t,i);
-      if (w < 0) break;
-      pSetExp(h,i,w);
-      i--;
-      if (i == 0)
-      {
-        pSetm(h);
-        pSetCoeff0(h,nMult(y,pGetCoeff(t)));
-        pIter(t);
-        if (t == NULL)
-        {
-          pNext(h) = NULL;
-          return res;
-        }
-        r = h;
-        h = pNext(h) = pInit();
-        i=pVariables;
-      }
+      pIter(t);
+      if(t==NULL)
+      {
+        pNext(h)=NULL;
+        return res;
+      }
+      if(smCheckLead(t,e)) break;
+    }
+    h=pNext(h)=pNew();
+  }
+}
+
+static void smComplete(poly t, const poly b, const poly c)
+{
+  int i;
+  while(t!=NULL)
+  {
+    for (i=pVariables; i; i--)
+    {
+      pAddExp(t,i,pGetExp(b,i));
+      pSubExp(t,i,pGetExp(c,i));
+      pSetm(t);
     }
     pIter(t);
-    if (t == NULL)
-    {
-      if (r != NULL)
-        pNext(r) = NULL;
-      else
-        res = NULL;
-      pFree1(h);
-      return res;
-    }
   }
 }

Singular/sparsmat.h

@@ -8 +8 @@
  *
  *******************************************************************/
-/* $Id: sparsmat.h,v 1.5 2000-02-09 08:45:16 pohl Exp $ */
+/* $Id: sparsmat.h,v 1.6 2000-04-19 15:45:00 pohl Exp $ */
 
 
@@ -16 +16 @@
 void smSpecialPolyDiv(poly, poly);
 /* ----------------- macros ------------------ */
-#define OLD_DIV 1
+/* #define OLD_DIV 1 */
 
 #ifdef OLD_DIV