Changeset 094f80 in git

Timestamp:

Mar 10, 2009, 4:47:18 PM (14 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

eda41404503d654cd3e9dacc624c5bd1e77fdafb

Parents:

ec993c0195f4b63f7c55517888001aa19a6794ba

Message:

*levandov: fixes for RatGring for modules, now std,syz and nres work well


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

Files:

• Singular/extra.cc (modified) (3 diffs)
• kernel/gr_kstd2.cc (modified) (2 diffs)
• kernel/ratgring.cc (modified) (5 diffs)

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.296 2009-02-21 19:30:56 levandov Exp $ */
+/* $Id: extra.cc,v 1.297 2009-03-10 15:47:18 levandov Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -2676 +2676 @@
     {
       poly p,q;
-      int is;
-      if ((h!=NULL) && (h->Typ()==POLY_CMD))
+      int is, htype;
+      if ((h!=NULL) && ( (h->Typ()==POLY_CMD) || (h->Typ()==VECTOR_CMD) ) )
       {
         p=(poly)h->CopyD();
         h=h->next;
+        htype = h->Typ();
       }
       else return TRUE;
-      if ((h!=NULL) && (h->Typ()==POLY_CMD))
+      if ((h!=NULL) && ( (h->Typ()==POLY_CMD) || (h->Typ()==VECTOR_CMD) ) )
       {
         q=(poly)h->CopyD();
@@ -2692 +2693 @@
       {
         is=(int)((long)(h->Data()));
-        res->rtyp=POLY_CMD;
+        res->rtyp=htype;
         //      res->rtyp=IDEAL_CMD;
         if (rIsPluralRing(currRing))

kernel/gr_kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gr_kstd2.cc,v 1.36 2009-02-27 19:30:47 levandov Exp $ */
+/* $Id: gr_kstd2.cc,v 1.37 2009-03-10 15:47:17 levandov Exp $ */
 /*
 *  ABSTRACT -  Kernel: noncomm. alg. of Buchberger
@@ -306 +306 @@
       if(TEST_OPT_DEBUG)
       {
-        p_wrp(h->p,currRing); Print(" divisibly by S[%d]=",j);
+        p_wrp(h->p,currRing); Print(" divisible by S[%d]=",j);
         p_wrp(strat->S[j],currRing); PrintS(" e=-1\n");
       }

kernel/ratgring.cc

@@ -7 +7 @@
  *  Author:  levandov (Viktor Levandovsky)
  *  Created: 8/00 - 11/00
- *  Version: $Id: ratgring.cc,v 1.23 2009-02-27 19:30:47 levandov Exp $
+ *  Version: $Id: ratgring.cc,v 1.24 2009-03-10 15:47:18 levandov Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -92 +92 @@
   if (q == NULL) return p;
   poly res = p_Head(p,r);
-  while ( (q!=NULL) && (p_Comp_k_n(p, q, ishift+1, r)))
+  const long cmp = p_GetComp(p, r);
+  while ( (q!=NULL) && (p_Comp_k_n(p, q, ishift+1, r)) && (p_GetComp(q, r) == cmp) )
   {
     res = p_Add_q(res,p_Head(q,r),r);
     q   = pNext(q);
   }
+  p_SetCompP(res,cmp,r);
   return res;
 }
 
 /* returns x-coeff of p, i.e. a poly in x, s.t. corresponding xd-monomials 
-have the same D-part 
+have the same D-part and the component 0
 does not destroy p
 */
@@ -112 +114 @@
   p_SetCoeff(res,n_Copy(p_GetCoeff(p,r),r),r);
   poly s;
-  while ((q!= NULL) && (p_Comp_k_n(p, q, ishift+1, r)))
+  long cmp = p_GetComp(p, r);
+  while ( (q!= NULL) && (p_Comp_k_n(p, q, ishift+1, r)) && (p_GetComp(q, r) == cmp) )
   {
     s   = p_GetExp_k_n(q, ishift+1, r->N, r);
@@ -119 +122 @@
     q   = pNext(q);
   }
+  cmp = 0;
+  p_SetCompP(res,cmp,r);
   return res;
 }
@@ -128 +133 @@
   p_LmCheckPolyRing2(*p, r);
   poly q = p_Head(*p,r);
-  while ( ( (*p)!=NULL ) && ( p_Comp_k_n(*p, q, ishift+1, r) ))
+  const long cmp = p_GetComp(*p, r);
+  while ( ( (*p)!=NULL ) && ( p_Comp_k_n(*p, q, ishift+1, r) ) && (p_GetComp(*p, r) == cmp) )
   {
     p_LmDelete(p,r);