Changeset 1f6812 in git

Timestamp:

Feb 14, 2003, 9:18:18 PM (21 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

2217b4e28cf2e51884ba5badccb31db717fd34f5

Parents:

335eeed94f74c9b1536e445cd619be96c31754b8

Message:

*bricken: further work on multireductions


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

Location:

Singular

Files:

• tgb.cc (modified) (11 diffs)
• tgb.h (modified) (1 diff)

Singular/tgb.cc

@@ -6 +6 @@
 #include "tgb.h"
 #define OM_KEEP 0
-#define LEN_VAR4
+#define LEN_VAR1
 
 #ifdef LEN_VAR1
@@ -277 +277 @@
 
 
-#ifdef RANDOM_WALK
-int my_rand(int n){
-  //RANDOM integer beetween 0,..,n-1
-  int erg=(double(rand())/RAND_MAX) *n;
-  return ((erg>=n)?erg-1:erg);
-}
-#endif
 
 static BOOLEAN is_empty(calc_dat* c){
@@ -356 +349 @@
   return s;
 }
-static BOOLEAN find_next_pair(calc_dat* c, BOOLEAN go_higher)
-{
-  int start_i,start_j,i,j;
-  start_i=0;
-  start_j=-1;
-#ifndef HOMOGENEOUS_EXAMPLE
-  if (c->misses_series>80){
-    c->current_degree++;
-    c->misses_series=0;
-  }
-#endif
-  start_i=c->continue_i;
-  start_j=c->continue_j;
-
-  for (int i=start_i;i<c->n;i++){
-    if (c->T_deg[i]>c->current_degree)
-    {
-      c->skipped_pairs++;
-      continue;
-    }
-    for(int j=(i==start_i)?start_j+1:0;j<i;j++){
-      // printf("searching at %d,%d",i,j);
-      if (c->misses_counter>=2) {
-        c->skipped_pairs++;
-        break;
-      }
-      if (c->states[i][j]==UNCALCULATED){
-        if(c->deg[i][j]<=c->current_degree)
-        {
-          c->continue_i=c->found_i=i;
-          c->continue_j=c->found_j=j;
-          return TRUE;
-        }
-        else
-        {
-          ++(c->skipped_pairs);
-        }
-      }
-    }
-    c->misses_counter=0;
-  }
-
-  if (!((start_i==1) &&(start_j==0))){
-    c->continue_i=1;
-    c->continue_j=0;
-    return find_next_pair(c);
-  }
-
-  if ((c->skipped_pairs>0) && go_higher){
-    ++(c->current_degree);
-    c->skipped_pairs=0;
-    c->continue_i=0;
-    c->continue_j=0;
-    return find_next_pair(c);
-  }
-  return FALSE;
-}
+
 static void move_forward_in_S(int old_pos, int new_pos,kStrategy strat, BOOLEAN is_char0)
 {
@@ -1541 +1478 @@
 }
 
+static BOOLEAN redNF2_pseudo (redNF_inf* obj,calc_dat* c, int n){
+  if(obj->P->p==NULL) {obj->h=NULL; return TRUE;}
+  LObject** P= (LObject**) omalloc(sizeof(LObject*));
+  P[0]=obj->P;
+  int nonzero=1;
+  multi_reduction(P, nonzero, c);
+  if(nonzero) {
+    int len;
+    kBucketClear(P[0]->bucket,&(obj->h), & len);
+} else 
+ {
+   obj->h=NULL;
+   obj->P=NULL;
+}
+  omfree(P);
+  return TRUE;
+}
 static BOOLEAN redNF2_n_steps (redNF_inf* obj,calc_dat* c, int n)
 {
@@ -2037 +1991 @@
       if (!c->work_on[i].is_free){
 //        Print("Computing i=%i,j=%i",c->work_on[i].i,c->work_on[i].j);
-        if(redNF2_n_steps(&(c->work_on[i]),c,((c->reduction_steps+50)/(c->normal_forms+1))/4+5)){
+        if(redNF2_pseudo(&(c->work_on[i]),c,((c->reduction_steps+50)/(c->normal_forms+1))/4+5)){
 
 
@@ -2579 +2533 @@
         erg.swap_roles=FALSE;
       }
-      return;
+  
     }
       else
@@ -2654 +2608 @@
   }
   if(erg.swap_roles){
+    PrintS("b");
     poly clear_into;
     int dummy_len;
@@ -2695 +2650 @@
   else                     
     pNorm(clear_into);
-    if (new_pos<j)
+    if (new_pos<j){
       move_forward_in_S(j,new_pos,c->strat,c->is_char0);
-
+      erg.reduce_by=new_pos;
+    }
   }
 }
@@ -2724 +2680 @@
       //not reduceable, try to use this for reducing higher terms
       int i2;
-      for (i2=i+1;i2<=losl;i2++){
+      for (i2=i+1;i2<losl;i2++){
         if (p_LmShortDivisibleBy(los[i]->p,los[i]->sev,los[i2]->p,los[i2]->sev,
                                 c->r)){
@@ -2811 +2767 @@
     los[i]->p=kBucketGetLm(los[i]->bucket);
   }
-  poly h=kBucketGetLm(los[i]->bucket);
+
   kStrategy strat=c->strat;
   int curr_pos=losl-1;
@@ -2841 +2797 @@
     for(i=erg.to_reduce_l;i<=erg.to_reduce_u;i++)
     {
-      assume((!erg.fromS)||(i!=erg.reduce_by));
+    
+      assume((erg.fromS)||(i!=erg.reduce_by));
+      assume(reductor!=NULL);
        number coef=kBucketPolyRed(los[i]->bucket,reductor,
                                   len,

Singular/tgb.h

@@ -135 +135 @@
 BOOLEAN extended_product_criterion(poly p1, poly gcd1, poly p2, poly gcd2, calc_dat* c);
 static poly kBucketGcd(kBucket* b, ring r);
+static void multi_reduction(LObject** los, int & losl, calc_dat* c);
 #endif