Changeset 85a342 in git for kernel/f5gb.cc

Timestamp:

Mar 20, 2009, 9:34:43 PM (15 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

b99421493f70c5a40b8867d26b69e67529326c2b

Parents:

1122b22f64e9f1131b42cfe12973c0ad95b902b2

Message:

criterion2() for previously computed elements deleted


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

File:

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

kernel/f5gb.cc

@@ -25 +25 @@
 #include "f5data.h"
 #include "f5lists.h"
+#include "timer.h"
 int reductionsToZero   =  0;
 
@@ -232 +233 @@
         // testing both new labels by the F5 Criterion
         //critPairs->print();
-        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(!criterion2(gPrev->getFirst()->getIndex(), u2, temp, rules, rTag)
+           && !criterion2(gPrev->getFirst()->getIndex(), u1, newElement, 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
             // label as first element in the CPair
@@ -300 +301 @@
         //pWrite(ppMult_qq(t,l->getTerm()));
         //Print("%d\n\n",l->getIndex());
-        /*
         while(testNode->getIndex() < idx) { // && NULL != testNode->getLPoly()) {
             //pWrite(testNode->getPoly());
@@ -311 +311 @@
             testNode    =   testNode->getNext();
         }
-        */
+        /*
         ideal testId    =   idInit(idx-1,1);
         for(i=0;i<idx-1;i++) {
@@ -329 +329 @@
             return true;
         }
+        */
         return false;
     }
@@ -886 +887 @@
 */
 ideal F5main(ideal id, ring r) {
+    int timer   =   initTimer();
+    startTimer();
     int i,j,k,l;
     int gbLength;
@@ -986 +989 @@
                 gPrev    =   new LList(pOne,1,gbPrev->m[0]);
                 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);
+                //poly tempPoly = pInit();
+                //pLcm(pHead(gbPrev->m[0]),pHead(gbPrev->m[1]),tempPoly);
+                //tempPoly    =   pDivide(tempPoly,pOne());
+                //pSetCoeff(tempPoly,nOne);
                 rules    =   new RList();
                 rTag     =   new RTagList(rules->getFirst());
@@ -995 +998 @@
                 //Print("%p\n",rules->getFirst());
                 //pWrite(tempPoly);
-                rules->insert(2,tempPoly);
-                rTag->insert(rules->getFirst());
+                //rules->insert(2,tempPoly);
+                //rTag->insert(rules->getFirst());
                 //Print("%p\n",rules->getFirst());
                 //Print("%p\n",rTag->getFirst());
@@ -1009 +1012 @@
                         //pWrite(gbPrev->m[k]);
                         //pWrite(gbPrev->m[l]);
-                        poly tempPoly2  =   pOne();
-                        pLcm(pHead(gbPrev->m[k]),pHead(gbPrev->m[l]),tempPoly2);
-                        tempPoly2   =   pDivide(tempPoly2,pOne());
-                        pSetCoeff(tempPoly2,nOne);
+                        //poly tempPoly2  =   pOne();
+                        //pLcm(pHead(gbPrev->m[k]),pHead(gbPrev->m[l]),tempPoly2);
+                        //tempPoly2   =   pDivide(tempPoly2,pOne());
+                        //pSetCoeff(tempPoly2,nOne);
                         //pWrite(tempPoly2);
-                        rules->insert(k+1,tempPoly2);
+                        //rules->insert(k+1,tempPoly2);
                     }
-                    rTag->insert(rules->getFirst());
+                    //rTag->insert(rules->getFirst());
                 }
             }
@@ -1040 +1043 @@
         //idShow(gbPrev);
     Print("\n\nNumber of zero-reductions:  %d\n",reductionsToZero);
+    timer   =   getTimer();
+    Print("Time for computations: %d/1000 seconds\n",timer);
     //LNode* temp    =   gPrev->getFirst();
     //while(NULL != temp) {