Changeset 4ec0f0 in git for kernel/combinatorics/hilb.cc

Timestamp:

Sep 15, 2014, 9:14:09 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

eb55f8a52fe5ee84d19c269132981a40defce0da

Parents:

f7d39bddf5a7034fe148956d21d0cbe5d13c0021

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-09-15 21:14:09+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-09-23 20:08:14+02:00

Message:

Instumentation with id_Test* for inputs + more general hLookSeries

File:

• kernel/combinatorics/hilb.cc (modified) (2 diffs)

kernel/combinatorics/hilb.cc

@@ -1138 +1138 @@
                 int /*notstc*/, intvec *wdegree, ideal Q, ring tailRing)
 {
+  id_TestTail(S, currRing, tailRing);
+   
   intvec *work, *hseries1=NULL;
   int  mc;
@@ -1370 +1372 @@
 *caller
 */
-void hLookSeries(ideal S, intvec *modulweight, ideal Q)
-{
-  int co, mu, l;
-  intvec *hseries2;
-  intvec *hseries1 = hFirstSeries(S, modulweight, Q);
+void hLookSeries(ideal S, intvec *modulweight, ideal Q, intvec *wdegree, ring tailRing)
+{
+  id_TestTail(S, currRing, tailRing);
+
+  intvec *hseries1 = hFirstSeries(S, modulweight, Q, wdegree, tailRing);
+   
   hPrintHilb(hseries1);
-  l = hseries1->length()-1;
-  if (l > 1)
-    hseries2 = hSecondSeries(hseries1);
-  else
-    hseries2 = hseries1;
+   
+  const int l = hseries1->length()-1;
+   
+  intvec *hseries2 = (l > 1) ? hSecondSeries(hseries1) : hseries1;
+   
+  int co, mu;
   hDegreeSeries(hseries1, hseries2, &co, &mu);
+   
   PrintLn();
   hPrintHilb(hseries2);
   if ((l == 1) &&(mu == 0))
-    scPrintDegree((currRing->N)+1, 0);
+    scPrintDegree(rVar(currRing)+1, 0);
   else
     scPrintDegree(co, mu);