Changeset c3da59 in git

Timestamp:

Mar 8, 2009, 9:20:21 PM (14 years ago)

Author:

Christian Eder

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

c280050914141785292e5e545246befb528279f9

Parents:

55a8282afcb99a7a85304b3f8ecf99062c4dd376

Message:

still problems with rTag, old structures with new idea of reduction of GB after each iteration step => lots of optimizations need to be done


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

File:

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

kernel/f5gb.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: f5gb.cc,v 1.40 2009-03-06 21:30:21 ederc Exp $ */
+/* $Id: f5gb.cc,v 1.41 2009-03-08 20:20:21 ederc Exp $ */
 /*
 * ABSTRACT: f5gb interface
@@ -134 +134 @@
     //Print("%p\n",rules->getFirst());
     //Print("%p\n",rTag->getFirst());
-    if(rules->getFirst() != rTag->getFirst()) {
+    //if(rules->getFirst() != rTag->getFirst()) {
         //Print("+++++++++++++++++++++++++++++++++++++NEW RULES+++++++++++++++++++++++++++++++++++++\n");
-        rTag->insert(rules->getFirst());
-    }
-    else {
+        //rTag->insert(rules->getFirst());
+    //}
+    //else {
         //Print("+++++++++++++++++++++++++++++++++++NO NEW RULES++++++++++++++++++++++++++++++++++++\n");
-    }
+    //}
     lTag->insert(lTag->getFirstCurrentIdx());
     //Print("INDEX: %d\n",tempTag->getIndex());
@@ -873 +873 @@
             //Print("HIER AUCH\n");
             gbPrev          =   idAdd(gbPrev,gbAdd);
+            
+            
             // interreduction stuff
             
@@ -883 +885 @@
                 //Print("HIER\n");
                 delete rules;
+                //delete rTag;
                 //Print("HIER AUCH\n");
                 //Print("%p\n",rules->getFirst());
@@ -891 +894 @@
                 pLcm(pHead(gbPrev->m[0]),pHead(gbPrev->m[1]),tempPoly);
                 rules    =   new RList();
+                
                 //Print("%p\n",rules->getFirst());
                 //pWrite(tempPoly);
                 rules->insert(2,tempPoly);
+                rTag    =   new RTagList(rules->getFirst());
                 //Print("%p\n",rules->getFirst());
                 //Print("%p\n",rules->getFirst()->getNext()->getNext());
@@ -908 +913 @@
                         rules->insert(k+1,tempPoly);
                     }
+                    rTag->insert(rules->getFirst());
                 }
             }