Changeset 47faf56 in git for Singular/ideals.cc

Timestamp:

Jan 12, 1998, 8:00:02 PM (26 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

567aff6dba275744806617fcbb3253b828a9b5d1

Parents:

38cfbb50a8306b0a1da54ae6a6614ae8f4ecc643

Message:

* ring handling: from pChangeRing to rChangeCurrRing was prepared
* various fixes towards working COMP_FAST
* fixed gcd content problem of factory


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

File:

• Singular/ideals.cc (modified) (6 diffs)

Singular/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.15 1997-12-15 22:46:26 obachman Exp $ */
+/* $Id: ideals.cc,v 1.16 1998-01-12 18:59:47 obachman Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -2103 +2103 @@
   intvec * w;
   sip_sring tmpR;
+  ring origR = currRing;
 
   if (delVar==NULL)
@@ -2145 +2146 @@
 
   // fill in tmp ring to get back the data later on
-  memset(&tmpR, 0, sizeof(sip_sring));
-  tmpR.N = pVariables;
-  tmpR.OrdSgn = currRing->OrdSgn;
+  tmpR  = *origR;
   tmpR.order = ord;
   tmpR.block0 = block0;
@@ -2153 +2152 @@
   tmpR.wvhdl = wv;
   rComplete(&tmpR);
-
+  
   // change into the new ring
   pChangeRing(pVariables,currRing->OrdSgn,ord,block0,block1,wv);
+  //  rChangeCurrRing(&tmpR, FALSE);
+  currRing = &tmpR;
   h = idInit(IDELEMS(h1),1);
   // fetch data from the old ring
-  for (k=0;k<IDELEMS(h1);k++) h->m[k] = pFetchCopy(currRing, pCopy(h1->m[k]));
+  for (k=0;k<IDELEMS(h1);k++) h->m[k] = pFetchCopy(origR, h1->m[k]);
   // compute std
   hh = std(h,NULL,hom,&w,hilb);
@@ -2164 +2165 @@
 
   // go back to the original ring
-  pChangeRing(pVariables,currRing->OrdSgn,currRing->order,
-    currRing->block0,currRing->block1,currRing->wvhdl);
+  rChangeCurrRing(origR,FALSE);
   i = IDELEMS(hh)-1;
   while ((i >= 0) && (hh->m[i] == NULL)) i--;
@@ -2182 +2182 @@
         IDELEMS(h3) += 16;
       }
-//pWrite(hh->m[k]);
       h3->m[j] = pFetchCopy(&tmpR, hh->m[k]);
-//pWrite(h3->m[j]);
-//PrintLn();
     }
   }