Changeset 02e9a1 in git for Singular/kstd1.cc

Timestamp:

Dec 15, 1998, 11:06:47 AM (25 years ago)

Author:

Wilfred Pohl <pohl@…>

Branches:

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

Children:

07ddf54e758b37dd606b570026262eae519d36bb

Parents:

2c8e42f0c06782cd29e3bf79a78b684e92ca65a3

Message:

quasihomogen for std with hilbert series


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

File:

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

Singular/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.29 1998-12-09 16:22:15 Singular Exp $ */
+/* $Id: kstd1.cc,v 1.30 1998-12-15 10:06:46 pohl Exp $ */
 /*
 * ABSTRACT:
@@ -1834 +1834 @@
 
 pFDegProc pOldFDeg;
-intvec * kModW;
+intvec * kModW, * kHomW;
 
 int kModDeg(poly p)
 {
-  int o=pTotaldegree(p);//quasihomogen!!
+  int o=pWDegree(p);
   int i=pGetComp(p);
   if (i==0) return o;
   return o+(*kModW)[i-1];
+}
+int kHomModDeg(poly p)
+{
+  int i;
+  int j=0;
+
+  for (i=pVariables;i>0;i--)
+    j+=pGetExp(p,i)*(*kHomW)[i-1];
+  if (kModW == NULL) return j;
+  i = pGetComp(p);
+  if (i==0) return j;
+  return j+(*kModW)[i-1];
 }
 ideal kStd(ideal F, ideal Q, tHomog h,intvec ** w, intvec *hilb,int syzComp,
@@ -1859 +1871 @@
   strat->LazyDegree = 1;
   strat->ak = idRankFreeModule(F);
+  strat->kModW=kModW=NULL;
+  strat->kHomW=kHomW=NULL;
+  if (vw != NULL)
+  {
+    pLexOrder=FALSE;
+    strat->kHomW=kHomW=vw;
+    pOldFDeg = pFDeg;
+    pFDeg = kHomModDeg;
+    toReset = TRUE;
+  }
   if ((h==testHomog)
 #ifdef DRING
@@ -1871 +1893 @@
     }
     else
+    {
       h = (tHomog)idHomModule(F,Q,w);
+    }
     //Print("test homog:%d\n",h);
     //if ((h==isHomog)&&(w!=NULL)&&(*w!=NULL))
@@ -1880 +1904 @@
     //}
   }
+  pLexOrder=b;
 #ifdef DRING
   if (pDRING) h=isNotHomog;
@@ -1887 +1912 @@
     if ((w!=NULL) && (*w!=NULL))
     {
-      kModW = *w;
-      strat->kModW = *w;
-      pOldFDeg = pFDeg;
-      pFDeg = kModDeg;
-      toReset = TRUE;
+      strat->kModW = kModW = *w;
+      if (vw == NULL)
+      {
+        pOldFDeg = pFDeg;
+        pFDeg = kModDeg;
+        toReset = TRUE;
+      }
     }
     pLexOrder = TRUE;