fix: p_deg/p_GetOrder for ordering am

hannes14 · hannes14 · commit 788fdfc919bc · 2012-03-15T17:05:17.000+01:00
diff --git a/Singular/cntrlc.cc b/Singular/cntrlc.cc
@@ -1,7 +1,6 @@
 /****************************************
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id$ */
 /*
 * ABSTRACT - interupt handling
 */
@@ -222,7 +221,7 @@ void sigsegv_handler(int sig, sigcontext s)
   }
 #endif /* __OPTIMIZE__ */
 #ifdef CALL_GDB
-  if (sig!=SIGINT) 
+  if (sig!=SIGINT)
   {
     if (singular_in_batchmode) debug(STACK_TRACE);
     else                       debug(INTERACTIVE);
@@ -247,7 +246,7 @@ void sigsegv_handler(int sig, sigcontext s)
 /*---------------------------------------------------------------------*/
 void sig_chld_hdl(int sig)
 {
- waitpid(-1,NULL,WNOHANG);  
+  waitpid(-1,NULL,WNOHANG);
 }
 
 /*2
diff --git a/Singular/iparith.cc b/Singular/iparith.cc
@@ -6012,13 +6012,13 @@ static BOOLEAN jjSUBST_Test(leftv v,leftv w,
     return TRUE;
   }
 #endif
-  if (!(ringvar=pVar(p)))
+  if ((ringvar=pVar(p))==0)
   {
     if (rField_is_Extension(currRing))
     {
       assume(currRing->cf->extRing!=NULL);
       number n = pGetCoeff(p);
-      ringvar=- n_IsParam(n, currRing);
+      ringvar= -n_IsParam(n, currRing);
     }
     if(ringvar==0)
     {
diff --git a/libpolys/polys/monomials/p_polys.h b/libpolys/polys/monomials/p_polys.h
@@ -436,6 +436,7 @@ static inline long p_GetOrder(poly p, ring r)
   {
     switch(r->typ[i].ord_typ)
     {
+      case ro_am:
       case ro_wp_neg:
         return (((long)((p)->exp[r->pOrdIndex]))-POLY_NEGWEIGHT_OFFSET);
       case ro_syzcomp:

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`/****************************************`
`2`	`2`	`* Computer Algebra System SINGULAR *`
`3`	`3`	`****************************************/`
`4`		`-/* $Id$ */`
`5`	`4`	`/*`
`6`	`5`	`* ABSTRACT - interupt handling`
`7`	`6`	`*/`
`@@ -222,7 +221,7 @@ void sigsegv_handler(int sig, sigcontext s)`
`222`	`221`	`}`
`223`	`222`	`#endif /* __OPTIMIZE__ */`
`224`	`223`	`#ifdef CALL_GDB`
`225`		`- if (sig!=SIGINT)`
	`224`	`+ if (sig!=SIGINT)`
`226`	`225`	`{`
`227`	`226`	`if (singular_in_batchmode) debug(STACK_TRACE);`
`228`	`227`	`else debug(INTERACTIVE);`
`@@ -247,7 +246,7 @@ void sigsegv_handler(int sig, sigcontext s)`
`247`	`246`	`/---------------------------------------------------------------------/`
`248`	`247`	`void sig_chld_hdl(int sig)`
`249`	`248`	`{`
`250`		`- waitpid(-1,NULL,WNOHANG);`
	`249`	`+ waitpid(-1,NULL,WNOHANG);`
`251`	`250`	`}`
`252`	`251`
`253`	`252`	`/*2`
Original file line number	Diff line number	Diff line change
`@@ -6012,13 +6012,13 @@ static BOOLEAN jjSUBST_Test(leftv v,leftv w,`
`6012`	`6012`	`return TRUE;`
`6013`	`6013`	`}`
`6014`	`6014`	`#endif`
`6015`		`- if (!(ringvar=pVar(p)))`
	`6015`	`+ if ((ringvar=pVar(p))==0)`
`6016`	`6016`	`{`
`6017`	`6017`	`if (rField_is_Extension(currRing))`
`6018`	`6018`	`{`
`6019`	`6019`	`assume(currRing->cf->extRing!=NULL);`
`6020`	`6020`	`number n = pGetCoeff(p);`
`6021`		`- ringvar=- n_IsParam(n, currRing);`
	`6021`	`+ ringvar= -n_IsParam(n, currRing);`
`6022`	`6022`	`}`
`6023`	`6023`	`if(ringvar==0)`
`6024`	`6024`	`{`
Original file line number	Diff line number	Diff line change
`@@ -436,6 +436,7 @@ static inline long p_GetOrder(poly p, ring r)`
`436`	`436`	`{`
`437`	`437`	`switch(r->typ[i].ord_typ)`
`438`	`438`	`{`
	`439`	`+ case ro_am:`
`439`	`440`	`case ro_wp_neg:`
`440`	`441`	`return (((long)((p)->exp[r->pOrdIndex]))-POLY_NEGWEIGHT_OFFSET);`
`441`	`442`	`case ro_syzcomp:`