Changeset 6e08ad in git

Timestamp:

Oct 25, 2006, 12:14:52 PM (17 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

8b48b5a41556648b08b6d0a32b5fdbf5a745a2c7

Parents:

e342a22d0f3f98d574c9053d05566bc4cee91dd9

Message:

+ improved initialization process


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

Location:

kernel

Files:

• tgb.cc (modified) (7 diffs)
• tgb_internal.h (modified) (2 diffs)

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.103 2006-10-17 06:48:43 bricken Exp $ */
+/* $Id: tgb.cc,v 1.104 2006-10-25 10:14:51 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -1553 +1553 @@
   {
       int dummy=strat->sl;
-      j=kFindDivisibleByInS(strat,&dummy,&P);
+      j=kFindDivisibleByInS_easy(strat,P.p,P.sev);
+      //j=kFindDivisibleByInS(strat,&dummy,&P);
       if ((j>=0) && ((!n)||
         ((strat->lenS[j]<=n) &&
@@ -2160 +2161 @@
   return 0;
 }
+void slimgb_alg::introduceDelayedPairs(poly* pa,int s){
+        if (s==0) return;
+        sorted_pair_node** si_array=(sorted_pair_node**) omalloc(s* sizeof(sorted_pair_node*));
+        
+        for( unsigned int i = 0; i < s; i++ )
+        {
+                sorted_pair_node* si=(sorted_pair_node*) omalloc(sizeof(sorted_pair_node));
+                si->i=-1;
+                si->j=-2;
+                poly p=pa[i];
+                simplify_poly(p,r);
+                si->expected_length=pQuality(p,this,pLength(p));
+                si->deg=pTotaldegree_full(p);
+                if (!rField_is_Zp(r)){
+                  pCleardenom(p);
+                }
+                si->lcm_of_lm=p;
+
+                //      c->apairs[n-1-i]=si;
+                si_array[i]=si;
+                
+  }
+        
+  qsort(si_array,s,sizeof(sorted_pair_node*),tgb_pair_better_gen2);
+        apairs=spn_merge(apairs,pair_top+1,si_array,s,this);
+  pair_top+=s;
+}
 slimgb_alg::slimgb_alg(ideal I, int syz_comp,BOOLEAN F4){
   completed=FALSE;
@@ -2290 +2318 @@
   if(!(F4_mode))
   {
+                poly* array_arg=I->m;
+                array_arg++;
+                introduceDelayedPairs(array_arg,n-1);
+                /*
     for (i=1;i<n;i++)//the 1 is wanted, because first element is added to basis
     {
@@ -2306 +2338 @@
       apairs[n-i-1]=si;
       ++(pair_top);
-    }
+    }*/
   }
   else
@@ -3399 +3431 @@
 
 
-  sorted_pair_node** pairs=(sorted_pair_node**)
-    omalloc(delay_s*sizeof(sorted_pair_node*));
+  //sorted_pair_node** pairs=(sorted_pair_node**)
+  //  omalloc(delay_s*sizeof(sorted_pair_node*));
+  c->introduceDelayedPairs(delay,delay_s);
+  /*
   for(i=0;i<delay_s;i++){
 
@@ -3423 +3457 @@
   qsort(pairs,delay_s,sizeof(sorted_pair_node*),tgb_pair_better_gen2);
   c->apairs=spn_merge(c->apairs,c->pair_top+1,pairs,delay_s,c);
-  c->pair_top+=delay_s;
+  c->pair_top+=delay_s;*/
   omfree(delay);
-  omfree(pairs);
+  //omfree(pairs);
   return;
 }

kernel/tgb_internal.h

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb_internal.h,v 1.44 2006-07-07 10:17:04 bricken Exp $ */
+/* $Id: tgb_internal.h,v 1.45 2006-10-25 10:14:52 bricken Exp $ */
 /*
  * ABSTRACT: tgb internal .h file
@@ -101 +101 @@
   public:
     slimgb_alg(ideal I, int syz_comp,BOOLEAN F4);
+                void introduceDelayedPairs(poly* pa,int s);
     virtual ~slimgb_alg();
 #ifndef HAVE_BOOST