Changeset 625767 in git

Timestamp:

May 16, 2006, 10:38:39 AM (17 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

b8b01af0e7839f5203fa9378d74dad8732160032

Parents:

45c9af467659b9010e2fc67a7cb8da665abaf595

Message:

* bricken: + syz_comp support


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

Location:

kernel

Files:

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

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.87 2006-05-07 06:16:01 bricken Exp $ */
+/* $Id: tgb.cc,v 1.88 2006-05-16 08:38:39 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -1230 +1230 @@
 
 #undef ENLARGE
+  if (p_GetComp(h,currRing)<=c->syz_comp){
   for (j=0;j<i;j++){
 
@@ -1346 +1347 @@
   //}
   }
-
+  }//if syz_comp end
+  
+  
+  
+  
   assume(spc<=i);
   //now ideal quotient crit
@@ -2091 +2096 @@
   return 0;
 }
-slimgb_alg::slimgb_alg(ideal I, BOOLEAN F4){
-
-
+slimgb_alg::slimgb_alg(ideal I, int syz_comp,BOOLEAN F4){
+
+  this->syz_comp=syz_comp;
   r=currRing;
   nc=rIsPluralRing(r);
@@ -2360 +2365 @@
   {
     assume(c->S->m[i]!=NULL);
+    if (p_GetComp(c->S->m[i],currRing)>this->syz_comp) continue;
     for(j=0;j<c->n;j++)
     {
@@ -2393 +2399 @@
   delete c->strat;
 }
-ideal t_rep_gb(ring r,ideal arg_I, BOOLEAN F4_mode){
+ideal t_rep_gb(ring r,ideal arg_I, int syz_comp, BOOLEAN F4_mode){
 
   //  Print("QlogSize(0) %d, QlogSize(1) %d,QlogSize(-2) %d, QlogSize(5) %d\n", QlogSize(nlInit(0)),QlogSize(nlInit(1)),QlogSize(nlInit(-2)),QlogSize(nlInit(5)));
-
+  
   if (TEST_OPT_PROT)
     if (F4_mode)
@@ -2417 +2423 @@
   //Print("Idelems %i \n----------\n",IDELEMS(I));
   //slimgb_alg* c=(slimgb_alg*) omalloc(sizeof(slimgb_alg));
-  slimgb_alg* c=new slimgb_alg(I, F4_mode);
+  //int syz_comp=arg_I->rank;
+  slimgb_alg* c=new slimgb_alg(I, syz_comp,F4_mode);
 
 

kernel/tgb.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.h,v 1.8 2005-10-19 16:10:19 Singular Exp $ */
+/* $Id: tgb.h,v 1.9 2006-05-16 08:38:39 bricken Exp $ */
 /*
 * ABSTRACT: trepgb interface
@@ -19 +19 @@
 
 
-ideal t_rep_gb(ring r,ideal arg_I, BOOLEAN F4_mode=FALSE);
+ideal t_rep_gb(ring r,ideal arg_I, int syz_comp, BOOLEAN F4_mode=FALSE);
 #endif

kernel/tgb_internal.h

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb_internal.h,v 1.37 2006-05-07 06:18:00 bricken Exp $ */
+/* $Id: tgb_internal.h,v 1.38 2006-05-16 08:38:39 bricken Exp $ */
 /*
  * ABSTRACT: tgb internal .h file
@@ -94 +94 @@
 {
   public:
-    slimgb_alg(ideal I, BOOLEAN F4);
+    slimgb_alg(ideal I, int syz_comp,BOOLEAN F4);
     virtual ~slimgb_alg();
   #ifndef HAVE_BOOST
@@ -135 +135 @@
   int n;
   //! array_lengths should be greater equal n;
+  int syz_comp;
   int array_lengths; 
   int normal_forms;