Changeset 112e09 in git

Timestamp:

Mar 4, 2007, 11:56:16 PM (17 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c11c4daf7e3896aeb978b0e5d088aa00da640998

Parents:

f52b35d84241ce7e7505d2fc317f785452810345

Message:

*levandov: ratNF related changes


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

Location:

kernel

Files:

• pInline2.h (modified) (3 diffs)
• ratgring.cc (modified) (9 diffs)

kernel/pInline2.h

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pInline2.h,v 1.10 2007-01-31 23:51:24 motsak Exp $
+ *  Version: $Id: pInline2.h,v 1.11 2007-03-04 22:56:16 levandov Exp $
  *******************************************************************/
 #ifndef PINLINE2_H
@@ -152 +152 @@
 PINLINE2 int p_Comp_k_n(poly a, poly b, int k, ring r)
 {
+  if ((a==NULL) || (b==NULL) ) return FALSE;
   p_LmCheckPolyRing2(a, r);
   p_LmCheckPolyRing2(b, r);
@@ -158 +159 @@
   for(;i<=r->N;i++)
   {
-    if(a->exp[(r->VarOffset[i] & 0xffffff)]
-    != b->exp[(r->VarOffset[i] & 0xffffff)])
-      return FALSE;
+    if (a->exp[(r->VarOffset[i] & 0xffffff)] != b->exp[(r->VarOffset[i] & 0xffffff)]) return FALSE;
   }
   return TRUE;

kernel/ratgring.cc

@@ -7 +7 @@
  *  Author:  levandov (Viktor Levandovsky)
  *  Created: 8/00 - 11/00
- *  Version: $Id: ratgring.cc,v 1.2 2007-03-04 18:18:17 levandov Exp $
+ *  Version: $Id: ratgring.cc,v 1.3 2007-03-04 22:56:16 levandov Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -63 +63 @@
 {
   poly q   = pNext(p);
+  if (q == NULL) return p;
   poly res = p_Head(p,r);
   while ( p_Comp_k_n(p, q, ishift, r) )
@@ -108 +109 @@
   h->m[1] = p_Copy(q,r);
 #ifdef PDEBUG
-  Print("running syzygy comp. for nc_GCD:");
+  Print("running syzygy comp. for nc_GCD:\n");
 #endif
   ideal sh = idSyzygies(h, testHomog, &w);
 #ifdef PDEBUG
-  Print("done syzygy comp. for nc_GCD");
+  Print("done syzygy comp. for nc_GCD\n");
 #endif
   /* in comm case, there is only 1 syzygy */
@@ -119 +120 @@
   K  = sh->m[0]; /* take just the first element - to be enhanced later */
   K1 = pTakeOutComp(&K, 1); // 1st component is taken out from K
+//  K2 = pTakeOutComp(&K, 2);
+  p_SetCompP(K1,0,r);
   pShift(&K,-2); // 2nd component to 0th comp.
-  K2 = K;
+//  K2 = pTakeOutComp(&K, 2);
+  p_SetCompP(K2,0,r);
+  K2 = K; 
 
   /* checking signs before multiplying */    
@@ -136 +141 @@
   idDelete(&h);
   h = idInit(2,1);
-  h->m[0] = K1;
-  h->m[1] = K2;
+  h->m[0] = p_Copy(K1,r);
+  h->m[1] = p_Copy(K2,r);
   idDelete(&sh);
   return(h);
@@ -327 +332 @@
   /* pSetComp(m,r)=0? */
   poly HH, H;
-  HH = p_HeadRat(p1,is,r); // lm_D(g)
+  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)
 
@@ -341 +346 @@
 
   ideal ncsyz = ncGCD(P,K,r);
-  poly KK = ncsyz->m[0]; // k'
-  poly PP = ncsyz->m[1]; // p'
+  poly KK = p_Copy(ncsyz->m[0],r); // k'
+  poly PP = p_Copy(ncsyz->m[1],r); // p'
   
-  HH = p_HeadRat(p2,is,r);
+  HH = p_Copy(p_HeadRat(p2,is,r),r);
   HH = p_Neg(HH, r);
   p2 = p_Add_q(p2, HH, r); // t_f
@@ -352 +357 @@
 
 
-  HH = p_HeadRat(H,is,r);
+  HH = p_Copy(p_HeadRat(H,is,r),r);
   HH = p_Neg(HH, r);
   H  = p_Add_q(H, HH, r); // r_g
@@ -360 +365 @@
 
 
-  p2 = p_Mult_mm(p2, KK, r); // p2 = k' t_f
+  p2 = p_Mult_q(p2, KK, r); // p2 = k' t_f
   p_Test(p2,r);
-  p_Delete(&KK,r);
+//  p_Delete(&KK,r);
 
   out = r->nc->p_Procs.mm_Mult_p(m, out, r); // d^aplha t_g