Changeset 4ec0f0 in git for kernel

Timestamp:

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

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

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

Location:

kernel/combinatorics

Files:

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

kernel/combinatorics/hdegree.cc

@@ -72 +72 @@
 int  scDimInt(ideal S, ideal Q)
 {
+  id_Test(S, currRing);
+  id_Test(Q, currRing);
   int  mc;
   hexist = hInit(S, Q, &hNexist, currRing);
@@ -209 +211 @@
 intvec * scIndIntvec(ideal S, ideal Q)
 {
+  id_Test(S, currRing);
+  id_Test(Q, currRing);
   intvec *Set=new intvec((currRing->N));
   int  mc,i;
@@ -692 +696 @@
 static void hDegree(ideal S, ideal Q)
 {
+  id_Test(S, currRing);
+  id_Test(Q, currRing);
   int  di;
   int  mc;
@@ -790 +796 @@
 int  scMultInt(ideal S, ideal Q)
 {
+  id_Test(S, currRing);
+  id_Test(Q, currRing);
   hDegree(S, Q);
   return hMu;
@@ -810 +818 @@
 void scDegree(ideal S, intvec *modulweight, ideal Q)
 {
+  id_Test(S, currRing);
+  id_Test(Q, currRing);
   int co, mu, l;
   intvec *hseries2;
@@ -830 +840 @@
 static void hDegree0(ideal S, ideal Q, const ring r=currRing)
 {
+  id_Test(S, r);  
+  id_Test(Q, r);
+   
   int  mc;
-  hexist = hInit(S, Q, &hNexist, currRing);
+  hexist = hInit(S, Q, &hNexist, r);
   if (!hNexist)
   {
@@ -898 +911 @@
 int  scMult0Int(ideal S, ideal Q, const ring r)
 {
+  id_Test(S, r);  
+  id_Test(Q, r);  
   hDegree0(S, Q);
   return hMu;
@@ -981 +996 @@
 void scComputeHC(ideal S, ideal Q, int ak, poly &hEdge, ring tailRing)
 {
+  id_TestTail(S, currRing, tailRing);  
+  id_TestTail(Q, currRing, tailRing);  
   int  i;
   int  k = ak;
@@ -1309 +1326 @@
     q = p;
   } while (q!=NULL);
+   
+  id_Test(res, currRing);   
   return res;
 }
@@ -1314 +1333 @@
 ideal scKBase(int deg, ideal s, ideal Q, intvec * mv)
 {
+  id_Test(Q, currRing);  
   int  i, di;
   poly p;
@@ -1376 +1396 @@
     ideal res=scIdKbase();
     res->rank=s->rank;
+    id_Test(res, currRing);
     return res;
   }
@@ -1383 +1404 @@
 void scComputeHCw(ideal ss, ideal Q, int ak, poly &hEdge, ring tailRing)
 {
+  id_TestTail(ss, currRing, tailRing);  
+  id_TestTail(Q, currRing, tailRing);
+   
   int  i, di;
   poly p;

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);

kernel/combinatorics/hilb.h

@@ -16 +16 @@
 extern ring currRing;
 
-intvec * hHstdSeries(ideal S, intvec *modulweight, intvec *wdegree,
-                     ideal Q=NULL, ring tailRing = currRing);
+intvec * hHstdSeries(ideal S, intvec *modulweight, intvec *wdegree, ideal Q=NULL, ring tailRing = currRing);
 intvec * hFirstSeries(ideal S, intvec *modulweight, ideal Q=NULL, intvec *wdegree=NULL, ring tailRing = currRing);
+
 intvec * hSecondSeries(intvec *hseries1);
 
-void hLookSeries(ideal S, intvec *modulweight, ideal Q=NULL);
+void hLookSeries(ideal S, intvec *modulweight, ideal Q=NULL, intvec *wdegree=NULL, ring tailRing = currRing); 
 
 #endif

kernel/combinatorics/hutil.cc

@@ -34 +34 @@
 scfmon hInit(ideal S, ideal Q, int *Nexist, ring tailRing)
 {
-  if (tailRing != currRing)
+  id_TestTail(S, currRing, tailRing);  
+  id_TestTail(Q, currRing, tailRing);  
+
+//   if (tailRing != currRing)
     hisModule = id_RankFreeModule(S, currRing, tailRing);
-  else
-    hisModule = id_RankFreeModule(S, currRing);
+//  else
+//    hisModule = id_RankFreeModule(S, currRing);
 
   if (hisModule < 0)