Changeset ca086f in git

Timestamp:

Feb 17, 2006, 11:26:38 AM (17 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

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

Children:

ad6ad248b17525d3c24a305a72c5bc48027f3a32

Parents:

03f3269a5d14c3b22852ee7da5f71f27c6e017fb

Message:

*bricken: bit reductions


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

Location:

kernel

Files:

• digitech.cc (modified) (2 diffs)
• digitech.h (modified) (1 diff)
• tgb_internal.h (modified) (3 diffs)

kernel/digitech.cc

@@ -3 +3 @@
 #include "ideals.h"
 static ideal zero_ideal;
+#if 1
 void bit_reduce(poly & f,ring r){
   poly p=f;
@@ -31 +32 @@
   f=erg;
 }
+#else
+
+
+
+void do_bit_reduce(poly f, kBucket_pt bucket){
+    ring r=bucket->bucket_ring;
+    int p=rChar(r);
+    int max=rVar(r);
+    while (f!=NULL)
+        {
+            // int len=0;
+//             poly erg;
+//             kBucketClear(bucket,&erg, &len);
+//             kBucketDestroy(&bucket);
+//             return erg;
+            //return;
+        //}
+    
+    BOOLEAN changed=FALSE;
+    poly next=pNext(f);
+    pNext(f)=NULL;
+    int i;
+    for(i=1;i<=max;i++){
+      unsigned long exp;
+      while((exp=p_GetExp(f,i,r))>=p){
+               p_SetExp(f,i,exp-p+1,r);
+               changed=TRUE;
+      }
+    }
+    
+    if (changed) {
+        p_Setm(f,r);
+        
+        int pseudo_len=0;
+        kBucket_Add_q(bucket,f,&pseudo_len);
+        //do_bit_reduce(next,bucket);
+    } else {
+        //do_bit_reduce(next,bucket);
+        int pseudo_len=0;
+        kBucket_Add_q(bucket,f,&pseudo_len);
+        
+    }
+    f=next;
+    }
+}
+poly do_bitreduce(poly f, ring r){
+  poly erg=NULL;
+  poly *append_to=&erg;
+  int p=rChar(r);
+  int max=rVar(r);
+  kBucket_pt bucket= kBucketCreate(r);
+  kBucketInit(bucket,NULL,0 /*pLength(P.p)*/);
+  while(f!=NULL){
+    BOOLEAN changed=FALSE;
+    poly next=pNext(f);
+    pNext(f)=NULL;
+    assume(pNext(f)==NULL);
+    int i;
+    for(i=1;i<=max;i++){
+      unsigned long exp;
+      while((exp=p_GetExp(f,i,r))>=p){
+               p_SetExp(f,i,exp-p+1,r);
+               changed=TRUE;
+      }
+    }
+    if (changed) {
+        p_Setm(f,r);
+        int pseudo_len=0;
+        kBucket_Add_q(bucket,f,&pseudo_len);
+    } else {
+        (*append_to)=f;
+        append_to=&(pNext(f));
+    }
+    f=next;
+  }
+  {
+    int pseudo_len=0;
+    kBucket_Add_q(bucket,erg,&pseudo_len);
+    pseudo_len=0;
+    kBucketClear(bucket,&erg,&pseudo_len);
+  }
+    return erg;
+}
+void bit_reduce2(poly & f,ring r){
+  if (f==NULL) return;
+  if (pNext(f)==NULL){
+    int p=rChar(r);
+    int max=rVar(r);
+    BOOLEAN changed=FALSE;
+    poly next=pNext(f);
+    assume(pNext(f)==NULL);
+    int i;
+    for(i=1;i<=max;i++){
+      unsigned long exp;
+      while((exp=p_GetExp(f,i,r))>=p){
+               p_SetExp(f,i,exp-p+1,r);
+               changed=TRUE;
+      }
+    }
+    if (changed)
+        p_Setm(f,r);
+    return;
+  }
+  // kBucket_pt bucket= kBucketCreate(r);
+//   kBucketInit(bucket,NULL,0 /*pLength(P.p)*/);
+//   do_bit_reduce(f,bucket);
+//   int len=0;
+//   kBucketClear(bucket,&f, &len);
+//   kBucketDestroy(&bucket);
+    f=do_bitreduce(f,r);
+  
+}
+void bit_reduce1(poly & f,ring r){
+  if (f==NULL) return;
+
+  
+  if (pNext(f)==NULL){
+    int p=rChar(r);
+    int max=rVar(r);
+    BOOLEAN changed=FALSE;
+    poly next=pNext(f);
+    assume(pNext(f)==NULL);
+    int i;
+    for(i=1;i<=max;i++){
+      unsigned long exp;
+      while((exp=p_GetExp(f,i,r))>=p){
+               p_SetExp(f,i,exp-p+1,r);
+               changed=TRUE;
+      }
+    }
+    if (changed)
+        p_Setm(f,r);
+    return;
+  }
+  kBucket_pt bucket= kBucketCreate(r);
+  kBucketInit(bucket,NULL,0 /*pLength(P.p)*/);
+  do_bit_reduce(f,bucket);
+  int len=0;
+  kBucketClear(bucket,&f, &len);
+  kBucketDestroy(&bucket);
+  
+}
+// void bit_reduce_arg(poly & f,ring r){
+//   kBucket_pt bucket= kBucketCreate(r);
+//   kBucketInit(bucket,NULL,0 /*pLength(P.p)*/);
+//   f=do_bit_reduce(f,bucket);
+// }
+#endif
+
 poly uni_subst_bits(poly outer_uni, poly inner_multi, ring r){
   zero_ideal=idInit(0,1);

kernel/digitech.h

@@ -3 +3 @@
 #include "mod2.h"
 #include "polys.h"
+void bit_reduce(poly & f,ring r);
 poly uni_subst_bits(poly outer_uni, poly inner_multi, ring r);
 #endif

kernel/tgb_internal.h

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb_internal.h,v 1.21 2005-12-08 09:00:20 bricken Exp $ */
+/* $Id: tgb_internal.h,v 1.22 2006-02-17 10:26:35 bricken Exp $ */
 /*
  * ABSTRACT: tgb internal .h file
@@ -88 +88 @@
     virtual ~slimgb_alg();
   char** states;
+  ideal add_later;
   ideal S;
   ring r;
@@ -185 +186 @@
 static poly kBucketGcd(kBucket* b, ring r);
 static void multi_reduction(red_object* los, int & losl, slimgb_alg* c);
+
 sorted_pair_node* quick_pop_pair(slimgb_alg* c);
 sorted_pair_node* top_pair(slimgb_alg* c);