Changeset 4a822ba in git for Singular/iparith.cc

Timestamp:

Sep 12, 2016, 3:10:43 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0816f71425281ce41a6a64263309ea59a13ade6e

Parents:

395731e22e1afda9d31e802ed31db98790d11c52

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2016-09-12 15:10:43+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2016-09-12 15:11:11+02:00

Message:

adjust poly, matrix etc comparisons

File:

• Singular/iparith.cc (modified) (1 diff)

Singular/iparith.cc

@@ -431 +431 @@
   return FALSE;
 }
+static BOOLEAN jjCOMPARE_MA(leftv res, leftv u, leftv v)
+{
+  //Print("in: >>%s<<\n",my_yylinebuf);
+  matrix a=(matrix)u->Data();
+  matrix b=(matrix)v->Data();
+  int r=mp_Compare(a,b,currRing);
+  switch  (iiOp)
+  {
+    case '<':
+      res->data  = (char *) (long)(r < 0);
+      break;
+    case '>':
+      res->data  = (char *) (long)(r > 0);
+      break;
+    case LE:
+      res->data  = (char *) (long)(r <= 0);
+      break;
+    case GE:
+      res->data  = (char *) (long)(r >= 0);
+      break;
+    case EQUAL_EQUAL:
+    case NOTEQUAL: /* negation handled by jjEQUAL_REST */
+      res->data  = (char *)(long) (r == 0);
+      break;
+  }
+  jjEQUAL_REST(res,u,v);
+  return FALSE;
+}
 static BOOLEAN jjCOMPARE_P(leftv res, leftv u, leftv v)
 {
   poly p=(poly)u->Data();
   poly q=(poly)v->Data();
-  int r=pCmp(p,q);
-  if (r==0)
-  {
-    number h=nSub(pGetCoeff(p),pGetCoeff(q));
-    /* compare lead coeffs */
-    r = -1+nIsZero(h)+2*nGreaterZero(h); /* -1: <, 0:==, 1: > */
-    nDelete(&h);
-  }
-  else if (p==NULL)
-  {
-    if (q==NULL)
-    {
-      /* compare 0, 0 */
-      r=0;
-    }
-    else if(pIsConstant(q))
-    {
-      /* compare 0, const */
-      r = 1-2*nGreaterZero(pGetCoeff(q)); /* -1: <, 1: > */
-    }
-  }
-  else if (q==NULL)
-  {
-    if (pIsConstant(p))
-    {
-      /* compare const, 0 */
-      r = -1+2*nGreaterZero(pGetCoeff(p)); /* -1: <, 1: > */
-    }
-  }
+  int r=p_Compare(p,q,currRing);
   switch  (iiOp)
   {