Changeset 74802b in git

Timestamp:

Feb 25, 2007, 10:40:24 AM (16 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

8120f8d31249d952812c48928a245fe445f5abd1

Parents:

d7cb5209bebe803a759d89681cb9177e09e438f8

Message:

*bricken: more structure for profiling


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

File:

• kernel/tgb_internal.h (modified) (5 diffs)

kernel/tgb_internal.h

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb_internal.h,v 1.62 2007-02-25 06:09:43 bricken Exp $ */
+/* $Id: tgb_internal.h,v 1.63 2007-02-25 09:40:24 bricken Exp $ */
 /*
  * ABSTRACT: tgb internal .h file
@@ -762 +762 @@
 template<class number_type> SparseRow<number_type>* convert_to_sparse_row(number_type* temp_array,int temp_size,int non_zeros){
 SparseRow<number_type>* res=new SparseRow<number_type>(non_zeros);
-int pos=0;
+//int pos=0;
+number_type* it_coef=res->coef_array;
+int* it_idx=res->idx_array;
 #if 0
 for(i=0;i<cache->nIrreducibleMonomials;i++){
@@ -797 +799 @@
     const int temp_index=((number_type*)((void*) it))-temp_array;
     const int bound=temp_index+multiple;
+    number_type c;
     for(small_i=temp_index;small_i<bound;small_i++){
-      if(temp_array[small_i]!=0){
-        res->idx_array[pos]=small_i;
-        res->coef_array[pos]=temp_array[small_i];
-
-        pos++;
+      if((c=temp_array[small_i])!=0){
+        //res->idx_array[pos]=small_i;
+        //res->coef_array[pos]=temp_array[small_i];
+        (*(it_idx++))=small_i;
+        (*(it_coef++))=c;
+        //pos++;
         non_zeros--;
         
       }
-      if (non_zeros==0) break;
+      if UNLIKELY(non_zeros==0) break;
     }
     
@@ -815 +819 @@
 return res;
 }
-
+template <class number_type> void add_coef_times_sparse(number_type* temp_array,int temp_size,SparseRow<number_type>* row, number coef){
+  int j;
+  for(j=0;j<row->len;j++){
+    int idx=row->idx_array[j];
+    assume(!(npIsZero(coef)));
+    assume(!(npIsZero((number) row->coef_array[j])));
+    temp_array[idx]=F4mat_to_number_type(npAddM((number) temp_array[idx],npMultM((number) row->coef_array[j],coef)));
+    assume(idx<temp_size);
+  }
+}
 template<class number_type> SparseRow<number_type> * noro_red_to_non_poly_t(poly p, int &len, NoroCache<number_type>* cache,slimgb_alg* c){
   assume(len==pLength(p));
@@ -860 +873 @@
         int j;
         if (!((coef==(number) 1)||(coef==minus_one))){
-        for(j=0;j<row->len;j++){
-          int idx=row->idx_array[j];
-          assume(!(npIsZero(coef)));
-          assume(!(npIsZero((number) row->coef_array[j])));
-          temp_array[idx]=F4mat_to_number_type(npAddM((number) temp_array[idx],npMultM((number) row->coef_array[j],coef)));
-          assume(idx<temp_size);
-        }}else{
+          add_coef_times_sparse(temp_array,temp_size,row,coef);
+        
+        
+        
+        }else{
           if (coef==(number) 1){
           for(j=0;j<row->len;j++){