Changeset 10d1b7 in git

Timestamp:

Sep 6, 2004, 6:45:28 PM (20 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c4063dbdf6b17b78950a97b3b6996bb01fd18202

Parents:

db427bfff5c3de62ca7d93f403e9b7349b088118

Message:

+ made find_in_S deterministic during multi_reduction


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

Location:

Singular

Files:

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

Singular/tgb.cc

@@ -409 +409 @@
     pNorm(P.p);
  
- 
+
   c->strat->enterS(P,i,c->strat);
  
@@ -903 +903 @@
 
   add_to_reductors(c, h, c->lengths[c->n-1]);
-  //i=posInS(c->strat,c->strat->sl,h,0 /*ecart*/);
+  //i=posInS(c->strat,c->strat->sl,h,0 ecart);
 
   if (c->lengths[c->n-1]==1)
@@ -1451 +1451 @@
   qsort(buf,i,sizeof(red_object),red_object_better_gen);
 //    Print("\ncurr_deg:%i\n",curr_deg);
-  Print("M[%i, ",i);  
+  Print("M[%i, ",i);
+  c->modifiedS=(BOOLEAN*) omalloc((c->strat->sl+1)*sizeof(BOOLEAN));
+  c->expandS=(poly*) omalloc((1)*sizeof(poly));
+  c->expandS[0]=NULL;
+  int z2;
+  for(z2=0;z2<=c->strat->sl;z2++)
+    c->modifiedS[z2]=FALSE;
   multi_reduction(buf, i, c);
+
+  //resort S
+
+  for(z2=0;z2<=c->strat->sl;z2++)
+    {
+      if (c->modifiedS[z2])
+        {
+          int qal;
+          if (c->strat->lenSw)
+            qal=c->strat->lenSw[z2];
+          else
+            qal=c->strat->lenS[z2];
+          int new_pos=simple_posInS(c->strat,c->strat->S[z2],qal,c->is_char0);
+          if (new_pos<z2)
+            { 
+              move_forward_in_S(z2,new_pos,c->strat,c->is_char0);
+            }
+        }
+    }
+  for(z2=0;c->expandS[z2];z2++)
+    add_to_reductors(c,c->expandS[z2],pLength(c->expandS[z2]));
+  omfree(c->modifiedS);
+  c->modifiedS=NULL;
+  omfree(c->expandS);
+  c->expandS=NULL;
   Print("%i]",i); 
  //  for(j=0;j<i;j++){
@@ -2421 +2452 @@
   else                     
     pNorm(clear_into);
-    if (new_pos<j){
-      move_forward_in_S(j,new_pos,c->strat,c->is_char0);
-      erg.reduce_by=new_pos;
-    }
+    erg.reduce_by=j;
+    //resort later see diploma thesis, find_in_S must be deterministic during multireduction 
+    //   if (new_pos<j){ 
+    //  move_forward_in_S(j,new_pos,c->strat,c->is_char0);
+    // erg.reduce_by=new_pos;
+    //}
   }
 }
@@ -2643 +2676 @@
     //  qsort(los,losl,sizeof(red_object),red_object_better_gen);
     if(erg.expand)
-      add_to_reductors(c,erg.expand,erg.expand_length);
+      {
+        int i;
+        for(i=0;c->expandS[i];i++);
+        c->expandS=(poly*) omrealloc(c->expandS,(i+2)*sizeof(poly));
+        c->expandS[i+1]=NULL;
+      }
+      //      add_to_reductors(c,erg.expand,erg.expand_length);
   }
   return;

Singular/tgb.h

@@ -92 +92 @@
   kStrategy strat;
   int* T_deg;
+  poly* expandS;
   poly* gcd_of_terms;
   int_pair_node* soon_free;
   sorted_pair_node** apairs;
+  BOOLEAN* modifiedS;
 #ifdef HEAD_BIN
   struct omBin_s*   HeadBin;