Changeset 4f006f in git

Timestamp:

Mar 2, 2003, 9:14:04 AM (20 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

6cf1919180db9e6de9ce32ce1d9103622b929d39

Parents:

d6f4d943dc9e5df16732b62b38b67a0be4f90de3

Message:

* bricken: new structures, cleaning


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

Location:

Singular

Files:

• tgb.cc (modified) (5 diffs)
• tgb.h (modified) (2 diffs)

Singular/tgb.cc

@@ -1265 +1265 @@
     buf[i].p=h;
     buf[i].sev=pGetShortExpVector(h);
+    buf[i].sum=NULL;
     buf[i].bucket = kBucketCreate(currRing);
     kBucketInit(buf[i].bucket,buf[i].p,len);
@@ -1543 +1544 @@
 ideal t_rep_gb(ring r,ideal arg_I){
    Print("Idelems %i \n----------\n",IDELEMS(arg_I));
-  ideal I_temp=idCopy(arg_I); //kInterRed(arg_I);
-  ideal I=idCompactify(I_temp);
+  ideal I=idCompactify(arg_I);
   qsort(I->m,IDELEMS(I),sizeof(poly),poly_crit);
-  idDelete(&I_temp);
   Print("Idelems %i \n----------\n",IDELEMS(I));
   calc_dat* c=(calc_dat*) omalloc(sizeof(calc_dat));
@@ -1555 +1554 @@
   while(c->pair_top>=0)
     go_on(c);
-   omfree(c->rep);
+
   for(int z=0;z<c->n;z++){
     omfree(c->states[z]);
@@ -1575 +1574 @@
   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);
-  I=c->S;
+  int deleted_form_c_s=0;
+
+  for(i=0;i<c->n;i++){
+    if (c->rep[i]!=i){
+      for(int j=0;j<=c->strat->sl;j++){
+        if(c->strat->S[j]==c->S->m[i]){
+          c->strat->S[j]=NULL;
+          break;
+        }
+      }
+      PrintS("R_delete");
+      pDelete(&c->S->m[i]);
+    }
+  }
+  for(i=0;i<=c->strat->sl;i++){
+    if (!c->strat->S[i]) continue;
+    BOOLEAN found=FALSE;
+    for(int j=0;j<c->n;j++){
+      if (c->S->m[j]==c->strat->S[i]){
+        found=TRUE;
+        break;
+      }
+    }
+    if(!found) pDelete(&c->strat->S[i]);
+  }
+  omfree(c->rep);
+    I=c->S;
   IDELEMS(I)=c->n;
+
+  idSkipZeroes(c->S);
+  
+
   omfree(c);
 
@@ -2317 +2346 @@
   return;
 }
+void red_object::flatten(){
+  if (sum!=NULL)
+  {
+
+ 
+    if(kBucketGetLm(sum->ac->bucket)!=NULL){
+      number mult_my=n_Mult(sum->c_my,sum->ac->multiplied,currRing);
+      poly add_this;
+      if(!nIsOne(mult_my))
+        kBucket_Mult_n(bucket,mult_my);
+      int len;
+      poly clear_into;
+      kBucketClear(sum->ac->bucket,&clear_into,&len);
+      if(sum->ac->counter>1){
+        add_this=pCopy(clear_into);
+        kBucketInit(bucket,clear_into,len);
+      }
+      else
+        add_this=clear_into;
+      pMult_nn(add_this, sum->c_ac);
+      nDelete(&sum->c_ac);
+      nDelete(&sum->c_my);
+      nDelete(&mult_my);
+      delete sum;
+      kBucket_Add_q(bucket,add_this, &len);
+      sum->ac->decrease_counter();
+      
+    }
+  }
+}
+void red_object::validate(){
+  if(sum!=NULL)
+  {
+    poly lm=kBucketGetLm(bucket);
+    poly lm_ac=kBucketGetLm(sum->ac->bucket);
+    if ((lm_ac==NULL)||((lm!=NULL) && (pLmCmp(lm,lm_ac)!=-1))){
+      flatten();
+      p=kBucketGetLm(bucket);
+    } 
+    else
+    {
+      p=lm_ac;
+    }
+    
+  }
+  else
+    p=kBucketGetLm(bucket);
+
+}

Singular/tgb.h

@@ -29 +29 @@
 
 
+class reduction_accumulator{
+ public:
+  number multiplied;
+  kBucket_pt bucket;
+  int counter;
+  void decrease_counter(){
+    if((--counter)==0)
+      {
+        nDelete(&multiplied);
+        kBucketDeleteAndDestroy(&bucket);
+        delete this; //self destruction
+      }
+  }
+  
+};
+struct formal_sum_descriptor{
+  number c_my;
+  number c_ac;
+  reduction_accumulator* ac;
+};
 struct int_pair_node{
   int_pair_node* next;
@@ -34 +54 @@
   int b;
 };
-struct red_object{
+class red_object{
+ public:
   kBucket_pt bucket;
   poly p;
+  formal_sum_descriptor* sum;
   unsigned long sev;
+  void flatten();
+  void validate();
 };
 struct sorted_pair_node{