Changeset a0350e9 in git for kernel/f5gb.cc

Timestamp:

Jan 15, 2009, 6:44:24 PM (15 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2653d3c2809f0b96d6da699e54066fdb07623b92

Parents:

5ec4a8bc9c1e8e23c5f5f95235a4e4839659b682

Message:

added lists for critical pairs


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

File:

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

kernel/f5gb.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: f5gb.cc,v 1.15 2008-12-27 13:50:05 ederc Exp $ */
+/* $Id: f5gb.cc,v 1.16 2009-01-15 17:44:23 ederc Exp $ */
 /*
 * ABSTRACT: f5gb interface
@@ -24 +24 @@
 #include "lpolynomial.h"
 #include "lists.h"
-
-
-/*
-================================================
-computation of ONE polynomial as global variable
-================================================
-*/
-poly one_poly() {
-    poly one = pInit();
-    pSetCoeff(one,nInit(1));
-    return one;
-}
-
 
 
@@ -80 +67 @@
 ==================================================
 */
-LList* F5inc(long* i, poly* f_i, LList* g_prev) {
-    poly one = pInit();
-    pSetCoeff(one, nInit(1));
-    static poly ONE = one;
-    //poly ONE = pOne();
+LList* F5inc(int* i, poly* f_i, LList* g_prev, poly* ONE) {
     LList* g_curr       =   g_prev;
-    LNode* prev_last    =   g_prev->getLast(); //tags the end of g_prev->only 1 list for g_prev & g_curr
-    g_curr->append(&ONE,i,f_i);
+    g_curr->insert(ONE,i,f_i);
    
     return g_curr;
@@ -98 +80 @@
 */
 ideal F5main(ideal id, ring r) {
-   
-    static poly ONE = pOne();
-    long i,j;
-
+    int i,j;
+    const int idElems = IDELEMS(id);
+    // 1 polynomial for defining initial labels & further tests
+    static poly ONE = pOne(); 
+    
+    
     // definition of one-polynomial as global constant ONE
     //poly one = pInit();
@@ -122 +106 @@
     idShow(id);
     i = 1;
-    //lp->setIndex(&i);
-    //lp->setTerm(&ONE);
-    //lp->setPoly(&id->m[0]);
-    LPoly* lp = new LPoly(&ONE,&i,&ONE);    
-    
     // only for debugging
-    long k = 2;
-    LList* g_prev = new LList(&ONE,&k,&id->m[2]);
-    LNode* current;
-    LPoly* lp2  = new LPoly(&ONE,&k,&ONE);    
+    //LNode* current;
     //LList* g_curr = new LList(lp);
-    k = 134;
-    g_prev->append(&ONE,&k,&id->m[3]);
-    g_prev->append(&ONE,&k,&id->m[3]);
-    g_prev->append(lp2);
-    g_prev->append(lp2);
-    g_prev->append(lp);
-    g_prev->append(&ONE,&k,&id->m[1]);
-    g_prev->append(&ONE,&k,&id->m[3]);
-    g_prev->append(lp2);
-    i = g_prev->getLength();
-    Print("%ld\n\n",i); 
-    current = g_prev->getFirst();
-    while(NULL != current) {
-    Print("Index: %ld\n",*(current->getLPoly()->getIndex()));
-    Print("Pointer comparison: %p , %p\n\n",g_prev->getFirst(),current);
-    current = current->getNext();
-    }
+    //}
     //for(i=2; i<IDELEMS(id); i++) {
         //g_curr = F5inc(&i,&id->m[i],g_prev);