Changeset 220277f in git

Timestamp:

Aug 30, 2018, 10:36:25 AM (5 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')

Children:

a0f2b6b7a8139ad5ce4fb16d58135c9558ba191a

Parents:

0b5677c6b2f8865b896a99cadd2973168d436443

Message:

Support components in letterplace kernel multiplication

Files:

• kernel/GBEngine/shiftgb.cc (modified) (3 diffs)
• libpolys/polys/shiftop.cc (modified) (5 diffs)

kernel/GBEngine/shiftgb.cc

@@ -95 +95 @@
   int lV = r->isLPring;
 
-  if (sh == 0 || p == NULL || p_LmIsConstant(p,r)) return(p);
+  if (sh == 0 || p == NULL || p_LmIsConstantComp(p,r)) return(p);
 
   int L = p_mLastVblock(p,r);
@@ -148 +148 @@
 int p_mLastVblock(poly p, const ring r)
 {
-  if (p == NULL || p_LmIsConstant(p,r))
+  if (p == NULL || p_LmIsConstantComp(p,r))
   {
     return(0);
@@ -192 +192 @@
 int p_mFirstVblock(poly p, const ring r)
 {
-  if (p == NULL || p_LmIsConstant(p,r))
+  if (p == NULL || p_LmIsConstantComp(p,r))
   {
     return(0);

libpolys/polys/shiftop.cc

@@ -308 +308 @@
 void p_mLPUnShift(poly m, const ring ri)
 {
-  if (m == NULL || p_LmIsConstant(m,ri)) return;
+  if (m == NULL || p_LmIsConstantComp(m,ri)) return;
 
   int lV = ri->isLPring;
@@ -345 +345 @@
 
 // appends m2ExpV to m1ExpV where m1Last is the last Vblock of m1 and m2Last the last Vblock of m2
+// also adds their components (one of them is always zero)
 void p_LPExpVappend(int *m1ExpV, int *m2ExpV, int m1Length, int m2Length, const ring ri) {
 #ifdef SHIFT_MULT_DEBUG
@@ -357 +358 @@
     m1ExpV[i] = m2ExpV[i - m1Length];
   }
+
+  assume(m1ExpV[0] == 0 || m2ExpV[0] == 0); // one component should be zero (otherwise this doesn't make any sense)
+  m1ExpV[0] += m2ExpV[0]; // as in the commutative variant (they use MemAdd)
 #ifdef SHIFT_MULT_DEBUG
   PrintLn(); WriteLPExpV(m1ExpV, ri);
@@ -363 +367 @@
 
 // prepends m2ExpV to m1ExpV where m1Last is the last Vblock of m1 and m2Last the last Vblock of m2
+// also adds their components (one of them is always zero)
 void p_LPExpVprepend(int *m1ExpV, int *m2ExpV, int m1Length, int m2Length, const ring ri) {
 #ifdef SHIFT_MULT_DEBUG
@@ -388 +393 @@
   }
   omFreeSize((ADDRESS) m1Tmp, (m1Length+1)*sizeof(int));
+
+  assume(m1ExpV[0] == 0 || m2ExpV[0] == 0); // one component should be zero (otherwise this doesn't make any sense)
+  m1ExpV[0] += m2ExpV[0]; // as in the commutative variant (they use MemAdd)
 #ifdef SHIFT_MULT_DEBUG
   PrintLn(); WriteLPExpV(m1ExpV, ri);