Changeset 326434 in git

Timestamp:

Aug 7, 2008, 11:15:56 PM (15 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

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

Children:

350a6d224148d833e5548c77167a09e0efc470db

Parents:

322662c5b8af027d90ce23cdbf7a11d43ad0b912

Message:

*levandov: some changes for rational ncgb


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

Location:

kernel

Files:

• gr_kstd2.cc (modified) (2 diffs)
• ratgring.cc (modified) (8 diffs)
• ratgring.h (modified) (2 diffs)

kernel/gr_kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gr_kstd2.cc,v 1.24 2008-08-04 07:31:13 Singular Exp $ */
+/* $Id: gr_kstd2.cc,v 1.25 2008-08-07 21:15:56 levandov Exp $ */
 /*
 *  ABSTRACT -  Kernel: noncomm. alg. of Buchberger
@@ -257 +257 @@
           c_p = nc_CreateSpoly(pCopy(strat->S[c_j]),pCopy((*h).p), currRing);
         else
-          c_p=nc_rat_ReduceSpolyNew(pCopy(strat->S[c_j]),
-               pCopy((*h).p),currRing->real_var_start-1,currRing);
+          c_p=nc_rat_ReduceSpolyNew(pCopy((*h).p), pCopy(strat->S[c_j]),currRing->real_var_start-1,currRing);
         pDelete(&((*h).p));
         (*h).p=c_p;

kernel/ratgring.cc

@@ -7 +7 @@
  *  Author:  levandov (Viktor Levandovsky)
  *  Created: 8/00 - 11/00
- *  Version: $Id: ratgring.cc,v 1.10 2008-06-10 10:17:32 motsak Exp $
+ *  Version: $Id: ratgring.cc,v 1.11 2008-08-07 21:15:56 levandov Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -28 +28 @@
 void pLcmRat(poly a, poly b, poly m, int rat_shift)
 {
-  /* shift is the last exp one should count with */
+  /* rat_shift is the last exp one should count with */
   int i;
-  for (i=pVariables; i=rat_shift; i--)
+  for (i=pVariables; i>=rat_shift; i--)
   {
     pSetExp(m,i, si_max( pGetExp(a,i), pGetExp(b,i)));
@@ -121 +121 @@
   poly t=pr;
   Exponent_t e1,e2;
-  for (i=ishift+1 ; i<=r->N; i++)
+  for (i=ishift+1; i<=r->N; i++)
   {
     e1 = p_GetExp(p1, i, r);
@@ -142 +142 @@
 }
 
-
-
-
 /* returns ideal (u,v) s.t. up + vq = 0 */
 
-ideal ncGCD(poly p, poly q, const ring r)
+ideal ncGCD2(poly p, poly q, const ring r)
 {
   intvec *w = NULL;
@@ -192 +189 @@
 }
 
-
+/* returns ideal (u,v) s.t. up + vq = 0 */
+
+ideal ncGCD(poly p, poly q, const ring r)
+{
+  // assume: p,q are in the comm. ring
+  // to be used in the coeff business
+#ifdef PDEBUG
+  Print("G_start:");
+#endif
+  poly g = singclap_gcd(p_Copy(p,r),p_Copy(q,r));
+#ifdef PDEBUG
+  p_wrp(g,r);
+  Print("G_end;");
+#endif
+  poly u = singclap_pdivide(q,g); //q/g
+  poly v = singclap_pdivide(p,g); //p/g
+  ideal h = idInit(2,1);
+  h->m[0] = u; // p_Copy(u,r);
+  h->m[1] = v; // p_Copy(v,r);
+  return(h);
+}
 
 /* PINLINE1 void p_ExpVectorDiff 
@@ -368 +385 @@
 
   poly m = pOne();
-  p_ExpVectorDiffRat(m, p2, p1, ishift, r); // includes X and D parts
+  p_ExpVectorDiffRat(m, p1, p2, ishift, r); // includes X and D parts
   //p_Setm(m,r);
   //  m = p_GetExp_k_n(m,1,ishift,r); /* rat D-exp of m */
@@ -380 +397 @@
   HH = p_Copy(p_HeadRat(p1,is,r),r); // lm_D(g)
 //  H  = r->nc->p_Procs.mm_Mult_p(m, p_Copy(HH, r), r); // d^aplha lm_D(g)
-  H  = nc_mm_Mult_pp(m, HH, r); // d^aplha lm_D(g)
-
-  poly K  = p_Copy( p_GetCoeffRat(H,  is, r), r);
+  H  = nc_mm_Mult_pp(m, HH, r); // d^aplha lm_D(g) == h_g in the paper
+
+  poly K  = p_Copy( p_GetCoeffRat(H,  is, r), r); // k in the paper
   Print("k: "); p_wrp(K,r); PrintS("\n");
-  poly P  = p_Copy( p_GetCoeffRat(p2, is, r), r);
+  poly P  = p_Copy( p_GetCoeffRat(p2, is, r), r); // lc_D(p_2) == lc_D(f)
   Print("p: "); p_wrp(P,r); PrintS("\n");
 
@@ -434 +451 @@
 
   Print("d^a t_g: "); p_wrp(out,r);
-  PrintS(" end reduction");
-  out = p_Add_q(H, out, r);
+  Print(" end reduction\n");
+  out = p_Add_q(H, out, r); // r_g + d^a t_g
   p_Test(out,r);
-  out  = p_Mult_q(PP, out, r);
-
-  out = p_Add_q(p2,out,r); // delete out, p2
+  out  = p_Mult_q(PP, out, r); // c' (r_g + d^a t_g)
+
+  out = p_Add_q(p2,out,r); // delete out, p2; // the sum
   p_Test(out,r);
   if ( out!=NULL ) pContent(out);

kernel/ratgring.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ratgring.h,v 1.5 2008-01-31 13:23:25 Singular Exp $ */
+/* $Id: ratgring.h,v 1.6 2008-08-07 21:15:56 levandov Exp $ */
 /*
 * ABSTRACT additional defines etc for --with-plural
@@ -31 +31 @@
 void p_ExpVectorDiffRat(poly pr, poly p1, poly p2, int ishift, ring r);
 
-ideal ncGCD(poly p, poly q, ring r);
+ideal ncGCD2(poly p, poly q, ring r); // real nc stuff
+
+ideal ncGCD(poly p, poly q, ring r); // for p,q from a commutative ring
 
 //poly nc_rat_CreateSpoly(poly p1, poly p2, poly spNoether, int ishift, ring r);