Changeset 148862 in git

Timestamp:

Nov 20, 1999, 11:17:24 AM (24 years ago)

Author:

Thomas Siebert <siebert@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

b6c58b8def80edd38fc5084e9a00600d307f7b33

Parents:

0e002da8a20c1e86452db907f05d4b354bc64f88

Message:

Bugfix for kill after hres


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

Location:

Singular

Files:

• ring.cc (modified) (2 diffs)
• syz1.cc (modified) (4 diffs)
• syz2.cc (modified) (3 diffs)

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.89 1999-11-19 16:42:41 obachman Exp $ */
+/* $Id: ring.cc,v 1.90 1999-11-20 10:17:24 siebert Exp $ */
 
 /*
@@ -3414 +3414 @@
          b2 == ringorder_c || b2 == ringorder_C ||
          b2 == ringorder_S);
-
-#if THOMAS_HAS_FIXED_ALLRES
-  if (r_blocks == 3 && 
-      currRing->order[0] == b1 && 
-      currRing->order[1] == b2 &&
-      currRing->order[2] == 0)
+  if ((r_blocks == 3) && 
+      (currRing->order[0] == b1) && 
+      (currRing->order[1] == b2) &&
+      (currRing->order[2] == 0))
     return currRing;
-#endif
-
   ring res = rCopy0(currRing, TRUE, FALSE);
   res->order = (int*)Alloc0(3*sizeof(int));

Singular/syz1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz1.cc,v 1.49 1999-11-16 12:39:31 obachman Exp $ */
+/* $Id: syz1.cc,v 1.50 1999-11-20 10:17:23 siebert Exp $ */
 /*
 * ABSTRACT: resolutions
@@ -1644 +1644 @@
     ring origR = currRing;
 
-    if (syzstr->syRing != NULL)
+    if ((syzstr->syRing != NULL) && (syzstr->syRing != origR))
       rChangeCurrRing(syzstr->syRing, FALSE);
 
@@ -1725 +1725 @@
     if (syzstr->resolution!=NULL)
       delete syzstr->resolution;
-    if (syzstr->syRing != NULL)
+    if ((syzstr->syRing != NULL) && (syzstr->syRing != origR))
     {
       rChangeCurrRing(origR, FALSE);
@@ -2739 +2739 @@
   if (temp!=NULL) idDelete(&temp);
   kBucketDestroy(&(syzstr->bucket));
-  rChangeCurrRing(origR,TRUE);
+  if (origR != syzstr->syRing)
+    rChangeCurrRing(origR,TRUE);
   pDelete1(&redpol);
   if (TEST_OPT_PROT) PrintLn();

Singular/syz2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz2.cc,v 1.10 1999-11-19 16:42:43 obachman Exp $ */
+/* $Id: syz2.cc,v 1.11 1999-11-20 10:17:24 siebert Exp $ */
 /*
 * ABSTRACT: resolutions
@@ -972 +972 @@
   for (i=0;i<IDELEMS(arg);i++)
   {
-    temp->m[i] = prCopyR( arg->m[i], origR);
+    if (origR != syzstr->syRing)
+      temp->m[i] = prCopyR( arg->m[i], origR);
+    else
+      temp->m[i] = pCopy( arg->m[i]);
     if (temp->m[i]!=NULL)
     {
@@ -1062 +1065 @@
   kBucketDestroy(&(syzstr->bucket));
   kBucketDestroy(&(syzstr->syz_bucket));
-  rChangeCurrRing(origR,TRUE);
+  if (origR != syzstr->syRing)  
+    rChangeCurrRing(origR,TRUE);
+  else
+    currRing =  origR;
   if (TEST_OPT_PROT) PrintLn();
   return syzstr;