Changeset 634b60 in git

Timestamp:

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

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

aa9fb6f8881d66822a503d2cb47d89c6add6be24

Parents:

c2c418bf9e9970a136f359e9c9c80e43741188fc

Message:

* bricken: adding additional reductors feature to multired


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

Location:

Singular

Files:

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

Singular/tgb.cc

@@ -7 +7 @@
 //       "e"
 //       multiple rings
+//       shorten_tails und dessen Aufrufe pruefen wlength!!!
 #include "tgb.h"
 #define OM_KEEP 0
@@ -680 +681 @@
   h=omalloc(n*sizeof(char*));
   c->states=(char**) h;
-  
-  c->deg=(int **) omalloc(n*sizeof(int*));
   h=omalloc(n*sizeof(int));
   c->lengths=(int*) h;
@@ -822 +821 @@
   c->gcd_of_terms=(poly*) omrealloc(c->gcd_of_terms, c->n *sizeof(poly));
   c->gcd_of_terms[i]=gcd_of_terms(h,c->r);
-  c->deg=(int**) omrealloc(c->deg, c->n * sizeof(int*));
   c->rep[i]=i;
   hp=omalloc(i*sizeof(char));
@@ -830 +828 @@
     exit(1);
   }
-  c->deg[i]=(int*) omalloc(i*sizeof(int));
   hp=omrealloc(c->S->m,c->n*sizeof(poly));
   if (hp!=NULL){
@@ -840 +837 @@
   c->short_Exps[i]=p_GetShortExpVector(h,c->r);
   for (j=0;j<i;j++){
-    c->deg[i][j]=pLcmDeg(c->S->m[i],c->S->m[j]);
     if (c->rep[j]==j){
       //check product criterion
@@ -1565 +1561 @@
   omfree(c->states);
   omfree(c->lengths);
+
+
+  omfree(c->short_Exps);
+  omfree(c->T_deg);
+  int i;
+  for(i=0;i<c->n;i++){
+    if(c->gcd_of_terms[i])
+      pDelete(&(c->gcd_of_terms[i]));
+  }
+  omfree(c->gcd_of_terms);
+
+  omfree(c->apairs);
   printf("calculated %d NFs\n",c->normal_forms);
   printf("applied %i product crit, %i extended_product crit \n", c->easy_product_crit, c->extended_product_crit);
@@ -1904 +1912 @@
 struct find_erg{
   poly expand;
+  int expand_length;
   int to_reduce_u;
   int to_reduce_l;
@@ -1954 +1963 @@
     {
       if (erg.to_reduce_u>erg.to_reduce_l){
+
         int i;
         int quality_a=quality_of_pos_in_strat_S(erg.reduce_by,c);
@@ -1974 +1984 @@
         }
       }
+      else 
+      {
+        assume(erg.to_reduce_u==erg.to_reduce_l);
+        int quality_a=quality_of_pos_in_strat_S(erg.reduce_by,c);
+        int qc=guess_quality(los[erg.to_reduce_u],c);
+        if(qc<quality_a){
+          BOOLEAN exp=FALSE;
+          if(qc<=2)
+            exp=TRUE;
+          else {
+            if (qc<quality_a/2)
+              exp=TRUE;
+            else
+              if(erg.reduce_by<c->n/4)
+                exp=TRUE;
+          }
+          if (exp){
+            poly clear_into;
+            
+            kBucketClear(los[erg.to_reduce_u].bucket,&clear_into,&erg.expand_length);
+            erg.expand=pCopy(clear_into);
+            kBucketInit(los[erg.to_reduce_u].bucket,clear_into,erg.expand_length);
+            PrintS("e");
+            
+          }
+        }
+
+        
+      }
+      
       swap_roles=FALSE;
       return;
@@ -2270 +2310 @@
 //   sort_region_down(los, 0, losl-1, c);
     //  qsort(los,losl,sizeof(red_object),red_object_better_gen);
+    if(erg.expand)
+      add_to_reductors(c,erg.expand,erg.expand_length);
   }
   return;

Singular/tgb.h

@@ -65 +65 @@
   long* short_Exps;
   kStrategy strat;
-  int** deg;
   int* T_deg;
   poly* gcd_of_terms;