Changeset cce6701 in git

Timestamp:

Oct 8, 2018, 12:25:07 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

0ae5299d623b89bbee2f63b709f0ee7c84cfbbfc

Parents:

643057471a2902ab4b5882c1ec1b833c4b82561c808e441dcf8ac75f71c5edca0c35cee52d2ba3cd

Message:

Merge branch 'letterplace_kernel_multiplication' of https://github.com/kabouzeid/Singular into kabouzeid-letterplace_kernel_multiplication

Files:

• Singular/LIB/freegb.lib (modified) (1 diff)
• kernel/polys.cc (modified) (1 diff)

Singular/LIB/freegb.lib

@@ -3659 +3659 @@
 
 static proc getlpCoeffs(poly q, poly p)
-{list R; poly m; intvec cq,t,lv,rv,bla;
+{list R; intvec cq,t,lv,rv,bla;
  int n = attrib(basering,"isLetterplaceRing"); int d = attrib(basering,"uptodeg");
  int i;
- m = p/q;
- cq = leadexp(m);
+ cq = leadexp(p)-leadexp(q); /* p/q */
  for (i = 1; i<= d; i++)
  {bla = cq[((i-1)*n+1)..(i*n)];

kernel/polys.cc

@@ -180 +180 @@
   else         return f; // g==0 => gcd=f (but do a p_Cleardenom/pNorm)
   if (f==NULL) return g; // f==0 => gcd=g (but do a p_Cleardenom/pNorm)
-  if(!rField_is_Ring(currRing)
-  && (p_IsConstant(f,currRing)
-  ||p_IsConstant(g,currRing)))
-  {
-    res=p_One(currRing);
+  if(!rField_is_Ring(r)
+  && (p_IsConstant(f,r)
+  ||p_IsConstant(g,r)))
+  {
+    res=p_One(r);
   }
   else if (r->cf->convSingNFactoryN!=ndConvSingNFactoryN)