Changeset e9e0aa in git

Timestamp:

Feb 27, 2024, 1:50:50 PM (3 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

151235c5cde328c4cdd1396dba145495b2dd9110

Parents:

772cf3b042bab767d4d359d27fd798e0b7e48179

Message:

scDegree via hFirstSeries0

Location:

kernel/combinatorics

Files:

• hdegree.cc (modified) (1 diff)
• hilb.cc (modified) (2 diffs)
• hilb.h (modified) (1 diff)

kernel/combinatorics/hdegree.cc

@@ -922 +922 @@
   else
     Print("// dimension (local)   = %d\n// multiplicity = %d\n", di, mu);
-}
-
-void scDegree(ideal S, intvec *modulweight, ideal Q)
-{
-  id_Test(S, currRing);
-  if( Q!=NULL ) id_Test(Q, currRing);
-
-  int co, mu, l;
-  intvec *hseries2;
-  intvec *hseries1 = hFirstSeries(S, modulweight, Q);
-  if (errorreported) return;
-  l = hseries1->length()-1;
-  if (l > 1)
-    hseries2 = hSecondSeries(hseries1);
-  else
-    hseries2 = hseries1;
-  hDegreeSeries(hseries1, hseries2, &co, &mu);
-  if ((l == 1) &&(mu == 0))
-    scPrintDegree((currRing->N)+1, 0);
-  else
-    scPrintDegree(co, mu);
-  if (l>1)
-    delete hseries1;
-  delete hseries2;
 }
 

kernel/combinatorics/hilb.cc

@@ -2154 +2154 @@
 }
 
+intvec* hFirstSeries0wm(ideal A,ideal Q, intvec *wdegree, intvec *shifts, const ring src, const ring Qt)
+{
+  poly s=hFirstSeries0m(A,Q,wdegree,shifts,src,Qt);
+  intvec *ss;
+  if (s==NULL)
+    ss=new intvec(2);
+  else
+  {
+    ss=new intvec(p_Totaldegree(s,Qt)+2);
+    while(s!=NULL)
+    {
+      int i=p_Totaldegree(s,Qt);
+      long l=n_Int(pGetCoeff(s),Qt->cf);
+      (*ss)[i]=n_Int(pGetCoeff(s),Qt->cf);
+      if((l==0)||(l<=-INT_MAX)||(l>INT_MAX))
+      {
+        if(!errorreported) Werror("overflow at t^%d\n",i);
+      }
+      else (*ss)[i]=(int)l;
+      p_LmDelete(&s,Qt);
+    }
+  }
+  return ss;
+}
+
 static ideal getModuleComp(ideal A, int c, const ring src)
 {
@@ -2707 +2732 @@
   return biv;
 }
+
+void scDegree(ideal S, intvec *modulweight, ideal Q)
+{
+  id_Test(S, currRing);
+  if( Q!=NULL ) id_Test(Q, currRing);
+
+  int co, mu, l;
+  intvec *hseries2;
+  if (hilb_Qt==NULL) hilb_Qt=makeQt();
+  intvec *hseries1 = hFirstSeries0wm(S,Q,NULL, modulweight,currRing,hilb_Qt);
+  l = hseries1->length()-1;
+  if (l > 1)
+    hseries2 = hSecondSeries(hseries1);
+  else
+    hseries2 = hseries1;
+  hDegreeSeries(hseries1, hseries2, &co, &mu);
+  if ((l == 1) &&(mu == 0))
+    scPrintDegree((currRing->N)+1, 0);
+  else
+    scPrintDegree(co, mu);
+  if (l>1)
+    delete hseries2;
+  delete hseries1;
+}
+

kernel/combinatorics/hilb.h

@@ -22 +22 @@
 bigintmat* hSecondSeries0b(ideal I, ideal Q, intvec *wdegree, intvec *shifts,const ring src, const coeffs biv_cf);
 poly hFirstSeries0m(ideal A,ideal Q, intvec *wdegree, intvec *shifts, const ring src, const ring Qt);
+intvec* hFirstSeries0wm(ideal A,ideal Q, intvec *wdegree, intvec *shifts, const ring src, const ring Qt);
 
 intvec * hSecondSeries(intvec *hseries1);