Changeset 89e45b in git

Timestamp:

Feb 26, 2007, 1:52:45 PM (16 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

08932b1c52841085c67412beca95f77ba46d4014

Parents:

f529246505a5d745330cbb08ffc3f1db543d3ed3

Message:

*bricken: avoid multiplications in sparse


git-svn-id: file:///usr/local/Singular/svn/trunk@9901 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.64 2007-02-26 10:57:39 bricken Exp $ */
+/* $Id: tgb_internal.h,v 1.65 2007-02-26 12:52:45 bricken Exp $ */
 /*
  * ABSTRACT: tgb internal .h file
@@ -922 +922 @@
   int idx;
   bool operator<(const CoefIdx<number_type>& other) const{
-    return idx<other.idx;
-  }
-};
+    return (idx<other.idx);
+  }
+};
+template<class number_type> void write_coef_times_xx_idx_to_buffer(CoefIdx<number_type>* const pairs,int& pos,int* const idx_array, number_type* const coef_array,const int rlen, const number coef){
+  int j;
+  for(j=0;j<rlen;j++){
+    assume(coef_array[j]!=0);
+    CoefIdx<number_type> ci;
+    ci.coef=F4mat_to_number_type(npMultM((number) coef,(number) coef_array[j]));
+    ci.idx=idx_array[j];
+    pairs[pos++]=ci;
+  }
+}
+template<class number_type> void write_coef_idx_to_buffer(CoefIdx<number_type>* const pairs,int& pos,int* const idx_array, number_type* const coef_array,const int rlen){
+  int j;
+  for(j=0;j<rlen;j++){
+    assume(coef_array[j]!=0);
+    CoefIdx<number_type> ci;
+    ci.coef=coef_array[j];
+    ci.idx=idx_array[j];
+    pairs[pos++]=ci;
+  }
+}
+
+template<class number_type> void write_minus_coef_idx_to_buffer(CoefIdx<number_type>* const pairs,int& pos,int* const idx_array, number_type* const coef_array,const int rlen){
+  int j;
+  for(j=0;j<rlen;j++){
+    assume(coef_array[j]!=0);
+    CoefIdx<number_type> ci;
+    ci.coef=F4mat_to_number_type(npNegM(coef_array[j]));
+    ci.idx=idx_array[j];
+    pairs[pos++]=ci;
+  }
+}
 template <class number_type> SparseRow<number_type>* noro_red_to_non_poly_sparse(MonRedResNP<number_type>* mon, int len,NoroCache<number_type>* cache){
   int i;
@@ -944 +975 @@
   int pos=0;
   int j;
+  const number one=npInit(1);
+  const number minus_one=npInit(-1);
   for(i=0;i<len;i++){
     MonRedResNP<number_type> red=mon[i];
@@ -951 +984 @@
       number_type* coef_array=red.ref->row->coef_array;
       int rlen=red.ref->row->len;
-      for(j=0;j<rlen;j++){
-        assume(coef_array[j]!=0);
-        CoefIdx<number_type> ci;
-        ci.coef=F4mat_to_number_type(npMultM((number) red.coef,(number) coef_array[j]));
-        ci.idx=idx_array[j];
-        pairs[pos++]=ci;
+      number coef=red.coef;
+      if ((coef!=one)&&(coef!=minus_one)){
+      write_coef_times_xx_idx_to_buffer(pairs,pos,idx_array, coef_array,rlen, coef);
+    } else
+    {
+      if (coef==one){
+        write_coef_idx_to_buffer(pairs,pos,idx_array, coef_array,rlen);
+      } else {
+        assume(coef==minus_one);
+        write_minus_coef_idx_to_buffer(pairs,pos,idx_array, coef_array,rlen);
       }
+    }
     } else {
       if ((red.ref) &&(red.ref->value_len==NoroCache<number_type>::backLinkCode)){
@@ -1038 +1076 @@
   len=i;
   bool dense=true;
-  if (max_density<0.1) dense=false;
+  if (max_density<0.05) dense=false;
   if (dense){
     SparseRow<number_type>* res=noro_red_to_non_poly_dense(mon,len,cache);