Changeset 4cfd6d in git

Timestamp:

Nov 20, 2008, 6:55:04 PM (15 years ago)

Author:

Christian Eder

Branches:

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

Children:

3b5daf5c3b6d494f4399c4436450100041ce3dc0

Parents:

c16f9922fe5d93bd72e4b2440cd6c7cd43889ca6

Message:

added function "generate_input_list"


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

Location:

kernel

Files:

• f5gb.cc (modified) (5 diffs)
• f5gb.h (modified) (2 diffs)

kernel/f5gb.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: f5gb.cc,v 1.10 2008-10-11 12:12:46 ederc Exp $ */
+/* $Id: f5gb.cc,v 1.11 2008-11-20 17:55:04 ederc Exp $ */
 /*
 * ABSTRACT: f5gb interface
@@ -24 +24 @@
 #include "f5gb.h"
 #include "lpolynom.h"
+
+
+// global variables
+const poly one = pInit();
 
 
@@ -89 +93 @@
 
 
+// generating the list lp of ideal generators and test if 1 is in lp
+bool generate_input_list(lpoly* lp, ideal id)
+{
+        long j;
+        for(j=0; j<IDELEMS(id)-1; j++){
+
+                lp[j].setPoly(id->m[j]);
+                
+                if(pComparePolys(lp[j].getPoly(), one)){
+                        Print("1 in GB\n");
+                        return(1);
+                }
+                
+                lp[j].setIndex(j+1);
+                lp[j].setTerm(one);
+                lp[j].setDel(false);
+                lp[j].setNext(&lp[j+1]);
+                Print("Labeled Polynomial %d: ",j+1);
+                Print("Label Term: ");
+                pWrite(lp[j].getTerm());
+                Print("Index: %d\n", lp[j].getIndex());
+                Print("Delete? %d\n", lp[j].getDel());
+                pWrite(lp[j].getPoly());
+                Print("NEUNEUNEU\n\n");
+        }
+        return(0);
+}
+
+
 /*2
 * computes a gb of the ideal i in the ring r with our f5 
@@ -96 +129 @@
 {
         ideal iTmp, g_basis;
-        long j, k;
-        poly one = pInit();
+        bool one_id;
+        long j,k;
         pSetCoeff(one, nInit(1));
         pWrite(one);
@@ -119 +152 @@
         lp = new lpoly[IDELEMS(iTmp)];
         
-        for(j=0; j <IDELEMS(iTmp)-1; j++){
-                lp[j].setPoly(iTmp->m[j]);
-                
-                if(pComparePolys(lp[j].getPoly(), one)){
-                        Print("1 in GB\n");
-                        return(iTmp);
-                }
-                
-                lp[j].setIndex(j+1);
-                lp[j].setTerm(one);
-                lp[j].setDel(false);
-                lp[j].setNext(&lp[j+1]);
-                Print("Labeled Polynomial %d: ",j+1);
-                Print("Label Term: ");
-                pWrite(lp[j].getTerm());
-                Print("Index: %d\n", lp[j].getIndex());
-                Print("Delete? %d\n", lp[j].getDel());
-                pWrite(lp[j].getPoly());
-                Print("\n\n");
-        }
-
-        lp[IDELEMS(iTmp)-1].setPoly(iTmp->m[IDELEMS(iTmp)-1]);
-        
-        if(pComparePolys(lp[IDELEMS(iTmp)-1].getPoly(), one)){
-                        Print("1 in GB\n");
-                        return(iTmp);
-        }
-        
-        lp[IDELEMS(iTmp)-1].setIndex(IDELEMS(iTmp));
-        lp[IDELEMS(iTmp)-1].setTerm(one);
-        lp[IDELEMS(iTmp)-1].setDel(false);
-        lp[IDELEMS(iTmp)-1].setNext(NULL);
-        Print("Labeled Polynomial %d: ",IDELEMS(iTmp));
-        Print("Label Term: ");
-        pWrite(lp[IDELEMS(iTmp)-1].getTerm());
-        Print("Index: %d\n", lp[IDELEMS(iTmp)-1].getIndex());
-        Print("Delete? %d\n", lp[IDELEMS(iTmp)-1].getDel());
-        pWrite(lp[IDELEMS(iTmp)-1].getPoly());
-        Print("\n\n");
+        one_id = generate_input_list(lp,iTmp);        
+         
         
         // PROBLEM: muss signatur mitliefern, daher datentyp

kernel/f5gb.h

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: f5gb.h,v 1.9 2008-10-11 12:12:46 ederc Exp $ */
+/* $Id: f5gb.h,v 1.10 2008-11-20 17:55:04 ederc Exp $ */
 /*
 * ABSTRACT: f5gb interface
@@ -17 +17 @@
 
 
+// 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);
+
 /* computes incrementally gbs of subsets of the input 
-** gb{f_m} -> gb{f_m,f_(m-1)} -> gb{f_m,...,f_1}  
+   gb{f_m} -> gb{f_m,f_(m-1)} -> gb{f_m,...,f_1}  
 */
 lpoly* f5_inc(lpoly* lp, lpoly* g_prev);