Changeset 7256f9 in git

Timestamp:

Dec 31, 2002, 5:17:23 PM (21 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

4acd2ae5f31c7fb017f79de4a8163ed7529916c9

Parents:

a202ed4f9ad4e4c56871df569f5ae0a8d7f250d5

Message:

+ bugfixing


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

File:

• Singular/tgb.cc (modified) (2 diffs)

Singular/tgb.cc

@@ -5 +5 @@
 
 #include "tgb.h"
+static int posInPairs (sorted_pair_node**  p, int pn, sorted_pair_node* qe,calc_dat* c,int an=0)
+{
+  if(pn==0) return 0;
+
+  int length=pn-1;
+  int i;
+  //int an = 0;
+  int en= length;
+
+  if (pair_better(qe,p[en],c))
+    return length+1;
+
+  while(1)
+    {
+      //if (an >= en-1)
+      if(en-1<=an)
+      {
+        if (pair_better(p[an],qe,c)) return an;
+        return en;
+      }
+      i=(an+en) / 2;
+        if (pair_better(p[i],qe,c))
+          en=i;
+      else an=i;
+    }
+}
+sorted_pair_node**  merge(sorted_pair_node** p, int pn,sorted_pair_node **q, int qn,calc_dat* c){
+  int i;
+  int* a= (int*) omalloc(qn*sizeof(int));
+  
+  int lastpos=0;
+  for(i=0;i<qn;i++){
+    lastpos=posInPairs(p,pn-1,q[i],c, max(lastpos-1,0));
+    //   cout<<lastpos<<"\n";
+    a[i]=lastpos;
+
+  }
+  p=(sorted_pair_node**) realloc(p,(pn+qn)*sizeof(sorted_pair_node*));
+  for(i=qn-1;i>=0;i--){
+    size_t size;
+    if(qn-1>i)
+      size=(a[i+1]-a[i])*sizeof(sorted_pair_node*);
+    else
+      size=(pn-a[i])*sizeof(sorted_pair_node*); //as indices begin with 0
+    memmove (p+a[i]+(1+i), p+a[i], size);
+    p[a[i]+i]=q[i];
+  }
+  omfree(a);
+  return p;
+}
 static BOOLEAN trivial_syzygie(int pos1,int pos2,poly bound,calc_dat* c){
 
@@ -2054 +2104 @@
   omfree(c->lengths);
   printf("calculated %d NFs\n",c->normal_forms);
+  I=c->S;
+  IDELEMS(I)=c->n;
   omfree(c);
+  
   return(I);
 }