Changeset b9bb88 in git

Timestamp:

Dec 31, 2013, 3:27:27 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

78de0188f3b8151d0749417a0074675a9602c017

Parents:

e86e21bda42dff533a74d4741008e9bde372d619cd5b0fe0695b0fbe98f020435d935066ea3a5e8a

Message:

Merge pull request #465 from ederc/min-sba

sba returns SB minimal possible without adding too much overhead

Files:

• doc/reference.doc (modified) (previous)
• kernel/kstd2.cc (modified) (5 diffs)
• kernel/kutil.h (modified) (1 diff)

kernel/kstd2.cc

@@ -1686 +1686 @@
 #endif
 #if SBA_PRINT_SIZE_G
-  long size_g                   = 0;
+  int size_g                    = 0;
+  int size_g_non_red            = 0;
 #endif
 #if SBA_PRINT_SIZE_SYZ
@@ -2292 +2293 @@
   else if (TEST_OPT_PROT) PrintLn();
 
-#if SBA_PRINT_SIZE_G
-  size_g   = strat->sl+1;
-#endif
 #if SBA_PRINT_SIZE_SYZ
   // that is correct, syzl is counting one too far
@@ -2317 +2315 @@
 #endif /* MYTEST */
 #endif /* KDEBUG */
-  // using F5C it is possible that there is some data stored in the last
-  // entries of strat->Shdl which are dirty, i.e. not correct, but also not NULL
-  // => we need to delete them before return the ideal
-#if F5C
-  for(int i=strat->sl+1;i<IDELEMS(strat->Shdl);i++)
-  {
-    //pDelete (&strat->Shdl->m[i]);
-    strat->Shdl->m[i] = NULL;
-  }
+#if SBA_PRINT_SIZE_G
+  size_g_non_red  = IDELEMS(strat->Shdl);
 #endif
   if ((strat->sbaOrder == 1 || strat->sbaOrder == 3) && sRing!=currRingOld)
@@ -2334 +2325 @@
     rDelete (sRing);
   }
+  id_DelDiv(strat->Shdl, currRing);
+  idSkipZeroes(strat->Shdl);
   idTest(strat->Shdl);
 
+#if SBA_PRINT_SIZE_G
+  size_g   = IDELEMS(strat->Shdl);
+#endif
 #ifdef DEBUGF5
   printf("SIZE OF SHDL: %d\n",IDELEMS(strat->Shdl));
@@ -2378 +2374 @@
 #if SBA_PRINT_SIZE_G
   printf("----------------------------------------------------------\n");
-  printf("SIZE OF G:                  %ld\n",size_g);
-  size_g  = 0;
+  printf("SIZE OF G:                  %d / %d\n",size_g,size_g_non_red);
+  size_g          = 0;
+  size_g_non_red  = 0;
 #endif
 #if SBA_PRINT_SIZE_SYZ

kernel/kutil.h

@@ -180 +180 @@
 public:
   unsigned long sev;
-  unsigned long from; // index in sig up to which the correspongin LObject was already checked
   unsigned long checked; // this is the index of S up to which
                       // the corresponding LObject was already checked in