Changeset f09105 in git

Timestamp:

Jun 6, 2011, 4:45:55 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

a5d5fca9f3b322761be00e3eaaf1b6641d54f518

Parents:

c227a2fe328d29d1cfbd56bc8d8824aed8aa2d38

Message:

use bivariate factorization directly


git-svn-id: file:///usr/local/Singular/svn/trunk@14261 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

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

factory/facFqFactorize.h

@@ -46 +46 @@
                        )
 {
+  if (getNumVars (F) == 2)
+    return FpBiSqrfFactorize (F);
   ExtensionInfo info= ExtensionInfo (false);
   CFList result= multiFactorize (F, info);
@@ -62 +64 @@
                        )
 {
+  if (getNumVars (F) == 2)
+    return FqBiSqrfFactorize (F, alpha);
   ExtensionInfo info= ExtensionInfo (alpha, false);
   CFList result= multiFactorize (F, info);
@@ -79 +83 @@
   ASSERT (CFFactory::gettype() == GaloisFieldDomain,
           "GF as base field expected");
+  if (getNumVars (F) == 2)
+    return GFBiSqrfFactorize (F);
   ExtensionInfo info= ExtensionInfo (getGFDegree(), gf_name, false);
   CFList result= multiFactorize (F, info);
@@ -94 +100 @@
                     )
 {
+  if (getNumVars (F) == 2)
+    return FpBiFactorize (F);
   ExtensionInfo info= ExtensionInfo (false);
   Variable a= Variable (1);
@@ -139 +147 @@
                     )
 {
+  if (getNumVars (F) == 2)
+    return FqBiFactorize (F, alpha);
   ExtensionInfo info= ExtensionInfo (alpha, false);
   CanonicalForm LcF= Lc (F);
@@ -185 +195 @@
   ASSERT (CFFactory::gettype() == GaloisFieldDomain,
           "GF as base field expected");
+  if (getNumVars (F) == 2)
+    return GFBiFactorize (F);
   Variable a= Variable (1);
   ExtensionInfo info= ExtensionInfo (getGFDegree(), gf_name, false);