Changeset f2b5839 in git

Timestamp:

Jun 9, 2008, 8:16:04 AM (15 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

52e2f60700ff18f1b002b09ada312e11d8a71027

Parents:

ee586a66c94f553b815e0af833a1d2aba622d56f

Message:

+ last block things


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

Location:

kernel

Files:

• tgb.cc (modified) (10 diffs)
• tgb_internal.h (modified) (5 diffs)

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.153 2008-03-19 17:44:12 Singular Exp $ */
+/* $Id: tgb.cc,v 1.154 2008-06-09 06:16:03 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -351 +351 @@
     return FALSE;
 }
-static BOOLEAN get_last_dp_block_start(ring r){
+
+static BOOLEAN lies_in_last_dp_block(poly p, slimgb_alg* c){
+    ring r=c->r;
+    if (p_GetComp(p,r)!=0) return FALSE;
+    if (c->lastDpBlockStart<=pVariables){
+        int i;
+        for(i=1;i<c->lastDpBlockStart;i++){
+            if (p_GetExp(p,i,r)!=0){
+                break;
+            }
+        }
+        if (i>=c->lastDpBlockStart) {
+        //wrp(p);
+        //PrintS("\n");
+        return TRUE;
+        }
+        else return FALSE;
+    }else
+    return FALSE;
+}
+
+static int get_last_dp_block_start(ring r){
     //ring r=c->r;
     int last_block;
@@ -1135 +1156 @@
 
 
-static void add_later(poly p, const char* prot, slimgb_alg* c)
-{
+static void add_later(poly p, char* prot, slimgb_alg* c){
     int i=0;
     //check, if it is already in the queue
 
 
-    while(c->add_later->m[i]!=NULL)
-    {
+    while(c->add_later->m[i]!=NULL){
         if (p_LmEqual(c->add_later->m[i],p,c->r))
             return;
@@ -2368 +2387 @@
   qsort(terms,reduced_sum,sizeof(poly),terms_sort_crit);
   int nterms=reduced_sum;
-  if (TEST_OPT_PROT)
-    Print("orig estimation:%i\n",reduced_sum);
+  //if (TEST_OPT_PROT)
+  //Print("orig estimation:%i\n",reduced_sum);
   unify_terms(terms,nterms);
-  if (TEST_OPT_PROT)
-    Print("actual number of columns:%i\n",nterms);
+  //if (TEST_OPT_PROT)
+  //    Print("actual number of columns:%i\n",nterms);
   int rank=reduced_c;
   linalg_step_modp(reduced, p,rank,terms,nterms,c);
@@ -2394 +2413 @@
   #ifdef USE_NORO
   //Print("module rank%d\n",c->S->rank);
-  const BOOLEAN use_noro=((!(c->nc))&&(c->S->rank<=1)&&(rField_is_Zp(c->r)) &&(!(c->eliminationProblem))&&(npPrimeM<=32003));
+    const BOOLEAN use_noro=c->use_noro;
   #else
   const BOOLEAN use_noro=FALSE;
@@ -2406 +2425 @@
   i=0;
   int max_pairs=bundle_size;
-  if (use_noro)
+  
+  #ifdef USE_NORO
+  if ((use_noro)||(c->use_noro_last_block))
     max_pairs=bundle_size_noro;
+  #endif
   poly* p=(poly*) omalloc((max_pairs+1)*sizeof(poly));//nullterminated
 
@@ -2500 +2522 @@
     }
     
-    if (TEST_OPT_PROT){
-      Print("reported rank:%i\n",pn);
-    }
+    //if (TEST_OPT_PROT){
+    //  Print("reported rank:%i\n",pn);
+    //}
     mass_add(p,pn,c);
     omfree(p);
@@ -2580 +2602 @@
 
     //if (!c->nc) {
-      if (c->tailReductions){
+      if ((c->tailReductions) ||(lies_in_last_dp_block(p,c))){
       p=redNFTail(p,c->strat->sl,c->strat, 0);
       } else {
@@ -2972 +2994 @@
   idDelete(&I);
   add_later=idInit(ADD_LATER_SIZE,S->rank);
+  #ifdef USE_NORO
+  use_noro=((!(nc))&&(S->rank<=1)&&(rField_is_Zp(r)) &&(!(eliminationProblem))&&(npPrimeM<=32003));
+  use_noro_last_block=false;
+  if ((!(use_noro))&&(lastDpBlockStart<=pVariables)){
+      use_noro_last_block=((!(nc))&&(S->rank<=1)&&(rField_is_Zp(r)) &&(npPrimeM<=32003));
+  }
+  #else
+  use_noro=false;
+  use_noro_last_block=false;
+  #endif
+  //Print("NORO last block %i",use_noro_last_block);
   memset(add_later->m,0,ADD_LATER_SIZE*sizeof(poly));
 }
@@ -4123 +4156 @@
   // nullen loeschen
   while(curr_pos>=0){
-
+    if ((c->use_noro_last_block)&&(lies_in_last_dp_block(los[curr_pos].p,c))){
+        PrintS("L");
+        int pn_noro=curr_pos+1;
+        poly* p_noro=(poly*) omalloc(pn_noro*sizeof(poly));
+        for(i=0;i<pn_noro;i++){
+            int dummy_len;
+            poly p;
+            los[i].p=NULL;
+            kBucketClear(los[i].bucket,&p,&dummy_len);
+            p_noro[i]=p;
+        }
+
+    
+        if (npPrimeM<255){
+          noro_step<tgb_uint8>(p_noro,pn_noro,c);
+        } else {
+          if (npPrimeM<65000){
+            noro_step<tgb_uint16>(p_noro,pn_noro,c);
+          } else{
+            noro_step<tgb_uint32>(p_noro,pn_noro,c);
+          }
+        }
+        for(i=0;i<pn_noro;i++){
+            los[i].p=p_noro[i];
+            los[i].sev=pGetShortExpVector(los[i].p);
+            //ignore quality
+            kBucketInit(los[i].bucket,los[i].p,pLength(los[i].p));
+            
+        }
+        qsort(los,pn_noro,sizeof(red_object),red_object_better_gen);
+        int deleted=multi_reduction_clear_zeroes(los, losl, pn_noro, curr_pos);
+        losl -= deleted;
+        curr_pos -= deleted;
+        break;
+    }
     find_erg erg;
+    
     multi_reduction_find(los, losl,c,curr_pos,erg);//last argument should be curr_pos
     if(erg.reduce_by<0) break;
 
-
-
+   
+    
     erg.expand=NULL;
     int d=erg.to_reduce_u-erg.to_reduce_l+1;

kernel/tgb_internal.h

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb_internal.h,v 1.69 2007-02-27 10:40:57 bricken Exp $ */
+/* $Id: tgb_internal.h,v 1.70 2008-06-09 06:16:04 bricken Exp $ */
 /*
  * ABSTRACT: tgb internal .h file
@@ -19 +19 @@
 #include "stdlib.h"
 #include <modulop.h>
-//#define USE_NORO 1
+#define USE_NORO 1
 
 
@@ -241 +241 @@
   int lastDpBlockStart;
   int lastCleanedDeg;
+  BOOLEAN use_noro;
+  BOOLEAN use_noro_last_block;
   BOOLEAN isDifficultField;
   BOOLEAN completed;
@@ -1529 +1531 @@
 template <class number_type > void simplest_gauss_modp(number_type* a, int nrows,int ncols){
   //use memmoves for changing rows
-  if (TEST_OPT_PROT)
-    PrintS("StartGauss\n");
+  //if (TEST_OPT_PROT)
+  //    PrintS("StartGauss\n");
   ModPMatrixProxyOnArray<number_type> mat(a,nrows,ncols);
   
@@ -1544 +1546 @@
   backmat.backwardSubstitute();
   //backward substitutions
-  if (TEST_OPT_PROT)
-    PrintS("StopGauss\n");
+  //if (TEST_OPT_PROT)
+  //PrintS("StopGauss\n");
 }
 //int term_nodes_sort_crit(const void* a, const void* b);