Changeset 24ac666 in git

Timestamp:

Mar 16, 2009, 8:50:23 AM (14 years ago)

Author:

Christian Eder

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

a81e0b7a47bc8fc3194c348a4291cf22ceed6c27

Parents:

d738b47ee2746bdf05645beba5fff4b1ec35cbf3

Message:

criterion1() changed using ideals now, ExpVector tests


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

File:

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

kernel/f5gb.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: f5gb.cc,v 1.45 2009-03-13 10:36:19 ederc Exp $ */
+/* $Id: f5gb.cc,v 1.46 2009-03-16 07:50:23 ederc Exp $ */
 /*
 * ABSTRACT: f5gb interface
@@ -191 +191 @@
         pSetCoeff(lcm,nOne);
         // computing factors u2 for new labels
-        u1 = pDivide(lcm,t);
-        pSetCoeff(u1,nOne);
-        u2 = pDivide(lcm, pHead(temp->getPoly()));
-        pSetCoeff(u2,nOne);
+        pExpVectorDiff(u1,lcm,t);
+        //pWrite(u1);
+        //u1 = pDivide(lcm,t);
+        //pWrite(u1);
+        //pSetCoeff(u1,nOne);
+        pExpVectorDiff(u2,lcm,temp->getPoly());
+        //pWrite(u2);
+        //u2 = pDivide(lcm, pHead(temp->getPoly()));
+        //pWrite(u2);
+        //pSetCoeff(u2,nOne);
         //if(gPrev->getLast()->getIndex()==5) {
             //Print("IN CRITPAIRS\n");
@@ -204 +210 @@
         //}
         // testing both new labels by the F5 Criterion
-        if(!criterion1(gPrev,u1,newElement,lTag) && !criterion1(gPrev,u2,temp,lTag) && 
-           !criterion2(u1, newElement, rules, rTag) && !criterion2(u2, temp, rules, rTag)) {
+        if(!criterion2(u1, newElement, rules, rTag) && !criterion2(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
             // label as first element in the CPair
@@ -255 +261 @@
     // starts at the first element in gPrev with index = (index of l)-1, these tags are saved in lTag
         int idx =   l->getIndex();
+    int i;
     if(idx == 1) {
         return false;
@@ -268 +275 @@
         //pWrite(ppMult_qq(t,l->getTerm()));
         //Print("%d\n\n",l->getIndex());
+        /*
         while(testNode->getIndex() < idx) { // && NULL != testNode->getLPoly()) {
             //pWrite(testNode->getPoly());
@@ -277 +285 @@
             //pWrite(testNode->getNext()->getPoly());
             testNode    =   testNode->getNext();
+        }
+        */
+        ideal testId    =   idInit(idx-1,1);
+        for(i=0;i<idx-1;i++) {
+            testId->m[i]  =   pHead(testNode->getPoly());
+            testNode        =   testNode->getNext();
+        }
+        poly temp   =   kNF(testId,currQuotient,u1);
+        //pWrite(temp);
+        for(i=0;i<IDELEMS(testId);i++) {
+            testId->m[i]    =   NULL;
+        }
+        idDelete(&testId);
+        if(NULL == temp) {
+            return true;
         }
         return false;
@@ -314 +337 @@
     RNode* testNode; // =   new RNode();
      
-    if(NULL == rTag->getFirst() ) {
-        testNode    =   rules->getFirst();
+    if(NULL == rTag->getFirst()->getRule()) {
+        if(NULL != rules->getFirst()) {
+            testNode    =   rules->getFirst();
+        }
+        else {
+            return false;
+        }
     }
     else {
+
         if(l->getIndex() > rTag->getFirst()->getRuleIndex()) {
             testNode    =   rules->getFirst();
@@ -338 +367 @@
         }
     }
-    
     //testNode    =   rules->getFirst();
         // save the monom t1*label_term(l) as it is tested various times in the following
@@ -367 +395 @@
         //pWrite(u1);
         //Print("%d\n",testNode->getRuleIndex());
-        if(pLmDivisibleBy(testNode->getRuleTerm(),u1)) {
+        if(pLmDivisibleByNoComp(testNode->getRuleTerm(),u1)) {
             //Print("Criterion 2 NOT passed!\n");
             pDelete(&u1);
@@ -412 +440 @@
         while(NULL != testNode && testNode->getRule() != testedRule) {
         //pWrite(testNode->getRuleTerm());
-        if(pLmDivisibleBy(testNode->getRuleTerm(),u1)) {
+        if(pLmDivisibleByNoComp(testNode->getRuleTerm(),u1)) {
             //Print("Criterion 2 NOT passed!\n");
             pDelete(&u1);
@@ -772 +800 @@
         //pWrite(t);
         //Print("HALLO\n");
-        if(pLmDivisibleByNoComp(temp->getPoly(),t)) {
+        if(pLmDivisibleByNoComp(pHead(temp->getPoly()),t)) {
         //Print("HALLO\n");
             // get all the information needed for the following tests
@@ -852 +880 @@
     ideal idNew     =   kInterRed(id); 
     id              =   idNew;
-    qsortDegree(&id->m[0],&id->m[IDELEMS(id)-1]);
+    //qsortDegree(&id->m[0],&id->m[IDELEMS(id)-1]);
     idShow(id);
     LList* gPrev    =   new LList(ONE, i, id->m[0]);
@@ -911 +939 @@
             if(i<IDELEMS(id)) {
                 ideal tempId    =   kInterRed(gbPrev);
-                idShow(tempId);
+                //idShow(tempId);
                 sleep(5);
                 gbPrev          =   tempId;
-                qsortDegree(&gbPrev->m[0],&gbPrev->m[IDELEMS(gbPrev)-1]);
+                //qsortDegree(&gbPrev->m[0],&gbPrev->m[IDELEMS(gbPrev)-1]);
                 delete gPrev;
                 //Print("RULES FIRST NOW1: %p\n",rules->getFirst());