Changeset 6deedd in git

Timestamp:

Nov 29, 2011, 2:33:18 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

91788c087460478b3feb0c0461c30cb0383129fe

Parents:

7efef7a73060a49677b3bcf2172e9cdb3b4d76a8

git-author:

Martin Lee <martinlee84@web.de>2011-11-29 14:33:18+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-12-12 18:00:42+01:00

Message:

modified some helper functions and removed unneccessary inclusion of config.h

Location:

factory

Files:

• cf_gcd_smallp.h (modified) (1 diff)
• facFqFactorizeUtil.cc (modified) (2 diffs)
• facFqFactorizeUtil.h (modified) (3 diffs)

factory/cf_gcd_smallp.h

@@ -97 +97 @@
 CanonicalForm
 randomIrredpoly (int i, const Variable & x) ;
+
+CFArray
+getMonoms (const CanonicalForm& F);
 #endif

factory/facFqFactorizeUtil.cc

@@ -128 +128 @@
 }
 
-CanonicalForm shift2Zero (const CanonicalForm& F, CFList& Feval, const CFList& evaluation)
+CanonicalForm shift2Zero (const CanonicalForm& F, CFList& Feval, const CFList& evaluation, int l)
 {
   CanonicalForm A= F;
-  int k= A.level();
+  int k= evaluation.length() + l - 1;
   for (CFListIterator i= evaluation; i.hasItem(); i++, k--)
     A= A (Variable (k) + i.getItem(), k);
@@ -145 +145 @@
 }
 
-CanonicalForm reverseShift (const CanonicalForm& F, const CFList& evaluation)
+CanonicalForm reverseShift (const CanonicalForm& F, const CFList& evaluation, int l)
 {
-  int l= evaluation.length() + 1;
+  int k= evaluation.length() + l - 1;
   CanonicalForm result= F;
   CFListIterator j= evaluation;
-  for (int i= l; i > 1; i--, j++)
+  for (int i= k; j.hasItem() && (i > l - 1); i--, j++)
   {
     if (F.level() < i)

factory/facFqFactorizeUtil.h

@@ -17 +17 @@
 
 // #include "config.h"
-
 #include "canonicalform.h"
 #include "cf_map.h"
@@ -108 +107 @@
                                      ///< @a F successively evaluated
                                      ///< at 0
-            const CFList& evaluation ///< [in] a valid evaluation point
+            const CFList& evaluation,///< [in] a valid evaluation point
+            int l= 2                 ///< [in] level at which the evaluation
+                                     ///< starts
            );
 
@@ -116 +117 @@
 /// @sa shift2Zero(), evalPoints()
 CanonicalForm reverseShift (const CanonicalForm& F,  ///< [in] a compressed poly
-                            const CFList& evaluation ///< [in] a valid
+                            const CFList& evaluation,///< [in] a valid
                                                      ///< evaluation point
+                            int l= 2                 ///< [in] level at which
+                                                     ///< the evaluation starts
                            );