Changeset 244ed5 in git

Timestamp:

Nov 27, 2008, 6:18:05 PM (15 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

4e803e313f457e20c95ef5350e02ebdfe4a1e3a0

Parents:

99d87535652761aa8ed969de6b6ab84ee03fea8a

Message:

updated header inclusions due to lplist


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

Location:

kernel

Files:

• f5gb.cc (modified) (7 diffs)
• f5gb.h (modified) (3 diffs)

kernel/f5gb.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: f5gb.cc,v 1.12 2008-11-22 20:48:23 ederc Exp $ */
+/* $Id: f5gb.cc,v 1.13 2008-11-27 17:17:32 ederc Exp $ */
 /*
 * ABSTRACT: f5gb interface
 */
 #include "mod2.h"
-#include <list>
 #ifdef HAVE_F5
 #include "kutil.h"
@@ -24 +23 @@
 #include "f5gb.h"
 #include "lpolynomial.h"
+#include "lplist.h"
 
 
@@ -66 +66 @@
 * gb{f_m} -> gb{f_m,f_(m-1)} -> gb{f_m,...,f_1}
   
-lpoly *f5_inc(lpoly* lp, lpoly* g_prev)
+LPoly *f5_inc(LPoly* lp, LPoly* g_prev)
 {
         long length = 1;
@@ -91 +91 @@
 */
 // generating the list lp of ideal generators and test if 1 is in lp
-bool generate_input_list(lpoly* lp, ideal id, poly ONE)
+bool generate_input_list(LPoly* lp, ideal id, poly ONE)
 {
         long j;
@@ -107 +107 @@
                 lp[j].setDel(false);
                 lp[j].setNext(&lp[j+1]);
-                Print("Labeled Polynomial %d: ",j+1);
+                Print("Labeled Polynomial %ld: ",j+1);
                 Print("Label Term: ");
                 pWrite(lp[j].getTerm());
-                Print("Index: %d\n", lp[j].getIndex());
+                Print("Index: %ld\n", lp[j].getIndex());
                 Print("Delete? %d\n", lp[j].getDel());
                 pWrite(lp[j].getPoly());
@@ -124 +124 @@
 */
 ideal F5main(ideal i, ring r) {
-    lpoly* lp;
+
     long j;
-
+    LPoly * lp = new LPoly;
     // definition of one-polynomial as global constant ONE
     poly one = pInit();
@@ -153 +153 @@
     }
     */
-    Print("Es klappt!\nWIRKLICH!");
-    return(i); 
-    
+    Print("Es klappt!\nWIRKLICH!\n");
+    // only for debugging
+    lp->get();
+    //return(i); 
+    LpList lp_list;
+    while(NULL != lp->getNext()) {
+        lp_list.insert(lp);
+        lp = lp->getNext();
+    }
+    lp_list.get();
+    return i;
 
 

kernel/f5gb.h

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: f5gb.h,v 1.11 2008-11-22 20:48:23 ederc Exp $ */
+/* $Id: f5gb.h,v 1.12 2008-11-27 17:18:05 ederc Exp $ */
 /*
 * ABSTRACT: f5gb interface
@@ -11 +11 @@
 #ifdef HAVE_F5
 #include "lpolynomial.h"
+#include "lplist.h"
 
 
@@ -19 +20 @@
 // generating the list lp of ideal generators and 
 // test if 1 is in lp(return 1) or not(return 0)
- bool generate_input_list(lpoly* lp, ideal id, poly one);
+ bool generate_input_list(LPoly* lp, ideal id, poly one);
 
 /* computes incrementally gbs of subsets of the input