Changeset f6c7c9b in git

Timestamp:

Mar 18, 2009, 2:39:13 PM (15 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d92713daaf53064c41302f5ac677aa51908ff3c9

Parents:

810a4af4676af92fb8445bdc35075ece1f8751dd

Message:

deleted criterion2-tests if the element does not have the current index


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

Location:

kernel

Files:

• f5gb.cc (modified) (12 diffs)
• f5gb.h (modified) (2 diffs)
• f5lists.cc (modified) (2 diffs)

kernel/f5gb.cc

@@ -155 +155 @@
     delete critPairs;
     //Print("IN F5INC\n");
-   Print("\n\n\nRULES: \n");
+    /*
+    Print("\n\n\nRULES: \n");
         RNode* tempR    =   rules->getFirst();
         Print("%p\n",tempR);
@@ -168 +169 @@
             t++;
         }
- 
+    */
     //gPrev->print();
     return gPrev;
@@ -231 +232 @@
         // testing both new labels by the F5 Criterion
         //critPairs->print();
-        if(!criterion2(u1, newElement, rules, rTag) && !criterion2(u2, temp, rules, rTag) && 
+        if(!criterion2(gPrev->getFirst()->getIndex(), u1, newElement, rules, rTag) 
+           && !criterion2(gPrev->getFirst()->getIndex(), u2, temp, rules, rTag) && 
            !criterion1(gPrev,u1,newElement,lTag) && !criterion1(gPrev,u2,temp,lTag)) {
             // if they pass the test, add them to CList critPairs, having the LPoly with greater
@@ -322 +324 @@
         idDelete(&testId);
         if(NULL == temp) {
+            //if(l->getIndex() != gPrev->getFirst()->getIndex()) {
+            //    Print("----------------------------Criterion1 not passed----------------------------------\n");
+            //}
             return true;
         }
@@ -335 +340 @@
 =====================================
 */
-inline bool criterion2(poly t, LNode* l, RList* rules, RTagList* rTag) {
+inline bool criterion2(int idx, poly t, LNode* l, RList* rules, RTagList* rTag) {
     //Print("------------------------------IN CRITERION 2/1-----------------------------------------\n");
     /*  
@@ -358 +363 @@
       */
 // start at the previously added element to gPrev, as all other elements will have the same index for sure
+    if(idx > l->getIndex()) {
+        return false;
+    }
+    
     RNode* testNode; // =   new RNode();
-     
+    
+
     if(NULL == rTag->getFirst()) {
         if(NULL != rules->getFirst()) {
@@ -419 +429 @@
         //Print("%d\n",testNode->getRuleIndex());
         if(pLmDivisibleByNoComp(testNode->getRuleTerm(),u1)) {
-            //Print("Criterion 2 NOT passed!\n");
+            //Print("-----------------Criterion 2 NOT passed!-----------------------------------\n");
+            //Print("INDEX: %d\n",l->getIndex());
             pDelete(&u1);
     //Print("------------------------------IN CRITERION 2/1-----------------------------------------\n\n");
@@ -464 +475 @@
         //pWrite(testNode->getRuleTerm());
         if(pLmDivisibleByNoComp(testNode->getRuleTerm(),u1)) {
-            //Print("Criterion 2 NOT passed!\n");
+            //Print("--------------------------Criterion 2 NOT passed!------------------------------\n");
+            //Print("INDEX: %d\n",l->getIndex());
             pDelete(&u1);
     //Print("------------------------------IN CRITERION 2/2-----------------------------------------\n\n");
@@ -841 +853 @@
         //Print("HALLO\n");
                 // passing criterion2 ?
-                if(!criterion2(u,temp,rules,rTag)) {
+                if(!criterion2(gPrev->getFirst()->getIndex(), u,temp,rules,rTag)) {
                     // passing criterion1 ?
                     if(!criterion1(gPrev,u,temp,lTag)) {
@@ -887 +899 @@
     // this must be done due to possible later improvements
     RList* rules    =   new RList();
-    Print("RULES FIRST: %p\n",rules->getFirst());
+    //Print("RULES FIRST: %p\n",rules->getFirst());
     //Print("RULES FIRST DATA: %p\n",rules->getFirst()->getRule());
     RTagList* rTag  =   new RTagList(rules->getFirst());
@@ -975 +987 @@
                 gPrev->insert(pOne,1,gbPrev->m[1]);
                 poly tempPoly = pInit();
+                pLcm(pHead(gbPrev->m[0]),pHead(gbPrev->m[1]),tempPoly);
+                tempPoly    =   pDivide(tempPoly,pOne());
                 pSetCoeff(tempPoly,nOne);
-                pLcm(pHead(gbPrev->m[0]),pHead(gbPrev->m[1]),tempPoly);
                 rules    =   new RList();
                 rTag     =   new RTagList(rules->getFirst());
                 
                 //Print("%p\n",rules->getFirst());
-                pWrite(tempPoly);
+                //pWrite(tempPoly);
                 rules->insert(2,tempPoly);
                 rTag->insert(rules->getFirst());
@@ -998 +1011 @@
                         poly tempPoly2  =   pOne();
                         pLcm(pHead(gbPrev->m[k]),pHead(gbPrev->m[l]),tempPoly2);
+                        tempPoly2   =   pDivide(tempPoly2,pOne());
                         pSetCoeff(tempPoly2,nOne);
-                        pWrite(tempPoly2);
+                        //pWrite(tempPoly2);
                         rules->insert(k+1,tempPoly2);
                     }

kernel/f5gb.h

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: f5gb.h,v 1.32 2009-03-04 20:23:04 ederc Exp $ */
+/* $Id: f5gb.h,v 1.33 2009-03-18 13:39:13 ederc Exp $ */
 /*
 * ABSTRACT: f5gb interface
@@ -58 +58 @@
 =====================================
 */
-inline bool criterion2(poly t, LNode* l, RList* rules, RTagList* rTag);
+inline bool criterion2(int idx, poly t, LNode* l, RList* rules, RTagList* rTag);
 
 /*

kernel/f5lists.cc

@@ -764 +764 @@
     //Print("ADDRESS OF RNODE: %p\n",newElement);
     //Print("ADDRESS OF RNODE DATA: %p\n",newElement->getRule());
+    newElement->next    =   this;
+    return newElement;
+    
+    /*
+     * not useful, as it does not only adds new rules to be tested but also
+     * deletes rules to be tested if a rule is set to another place in the line
+     *
     if(NULL == this || this->getRuleIndex() < newElement->getRuleIndex()) {
         newElement->next    =   this;
@@ -793 +800 @@
     }
     return newElement;
+    */
 }