Changeset 488738 in git

Timestamp:

Sep 7, 2000, 9:38:22 AM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

69139f6fac8f4e3fb3c358dfad72ef35f3d72d46

Parents:

005a724a3fa1475cc2b7b1eedde7e946be3fbf5e

Message:

*hannes: tried to fix smIsNegQuot


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

File:

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

Singular/sparsmat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sparsmat.cc,v 1.31 2000-08-14 12:56:51 obachman Exp $ */
+/* $Id: sparsmat.cc,v 1.32 2000-09-07 07:38:22 Singular Exp $ */
 
 /*
@@ -1903 +1903 @@
 }
 
+// orginal text:
+// static BOOLEAN smIsNegQuot(poly a, const poly b, const poly c)
+// {
+//   int i;
+// 
+//   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;
+//   }
+// }
 static BOOLEAN smIsNegQuot(poly a, const poly b, const poly c)
 {
-  int i;
-
-  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))
+  int i=pVariables;
+
+  while ((i>0) && (pGetExp(c,i) >= pGetExp(b,i))) i--;
+  if(i!=0)
+  {
+    for (i=pVariables; i>0; i--)
+    {
+      if(pGetExp(c,i) > pGetExp(b,i))
         pSetExp(a,i,pGetExp(c,i)-pGetExp(b,i));
       else
@@ -1922 +1948 @@
   else
   {
-    for (i=pVariables; i; i--)
-    {
-      pSetExp(a,i,pGetExp(b,i)-pGetExp(c,i));
+    for (i=pVariables; i>0; i--)
+    {
+      int j=pGetExp(b,i)-pGetExp(c,i);
+      if (j<0) { Print("!"); j=0;}
+      pSetExp(a,i,j);
     }
     return FALSE;