Changeset 822445 in git

Timestamp:

Feb 21, 2007, 8:05:45 AM (17 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

af2ba96ba5dce1de2ed11faf0624dd9972ac71e4

Parents:

421e42f64cacb50c3475fbbae08023fddb74803b

Message:

*bricken: some modp op optimizations


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

File:

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

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.141 2007-02-20 15:11:03 bricken Exp $ */
+/* $Id: tgb.cc,v 1.142 2007-02-21 07:05:45 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -1935 +1935 @@
           //assume(FALSE);
           for(i=start;i<=lastIndex;i++){
-            other_row_array[i]=npAdd(npMult(coef2,row_array[i]),other_row_array[i]);
+            other_row_array[i]=npAddM(npMult(coef2,row_array[i]),other_row_array[i]);
           }
         }
@@ -1947 +1947 @@
     assume((lower_bound<0)||(npIsZero(row_array[lower_bound])));
     int i;
+    number zero=npInit(0);
     for(i=lower_bound+1;i<ncols;i++){
-      if (!(npIsZero(row_array[i])))
+      if (!(row_array[i]==0))
         break;
     }
@@ -2025 +2026 @@
     if (upper_bound>nonZeroUntil) upper_bound=nonZeroUntil+1;
     int i;
+    number zero=npInit(0);
     for(i=upper_bound-1;i>r;i--){
       int start=startIndices[i];
       assume(start<ncols);
-      if (!(npIsZero(row_array[start]))){
+      if (!(row_array[start]==zero)){
         lastReducibleIndices[r]=start;
         return;
@@ -2059 +2061 @@
         assume(start>startIndices[other_row]);
         for(i=start;i<=lastIndex;i++){
-          other_row_array[i]=npAdd(npMult(coef,row_array[i]),other_row_array[i]);
+          other_row_array[i]=npAddM(npMult(coef,row_array[i]),other_row_array[i]);
         }
         updateLastReducibleIndex(other_row,r);
@@ -2540 +2542 @@
     number coef=place_holders[i].coef;
     if (ref->value_len==backLinkCode){
-      row[ref->term_index]=npAdd(row[ref->term_index],coef);
+      row[ref->term_index]=npAddM(row[ref->term_index],coef);
     } else {
       #ifndef NORO_SPARSE_ROWS_PRE
@@ -2552 +2554 @@
         while(ref_begin!=ref_end){
 
-          *my_pos=npAdd(*my_pos,npMult(coef,*ref_begin));
+          *my_pos=npAddM(*my_pos,npMult(coef,*ref_begin));
           ++ref_begin;
           ++my_pos;
@@ -2560 +2562 @@
         while(ref_begin!=ref_end){
 
-          *my_pos=npAdd(*my_pos,*ref_begin);
+          *my_pos=npAddM(*my_pos,*ref_begin);
           ++ref_begin;
           ++my_pos;
@@ -2578 +2580 @@
       int idx=idx_array[j];
       number ref_coef=coef_array[j];
-      row[idx]=npAdd(row[idx],npMult(coef,ref_coef));
+      row[idx]=npAddM(row[idx],npMult(coef,ref_coef));
     }
     #endif
@@ -2903 +2905 @@
   }
   
-  
+  number zero=npInit(0);
   MonRedResNP* mon=(MonRedResNP*) omalloc(len*sizeof(MonRedResNP));
   int i=0;
@@ -2934 +2936 @@
         number coef=red.coef;
         int j;
+        if (!(npIsOne(coef))){
         for(j=0;j<row->len;j++){
           int idx=row->idx_array[j];
-          temp_array[idx]=npAdd(temp_array[idx],npMult(row->coef_array[j],coef));
+          assume(!(npIsZero(coef)));
+          assume(!(npIsZero(row->coef_array[j])));
+          temp_array[idx]=npAddM(temp_array[idx],npMultM(row->coef_array[j],coef));
           assume(idx<temp_size);
+        }}else{
+          for(j=0;j<row->len;j++){
+            int idx=row->idx_array[j];
+            temp_array[idx]=npAddM(temp_array[idx],row->coef_array[j]);
+            assume(idx<temp_size);
+          }
         }
       }
       else{
         if (red.ref->value_len==NoroCache::backLinkCode){
-          temp_array[red.ref->term_index]=npAdd(temp_array[red.ref->term_index],red.coef);
+          temp_array[red.ref->term_index]=npAddM(temp_array[red.ref->term_index],red.coef);
         } else {
           //PrintS("third case\n");
@@ -2951 +2962 @@
   int non_zeros=0;
   for(i=0;i<cache->nIrreducibleMonomials;i++){
-    if (!(npIsZero(temp_array[i]))){
+    if (!(temp_array[i]==zero)){
       non_zeros++;
     }
@@ -2958 +2969 @@
   int pos=0;
   for(i=0;i<cache->nIrreducibleMonomials;i++){
-    if (!(npIsZero(temp_array[i]))){
+    if (!(zero==temp_array[i])){
     
       res->idx_array[pos]=i;