Changeset 518fb78 in git

Timestamp:

May 12, 2005, 3:42:01 PM (19 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

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

Children:

7c91e4020056a642ec07b90ee816bd1c0e948ecc

Parents:

accd6a78454959d4d30cfd2c78391dbc8490b47a

Message:

*bricken: cleaning


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

Location:

kernel

Files:

• tgb.cc (modified) (4 diffs)
• tgb_obsolete.cc (modified) (1 diff)

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.22 2005-05-12 09:19:43 bricken Exp $ */
+/* $Id: tgb.cc,v 1.23 2005-05-12 13:42:00 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -389 +389 @@
 }
 
-#if 0 
-int find_best(red_object* r,int l, int u, int &w, calc_dat* c){
-
-  int sz=u-l+1;
-  int n=sz/10+1;
-  int filled=0;
-  int* indizes=(int*) omalloc(n*sizeof(int));
-  int* weight=(int*) omalloc(n*sizeof(int));
-  int worst=-1;
-  int i;  
-  for(i=l;i<=u;i++){
-    int q=r[i].guess_quality(c);
-    if ((filled<n)||(q<worst)){
-      if(filled<n){
-        worst=si_max(q,worst);
-        indizes[filled]=i;
-        weight[filled]=q;
-        filled++;
-      }
-    }
-    else{
-      int j;
-      for(j=0;j<filled;j++){
-        if (worst==weight[j]){
-          weight[j]=q;
-          indizes[j]=i;
-        }
-      }
-      worst=-1;
-      for(j=0;j<filled;j++){
-        if (worst<weight[j]){
-          worst=weight[j];
-        }
-      }
-    }
-  }
-  assume(filled==n);
-  int pos=0;
-
-  for(i=0;i<filled;i++){  
-    r[indizes[i]].canonicalize();
-    weight[i]=r[indizes[i]].guess_quality(c);
-    if(weight[i]<weight[pos]) pos=i;
-  }
-  w=weight[pos];
-  pos=indizes[pos];
-
-  omfree(indizes);
-  omfree(weight);
-
-  assume(w==r[pos].guess_quality(c));
-  assume(l<=pos);
-  assume(u>=pos);
-  return pos;
-  
-}
-
-#endif
+
 void red_object::canonicalize(){
   kBucketCanonicalize(bucket);
@@ -1181 +1124 @@
 
 
-#if 0
-static poly redNF (poly h,kStrategy strat)
-{
-  int j = 0;
-  int z = 3;
-  unsigned long not_sev;
-
-  if (0 > strat->sl)
-  {
-    return h;
-  }
-  not_sev = ~ pGetShortExpVector(h);
-  loop
-    {
-      if (pLmShortDivisibleBy(strat->S[j], strat->sevS[j], h, not_sev))
-      {
-        //if (strat->interpt) test_int_std(strat->kIdeal);
-        /*- compute the s-polynomial -*/
-#ifdef KDEBUG
-        if (TEST_OPT_DEBUG)
-        {
-          
-          PrintS("red:");
-          wrp(h);
-          PrintS(" with ");
-          wrp(strat->S[j]);
-        }
-#endif
-        h = ksOldSpolyRed(strat->S[j],h,strat->kNoether);
-#ifdef KDEBUG
-        if (TEST_OPT_DEBUG)
-        {
-          PrintS("\nto:");
-          wrp(h);
-          PrintLn();
-        }
-#endif
-        if (h == NULL) return NULL;
-        z++;
-        if (z>=10)
-        {
-          z=0;
-          pNormalize(h);
-        }
-        /*- try to reduce the s-polynomial -*/
-        j = 0;
-        not_sev = ~ pGetShortExpVector(h);
-      }
-      else
-      {
-        if (j >= strat->sl) return h;
-        j++;
-      }
-    }
-}
-#else
 
 static poly redNF2 (poly h,calc_dat* c , int &len, number&  m,int n)
@@ -1778 +1665 @@
     }
 }
-#endif
+
 #ifdef REDTAIL_S
 

kernel/tgb_obsolete.cc

@@ -1 +1 @@
 #include "tgb_internal.h"
+int find_best(red_object* r,int l, int u, int &w, calc_dat* c){
+
+  int sz=u-l+1;
+  int n=sz/10+1;
+  int filled=0;
+  int* indizes=(int*) omalloc(n*sizeof(int));
+  int* weight=(int*) omalloc(n*sizeof(int));
+  int worst=-1;
+  int i;  
+  for(i=l;i<=u;i++){
+    int q=r[i].guess_quality(c);
+    if ((filled<n)||(q<worst)){
+      if(filled<n){
+        worst=si_max(q,worst);
+        indizes[filled]=i;
+        weight[filled]=q;
+        filled++;
+      }
+    }
+    else{
+      int j;
+      for(j=0;j<filled;j++){
+        if (worst==weight[j]){
+          weight[j]=q;
+          indizes[j]=i;
+        }
+      }
+      worst=-1;
+      for(j=0;j<filled;j++){
+        if (worst<weight[j]){
+          worst=weight[j];
+        }
+      }
+    }
+  }
+  assume(filled==n);
+  int pos=0;
+
+  for(i=0;i<filled;i++){  
+    r[indizes[i]].canonicalize();
+    weight[i]=r[indizes[i]].guess_quality(c);
+    if(weight[i]<weight[pos]) pos=i;
+  }
+  w=weight[pos];
+  pos=indizes[pos];
+
+  omfree(indizes);
+  omfree(weight);
+
+  assume(w==r[pos].guess_quality(c));
+  assume(l<=pos);
+  assume(u>=pos);
+  return pos;
+  
+}
+static poly redNF (poly h,kStrategy strat)
+{
+  int j = 0;
+  int z = 3;
+  unsigned long not_sev;
+
+  if (0 > strat->sl)
+  {
+    return h;
+  }
+  not_sev = ~ pGetShortExpVector(h);
+  loop
+  {
+    if (pLmShortDivisibleBy(strat->S[j], strat->sevS[j], h, not_sev))
+    {
+        //if (strat->interpt) test_int_std(strat->kIdeal);
+      /*- compute the s-polynomial -*/
+#ifdef KDEBUG
+        if (TEST_OPT_DEBUG)
+{
+          
+  PrintS("red:");
+  wrp(h);
+  PrintS(" with ");
+  wrp(strat->S[j]);
+}
+#endif
+        h = ksOldSpolyRed(strat->S[j],h,strat->kNoether);
+#ifdef KDEBUG
+        if (TEST_OPT_DEBUG)
+{
+  PrintS("\nto:");
+  wrp(h);
+  PrintLn();
+}
+#endif
+        if (h == NULL) return NULL;
+        z++;
+        if (z>=10)
+{
+  z=0;
+  pNormalize(h);
+}
+        /*- try to reduce the s-polynomial -*/
+        j = 0;
+        not_sev = ~ pGetShortExpVector(h);
+    }
+    else
+{
+  if (j >= strat->sl) return h;
+  j++;
+}
+  }
+}
 static sorted_pair_node** add_to_basis(poly h, int i_pos, int j_pos,calc_dat* c, int* ip)
 {