Changeset 788fdf in git

Timestamp:

Mar 15, 2012, 5:05:17 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

dad9fb11f19b0cc543d1fa4b62571df6a83adbab

Parents:

160f4391a1dc3f89b1f225c2606aac3aafbbb2ab

Message:

fix: p_deg/p_GetOrder for ordering am

Files:

• Singular/cntrlc.cc (modified) (3 diffs)
• Singular/iparith.cc (modified) (2 diffs)
• libpolys/polys/monomials/p_polys.h (modified) (1 diff)

Singular/cntrlc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id$ */
 /*
 * ABSTRACT - interupt handling
@@ -223 +222 @@
 #endif /* __OPTIMIZE__ */
 #ifdef CALL_GDB
-  if (sig!=SIGINT) 
+  if (sig!=SIGINT)
   {
     if (singular_in_batchmode) debug(STACK_TRACE);
@@ -248 +247 @@
 void sig_chld_hdl(int sig)
 {
- waitpid(-1,NULL,WNOHANG);  
+  waitpid(-1,NULL,WNOHANG);
 }
 

Singular/iparith.cc

@@ -6013 +6013 @@
   }
 #endif
-  if (!(ringvar=pVar(p)))
+  if ((ringvar=pVar(p))==0)
   {
     if (rField_is_Extension(currRing))
@@ -6019 +6019 @@
       assume(currRing->cf->extRing!=NULL);
       number n = pGetCoeff(p);
-      ringvar=- n_IsParam(n, currRing);
+      ringvar= -n_IsParam(n, currRing);
     }
     if(ringvar==0)

libpolys/polys/monomials/p_polys.h

@@ -437 +437 @@
     switch(r->typ[i].ord_typ)
     {
+      case ro_am:
       case ro_wp_neg:
         return (((long)((p)->exp[r->pOrdIndex]))-POLY_NEGWEIGHT_OFFSET);