Changeset 66a5f8 in git for kernel/f5gb.cc

Timestamp:

Mar 25, 2009, 3:24:00 PM (15 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9f9b142893198e383bb306d720e6dcb4e2da44ce

Parents:

16ed2f5aab6d00da628b5f73458c7045c9adaaf6

Message:

trying some stuff with exponent vectors, still not working with most of the example ideals from f5ex2.lib


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

File:

• kernel/f5gb.cc (modified) (6 diffs)

kernel/f5gb.cc

@@ -71 +71 @@
 */
 LList* F5inc(int i, poly f_i, LList* gPrev, ideal gbPrev, poly ONE, LTagList* lTag, RList* rules, RTagList* rTag) {
-    //Print("in f5inc\n");            
+    Print("in f5inc\n");            
     //pWrite(rules->getFirst()->getRuleTerm());
     int j;
@@ -91 +91 @@
     // computation of critical pairs with checking of criterion 1 and criterion 2 and saving them
     // in the list critPairs
+    Print("END F5INC\n");
     criticalPair(gPrev, critPairs, lTag, rTag, rules);
     static LList* sPolyList        =   new LList();
@@ -899 +900 @@
     //Print("LTAG BEGINNING: %p\n",lTag);
     
+    //DEBUGGING STUFF START
+    //Print("NUMBER: %d\n",r->N);
+    int* ev = new int[r->N];
+    for(i=0;i<IDELEMS(id);i++) {
+        pGetExpV(id->m[i],ev);
+        pWrite(id->m[i]);
+        Print("EXP1: %d\n",ev[1]);
+        Print("EXP2: %d\n",ev[2]);
+        Print("EXP3: %d\n\n",ev[3]);
+    }
+    //delete ev;
+    //DEBUGGING STUFF END
+    
     // first element in rTag is first element of rules which is NULL RNode, 
     // this must be done due to possible later improvements
@@ -906 +920 @@
     RTagList* rTag  =   new RTagList(rules->getFirst());
     i = 1;
-    for(j=0; j<IDELEMS(id); j++) {
+    /*for(j=0; j<IDELEMS(id); j++) {
         if(NULL != id->m[j]) { 
             if(pComparePolys(id->m[j],ONE)) {
@@ -915 +929 @@
             }   
         }
-    } 
+    }*/ 
     ideal idNew     =   kInterRed(id); 
     id              =   idNew;
@@ -937 +951 @@
     //idShow(gbPrev);
     //idShow(currQuotient);
-
     for(i=2; i<=IDELEMS(id); i++) {
         LNode* gPrevTag =   gPrev->getLast();