Changeset df638fb in git

Timestamp:

Jul 2, 2009, 3:47:24 PM (14 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

d3acc54f1ba33a84f1a35d9bf7dc820e03c5e70a

Parents:

609e27bbde0bf01bf5570326dc8bfcd73aaa4dba

Message:

renamed "f5data.cc" -> "F5cdata.cc"


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

Location:

kernel

Files:

• F5cdata.cc (moved) (moved from kernel/f5cdata.cc)
• Makefile.in (modified) (1 diff)
• f5c.cc (modified) (2 diffs)
• f5c.h (modified) (1 diff)
• f5gb.cc (modified) (11 diffs)
• f5gb.h (modified) (2 diffs)
• f5lists.cc (modified) (1 diff)
• mod2.h.in (modified) (2 diffs)

kernel/Makefile.in

@@ -114 +114 @@
     pDebug.cc pInline2.cc pInline1.cc pInline0.cc \
     pShallowCopyDelete.cc fast_mult.cc digitech.cc \
-    tgb.cc tgbgauss.cc ringgb.cc f5data.cc f5lists.cc f5gb.cc ratgring.cc shiftgb.cc gfan.cc
+    tgb.cc tgbgauss.cc ringgb.cc f5data.cc f5lists.cc f5gb.cc \
+        f5c.cc f5cdata.cc f5clists.cc ratgring.cc shiftgb.cc gfan.cc
 
 # normal C source files

kernel/f5c.cc

@@ -17 +17 @@
 #include "pInline1.h"
 #include "f5c.h"
-#include "f5cdata.h"
+#include "cF5cdata.h"
 #include "f5clists.h"
 #include "timer.h"
@@ -25 +25 @@
 ==========================================================================
 */
-ideal F5Cmain(ideal id, ring r) {
+ideal f5cMain(ideal id, ring r) {
     return id;
 }

kernel/f5c.h

@@ -13 +13 @@
  * OUTPUT:  ideal g (the gröbner basis of i computed via F5C)
 */
-ideal F5Cmain(ideal i, ring r);
+ideal f5cMain(ideal i, ring r);
 
 #endif
 #endif
+// F5C_HEADER

kernel/f5gb.cc

@@ -321 +321 @@
             if(pLmDivisibleByNoComp(testNode->getPoly(),u1)) {
                 //Print("Criterion 1 NOT passed!\n");
+                if(idx != gPrev->getLast()->getIndex()) {
+                    Print("DOCH!\n");
+                }
                 return true;
             }
@@ -384 +387 @@
     
     RNode* testNode; // =   new RNode();
-    
-    if(NULL == rTag->getFirst()) {
+    testNode    =   rules->getFirst();
+    /*
+     if(NULL == rTag->getFirst()) {
         if(NULL != rules->getFirst()) {
             testNode    =   rules->getFirst();
@@ -393 +397 @@
         }
     }
-    else {
+    
+     else {
 
         if(l->getIndex() > rTag->getFirst()->getRuleIndex()) {
@@ -402 +407 @@
             //Print("DEBUG\n");
         //Print("L INDEX: %d\n",l->getIndex());
-            /*-------------------------------------
+            *-------------------------------------
              * TODO: WHEN INTERREDUCING THE GB THE
              *       INDEX OF THE PREVIOUS ELEMENTS
              *       GETS HIGHER!
-             *-----------------------------------*/
+             *-----------------------------------*
             //testNode    =   rules->getFirst();
             testNode    =   rTag->get(l->getIndex());
@@ -415 +420 @@
         }
     }
+    */
     //testNode    =   rules->getFirst();
         // save the monom t1*label_term(l) as it is tested various times in the following
@@ -1269 +1275 @@
     //Print("RULES FIRST: %p\n",rules->getFirst());
     //Print("RULES FIRST DATA: %p\n",rules->getFirst()->getRule());
-    RTagList* rTag  =   new RTagList(rules->getFirst());
+    //RTagList* rTag  =   new RTagList(rules->getFirst());
+    RTagList* rTag  =   NULL;
     i = 1;
     /*for(j=0; j<IDELEMS(id); j++) {
@@ -1328 +1335 @@
         // remove this comment to get "F5"
         //
-         
+        /* 
         if(gPrev->getLength() > gbLength) {
             if(i < IDELEMS(id)) {
@@ -1358 +1365 @@
         }
         gbLength    =   gPrev->getLength();
-        
+        */ 
         
 
@@ -1403 +1410 @@
         // computing new groebner basis gbPrev
         //
-        /* 
+         
         if(gPrev->getLength() > gbLength) {
             if(i < IDELEMS(id)) {
@@ -1425 +1432 @@
             //if(i<IDELEMS(id)) {
                 ideal tempId    =   kInterRed(gbPrev);
-                Print("HERE\n");
                 gbPrev          =   tempId;
                 delete gPrev;
@@ -1432 +1438 @@
                 gPrev->insert(pOne,1,gbPrev->m[1]);
                 rules    =   new RList();
-                rTag     =   new RTagList(rules->getFirst());
+                //rTag     =   new RTagList(rules->getFirst());
                 for(k=2; k<IDELEMS(gbPrev); k++) {
                     gPrev->insert(pOne,k+1,gbPrev->m[k]);
+                    /*
                     for(l=0; l<k; l++) {
                     }
                     rTag->insert(rules->getFirst());
+                    */
                 }
             //}
             gbLength    =   gPrev->getLength(); 
         }  
-       */   
+        
 
 

kernel/f5gb.h

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: f5gb.h,v 1.40 2009-05-29 11:34:22 ederc Exp $ */
+/* $Id: f5gb.h,v 1.41 2009-07-02 13:47:24 ederc Exp $ */
 /*
 * ABSTRACT: f5gb interface
@@ -43 +43 @@
 ==================================================
 */
-inline LList* F5inc(int i, poly f_i, LList* gPrev, ideal gbPrev, poly ONE, LTagList* lTag, RList* rules, RTagList* rTag);
+LList* F5inc(int i, poly f_i, LList* gPrev, ideal gbPrev, poly ONE, LTagList* lTag, RList* rules, RTagList* rTag);
 
 /*

kernel/f5lists.cc

@@ -1019 +1019 @@
 
 RNode* RTagNode::getRNode() {
+    //Print("%p\n", this);
+    //Print("%p\n",this->data);
     return this->data;
 }

kernel/mod2.h.in

@@ -6 +6 @@
  *          DO NOT EDIT!
  *
- *  Version: $Id: mod2.h.in,v 1.35 2009-06-10 07:44:37 Singular Exp $
+ *  Version: $Id: mod2.h.in,v 1.36 2009-07-02 13:47:24 ederc Exp $
  *******************************************************************/
 #ifndef MOD2_H
@@ -196 +196 @@
 /* procedures to compute groebner bases with the f5 implementation */
 /* still testing */
-#undef HAVE_F5
+#define HAVE_F5 1
+
+/* procedures to compute groebner bases with the f5c implementation */
+/* still testing */
+#define HAVE_F5C 1
 
 /* letterplace gb:*/