Changeset a0d9be in git for kernel/kInline.cc

Timestamp:

Jun 10, 2010, 2:54:59 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

6e0750067834212a8910aad022e669ca646b5786

Parents:

407ff05c12f210a6f1d860dac19e7850c61d38ea

Message:

pCleardenom -> p_Cleardenom,
pCleardenom_n -> p_Cleardenom_n,
pContent -> p_Content



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

File:

• kernel/kInline.cc (modified) (4 diffs)

kernel/kInline.cc

@@ -423 +423 @@
 {
   assume(p != NULL);
-  #ifdef HAVE_RATGRING
-  p= ::pCleardenom(p);
-  #else
-  ::pCleardenom(p);
-  #endif
   if (t_p != NULL)
-    pSetCoeff0(t_p, pGetCoeff(p));
+  {
+    p_Cleardenom(t_p, tailRing);
+    pSetCoeff0(p, pGetCoeff(t_p));
+  }
+  else
+  {
+    #ifdef HAVE_RATGRING
+    p= p_Cleardenom(p, currRing);
+    #else
+    p_Cleardenom(p, currRing);
+    #endif
+  }
 }
 
@@ -979 +985 @@
 
   int i;
-  long x;
-  long e1;
-  long e2;
-  long s;
+  int x;
+  int e1;
+  int e2;
+  int s;
   m1 = p_Init(tailRing);
   m2 = p_Init(tailRing);
   lcm = p_Init(leadRing);
 
-  int small_index=1;
-  if ((pGetComp(p1)!=0)||(pGetComp(p2)!=0)) small_index=0;
-
-  for (i = leadRing->N; i>=small_index; i--)
+  for (i = leadRing->N; i>=1; i--)
   {
     e1 = p_GetExp(p1,i,leadRing);
@@ -998 +1001 @@
     {
       p_SetExp(m2,i,x, tailRing);
-      p_SetExp(m1,i,0, tailRing);
+      //p_SetExp(m1,i,0, tailRing); // done by p_Init
       s = e1;
     }
@@ -1004 +1007 @@
     {
       p_SetExp(m1,i,-x, tailRing);
-      p_SetExp(m2,i,0, tailRing);
+      //p_SetExp(m2,i,0, tailRing); // done by p_Init
       s = e2;
     }
     p_SetExp(lcm,i,s, leadRing);
   }
+  if ((s=pGetComp(p1))!=0)
+  {
+    p_SetComp(lcm,s, leadRing);
+  } 
+  else if ((s=pGetComp(p2))!=0)
+  {
+    p_SetComp(lcm,s, leadRing);
+  } 
+  // else p_SetComp(lcm,0,tailRing); // done by p_Init
 
   p_Setm(m1, tailRing);