Changeset fb0a2c0 in git

Timestamp:

Feb 8, 2007, 2:13:45 PM (17 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

45b750f46db46153c194606edbe187a53309d6dc

Parents:

6968f1f960104183ebb0a3099dc1bd90ce83c771

Message:

*bricken: prepare noro cache for new arithmetic


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

File:

• kernel/tgb.cc (modified) (11 diffs)

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.125 2007-02-08 10:40:18 bricken Exp $ */
+/* $Id: tgb.cc,v 1.126 2007-02-08 13:13:45 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -20 +20 @@
 #include "tgb_internal.h"
 #include "tgbgauss.h"
-#include "F4.h"
+
 #include "digitech.h"
 #include "gring.h"
@@ -2251 +2251 @@
 public:
   poly temp_term;
-#ifndef BUCKETS_FOR_NORO_RED
+#ifdef NORO_RED_ARRAY_RESERVER
   int reserved;
   poly* recursionPolyBuffer;
@@ -2280 +2280 @@
   poly lookup(poly term, BOOLEAN& succ, int & len);
   NoroCache(){
-#ifndef BUCKETS_FOR_NORO_RED
+#ifdef NORO_RED_ARRAY_RESERVER
     reserved=0;
     recursionPolyBuffer=(poly*)omalloc(1000000*sizeof(poly));
@@ -2286 +2286 @@
     temp_term=pOne();
   }
-#ifndef BUCKETS_FOR_NORO_RED
+#ifdef NORO_RED_ARRAY_RESERVER
   poly* reserve(int n){
     poly* res=recursionPolyBuffer+reserved;
@@ -2303 +2303 @@
     }
     p_Delete(&temp_term,currRing);
-#ifndef BUCKETS_FOR_NORO_RED
+#ifdef NORO_RED_ARRAY_RESERVER
     omfree(recursionPolyBuffer);
 #endif
@@ -2360 +2360 @@
 poly noro_red(poly p, int &len, NoroCache* cache,slimgb_alg* c);
 
-poly noro_red_mon(poly t, int &len, BOOLEAN& changed, NoroCache* cache,slimgb_alg* c){
+class MonRedRes{
+public:
+  poly p;
+  number coef;
+  BOOLEAN changed;
+  int len;
+  BOOLEAN onlyBorrowed;
+  bool operator<(const MonRedRes& other) const{
+    int cmp=p_LmCmp(p,other.p,currRing);
+    if ((cmp<0)||((cmp==0)&&((onlyBorrowed)&&(!(other.onlyBorrowed))))){
+      return true;
+    } else return false;
+  }
+};
+
+MonRedRes noro_red_mon(poly t, NoroCache* cache,slimgb_alg* c){
+  MonRedRes res_holder;
   BOOLEAN succ;
   //wrp(t);
-  changed=TRUE;
-  poly cache_lookup=cache->lookup(t,succ, len);//don't own this yet
+  res_holder.changed=TRUE;
+  poly cache_lookup=cache->lookup(t,succ, res_holder.len);//don't own this yet
   if (succ){
     if (cache_lookup==t){
       //know they are equal
-      len=1;
-      changed=FALSE;
-      return t;
+      //res_holder.len=1;
+      
+      res_holder.changed=FALSE;
+      res_holder.p=t;
+      res_holder.coef=npInit(1);
+      res_holder.onlyBorrowed=FALSE;
+      return res_holder;
     }
     poly t_new=ppMult_nn(cache_lookup,pGetCoeff(t));
     p_Delete(&t,c->r);
-    return t_new;
+    //res_holder.len=1;
+    //res_holder.changed=TRUE;
+    res_holder.p=t_new;
+    res_holder.coef=npInit(1);
+    res_holder.onlyBorrowed=FALSE;
+    return res_holder;
+    //return t_new;
   } else {
     unsigned long sev=p_GetShortExpVector(t,currRing);
@@ -2395 +2421 @@
       res=pp_Mult_mm(pNext(c->strat->S[i]),exp_diff,c->r);
 
-      len=c->strat->lenS[i]-1;
-      res=noro_red(res,len,cache,c);
+      res_holder.len=c->strat->lenS[i]-1;
+      res=noro_red(res,res_holder.len,cache,c);
       
       cache->insert(t,res,pLength(res));
@@ -2402 +2428 @@
       //p_Delete(&t_copy_mon,c->r);
       res=pMult_nn(res,coef_bak);
-      return res;
+      res_holder.changed=TRUE;
+      res_holder.p=res;
+      res_holder.coef=npInit(1);
+      res_holder.onlyBorrowed=FALSE;
+      return res_holder;
+
     } else {
       number coef_bak=p_GetCoeff(t,c->r);
       number one=npInit(1);
       p_SetCoeff(t,one,c->r);
-      len=1;
-      cache->insert(t,t,len);
+      res_holder.len=1;
+      cache->insert(t,t,res_holder.len);
       p_SetCoeff(t,coef_bak,c->r);
-      return t;
+      //return t;
+      res_holder.changed=FALSE;
+      res_holder.p=t;
+      
+      res_holder.coef=npInit(1);
+      res_holder.onlyBorrowed=FALSE;
+      return res_holder;
     }
   }
@@ -2440 +2477 @@
     return NULL;
   }
-  if (len==1){
-    BOOLEAN changed;
-    return noro_red_mon(p,len,changed,cache,c);
-  }
+
   #ifdef BUCKETS_FOR_NORO_RED
   kBucket_pt bucket=kBucketCreate(currRing);
@@ -2461 +2495 @@
     pIter(p);
     pNext(t)=NULL;
-    int l;
+    //int l;
     //poly reference=p_Head(t,c->r);
-    BOOLEAN changed;
-    t=noro_red_mon(t,l,changed,cache,c);
-    if (!(changed)){
+    //BOOLEAN changed;
+    MonRedRes red=noro_red_mon(t,cache,c);
+    if (!(red.changed)){
       unchanged_size++;
       if (unchanged_head){
-        pNext(unchanged_tail)=t;
+        pNext(unchanged_tail)=red.p;
         pIter(unchanged_tail);
       } else{
-        unchanged_tail=t;
-        unchanged_head=t;
+        unchanged_tail=red.p;
+        unchanged_head=red.p;
       }
     } else{
-      assume(l==pLength(t));
+      assume(red.len==pLength(red.p));
 #ifdef BUCKETS_FOR_NORO_RED
-      kBucket_Add_q(bucket,t,&l);
+      kBucket_Add_q(bucket,red.p,&red.len);
 #else
-     pre_buckets[pos++]=t;
+     pre_buckets[pos++]=red.p;
 #endif
     }