Changeset 8cbdd9 in git for libpolys

Timestamp:

Dec 4, 2018, 3:50:09 PM (5 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '4bd32dfef92ec9f5ed8dceee82d14318ae147107')

Children:

5161f3c439dd28c1bc0dd5d9a4aa7ae701a0a64d

Parents:

653af74c248d3b0a930cbaab22d3123faf777c29

git-author:

Karim Abou Zeid <karim23697@gmail.com>2018-12-04 15:50:09+01:00

git-committer:

Karim Abou Zeid <karim23697@gmail.com>2018-12-07 15:25:20+01:00

Message:

Fix multiplication error

File:

• libpolys/polys/shiftop.cc (modified) (2 diffs)

libpolys/polys/shiftop.cc

@@ -506 +506 @@
   PrintLn(); WriteLPExpV(m2ExpV, ri);
 #endif
-  if (m1Length + m2Length > ri->N)
-  {
+  int last = m1Length + m2Length;
+  if (last > ri->N)
+  {
+    last = ri->N;
     WarnS("letterplace degree bound too low for this multiplication");
   }
-  for (int i = 1 + m1Length; i < 1 + m1Length + m2Length; ++i)
+  for (int i = 1 + m1Length; i < 1 + last; ++i)
   {
     assume(m2ExpV[i - m1Length] <= 1);
@@ -531 +533 @@
   PrintLn(); WriteLPExpV(m2ExpV, ri);
 #endif
-  if (m1Length + m2Length > ri->N)
-  {
+  int last = m1Length + m2Length;
+  if (last > ri->N)
+  {
+    last = ri->N;
     WarnS("letterplace degree bound too low for this multiplication");
   }
 
   // shift m1 by m2Length
-  for (int i = m2Length + m1Length; i >= 1 + m2Length; --i)
+  for (int i = last; i >= 1 + m2Length; --i)
   {
     m1ExpV[i] = m1ExpV[i - m2Length];