Changeset 3e7db4 in git for factory/facFqBivarUtil.cc

Timestamp:

Dec 11, 2012, 7:33:39 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

14e634edb64741be0fbc04c9c89e8523cb0c1cc521dbb4186f3a2c56539d8f92abe1ee9e0fa0ae2c

Parents:

dcf88ff0bb046d73a7bde65e033fc58cbb5f4a97c9050082385152a64066f7540914cae34d990a43

Message:

Merge pull request #207 from kovzol/spielwiese

Adding new command line option --no-shell to prevent running escape shel...

NOTE: according to Hans we have to fix some more things in order to make this right

File:

• factory/facFqBivarUtil.cc (modified) (2 diffs)

factory/facFqBivarUtil.cc

@@ -504 +504 @@
     CanonicalForm G3= div (G, xToOldL);
     CanonicalForm Up= mulMod2 (G3, oldQ, xToLOldL);
-    CanonicalForm xToOldL2= power (x, oldL/2);
+    CanonicalForm xToOldL2= power (x, (oldL+1)/2);
     CanonicalForm G2= mod (G, xToOldL);
     CanonicalForm G1= div (G2, xToOldL2);
@@ -510 +510 @@
     CanonicalForm oldQ1= div (oldQ, xToOldL2);
     CanonicalForm oldQ0= mod (oldQ, xToOldL2);
-    CanonicalForm Mid= mulMod2 (G1, oldQ1, xToLOldL);
+    CanonicalForm Mid;
+    if (oldL % 2 == 1)
+      Mid= mulMod2 (G1, oldQ1*x, xToLOldL);
+    else
+      Mid= mulMod2 (G1, oldQ1, xToLOldL);
     //computation of Low might be faster using a real middle product?
     CanonicalForm Low= mulMod2 (G0, oldQ1, xToOldL)+mulMod2 (G1, oldQ0, xToOldL);
-    Low= div (Low, xToOldL2);
+    Low= div (Low, power (x, oldL/2));
+    Low= mod (Low, xToLOldL);
     Up += Mid + Low;
     bufF= div (F, xToOldL);