Changeset e78cce in git for Singular/ideals.cc

Timestamp:

Dec 15, 1997, 11:46:43 PM (26 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

74eea4ee278a222b9c9e93f5041d06fdec86d467

Parents:

3bc8cd5aedd9efcc75f287571cd2f05f49911c72

Message:

Mon Dec 15 23:31:56 1997  Olaf Bachmann
<obachman@mathematik.uni-kl.de>

	* polys-impl.h: Various small bug - fixes and changes in
	  preparation of COMP_FAST merge: hilbert series, maps are
	  ok; sres and syz are still buggy; small things still need to
	  be checked;


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

File:

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

Singular/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.14 1997-12-12 16:55:21 Singular Exp $ */
+/* $Id: ideals.cc,v 1.15 1997-12-15 22:46:26 obachman Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -707 +707 @@
     if (result == NULL)
     {/*first monomial*/
-      result = pNew();
+      result = pInit();
       qresult = result;
     }
     else
     {
-      qresult->next = pNew();
+      qresult->next = pInit();
       pIter(qresult);
     }
@@ -775 +775 @@
     if (result == NULL)
     {/*the first monomial*/
-      result = pNew();
+      result = pInit();
       resultp = result;
       resultp->next = NULL;
@@ -781 +781 @@
     else
     {
-      resultp->next = pNew();
+      resultp->next = pInit();
       pIter(resultp);
       resultp->next = NULL;
@@ -1431 +1431 @@
         pIter(p);
       }
-      e->m[i-1] = pOrdPolySchreyer(e->m[i-1]);
+      e->m[i-1] = pOrdPolyMerge(e->m[i-1]);
     }
   }
@@ -2102 +2102 @@
   tHomog hom;
   intvec * w;
+  sip_sring tmpR;
 
   if (delVar==NULL)
@@ -2136 +2137 @@
   block0[0] = 1;
   block1[0] = pVariables;
-  wv=(short**) Alloc(ordersize*sizeof(short**));
+  wv=(short**) Alloc0(ordersize*sizeof(short**));
   memcpy4(wv+1,currRing->wvhdl,(ordersize-1)*sizeof(short**));
   wv[0]=(short*)Alloc0((pVariables+1)*sizeof(short));
-  for (j=0;j<=pVariables;j++)
+  for (j=0;j<pVariables;j++)
     if (pGetExp(delVar,j+1)!=0) wv[0][j]=1;
   ord[0] = ringorder_a;
+
+  // 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.order = ord;
+  tmpR.block0 = block0;
+  tmpR.block1 = block1;
+  tmpR.wvhdl = wv;
+  rComplete(&tmpR);
+
+  // change into the new ring
   pChangeRing(pVariables,currRing->OrdSgn,ord,block0,block1,wv);
   h = idInit(IDELEMS(h1),1);
-  for (k=0;k<IDELEMS(h1);k++) h->m[k] = pOrdPoly(pCopy(h1->m[k]));
+  // fetch data from the old ring
+  for (k=0;k<IDELEMS(h1);k++) h->m[k] = pFetchCopy(currRing, pCopy(h1->m[k]));
+  // compute std
   hh = std(h,NULL,hom,&w,hilb);
   idDelete(&h);
+
+  // go back to the original ring
   pChangeRing(pVariables,currRing->OrdSgn,currRing->order,
     currRing->block0,currRing->block1,currRing->wvhdl);
@@ -2152 +2169 @@
   while ((i >= 0) && (hh->m[i] == NULL)) i--;
   j = -1;
+  // fetch data from temp ring
   for (k=0; k<=i; k++)
   {
     l=pVariables;
-    while ((l>0) && (pGetExp(hh->m[k],l)*pGetExp(delVar,l)==0)) l--;
+    while ((l>0) && (pRingGetExp(&tmpR, hh->m[k],l)*pGetExp(delVar,l)==0)) l--;
     if (l==0)
     {
@@ -2165 +2183 @@
       }
 //pWrite(hh->m[k]);
-      h3->m[j] = pOrdPoly(hh->m[k]);
-      hh->m[k] = NULL;
+      h3->m[j] = pFetchCopy(&tmpR, hh->m[k]);
 //pWrite(h3->m[j]);
 //PrintLn();
@@ -2261 +2278 @@
 BOOLEAN pIsUnit(poly p)
 {
-  poly q=p;
-  int i,j;
-  BOOLEAN b;
+  int i;
 
   if (p == NULL) return FALSE;
-  if (currRing->OrdSgn == 1)
-  {
-    for (i=1;i<=pVariables;i++)
-    {
-      j = pGetExp(p,i);
-      if (j != 0) return FALSE;
-    }
-    if (pGetComp(p) != 0) return FALSE;
-    if (pNext(p) !=NULL) return FALSE;
-  }
-  else
-  {
-    b = FALSE;
-    while ((! b) && (q != NULL))
-    {
-      if (pGetComp(p) == 0)
-      {
-        i = 0;
-        do
-        {
-          i++;
-          j = pGetExp(p,i);
-        }
-        while ((i<=pVariables) && (j == 0));
-        if (i>pVariables) b = TRUE;
-      }
-      q = pNext(q);
-    }
-    return b;
-  }
-  return TRUE;
+  i = 1;
+  while (i<=pVariables && pGetExp(p,i) == 0) i++;
+  if (i > pVariables && (pGetComp(p) == 0))
+  {
+    if (currRing->OrdSgn == 1 && pNext(p) !=NULL) return FALSE;
+    return TRUE;
+  }
+  return FALSE;
 }