Changeset 7b2896 in git

Timestamp:

Feb 23, 2007, 9:34:40 AM (17 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

abce2eb6b4be7725a8a5bc3b6feeb4821927af5b

Parents:

05023393670050d3a3678f07351eda09ade7a6eb

Message:

*bricken: tuned noro F4


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

Location:

kernel

Files:

• tgb.cc (modified) (6 diffs)
• tgb_internal.h (modified) (6 diffs)

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.147 2007-02-22 14:46:49 bricken Exp $ */
+/* $Id: tgb.cc,v 1.148 2007-02-23 08:34:40 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -2524 +2524 @@
 
   SparseRow** srows=(SparseRow**) omalloc(pn*sizeof(SparseRow*));
-
+  int non_zeros=0;
   for(j=0;j<pn;j++){
    
@@ -2533 +2533 @@
 
 
-    srows[j]=noro_red_to_non_poly(h,h_len,&cache,c);
-
+    srows[non_zeros]=noro_red_to_non_poly(h,h_len,&cache,c);
+    if (srows[non_zeros]!=NULL) non_zeros++;
   }
   std::vector<DataNoroCacheNode*> irr_nodes;
@@ -2569 +2569 @@
   //if (TEST_OPT_PROT)
   //  Print("Evaluate Rows \n");
-
+  pn=non_zeros;
   number_type* number_array=(number_type*) omalloc(n*pn*sizeof(number_type));
   memset(number_array,0,sizeof(number_type)*n*pn);
@@ -2582 +2582 @@
 
     SparseRow* srow=srows[j];
+    if (srow){
     for(i=0;i<srow->len;i++){
       int idx=old_to_new_indices[srow->idx_array[i]];
@@ -2587 +2588 @@
     }
     delete srow;
-
+    }
   }
   

kernel/tgb_internal.h

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb_internal.h,v 1.57 2007-02-22 14:46:50 bricken Exp $ */
+/* $Id: tgb_internal.h,v 1.58 2007-02-23 08:34:40 bricken Exp $ */
 /*
  * ABSTRACT: tgb internal .h file
@@ -583 +583 @@
     nReducibleMonomials=0;
     temp_term=pOne();
+    tempBufferSize=3000;
+    tempBuffer=omalloc(tempBufferSize);
+  }
+  void ensureTempBufferSize(size_t size){
+    if (tempBufferSize<size){
+      tempBufferSize=2*size;
+      omfree(tempBuffer);
+      tempBuffer=omalloc(tempBufferSize);
+    }
   }
 #ifdef NORO_RED_ARRAY_RESERVER
@@ -604 +613 @@
     omfree(recursionPolyBuffer);
 #endif
+   omfree(tempBuffer);
   }
   
   int nIrreducibleMonomials;
   int nReducibleMonomials;
+  void* tempBuffer;
+  size_t tempBufferSize;
 protected:
   DataNoroCacheNode* treeInsert(poly term,poly nf,int len){
@@ -679 +691 @@
   len=i;
   //in the loop before nIrreducibleMonomials increases, so position here is important
-  storage_type* temp_array=(storage_type*) omalloc(cache->nIrreducibleMonomials*sizeof(storage_type));
+  size_t temp_size_bytes=cache->nIrreducibleMonomials*sizeof(storage_type);
+  cache->ensureTempBufferSize(temp_size_bytes);
+  storage_type* temp_array=(storage_type*) cache->tempBuffer;//omalloc(cache->nIrreducibleMonomials*sizeof(storage_type));
   int temp_size=cache->nIrreducibleMonomials;
-  memset(temp_array,0,sizeof(storage_type)*cache->nIrreducibleMonomials);
+  memset(temp_array,0,temp_size_bytes);
   for(i=0;i<len;i++){
     MonRedResNP red=mon[i];
@@ -715 +729 @@
   int non_zeros=0;
   for(i=0;i<cache->nIrreducibleMonomials;i++){
-    if (!(temp_array[i]==0)){
-      non_zeros++;
-    }
+    //if (!(temp_array[i]==0)){
+    //  non_zeros++;
+    //}
+    assume(((temp_array[i]!=0)==0)|| (((temp_array[i]!=0)==1)));
+    non_zeros+=(temp_array[i]!=0);
+  }
+  
+  if (non_zeros==0){
+    omfree(mon);
+    return NULL;
   }
   SparseRow* res=new SparseRow(non_zeros);
@@ -727 +748 @@
       res->coef_array[pos]=(number) temp_array[i];
 
-      pos++;  
+      pos++;
+      non_zeros--;
+      if (non_zeros==0) break;
     }
     
   }
-  omfree(temp_array);
+  //omfree(temp_array);
 
   omfree(mon);