Changeset cc86cd3 in git

Timestamp:

Jan 29, 2003, 6:50:21 PM (21 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

b197b0615f7540efadd8e7aa8dc224ddfcb0d24b

Parents:

af42cafb12b9a6267ffe6f117e2f0782dfd82213

Message:

*hannes: ncKill


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

File:

• Singular/ring.cc (modified) (5 diffs)

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.196 2002-12-13 16:20:59 Singular Exp $ */
+/* $Id: ring.cc,v 1.197 2003-01-29 17:50:21 Singular Exp $ */
 
 /*
@@ -914 +914 @@
     if (r->nc!=NULL)
     {
-      int i,j;
-      for(i=1;i<r->N;i++)
-      {
-        for(j=i+1;j<=r->N;j++)
-        {
-          id_Delete((ideal *)&(r->nc->MT[UPMATELEM(i,j,r->N)]),r);
-        }
-      }
-      omFreeSize((ADDRESS)r->nc->MT,r->N*(r->N-1)/2*sizeof(matrix));
-      omFreeSize((ADDRESS)r->nc->MTsize,r->N*(r->N-1)/2*sizeof(int));
-      id_Delete((ideal *)&(r->nc->C),r);
-      id_Delete((ideal *)&(r->nc->D),r);
-      id_Delete((ideal *)&(r->nc->COM),r);    
-      omFreeSize((ADDRESS)r->nc,sizeof(nc_struct));
+      if (r->nc->ref>1) r->nc->ref--;
+      else ncKill(r);
     }
     #endif
@@ -992 +980 @@
   {
     if (((IDTYP(h)==RING_CMD)||(IDTYP(h)==QRING_CMD))
-        && (h!=n)
-        && (h->data.uring==r)
-        )
+    && (h!=n)
+    && (h->data.uring==r)
+    )
       return h;
     h=IDNEXT(h);
@@ -1732 +1720 @@
     else res->qideal = NULL;
   }
+#ifdef HAVE_PLURAL
+  if (rIsPluralRing(r))
+  {
+    res->nc->ref++;
+  }
+#endif
   return res;
 }
@@ -2654 +2648 @@
     {
       order[1]=ringorder_C;
-    }  
+    }
     ring res=(ring)omAlloc0Bin(ip_sring_bin);
     *res = *r;