Changeset 9f11ab in git

Timestamp:

Feb 16, 2007, 8:24:12 AM (17 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8324cc32fb89526d0957452cb54e691d6c81ef3f

Parents:

6881be5a0364e2c5f737071fdc615a582d56cff1

Message:

*bricken: sparse rows for noro preprocessing


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

File:

• kernel/tgb.cc (modified) (7 diffs)

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.138 2007-02-15 15:16:32 bricken Exp $ */
+/* $Id: tgb.cc,v 1.139 2007-02-16 07:24:12 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -2274 +2274 @@
   }
 };
+class SparseRow{
+public:
+  int* idx_array;
+  number* coef_array;
+  int len;
+  SparseRow(){
+    len=0;
+    idx_array=NULL;
+    coef_array=NULL;
+  }
+  SparseRow(int n){
+    len=n;
+    idx_array=(int*) omalloc(n*sizeof(int));
+    coef_array=(number*) omalloc(n*sizeof(number));
+  }
+  ~SparseRow(){
+    omfree(idx_array);
+    omfree(coef_array);
+  }
+};
 
 class DataNoroCacheNode:public NoroCacheNode{
@@ -2280 +2300 @@
   int value_len;
   poly value_poly;
+  #ifdef NORO_SPARSE_ROWS_PRE
+  SparseRow* row;
+  #else
   DenseRow* row;
+  #endif
   int term_index;
   DataNoroCacheNode(poly p, int len){
@@ -2421 +2445 @@
     DataNoroCacheNode* dn=(DataNoroCacheNode*) node;
     if (dn->value_len!=backLinkCode){
+      #ifndef NORO_SPARSE_ROWS_PRE
       dn->row=new DenseRow();
       DenseRow* row=dn->row;
@@ -2444 +2469 @@
       row->array=(number*) omalloc((len)*sizeof(number));
       memcpy(row->array,a+row->begin,len*sizeof(number));
-      /*dn->row->array=(number*) omalloc(nIrreducibleMonomials*sizeof(number));
-      dn->row->begin=0;
-      dn->row->end=nIrreducibleMonomials;
-      number* row= dn->row->array;
-      int i;
-      for(i=0;i<nIrreducibleMonomials;i++){
-        row[i]=npInit(0);
-      }
-      poly p=dn->value_poly;
-      i=0;
+      #else
+      assume(dn->value_len==dn->value_poly);
+      dn->row=new SparseRow(dn->value_len);
+      SparseRow* row=dn->row;
+      int i=0;
       while(p){
-
-        if (i==0){
-          dn->row->begin=idx;
-        }
-        dn->row->end=idx+1;
+        DataNoroCacheNode* ref=getCacheReference(p);
+        
+        idx=ref->term_index;
+        assume(idx>=0);
+        row->idx_array[i]=idx;
+        row->coef_array[i]=p_GetCoeff(p,currRing);
+        
         i++;
-        assume(idx>=0);
-        //Print("idx:%d\n",idx);
-        row[idx]=p_GetCoeff(p,currRing);
         pIter(p);
-      }*/
+      }
+      if (i!=dn->value_len){
+        Print("F4 calc wrong, as poly len was wrong\n");
+      }
+      assume(i==dn->value_len);
+      #endif
       
-      //p_Delete(&dn->value_poly,currRing);
     } 
   }
@@ -2480 +2503 @@
       row[ref->term_index]=npAdd(row[ref->term_index],coef);
     } else {
+      #ifndef NORO_SPARSE_ROWS_PRE
       DenseRow* ref_row=ref->row;
       if (ref_row==NULL) continue;
@@ -2504 +2528 @@
 
     }
+    
+    #else
+    SparseRow* ref_row=ref->row;
+    if (ref_row==NULL) continue;
+    int n=ref_row->len;
+    int j;
+    int* idx_array=ref_row->idx_array;
+    number* coef_array=ref_row->coef_array;
+    for(j=0;j<n;j++){
+      int idx=idx_array[j];
+      number ref_coef=coef_array[j];
+      row[idx]=npAdd(row[idx],npMult(coef,ref_coef));
+    }
+    #endif
   }