Changeset 35d0d1a in git

Timestamp:

Feb 9, 2009, 3:24:08 PM (14 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

2c6535a8648691161a07a546e5c73a0b41b9ac06

Parents:

fcb80223d452f79f3b3e1a62b71d291a5fc64943

Message:

*** empty log message ***


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

File:

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

kernel/f5gb.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: f5gb.cc,v 1.24 2009-02-08 19:17:54 ederc Exp $ */
+/* $Id: f5gb.cc,v 1.25 2009-02-09 14:24:08 ederc Exp $ */
 /*
 * ABSTRACT: f5gb interface
@@ -26 +26 @@
 
 int reductionsToZero   =  0;
-//*reductionsToZero       =   0;
 
 /*
@@ -180 +179 @@
 bool criterion1(poly* t, LNode* l, LTagList* lTag) {
     // starts at the first element in gPrev with index = (index of l)-1, these tags are saved in lTag
-    LNode* testNode =   lTag->get(l->getIndex());
-    // save the monom t1*label_term(l) as it is tested various times in the following
+        LNode* testNode =   lTag->get(l->getIndex());
+        // save the monom t1*label_term(l) as it is tested various times in the following
     poly u1 = ppMult_qq(*t,l->getTerm());
     while(NULL != testNode) {
@@ -188 +187 @@
             return true;
         }
-        testNode    =   testNode->getNext();
-    }
+        //pWrite(testNode->getNext()->getPoly());
+                testNode    =   testNode->getNext();
+    }
+    Print("HIER DRIN CRITERION 1\n");
+        
     return false;
 }
@@ -201 +203 @@
 */
 bool criterion2(poly* t, LNode* l, RTagList* rTag) {
+        Print("HIER DRIN CRITERION 2:=========================\n");
     // start at the previously added element to gPrev, as all other elements will have the same index for sure
-    RNode* testNode =   rTag->get(l->getIndex());
-    // save the monom t1*label_term(l) as it is tested various times in the following
+        RNode* testNode =   rTag->get(l->getIndex());
+    Print("ADDRESS TEST NODE: %p\n", testNode);
+        // save the monom t1*label_term(l) as it is tested various times in the following
     poly u1 = ppMult_qq(*t,l->getTerm());
+        Print("Poly u1: ");
+        pWrite(u1);
     // first element added to rTag was NULL, check for this
-    while(NULL != testNode && testNode->getRule()->getOrigin() != l->getLPoly()) {
-        if(pLmDivisibleByNoComp(ppMult_qq(*t,l->getTerm()),testNode->getRuleTerm())) {
+    while(NULL != testNode && NULL != testNode->getRule() && testNode->getRule()->getOrigin() != l->getLPoly()) {
+        Print("----------------------------------------------------------------------------------------------------------------------------------------------------\n");
+                pWrite(ppMult_qq(*t,l->getTerm()));
+                pWrite(testNode->getRuleTerm());
+                if(pLmDivisibleBy(ppMult_qq(*t,l->getTerm()),testNode->getRuleTerm())) {
             Print("Criterion 2 NOT passed!\n");
             return true;
         }
-        testNode    =   testNode->getNext();
+    Print("HIER AUCH DRIN?\n");
+                Print("TEST NODE ADDRESS: %p\n",testNode->getNext());
+                Print("TEST NODE LPOLY ADDRESS: %p\n",testNode->getNext()->getRule());
+                testNode    =   testNode->getNext();
     }
     return false;
@@ -225 +237 @@
 bool criterion2(poly* t, LPoly* l, RTagList* rTag, Rule* lastRuleTested) {
     // start at the previously added element to gPrev, as all other elements will have the same index for sure
-    RNode* testNode =   rTag->getFirst();
+        RNode* testNode =   rTag->getFirst();
     // save the monom t1*label_term(l) as it is tested various times in the following
     poly u1 = ppMult_qq(*t,l->getTerm());
-    // first element added to rTag was NULL, check for this
-    while(NULL != testNode && testNode->getRule() != lastRuleTested) {
-        if(pLmDivisibleByNoComp(ppMult_qq(*t,l->getTerm()),testNode->getRuleTerm())) {
+        // first element added to rTag was NULL, check for this
+        while(NULL != testNode && NULL != testNode->getRule() && testNode->getRule() != lastRuleTested) {
+        if(pLmDivisibleBy(testNode->getRuleTerm(),ppMult_qq(*t,l->getTerm()))) {
             Print("Criterion 2 NOT passed!\n");
             return true;
         }
-        testNode    =   testNode->getNext();
+                testNode    =   testNode->getNext();
     }
     return false;
@@ -272 +284 @@
                             // will never be used again as it is zero => no problems with 
                             // further criterion2() tests and termination conditions
-                            reductionsToZero++;
+                            Print("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ZERO REDUCTION~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n");
+                                                        reductionsToZero++;
                             rules->insert(temp->getLp1Index(),temp->getT1(),NULL);
                             rTag->setFirst(rules->getFirst());
@@ -298 +311 @@
                         // will never be used again as it is zero => no problems with 
                         // further criterion2() tests and termination conditions
+                            Print("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ZERO REDUCTION~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n");
                         reductionsToZero++;
                         rules->insert(temp->getLp1Index(),temp->getT1(),NULL);
@@ -346 +360 @@
             if(0 == pLmCmp(temp->getPoly(),zero)) {
             Print("HIER\n");
+                            Print("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ZERO REDUCTION~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n");
                 reductionsToZero++;
                 // TODO: sPolyList -> delete first element of list as it is zero and done