Changeset 7c81165 in git for kernel/f5gb.cc

Timestamp:

Mar 12, 2009, 10:43:53 AM (15 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

75e2e50e5ba0dbb6681ecbf8664330997a24b5e9

Parents:

47ca23dae2b0131537f61842055e75beb7836f77

Message:

updated list of critical pairs, thrown away some useless data


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

File:

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

kernel/f5gb.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: f5gb.cc,v 1.42 2009-03-09 14:51:42 ederc Exp $ */
+/* $Id: f5gb.cc,v 1.43 2009-03-12 09:43:53 ederc Exp $ */
 /*
 * ABSTRACT: f5gb interface
@@ -96 +96 @@
     static LList* reducedLPolys     =   new LList();
     // while there are critical pairs to be further checked and deleted/computed
-    while(NULL != critPairs->getFirst()->getData()) { 
+    while(NULL != critPairs->getFirst()) { 
         // critPairs->getMinDeg() deletes the first elements of minimal degree from
         // critPairs, thus the while loop is not infinite.
@@ -105 +105 @@
         // added
         computeSPols(critPairsMinDeg,rTag,rules,sPolyList);
-        
+        //Print("HIER2\n");
         // DEBUG STUFF FOR SPOLYLIST
         LNode* temp     =   sPolyList->getFirst();
@@ -180 +180 @@
     Rule* testedRule    =   rules->getFirst()->getRule();
     // computation of critical pairs
+    //critPairs->print();
     while( gPrev->getLast() != temp) {
         //pWrite( *(gPrev->getFirst()->getPoly()) );
@@ -206 +207 @@
             -1 == pLmCmp(ppMult_qq(u1, newElement->getTerm()),ppMult_qq(u2, temp->getTerm()))) {
                 //Print("zweites groesser\n");
+                
                 CPair* cp   =   new CPair(pDeg(ppMult_qq(u2,pHead(temp->getPoly()))), u2, 
                                 temp->getLPoly(), u1, newElement->getLPoly(), testedRule);                   
                 critPairs->insert(cp);
+                //Print("LALA %p\n",critPairs->getFirst());
+                //sleep(5);
             }
             else {
-                //Print("erstes groesser\n");
                 CPair* cp   =   new CPair(pDeg(ppMult_qq(u2,pHead(temp->getPoly()))), u1, 
                                 newElement->getLPoly(), u2, temp->getLPoly(), testedRule);                   
+                //Print("erstes groesser\n");
                 critPairs->insert(cp);
+                //Print("LALA %p\n",critPairs->getFirst());
+                //sleep(5);
             }
         }
@@ -228 +234 @@
         //sleep(5);
     //}
+    //Print("END CRITPAIRS\n");
 }
 
@@ -280 +287 @@
 inline bool criterion2(poly t, LNode* l, RList* rules, RTagList* rTag) {
     //Print("------------------------------IN CRITERION 2/1-----------------------------------------\n");
-        //Print("RULES: \n");
-        //RNode* tempR    =   rules->getFirst();
-        //while(NULL != tempR->getRule()) {
-            //Print("ADDRESS OF RNODE: %p\n",tempR);
-            //Print("ADDRESS OF RULE: %p\n",tempR->getRule());
-            //pWrite(tempR->getRuleTerm());
-            //Print("ADDRESS OF TERM: %p\n",tempR->getRuleTerm());
-            //Print("%d\n\n",tempR->getRuleIndex());
-            //tempR   =   tempR->getNext();
-        //}
+    /*    
+    Print("RULES: \n");
+        RNode* tempR    =   rules->getFirst();
+        int i   = 1;
+        while(NULL != tempR->getRule()) {
+            Print("ADDRESS OF %d RNODE: %p\n",i,tempR);
+            Print("ADDRESS OF RULE: %p\n",tempR->getRule());
+            pWrite(tempR->getRuleTerm());
+            Print("ADDRESS OF TERM: %p\n",tempR->getRuleTerm());
+            Print("%d\n\n",tempR->getRuleIndex());
+            tempR   =   tempR->getNext();
+            i++;
+        }
+        
         //Print("TESTED ELEMENT: ");
         //pWrite(l->getPoly());
@@ -295 +306 @@
         //pWrite(ppMult_qq(t,l->getTerm()));
         //Print("%d\n\n",l->getIndex());
+        */
 // start at the previously added element to gPrev, as all other elements will have the same index for sure
     RNode* testNode =   new RNode();
@@ -376 +388 @@
     //Print("LAST RULE TESTED: %p",testedRule);
     //Print("RULES: \n");
-        RNode* tempR    =   rules->getFirst();
+        //RNode* tempR    =   rules->getFirst();
         //while(NULL != tempR->getRule()) {
             //pWrite(tempR->getRuleTerm());
@@ -418 +430 @@
     poly sp      =   pInit();
     //Print("###############################IN SPOLS##############################\n");
-    while(NULL != temp->getData()) {
+    //first->print();
+
+    while(NULL != temp) {
+        //Print("JA\n");
         // only if a new rule was added since the last test in subalgorithm criticalPair()
         //if(rules->getFirst() != rTag->getFirst()) {
-            if(!criterion2(temp->getT1(),temp->getAdLp1(),rules,temp->getTestedRule())) {
+        if(!criterion2(temp->getT1(),temp->getAdLp1(),rules,temp->getTestedRule())) {
                 // the second component is tested only when it has the actual index, otherwise there is
                 // no new rule to test since the last test in subalgorithm criticalPair()
@@ -495 +510 @@
             }
         //}
+        //Print("%p\n",temp);
         temp    =   temp->getNext();
+        //Print("%p\n",temp);
+        //Print("%p\n",temp->getData());
+        //pWrite(temp->getLp1Poly());
     }
     // these critical pairs can be deleted now as they are either useless for further computations or 
@@ -854 +873 @@
         //pWrite(gPrevTag->getPoly());
         gPrev   =   F5inc(i, id->m[i-1], gPrev, gbPrev, ONE, lTag, rules, rTag);
+        //Print("____________________________________ITERATION STEP DONE________________________________________\n");
         
         // DEBUGGING STUFF