Changeset 06ee23 in git

Timestamp:

Feb 15, 2007, 9:28:08 AM (17 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

77f10ac0b42b5c408bdf79a5f410a02810a233d3

Parents:

b3daab03c4cc77a25533037671204cd7b2ba146f

Message:

* bricken: cached noro more memory efficient


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

File:

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

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.132 2007-02-15 07:43:36 bricken Exp $ */
+/* $Id: tgb.cc,v 1.133 2007-02-15 08:28:08 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -2328 +2328 @@
   DataNoroCacheNode* getCacheReference(poly term);
   NoroCache(){
+    buffer=NULL;
 #ifdef NORO_RED_ARRAY_RESERVER
     reserved=0;
-    
     recursionPolyBuffer=(poly*)omalloc(1000000*sizeof(poly));
 #endif
@@ -2388 +2388 @@
   //cache_map impl;
   NoroCacheNode root;
-  
+  number* buffer;
 };
 void NoroCache::evaluateRows(){
   //after that can evaluate placeholders
   int i;
+  buffer=(number*) omalloc(nIrreducibleMonomials*sizeof(number));
   for(i=0;i<root.branches_len;i++){
     evaluateRows(1,root.branches[i]);
   }
+  omfree(buffer);
+  buffer=NULL;
 }
 void NoroCache::evaluateRows(int level, NoroCacheNode* node){
@@ -2409 +2412 @@
     if (dn->value_len!=backLinkCode){
       dn->row=new DenseRow();
-      dn->row->array=(number*) omalloc(nIrreducibleMonomials*sizeof(number));
+      DenseRow* row=dn->row;
+      memset(buffer,0,sizeof(number)*nIrreducibleMonomials);
+      poly p=dn->value_poly;
+      if (p==NULL) {row->array=NULL;row->begin=0;row->end=0; return;}
+      int i=0;
+      int idx;
+      number* a=buffer;
+      while(p){
+        DataNoroCacheNode* ref=getCacheReference(p);
+        
+        idx=ref->term_index;
+        assume(idx>=0);
+        a[idx]=p_GetCoeff(p,currRing);
+        if (i==0) row->begin=idx;
+        i++;
+        pIter(p);
+      }
+      row->end=idx+1;
+      assume(row->end>row->begin);
+      int len=row->end-row->begin;
+      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;
@@ -2420 +2445 @@
       i=0;
       while(p){
-        DataNoroCacheNode* ref=getCacheReference(p);
-
-        int idx=ref->term_index;
+
         if (i==0){
           dn->row->begin=idx;
@@ -2432 +2455 @@
         row[idx]=p_GetCoeff(p,currRing);
         pIter(p);
-      }
+      }*/
+      
       //p_Delete(&dn->value_poly,currRing);
     } 
@@ -2447 +2471 @@
     } else {
       DenseRow* ref_row=ref->row;
-      int j;
+      if (ref_row==NULL) continue;
+      number* ref_begin=ref_row->array;
+      number* ref_end=ref_row->array+(ref_row->end-ref_row->begin);
+      number* my_pos=row+ref_row->begin;
+      //TODO npisOne distinction
+      while(ref_begin!=ref_end){
+        
+        *my_pos=npAdd(*my_pos,npMult(coef,*ref_begin));
+        ++ref_begin;
+        ++my_pos;
+      }
+      /*int j;
       if (!(npIsOne(coef))){
         for(j=ref_row->begin;j<ref_row->end;j++){
@@ -2453 +2488 @@
         }
       } else{
+        
         for(j=ref_row->begin;j<ref_row->end;j++)
           row[j]=npAdd(row[j],ref_row->array[j]);
-      }
+      }*/
     }
   }
@@ -2993 +3029 @@
     }
     mass_add(p,pn,c);
+    omfree(p);
     return;
     /*if (TEST_OPT_PROT)