Changeset ab453da in git

Timestamp:

Oct 1, 2010, 4:54:27 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

f20cf709bf3a6482f047b88775316527b71c8fdb

Parents:

e6651bbb0a61329057145fd896929682117e9455

Message:

smChangeRing via rCopy0

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

Location:

kernel

Files:

• ideals.cc (modified) (3 diffs)
• sparsmat.cc (modified) (14 diffs)
• sparsmat.h (modified) (1 diff)

kernel/ideals.cc

@@ -2847 +2847 @@
   ideal result,h;
   ring origR;
-  sip_sring tmpR;
+  ring tmpR;
   long bound;
 
@@ -2858 +2858 @@
   bound = smExpBound(h,c,r,ar);
   idDelete(&h);
-  smRingChange(&origR,tmpR,bound);
+  tmpR=smRingChange(&origR,bound);
   b = mpNew(r,c);
   for (i=r*c-1;i>=0;i--)
@@ -2882 +2882 @@
   idSkipZeroes(result);
   rChangeCurrRing(origR);
-  result = idrMoveR(result,&tmpR);
-  smRingClean(origR,tmpR);
+  result = idrMoveR(result,tmpR);
+  smKillModifiedRing(tmpR);
   idTest(result);
   return result;

kernel/sparsmat.cc

@@ -245 +245 @@
 
 /* ----------------- ops with rings ------------------ */
-void smRingChange(ring *origR, sip_sring &tmpR, long bound)
+ring smRingChange(ring *origR, long bound)
 {
   *origR =currRing;
-  ring tt=rCopy0(currRing,FALSE,FALSE);
-  tmpR=*tt;
+  ring tmpR=rCopy0(currRing,FALSE,FALSE);
   int *ord=(int*)omAlloc0(3*sizeof(int));
   int *block0=(int*)omAlloc(3*sizeof(int));
@@ -255 +254 @@
   ord[0]=ringorder_c;
   ord[1]=ringorder_dp;
-  tmpR.order=ord;
-  tmpR.OrdSgn=1;
+  tmpR->order=ord;
+  tmpR->OrdSgn=1;
   block0[1]=1;
-  tmpR.block0=block0;
-  block1[1]=tmpR.N;
-  tmpR.block1=block1;
-  tmpR.bitmask = 2*bound;
+  tmpR->block0=block0;
+  block1[1]=tmpR->N;
+  tmpR->block1=block1;
+  tmpR->bitmask = 2*bound;
+  tmpR->wvhdl = (int **)omAlloc0((3) * sizeof(int_ptr));
 
 // ???
-//  if (tmpR.bitmask > currRing->bitmask) tmpR.bitmask = currRing->bitmask;
-
-  rComplete(&tmpR,1);
+//  if (tmpR->bitmask > currRing->bitmask) tmpR->bitmask = currRing->bitmask;
+
+  rComplete(tmpR,1);
   if ((*origR)->qideal!=NULL)
   {
-    tmpR.qideal= idrCopyR_NoSort((*origR)->qideal, (*origR), &tmpR);
-  }
-  rChangeCurrRing(&tmpR);
+    tmpR->qideal= idrCopyR_NoSort((*origR)->qideal, (*origR), tmpR);
+  }
+  rChangeCurrRing(tmpR);
   if (TEST_OPT_PROT)
-    Print("[%ld:%d]", (long) tmpR.bitmask, tmpR.ExpL_Size);
-}
-
-void smRingClean(ring origR, ip_sring &tmpR)
-{
-  if (tmpR.qideal!=NULL) id_Delete(&(tmpR.qideal),&tmpR);
-  rUnComplete(&tmpR);
-  omFreeSize((ADDRESS)tmpR.order,3*sizeof(int));
-  omFreeSize((ADDRESS)tmpR.block0,3*sizeof(int));
-  omFreeSize((ADDRESS)tmpR.block1,3*sizeof(int));
+    Print("[%ld:%d]", (long) tmpR->bitmask, tmpR->ExpL_Size);
+  return tmpR;
+}
+
+void smKillModifiedRing(ring r)
+{
+  if (r->qideal!=NULL) id_Delete(&(r->qideal),r);
+  rKillModifiedRing(r);
 }
 
@@ -360 +358 @@
   poly res;
   ring origR;
-  sip_sring tmpR;
+  ring tmpR;
   sparse_mat *det;
   ideal II;
 
-  smRingChange(&origR,tmpR,bound);
+  tmpR=smRingChange(&origR,bound);
   II = idrCopyR(I, origR);
   diag = smCleardenom(II);
@@ -373 +371 @@
     delete det;
     rChangeCurrRing(origR);
-    smRingClean(origR,tmpR);
+    smKillModifiedRing(tmpR);
     return NULL;
   }
@@ -380 +378 @@
   delete det;
   rChangeCurrRing(origR);
-  res = prMoveR(res, &tmpR);
-  smRingClean(origR,tmpR);
+  res = prMoveR(res, tmpR);
+  smKillModifiedRing(tmpR);
   if (nEqual(diag,h) == FALSE)
   {
@@ -398 +396 @@
   long bound;
   ring origR;
-  sip_sring tmpR;
+  ring tmpR;
   sparse_mat *bareiss;
 
@@ -407 +405 @@
   if (t>s) t=s;
   bound=2*smExpBound(I,c,r,t);
-  smRingChange(&origR,tmpR,bound);
+  tmpR=smRingChange(&origR,bound);
   ideal II = idrCopyR(I, origR);
   bareiss = new sparse_mat(II);
@@ -425 +423 @@
     delete bareiss;
     rChangeCurrRing(origR);
-    II = idrMoveR(II,&tmpR);
-  }
-  smRingClean(origR,tmpR);
+    II = idrMoveR(II,tmpR);
+  }
+  smKillModifiedRing(tmpR);
   M=II;
 }
@@ -437 +435 @@
   long bound;
   ring origR;
-  sip_sring tmpR;
+  ring tmpR;
   sparse_mat *bareiss;
 
@@ -446 +444 @@
   if (t>s) t=s;
   bound=smExpBound(I,c,r,t);
-  smRingChange(&origR,tmpR,bound);
+  tmpR=smRingChange(&origR,bound);
   ideal II = idrCopyR(I, origR);
   bareiss = new sparse_mat(II);
@@ -464 +462 @@
     delete bareiss;
     rChangeCurrRing(origR);
-    II = idrMoveR(II,&tmpR);
-  }
-  smRingClean(origR,tmpR);
+    II = idrMoveR(II,tmpR);
+  }
+  smKillModifiedRing(tmpR);
   M=II;
 }
@@ -2589 +2587 @@
   sparse_number_mat *linsolv;
   ring origR;
-  sip_sring tmpR;
+  ring tmpR;
   ideal rr;
 
@@ -2599 +2597 @@
   I->rank = idRankFreeModule(I);
   if (smCheckSolv(I)) return NULL;
-  smRingChange(&origR,tmpR,1);
+  tmpR=smRingChange(&origR,1);
   rr=idrCopyR(I,origR);
   linsolv = new sparse_number_mat(rr);
@@ -2614 +2612 @@
   rChangeCurrRing(origR);
   if (rr!=NULL)
-    rr = idrMoveR(rr,&tmpR);
-  smRingClean(origR,tmpR);
+    rr = idrMoveR(rr,tmpR);
+  smKillModifiedRing(tmpR);
   return rr;
 }

kernel/sparsmat.h

@@ -31 +31 @@
 ideal smCallSolv(ideal I);
 
-void smRingChange(ring *, sip_sring &, long);
-void smRingClean(ring, ip_sring &);
+ring smRingChange(ring *, long);
+void smKillModifiedRing(ring r);
 long smExpBound(ideal, int, int, int);
 BOOLEAN smCheckDet(ideal, int, BOOLEAN);