Changeset 0bce291 in git

Timestamp:

Jan 14, 2003, 2:51:39 PM (21 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9dae4f015d0bb4c669b1bfdac5ecbc3ecaf949b8

Parents:

990feedb5484f38fbd5aa2fc693a21538b5f3f8d

Message:

*bricken: total degree instead of pFDeg


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

File:

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

Singular/tgb.cc

@@ -196 +196 @@
   pLcm(c->S->m[i], c->S->m[j], lm);
   pSetm(lm);
-  int deciding_deg= pFDeg(lm);
+  int deciding_deg= pTotaldegree(lm);
   int* i_con =make_connections(i,j,lm,c);
   p_Delete(&lm,c->r);
@@ -454 +454 @@
   pLcm(c->S->m[i], c->S->m[j], lm);
   pSetm(lm);
-  int deciding_deg= pFDeg(lm);
+  int deciding_deg= pTotaldegree(lm);
   int* i_con =make_connections(i,j,lm,c);
   int z=0;
@@ -481 +481 @@
   pSetm(lm);
   poly short_s;
-  curr_deg=pFDeg(lm);
+  curr_deg=pTotaldegree(lm);
   int_pair_node* last=NULL;
 
@@ -488 +488 @@
       pLcm(c->S->m[i_con[m]], c->S->m[j_con[n]], lm);
       pSetm(lm);
-      if (pFDeg(lm)>=deciding_deg)
+      if (pTotaldegree(lm)>=deciding_deg)
       {
         soon_t_rep(i_con[m],j_con[n],c);
@@ -531 +531 @@
       }
 #endif
-      int comp_deg(pFDeg(short_s));
+      int comp_deg(pTotaldegree(short_s));
       p_Delete(&short_s,c->r);
       if ((comp_deg<curr_deg)
@@ -583 +583 @@
   pLcm(c->S->m[i], c->S->m[j], lm);
   pSetm(lm);
-  int deciding_deg= pFDeg(lm);
+  int deciding_deg= pTotaldegree(lm);
   int* i_con =make_connections(i,j,lm,c);
   int z=0;
@@ -589 +589 @@
   for (int n=0;((n<c->n) && (i_con[n]>=0));n++){
     if (i_con[n]==j){
-      //       curr_deg=pFDeg(lm);
+      //       curr_deg=pTotaldegree(lm);
       //       for(int z1=0;((z1<c->n) && (i_con[z1]>=0));z1++)
       //         for (int z2=z1+1;((z2<c->n)&&(i_con[z2]>=0));z2++)
@@ -595 +595 @@
       //           pLcm(c->S->m[i_con[z1]], c->S->m[i_con[z2]], lm);
       //           pSetm(lm);
-      //           if (pFDeg(lm)==curr_deg)
+      //           if (pTotaldegree(lm)==curr_deg)
       //             now_t_rep(i_con[z1],i_con[z2],c);
       //         }
@@ -621 +621 @@
   pSetm(lm);
   poly short_s;
-  curr_deg=pFDeg(lm);
+  curr_deg=pTotaldegree(lm);
 
   for (int n=0;((n<c->n) && (j_con[n]>=0));n++){
@@ -627 +627 @@
       pLcm(c->S->m[i_con[m]], c->S->m[j_con[n]], lm);
       pSetm(lm);
-      if (pFDeg(lm)>=deciding_deg)
+      if (pTotaldegree(lm)>=deciding_deg)
       {
         //soon_t_rep(i_con[m],j_con[n],c);
@@ -670 +670 @@
       }
 #endif
-      int comp_deg(pFDeg(short_s));
+      int comp_deg(pTotaldegree(short_s));
       p_Delete(&short_s,c->r);
       if ((comp_deg<curr_deg)
@@ -699 +699 @@
 {
   ideal I=c->S;
-  int s=pFDeg(bound);
+  int s=pTotaldegree(bound);
   int* cans=(int*) omalloc(c->n*sizeof(int));
   int* connected=(int*) omalloc(c->n*sizeof(int));
@@ -741 +741 @@
 {
   ideal I=c->S;
-  int s=pFDeg(bound);
+  int s=pTotaldegree(bound);
   int* cans=(int*) omalloc(c->n*sizeof(int));
   int* connected=(int*) omalloc(c->n*sizeof(int));
@@ -993 +993 @@
       si->j=-1;
       si->expected_length=pLength(I->m[i]);
-      si->deg=pFDeg(I->m[i]);
+      si->deg=pTotaldegree(I->m[i]);
       si->lcm_of_lm=I->m[i];
       si->next=NULL;
@@ -1066 +1066 @@
   int spc=0;
   c->T_deg=(int*) omrealloc(c->T_deg,c->n*sizeof(int));
-  c->T_deg[i]=pFDeg(h);
+  c->T_deg[i]=pTotaldegree(h);
   hp=omrealloc(c->rep, c->n *sizeof(int));
   if (hp!=NULL){
@@ -1153 +1153 @@
         s->j=min(i,j);
         s->expected_length=c->lengths[i]+c->lengths[j]-2;
-        s->deg=pFDeg(short_s);
+        s->deg=pTotaldegree(short_s);
         poly lm=pOne();
 
@@ -2183 +2183 @@
 
   poly h=f->next;
-  int n=pFDeg(h);
+  int n=pTotaldegree(h);
   int i=0;
   while((i<2)){
@@ -2190 +2190 @@
     h=h->next;
     if (h!=NULL){
-      n=min(n,pFDeg(h));
+      n=min(n,pTotaldegree(h));
     }
     i++;