Changeset 4e76a6 in git

Timestamp:

Jul 31, 2013, 7:18:58 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

ae1735dae5c3034d933f9a8b0c463ff13b4b3521

Parents:

92bbbcc0bed082d961421c5dc103f86fb569feab

git-author:

Martin Lee <martinlee84@web.de>2013-07-31 19:18:58+02:00

git-committer:

Martin Lee <martinlee84@web.de>2013-08-30 13:48:27+02:00

Message:

fix: includes and some typos

Location:

factory

Files:

• facAbsBiFact.cc (modified) (1 diff)
• facAbsBiFact.h (modified) (1 diff)
• facAbsFact.cc (modified) (3 diffs)
• facAbsFact.h (modified) (1 diff)

factory/facAbsBiFact.cc

@@ -692 +692 @@
 #endif
 
-#ifdef HAVE_NTL
-/// absolute factorization of bivariate poly over Q
-///
-/// @return absFactorize returns a list whose entries contain three entities:
-///         an absolute irreducible factor, an irreducible univariate polynomial
-///         that defines the minimal field extension over which the irreducible
-///         factor is defined and the multiplicity of the absolute irreducible
-///         factor
-CFAFList absFactorize (const CanonicalForm& G ///<[in] bivariate poly over Q
-                      )
-{
-  //TODO handle homogeneous input
-  ASSERT (getNumVars (G) <= 2, "expected bivariate input");
-  ASSERT (getCharacteristic() == 0, "expected poly over Q");
-
-  CFMap N;
-  CanonicalForm F= compress (G, N);
-  bool isRat= isOn (SW_RATIONAL);
-  if (isRat)
-    F *= bCommonDen (F);
-
-  Off (SW_RATIONAL);
-  F /= icontent (F);
-  if (isRat)
-    On (SW_RATIONAL);
-
-  CanonicalForm contentX= content (F, 1);
-  CanonicalForm contentY= content (F, 2);
-  F /= (contentX*contentY);
-  CFAFList contentXFactors, contentYFactors;
-  contentXFactors= uniAbsFactorize (contentX);
-  contentYFactors= uniAbsFactorize (contentY);
-
-  if (contentXFactors.getFirst().factor().inCoeffDomain())
-    contentXFactors.removeFirst();
-  if (contentYFactors.getFirst().factor().inCoeffDomain())
-    contentYFactors.removeFirst();
-  if (F.inCoeffDomain())
-  {
-    CFAFList result;
-    for (CFAFListIterator i= contentXFactors; i.hasItem(); i++)
-      result.append (CFAFactor (N (i.getItem().factor()), i.getItem().minpoly(),
-                                i.getItem().exp()));
-    for (CFAFListIterator i= contentYFactors; i.hasItem(); i++)
-      result.append (CFAFactor (N (i.getItem().factor()),i.getItem().minpoly(),
-                                i.getItem().exp()));
-    normalize (result);
-    result.insert (CFAFactor (Lc (G), 1, 1));
-    return result;
-  }
-  CFFList rationalFactors= factorize (F);
-
-  CFAFList result, resultBuf;
-
-  CFAFListIterator iter;
-  CFFListIterator i= rationalFactors;
-  i++;
-  for (; i.hasItem(); i++)
-  {
-    resultBuf= absFactorizeMain (i.getItem().factor());
-    for (iter= resultBuf; iter.hasItem(); iter++)
-      iter.getItem()= CFAFactor (iter.getItem().factor(),
-                                 iter.getItem().minpoly(), i.getItem().exp());
-    result= Union (result, resultBuf);
-  }
-
-  for (CFAFListIterator i= result; i.hasItem(); i++)
-    i.getItem()= CFAFactor (N (i.getItem().factor()), i.getItem().minpoly(),
-                            i.getItem().exp());
-  for (CFAFListIterator i= contentXFactors; i.hasItem(); i++)
-    result.append (CFAFactor (N(i.getItem().factor()), i.getItem().minpoly(),
-                              i.getItem().exp()));
-  for (CFAFListIterator i= contentYFactors; i.hasItem(); i++)
-    result.append (CFAFactor (N(i.getItem().factor()), i.getItem().minpoly(),
-                              i.getItem().exp()));
-  normalize (result);
-  result.insert (CFAFactor (Lc(G), 1, 1));
-
-  return result;
-}
-#endif
-
-
+

factory/facAbsBiFact.h

@@ -15 +15 @@
 #define FAC_ABS_BI_FACT_H
 
-#include "cf_assert.h"
-
-#include "cf_algorithm.h"
-#include "cf_map.h"
+#include "canonicalform.h"
 
 #ifdef HAVE_NTL

factory/facAbsFact.cc

@@ -2 +2 @@
  * Computer Algebra System SINGULAR
 \*****************************************************************************/
-/** @file facAbsMultiFact.cc
+/** @file facAbsFact.cc
  *
  * @author Martin Lee
@@ -8 +8 @@
  **/
 /*****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #include "timing.h"
@@ -371 +375 @@
     TIMING_START (abs_fac_evaluation);
     bufEvaluation= evalPoints4AbsFact (bufA, bufAeval, E);
-    TIMING_END_AND_PRINT (abs_fac_evaluation, 
+    TIMING_END_AND_PRINT (abs_fac_evaluation,
                           "time to find evaluation point in abs fact: ");
     E.nextpoint();

factory/facAbsFact.h

@@ -2 +2 @@
  * Computer Algebra System SINGULAR
 \*****************************************************************************/
-/** @file facAbsMultiFact.h
+/** @file facAbsFact.h
  *
  * absolute multivariate factorization over Q