Changeset 8627ad in git

Timestamp:

Jun 26, 2008, 6:05:21 PM (16 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

cf4f984ee6d7c9c1a66934b0144d4e0d64c11b01

Parents:

4bf7611fbd40e148feb7eae45c84e0cfe66f2ad0

Message:

*** empty log message ***


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

Location:

kernel

Files:

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

kernel/f5gb.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: f5gb.cc,v 1.6 2008-06-01 15:14:37 ederc Exp $ */
+/* $Id: f5gb.cc,v 1.7 2008-06-26 16:05:07 ederc Exp $ */
 /*
 * ABSTRACT: f5gb interface
 */
-
 #include "mod2.h"
 #include "kutil.h"
@@ -24 +23 @@
 #ifdef HAVE_F5
 
+/*2
+* all functions working on the class lpoly for labeled polynomials
+*/
 
-
-void lpoly::setPoly(poly* p){
-        p_ptr = p;
+void lpoly::setPoly(poly p){
+        polynomial = p;
 }
 
-void lpoly::setTerm(poly* t){
-        t_ptr = t;
+void lpoly::setTerm(poly t){
+        term = t;
 }
 
-void lpoly::setIndex(long* i){
-        i_ptr = i;
+void lpoly::setIndex(long i){
+        index = i;
 }
 
-poly* lpoly::getPoly(){
-        return p_ptr;
+poly lpoly::getPoly(){
+        return polynomial;
 }
 
-poly* lpoly::getTerm(){
-        return t_ptr;
+poly lpoly::getTerm(){
+        return term;
 }
 
-long* lpoly::getIndex(){
-        return i_ptr;
+long lpoly::getIndex(){
+        return index;
 }
 
@@ -63 +64 @@
         poly* ptr2 = right;
         poly p1,p2;
-
         p2 = *(left + (right - left >> 1));
         do{
@@ -90 +90 @@
 
 /*2
+* computes incrementally gbs of subsets of the input 
+* gb{f_m} -> gb{f_m,f_(m-1)} -> gb{f_m,...,f_1}
+*/  
+lpoly* f5_inc(lpoly* lp, lpoly* g_prev)
+{
+        
+        
+        return lp;
+}    
+
+
+/*2
 * computes a gb of the ideal i in the ring r with our f5 
 * implementation 
@@ -95 +107 @@
 ideal F5main(ideal i, ring r)
 {
-      ideal iTmp, g;
-      int j;      
-      lpoly* lp;
+      ideal iTmp, g_basis;
+      long j, k;
+      poly one = pInit();
+      pSetCoeff(one, nInit(1));
+      pWrite(one);
+      lpoly *lp, *gb;
       intvec* sort;
       iTmp = idInit(IDELEMS(i),i->rank);
@@ -114 +129 @@
       
       lp = new lpoly[IDELEMS(iTmp)];
+      
       for(j=0; j <IDELEMS(iTmp); j++){
-                lp[j].setPoly(&iTmp->m[j]);
+                lp[j].setPoly(iTmp->m[j]);
+                
+                if(pComparePolys(lp[j].getPoly(), one)){
+                                Print("1 in GB");
+                                return(NULL);
+                }
+                
+                lp[j].setIndex(j+1);
+                lp[j].setTerm(one);
                 Print("Labeled Polynomial %d: ",j+1);
-                pWrite(*(lp[j].getPoly()));
+                Print("Signature Term: ");
+                pWrite(lp[j].getTerm());
+                Print("Signature Index: %d\n", lp[j].getIndex());
+                pWrite(lp[j].getPoly());
+                Print("\n\n");
+                         
+      }
+      
+      // PROBLEM: muss signatur mitliefern, daher datentyp
+      //          ideal nicht zu gebrauchen? 
+      gb = new lpoly;
+      gb = &lp[IDELEMS(iTmp)-1];
+      pWrite((*gb).getPoly());
+
+      for(j=IDELEMS(iTmp)-2; j>0; j--){
+             //PROBLEM: muss dynamisch Speicher allozieren
+             gb = f5_inc(&lp[j], gb);
+             for(k=0; k< IDELEMS(iTmp); k++){
+                    if(gb[k].getPoly()){
+                    }
+             }
+
+
+
+               
       }
                 
-
-            
+                        
 
 

kernel/f5gb.h

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: f5gb.h,v 1.5 2008-06-01 15:15:00 ederc Exp $ */
+/* $Id: f5gb.h,v 1.6 2008-06-26 16:05:21 ederc Exp $ */
 /*
 * ABSTRACT: f5gb interface
@@ -13 +13 @@
 
 
+// structure of the rules, i.e. index and term
+struct rule{
+        long index;
+        poly term;
+};
+
+
+// class of a labeled polynomial 
 class lpoly {
         private:
-                poly* t_ptr;
-                long* i_ptr;
-                poly* p_ptr;
+                poly term;
+                long index;
+                poly polynomial;
 
         public:
-                void setPoly(poly* p);
-                poly* getPoly();
-                void setTerm(poly* t);
-                poly* getTerm();
-                void setIndex(long* i);
-                long* getIndex();
+                void setPoly(poly p);
+                poly getPoly();
+                void setTerm(poly t);
+                poly getTerm();
+                void setIndex(long i);
+                long getIndex();
 };
 
@@ -34 +42 @@
 void qsort_degree(poly* left, poly* right);
 
+
+// computes incrementally gbs of subsets of the input 
+// gb{f_m} -> gb{f_m,f_(m-1)} -> gb{f_m,...,f_1}  
+lpoly* f5_inc(lpoly* lp, lpoly* g_prev);
+
+
 // main function of our f5 implementation
 ideal F5main(ideal i, ring r);