Changeset c1d486a in git for kernel/ideals.cc

Timestamp:

Mar 4, 2008, 3:58:35 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

195803b9ee6b9462fd5f3b42805bf7ecb3e8f865

Parents:

11d9d6ab9c7d17ce683526d3a3a51adbe2cb96a0

Message:

*hannes: use rCopy0


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

File:

• kernel/ideals.cc (modified) (9 diffs)

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.46 2008-02-01 13:45:37 Singular Exp $ */
+/* $Id: ideals.cc,v 1.47 2008-03-04 14:58:35 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -2308 +2308 @@
   tHomog hom;
   intvec * w;
-  sip_sring tmpR;
+  ring tmpR;
   ring origR = currRing;
 
@@ -2370 +2370 @@
 
   // fill in tmp ring to get back the data later on
-  tmpR  = *origR;
-  tmpR.order = ord;
-  tmpR.block0 = block0;
-  tmpR.block1 = block1;
-  tmpR.wvhdl = wv;
-  rComplete(&tmpR, 1);
+  tmpR  = rCopy0(origR);
+  omFree(tmpR->order); tmpR->order = ord;
+  omFree(tmpR->block0); tmpR->block0 = block0;
+  omFree(tmpR->block1); tmpR->block1 = block0;
+  for(k=rBlocks(origR); k>=0; k--)
+  { if (tmpR->wvhdl[k]!=NULL) omFree(tmpR->wvhdl[k]); }
+  omFree(tmpR->wvhdl);
+  tmpR->wvhdl = wv;
+  rComplete(tmpR, 1);
 
 #ifdef HAVE_PLURAL
@@ -2382 +2385 @@
   {
     BOOLEAN bBAD = FALSE;
-    if ( nc_rComplete(origR, &tmpR) )
+    if ( nc_rComplete(origR, tmpR) )
     {
       Werror("error in nc_rComplete");
@@ -2390 +2393 @@
     {
       /* tests the admissibility of the new elim. ordering */
-      if ( nc_CheckOrdCondition( (&tmpR)->nc->D, &tmpR) )
+      if ( nc_CheckOrdCondition( tmpR->nc->D, tmpR) )
       {
         Werror("no elimination is possible: ordering condition is violated");
@@ -2399 +2402 @@
     {
       // cleanup
-      omFree((ADDRESS)wv[0]);
-      omFreeSize((ADDRESS)wv,ordersize*sizeof(int**));
-      omFreeSize((ADDRESS)ord,ordersize*sizeof(int));
-      omFreeSize((ADDRESS)block0,ordersize*sizeof(int));
-      omFreeSize((ADDRESS)block1,ordersize*sizeof(int));
-      rUnComplete(&tmpR);
+      rDelete(tmpR);
       if (w!=NULL)
       {
@@ -2415 +2413 @@
   // change into the new ring
   //pChangeRing(pVariables,currRing->OrdSgn,ord,block0,block1,wv);
-  rChangeCurrRing(&tmpR);
+  rChangeCurrRing(tmpR);
 
   h = idInit(IDELEMS(h1),h1->rank);
@@ -2437 +2435 @@
   {
     l=pVariables;
-    while ((l>0) && (p_GetExp( hh->m[k],l,&tmpR)*pGetExp(delVar,l)==0)) l--;
+    while ((l>0) && (p_GetExp( hh->m[k],l,tmpR)*pGetExp(delVar,l)==0)) l--;
     if (l==0)
     {
@@ -2446 +2444 @@
         IDELEMS(h3) += 16;
       }
-      h3->m[j] = prCopyR( hh->m[k], &tmpR);
-    }
-  }
-  id_Delete(&hh, &tmpR);
+      h3->m[j] = prCopyR( hh->m[k], tmpR);
+    }
+  }
+  id_Delete(&hh, tmpR);
   idSkipZeroes(h3);
-  omFree((ADDRESS)wv[0]);
-  omFreeSize((ADDRESS)wv,ordersize*sizeof(int**));
-  omFreeSize((ADDRESS)ord,ordersize*sizeof(int));
-  omFreeSize((ADDRESS)block0,ordersize*sizeof(int));
-  omFreeSize((ADDRESS)block1,ordersize*sizeof(int));
-  rUnComplete(&tmpR);
+  rDelete(tmpR);
   if (w!=NULL)
     delete w;