Changeset d7cb52 in git

Timestamp:

Feb 25, 2007, 7:09:43 AM (16 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '23b0a9c07070b684aa12355009488dc00d9501e3')

Children:

74802b0c748389d7b2662b157bcd57bbbe13eb0d

Parents:

101775c32e4f8f7cd743c23b9822bc53abca1792

Message:

*bricken: more structured noro red


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

File:

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

kernel/tgb_internal.h

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb_internal.h,v 1.61 2007-02-23 13:30:35 bricken Exp $ */
+/* $Id: tgb_internal.h,v 1.62 2007-02-25 06:09:43 bricken Exp $ */
 /*
  * ABSTRACT: tgb internal .h file
@@ -20 +20 @@
 #include <modulop.h>
 //#define USE_NORO 1
+
+
 #ifdef USE_NORO
 #define NORO_CACHE 1
@@ -750 +752 @@
 }
 */
+#ifdef __GNUC__
+#define LIKELY(expression) (__builtin_expect(!!(expression), 1))
+#define UNLIKELY(expression) (__builtin_expect(!!(expression), 0))
+#else
+#define LIKELY(expression) (expression)
+#define UNLIKELY(expression) (expression)
+#endif
+
+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;
+#if 0
+for(i=0;i<cache->nIrreducibleMonomials;i++){
+  if (!(0==temp_array[i])){
+  
+    res->idx_array[pos]=i;
+    res->coef_array[pos]=temp_array[i];
+
+    pos++;
+    non_zeros--;
+    if (non_zeros==0) break;
+  }
+  
+}
+#else
+int64* start=(int64*) ((void*)temp_array);
+int64* end;
+const int multiple=sizeof(int64)/sizeof(number_type);
+if (temp_size==0) end=start;
+
+else
+{ 
+  int temp_size_rounded=temp_size+(multiple-(temp_size%multiple));
+  assume(temp_size_rounded>=temp_size);
+  assume(temp_size_rounded%multiple==0);
+  assume(temp_size_rounded<temp_size+multiple);
+  number_type* nt_end=temp_array+temp_size_rounded;
+  end=(int64*)((void*)nt_end);
+}
+int64* it=start;
+while(it!=end){
+  if UNLIKELY((*it)!=0){
+    int small_i;
+    const int temp_index=((number_type*)((void*) it))-temp_array;
+    const int bound=temp_index+multiple;
+    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++;
+        non_zeros--;
+        
+      }
+      if (non_zeros==0) break;
+    }
+    
+  }
+  ++it;
+}
+#endif
+return res;
+}
+
 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));
@@ -785 +851 @@
   int temp_size=cache->nIrreducibleMonomials;
   memset(temp_array,0,temp_size_bytes);
+  number minus_one=npInit(-1);
   for(i=0;i<len;i++){
     MonRedResNP<number_type> red=mon[i];
@@ -792 +859 @@
         number coef=red.coef;
         int j;
-        if (!(npIsOne(coef))){
+        if (!((coef==(number) 1)||(coef==minus_one))){
         for(j=0;j<row->len;j++){
           int idx=row->idx_array[j];
@@ -800 +867 @@
           assume(idx<temp_size);
         }}else{
+          if (coef==(number) 1){
           for(j=0;j<row->len;j++){
             int idx=row->idx_array[j];
@@ -805 +873 @@
             assume(idx<temp_size);
           }
+          } else {
+            for(j=0;j<row->len;j++){
+            int idx=row->idx_array[j];
+            temp_array[idx]=F4mat_to_number_type(   npSubM((number) temp_array[idx],(number) row->coef_array[j]));
+            assume(idx<temp_size);
+          }}
         }
       }
@@ -829 +903 @@
     return NULL;
   }
-  SparseRow<number_type>* res=new SparseRow<number_type>(non_zeros);
-  int pos=0;
-  #if 0
-  for(i=0;i<cache->nIrreducibleMonomials;i++){
-    if (!(0==temp_array[i])){
-    
-      res->idx_array[pos]=i;
-      res->coef_array[pos]=temp_array[i];
-
-      pos++;
-      non_zeros--;
-      if (non_zeros==0) break;
-    }
-    
-  }
-  #else
-  int64* start=(int64*) ((void*)temp_array);
-  int64* end;
-  const int multiple=sizeof(int64)/sizeof(number_type);
-  if (temp_size==0) end=start;
-  
-  else
-  { 
-    int temp_size_rounded=temp_size+(multiple-(temp_size%multiple));
-    assume(temp_size_rounded>=temp_size);
-    assume(temp_size_rounded%multiple==0);
-    assume(temp_size_rounded<temp_size+multiple);
-    number_type* nt_end=temp_array+temp_size_rounded;
-    end=(int64*)((void*)nt_end);
-  }
-  int64* it=start;
-  while(it!=end){
-    if ((*it)!=0){
-      int small_i;
-      const int temp_index=((number_type*)((void*) it))-temp_array;
-      const int bound=temp_index+multiple;
-      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++;
-          non_zeros--;
-          
-        }
-        if (non_zeros==0) break;
-      }
-      
-    }
-    ++it;
-  }
-  #endif
+  SparseRow<number_type>* res=convert_to_sparse_row(temp_array,temp_size, non_zeros);
+
   //omfree(temp_array);