Changeset 90934a in git

Timestamp:

Mar 15, 2012, 7:37:03 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4d94c97313de2ce07f4bfae84308b31c1294a569

Parents:

55e2df02f4f427087fcfc2be9320bbce5142bfe9

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-15 19:37:03+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-16 19:36:35+01:00

Message:

better rEqual & rSamePolyRep

fix: they both should test the equality of coeffs directly (NOT via type & rPar/Minpoly)
fix: rEqual should use rSamePolyRep
chg: moved documentation to header in doxygen style

Location:

libpolys/polys/monomials

Files:

• ring.cc (modified) (2 diffs)
• ring.h (modified) (1 diff)

libpolys/polys/monomials/ring.cc

@@ -1645 +1645 @@
 }
 
-// returns TRUE, if r1 equals r2 FALSE, otherwise Equality is
-// determined componentwise, if qr == 1, then qrideal equality is
-// tested, as well
 BOOLEAN rEqual(ring r1, ring r2, BOOLEAN qr)
 {
+  if( !rSamePolyRep(r1, r2) )
+    return FALSE;
+
   int i, j;
 
   if (r1 == r2) return TRUE;
-
   if (r1 == NULL || r2 == NULL) return FALSE;
 
-  if ((r1->cf->type != r2->cf->type)
+  assume( r1->cf == r2->cf );
+  assume( rVar(r1) == rVar(r2) );
+  
+  for (i=0; i<rVar(r1); i++)
+  {
+    if (r1->names[i] != NULL && r2->names[i] != NULL)
+    {
+      if (strcmp(r1->names[i], r2->names[i])) return FALSE;
+    }
+    else if ((r1->names[i] != NULL) ^ (r2->names[i] != NULL))
+    {
+      return FALSE;
+    }
+  }
+
+  if (qr)
+  {
+    if (r1->qideal != NULL)
+    {
+      ideal id1 = r1->qideal, id2 = r2->qideal;
+      int i, n;
+      poly *m1, *m2;
+
+      if (id2 == NULL) return FALSE;
+      if ((n = IDELEMS(id1)) != IDELEMS(id2)) return FALSE;
+
+      {
+        m1 = id1->m;
+        m2 = id2->m;
+        for (i=0; i<n; i++)
+          if (! p_EqualPolys(m1[i],m2[i], r1, r2)) return FALSE;
+      }
+    }
+    else if (r2->qideal != NULL) return FALSE;
+  }
+
+  return TRUE;
+}
+
+BOOLEAN rSamePolyRep(ring r1, ring r2)
+{
+  int i, j;
+
+  if (r1 == r2) return TRUE;
+
+  if (r1 == NULL || r2 == NULL) return FALSE;
+
+  if ((r1->cf != r2->cf)
   || (rVar(r1) != rVar(r2))
-  || (r1->OrdSgn != r2->OrdSgn)
-  || (rPar(r1) != rPar(r2)))
+  || (r1->OrdSgn != r2->OrdSgn))
     return FALSE;
-
-  for (i=0; i<rVar(r1); i++)
-  {
-    if (r1->names[i] != NULL && r2->names[i] != NULL)
-    {
-      if (strcmp(r1->names[i], r2->names[i])) return FALSE;
-    }
-    else if ((r1->names[i] != NULL) ^ (r2->names[i] != NULL))
-    {
-      return FALSE;
-    }
-  }
 
   i=0;
@@ -1695 +1728 @@
   if (r2->order[i] != 0) return FALSE;
 
-  for (i=0; i<rPar(r1);i++)
-  {
-      if (strcmp(rParameter(r1)[i], rParameter(r2)[i])!=0)
-        return FALSE;
-  }
-
-  if ( !rMinpolyIsNULL(r1) )
-  {
-    if ( rMinpolyIsNULL(r2) ) return FALSE;
-    if (! p_EqualPolys(r1->cf->extRing->minideal->m[0],
-                  r2->cf->extRing->minideal->m[0],
-                  r1->cf->extRing))
-      return FALSE;
-  }
-  else if (!rMinpolyIsNULL(r2)) return FALSE;
-
-  if (qr)
-  {
-    if (r1->qideal != NULL)
-    {
-      ideal id1 = r1->qideal, id2 = r2->qideal;
-      int i, n;
-      poly *m1, *m2;
-
-      if (id2 == NULL) return FALSE;
-      if ((n = IDELEMS(id1)) != IDELEMS(id2)) return FALSE;
-
-      {
-        m1 = id1->m;
-        m2 = id2->m;
-        for (i=0; i<n; i++)
-          if (! p_EqualPolys(m1[i],m2[i],r1)) return FALSE;
-      }
-    }
-    else if (r2->qideal != NULL) return FALSE;
-  }
-
-  return TRUE;
-}
-
-// returns TRUE, if r1 and r2 represents the monomials in the same way
-// FALSE, otherwise
-// this is an analogue to rEqual but not so strict
-BOOLEAN rSamePolyRep(ring r1, ring r2)
-{
-  int i, j;
-
-  if (r1 == r2) return TRUE;
-
-  if (r1 == NULL || r2 == NULL) return FALSE;
-
-  if ((r1->cf->type != r2->cf->type)
-  || (rVar(r1) != rVar(r2))
-  || (r1->OrdSgn != r2->OrdSgn)
-  || (rPar(r1) != rPar(r2)))
-    return FALSE;
-
-  if (rVar(r1)!=rVar(r2)) return FALSE;
-  if (rPar(r1)!=rPar(r2)) return FALSE;
-
-  i=0;
-  while (r1->order[i] != 0)
-  {
-    if (r2->order[i] == 0) return FALSE;
-    if ((r1->order[i] != r2->order[i])
-    || (r1->block0[i] != r2->block0[i])
-    || (r1->block1[i] != r2->block1[i]))
-      return FALSE;
-    if (r1->wvhdl[i] != NULL)
-    {
-      if (r2->wvhdl[i] == NULL)
-        return FALSE;
-      for (j=0; j<r1->block1[i]-r1->block0[i]+1; j++)
-        if (r2->wvhdl[i][j] != r1->wvhdl[i][j])
-          return FALSE;
-    }
-    else if (r2->wvhdl[i] != NULL) return FALSE;
-    i++;
-  }
-  if (r2->order[i] != 0) return FALSE;
-
+  // we do not check variable names
   // we do not check minpoly/minideal
   // we do not check qideal

libpolys/polys/monomials/ring.h

@@ -392 +392 @@
 int rSumInternal(ring r1, ring r2, ring &sum, BOOLEAN vartest, BOOLEAN dp_dp);
 
-BOOLEAN rEqual(ring r1, ring r2, BOOLEAN qr = 1);
+/// returns TRUE, if r1 equals r2 FALSE, otherwise Equality is
+/// determined componentwise, if qr == 1, then qrideal equality is
+/// tested, as well
+BOOLEAN rEqual(ring r1, ring r2, BOOLEAN qr = TRUE);
+
+/// returns TRUE, if r1 and r2 represents the monomials in the same way
+/// FALSE, otherwise
+/// this is an analogue to rEqual but not so strict
 BOOLEAN rSamePolyRep(ring r1, ring r2);
+
 void   rUnComplete(ring r);