Changeset 63374c in git

Timestamp:

Jul 9, 1999, 4:06:52 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

609ba11e29d4d3c44b5785da0728121bbc8e0065

Parents:

b2bae572c5a909bcd83de47db4dc59dce546641d

Message:

* moved mpsr_RingEqual to rEqual
* controled access to qideal in qrings


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

Location:

Singular

Files:

• LIB/general.lib (modified) (2 diffs)
• iparith.cc (modified) (3 diffs)
• mpsr_Get.cc (modified) (2 diffs)
• mpsr_Get.h (modified) (2 diffs)
• mpsr_GetMisc.cc (modified) (4 diffs)
• mpsr_GetPoly.cc (modified) (2 diffs)
• ring.cc (modified) (2 diffs)
• ring.h (modified) (2 diffs)

Singular/LIB/general.lib

@@ -1 @@
-// $Id: general.lib,v 1.15 1999-07-06 15:32:47 Singular Exp $
+// $Id: general.lib,v 1.16 1999-07-09 14:06:52 obachman Exp $
 //system("random",787422842);
 //GMG, last modified 18.6.99
 ///////////////////////////////////////////////////////////////////////////////
 
-version="$Id: general.lib,v 1.15 1999-07-06 15:32:47 Singular Exp $";
+version="$Id: general.lib,v 1.16 1999-07-09 14:06:52 obachman Exp $";
 info="
 LIBRARY:  general.lib   PROCEDURES OF GENERAL TYPE
@@ -545 +545 @@
 "USAGE:   sort(id[v,o,n]); id=ideal/module/intvec/list (of intvec's or int's)
          sort may be called with 1, 2 or 3 arguments in the following way:
-         -  sort(id[v,n]); v=intvec of positive integers, n=integer,
-         -  sort(id[o,n]); o=string (any allowed ordstr of a ring), n=integer
+         sort(id[v,n]); v=intvec of positive integers, n=integer,
+         sort(id[o,n]); o=string (any allowed ordstr of a ring), n=integer
 RETURN:  a list of two elements:
          [1]: object of same type as input but sorted in the following manner:

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.156 1999-07-08 10:18:09 wenk Exp $ */
+/* $Id: iparith.cc,v 1.157 1999-07-09 14:06:45 obachman Exp $ */
 
 /*
@@ -2653 +2653 @@
   {
     ring q=(ring)v->Data();
-    if ((rInternalChar(q)==rInternalChar(currRing))
-    && (q->N==currRing->N)) /* && varnames equ. */
+    if (rEqual(currRing, q, 0))
     {
       if (q->qideal==NULL)
@@ -2663 +2662 @@
     }
   }
+  WerrorS("can only get ideal from identical qring");
   return TRUE;
 }

Singular/mpsr_Get.cc

@@ -3 +3 @@
 ****************************************/
 
-/* $Id: mpsr_Get.cc,v 1.24 1999-06-08 08:02:35 Singular Exp $ */
+/* $Id: mpsr_Get.cc,v 1.25 1999-07-09 14:06:47 obachman Exp $ */
 /***************************************************************
  *
@@ -719 +719 @@
 
   idhdl h = mpsr_FindIdhdl(name, r2);
-  if (h == NULL || IDTYP(h) != RING_CMD || ! mpsr_RingEqual(IDRING(h), r))
+  if (h == NULL || IDTYP(h) != RING_CMD || ! rEqual(IDRING(h), r))
   {
     h = mpsr_InitIdhdl(RING_CMD, r, name);

Singular/mpsr_Get.h

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpsr_Get.h,v 1.5 1998-12-16 18:43:42 Singular Exp $ */
+/* $Id: mpsr_Get.h,v 1.6 1999-07-09 14:06:47 obachman Exp $ */
 /***************************************************************
  *
@@ -49 +49 @@
 extern int mpsr_rDefault(short ch, char *name, ring &r);
 extern ring mpsr_rDefault(short ch);
-extern BOOLEAN mpsr_RingEqual(ring r1, ring r2);
 extern mpsr_Status_t mpsr_MergeLeftv(mpsr_leftv mlv1, mpsr_leftv mlv2);
 extern void mpsr_MapLeftv(leftv l, ring from_ring, ring to_ring);

Singular/mpsr_GetMisc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpsr_GetMisc.cc,v 1.14 1999-04-29 11:38:52 Singular Exp $ */
+/* $Id: mpsr_GetMisc.cc,v 1.15 1999-07-09 14:06:48 obachman Exp $ */
 
 /***************************************************************
@@ -99 +99 @@
 }
 
-// returns TRUE, if r1 equals r2
-// FALSE, otherwise
-// Equality is determined componentwise
-BOOLEAN mpsr_RingEqual(ring r1, ring r2)
-{
-  int i, j;
-
-  if (r1 == r2) return 1;
-
-  if (r1 == NULL || r2 == NULL) return 0;
-
-  if ((rInternalChar(r1) != rInternalChar(r2))
-  // orig: r1->ch == r2->ch ???
-  || (r1->N != r2->N) || (r1->OrdSgn != r2->OrdSgn)
-      || (rPar(r1) != rPar(r2)))
-    return 0;
-
-  for (i=0; i<r1->N; i++)
-    if (strcmp(r1->names[i], r2->names[i])) return 0;
-
-  i=0;
-  while (r1->order[i] != 0)
-  {
-    if (r2->order[i] == 0) return 0;
-    if ((r1->order[i] != r2->order[i]) ||
-        (r1->block0[i] != r2->block0[i]) || (r2->block0[i] != r1->block0[i]))
-      return 0;
-    if (r1->wvhdl[i] != NULL)
-    {
-      if (r2->wvhdl[i] == NULL)
-        return 0;
-      for (j=0; j<r1->block1[i]-r1->block0[i]+1; j++)
-        if (r2->wvhdl[i][j] != r1->wvhdl[i][j])
-          return 0;
-    }
-    else if (r2->wvhdl[i] != NULL) return 0;
-    i++;
-  }
-
-  for (i=0; i<rPar(r1);i++)
-  {
-      if (strcmp(r1->parameter[i], r2->parameter[i])!=0)
-        return 0;
-  }
-
-  if (r1->minpoly != NULL)
-  {
-    if (r2->minpoly == NULL) return 0;
-    mpsr_SetCurrRing(r1, FALSE);
-    if (! naEqual(r1->minpoly, r2->minpoly)) return 0;
-  }
-  else if (r2->minpoly != NULL) return 0;
-
-  if (r1->qideal != NULL)
-  {
-    ideal id1 = r1->qideal, id2 = r2->qideal;
-    int i, n;
-    poly *m1, *m2;
-
-    if (id2 == NULL) return 0;
-    if ((n = IDELEMS(id1)) != IDELEMS(id2)) return 0;
-
-    mpsr_SetCurrRing(r1, FALSE);
-    m1 = id1->m;
-    m2 = id2->m;
-    for (i=0; i<n; i++)
-      if (! pEqualPolys(m1[i],m2[i])) return 0;
-  }
-  else if (r2->qideal != NULL) return 0;
-
-  return 1;
-}
-
-
 // returns TRUE, if r1 less or equals r2
 // FALSE, otherwise
@@ -225 +151 @@
   leftv lv;
 
-  if (mpsr_RingEqual(r1,r2))
+  if (rEqual(r1,r2))
   {
     if (r2 != NULL) rKill(r2);
@@ -372 +298 @@
   {
     if ((IDTYP(h) == RING_CMD || IDTYP(h) == QRING_CMD) &&
-        (mpsr_RingEqual(IDRING(h), r)))
+        (rEqual(IDRING(h), r)))
     {
       // found one

Singular/mpsr_GetPoly.cc

@@ -3 +3 @@
 ****************************************/
 
-/* $Id: mpsr_GetPoly.cc,v 1.21 1999-03-08 17:30:47 Singular Exp $ */
+/* $Id: mpsr_GetPoly.cc,v 1.22 1999-07-09 14:06:49 obachman Exp $ */
 
 /***************************************************************
@@ -956 +956 @@
   lv = mlv->lv;
 
-  if (! mpsr_RingEqual(r1, r)) return mpsr_Failure;
+  if (! rEqual(r1, r)) return mpsr_Failure;
 
   if (lv->rtyp == POLY_CMD)

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.58 1999-07-08 17:16:29 Singular Exp $ */
+/* $Id: ring.cc,v 1.59 1999-07-09 14:06:50 obachman Exp $ */
 
 /*
@@ -1822 +1822 @@
 }
 
+// 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)
+{
+  int i, j;
+
+  if (r1 == r2) return 1;
+
+  if (r1 == NULL || r2 == NULL) return 0;
+
+  if ((rInternalChar(r1) != rInternalChar(r2))
+  // orig: r1->ch == r2->ch ???
+  || (r1->N != r2->N) || (r1->OrdSgn != r2->OrdSgn)
+      || (rPar(r1) != rPar(r2)))
+    return 0;
+
+  for (i=0; i<r1->N; i++)
+    if (strcmp(r1->names[i], r2->names[i])) return 0;
+
+  i=0;
+  while (r1->order[i] != 0)
+  {
+    if (r2->order[i] == 0) return 0;
+    if ((r1->order[i] != r2->order[i]) ||
+        (r1->block0[i] != r2->block0[i]) || (r2->block0[i] != r1->block0[i]))
+      return 0;
+    if (r1->wvhdl[i] != NULL)
+    {
+      if (r2->wvhdl[i] == NULL)
+        return 0;
+      for (j=0; j<r1->block1[i]-r1->block0[i]+1; j++)
+        if (r2->wvhdl[i][j] != r1->wvhdl[i][j])
+          return 0;
+    }
+    else if (r2->wvhdl[i] != NULL) return 0;
+    i++;
+  }
+
+  for (i=0; i<rPar(r1);i++)
+  {
+      if (strcmp(r1->parameter[i], r2->parameter[i])!=0)
+        return 0;
+  }
+
+  if (r1->minpoly != NULL)
+  {
+    if (r2->minpoly == NULL) return 0;
+    if (currRing == r1 || currRing == r2)
+    {
+      if (! nEqual(r1->minpoly, r2->minpoly)) return 0;
+    }
+  }
+  else if (r2->minpoly != NULL) return 0;
+
+  if (qr)
+  {
+    if (r1->qideal != NULL)
+    {
+      ideal id1 = r1->qideal, id2 = r2->qideal;
+      int i, n;
+      poly *m1, *m2;
+
+      if (id2 == NULL) return 0;
+      if ((n = IDELEMS(id1)) != IDELEMS(id2)) return 0;
+
+      if (currRing == r1 || currRing == r2)
+      {
+        m1 = id1->m;
+        m2 = id2->m;
+        for (i=0; i<n; i++)
+          if (! pEqualPolys(m1[i],m2[i])) return 0;
+      }
+    }
+    else if (r2->qideal != NULL) return 0;
+  }
+
+  return 1;
+}
+
 rOrderType_t rGetOrderType(ring r)
 {

Singular/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.29 1999-07-08 13:38:42 Singular Exp $ */
+/* $Id: ring.h,v 1.30 1999-07-09 14:06:51 obachman Exp $ */
 
 /* includes */
@@ -47 +47 @@
 int    rIsExtension();
 int    rSum(ring r1, ring r2, ring &sum);
+BOOLEAN rEqual(ring r1, ring r2, BOOLEAN qr = 1);
 BOOLEAN   rComplete(ring r, int force = 0);
 void   rUnComplete(ring r);