Changeset 001cc15 in git for factory/facFqFactorize.h

Timestamp:

Sep 6, 2012, 7:11:17 PM (12 years ago)

Author:

Oleksandr Motsak <malex984@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0b27942997f2964b33d7b6fb15f97e372d54fc5f

Parents:

24a77fb14c59fc78cc67eb5f6934a45d8862d99e107aac1a78fd9b689a33a864d23b7cfb1caa5bdf

Message:

Merge pull request #179 from mmklee/factory_fix_sw

Factory fix sw

File:

• factory/facFqFactorize.h (modified) (3 diffs)

factory/facFqFactorize.h

@@ -547 +547 @@
                                  );
 
-/// evaluate F successively n-2 at 0
-///
-/// @return returns a list of successive evaluations of F, ending with F
-CFList evaluateAtZero (const CanonicalForm& F ///< [in] some poly
-                      );
-
-/// divides factors by their content wrt. Variable(1) and checks if these polys
-/// divide F
-///
-/// @return returns factors of F
-CFList recoverFactors (const CanonicalForm& F, ///< [in] some poly F
-                       const CFList& factors   ///< [in] some list of
-                                               ///< factor candidates
-                      );
-
-/// divides factors shifted by evaluation by their content wrt. Variable(1) and 
-/// checks if these polys divide F
-///
-/// @return returns factors of F
-CFList recoverFactors (const CanonicalForm& F,  ///< [in] some poly F
-                       const CFList& factors,   ///< [in] some list of
-                                                ///< factor candidates
-                       const CFList& evaluation
-                      );
-
 /// refine a bivariate factorization of A with l factors to one with
 /// minFactorsLength
@@ -595 +570 @@
                 );
 
+
+/// sort bivariate factors in Aeval such that their corresponding univariate
+/// factors coincide with uniFactors
+void sortByUniFactors (CFList*& Aeval,          ///< [in,out] array of bivariate
+                                                ///< factors
+                       int AevalLength,         ///< [in] length of Aeval
+                       const CFList& uniFactors,///< [in] univariate factors
+                       const CFList& evaluation ///< [in] evaluation point
+                      );
+
 /// extract leading coefficients wrt Variable(1) from bivariate factors obtained
 /// from factorizations of A wrt different second variables
@@ -655 +640 @@
              );
 
-/// evaluate @a F at @a evaluation
-///
-/// @return @a evaluateAtEval returns a list containing the successive 
-/// evaluations of @a F, last entry is @a F again
-CFList
-evaluateAtEval (const CanonicalForm& F,   ///<[in] some poly
-                const CFArray& evaluation ///<[in] some evaluation point
-               );
-
-/// evaluate @a F at @a evaluation
-///
-/// @return @a evaluateAtEval returns a list containing the successive
-/// evaluations of @a F starting at level @a l, last entry is @a F again
-CFList
-evaluateAtEval (const CanonicalForm& F,  ///<[in] some poly
-                const CFList& evaluation,///<[in] some evaluation point
-                int l                    ///<[in] level to start at
-               );
-
 #endif
 /* FAC_FQ_FACTORIZE_H */