Changeset b1326b in git for factory/cf_factor.cc

Timestamp:

Aug 28, 2003, 1:54:32 PM (21 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4bc9c25c9a8c589240a894844cee71be5220ee1b

Parents:

9b1e4c9febca790a3b9509dfd1c33492e29780fb

Message:

*hannes: NTL update, missing funtions for GF2E


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

File:

• factory/cf_factor.cc (modified) (5 diffs)

factory/cf_factor.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_factor.cc,v 1.19 2003-02-14 15:53:27 Singular Exp $ */
+/* $Id: cf_factor.cc,v 1.20 2003-08-28 11:54:32 Singular Exp $ */
 
 //{{{ docu
@@ -373 +373 @@
   #ifdef HAVE_NTL
   //if  (isOn(SW_USE_NTL))
-  if (isOn(SW_USE_NTL) && (isPurePoly(f,alpha)))
+  if (isOn(SW_USE_NTL) /*&& (isPurePoly(f,alpha))*/)
   {
     //USE NTL
@@ -410 +410 @@
 
       // remainder is two ==> nothing to do
+      // set remainder
+      ZZ r;
+      r=getCharacteristic();
+      ZZ_pContext ccc(r);
+      ccc.restore();
 
       // set minimal polynomial in NTL using the optimized conversion routines for characteristic 2
@@ -417 +422 @@
 
       // convert to NTL again using the faster conversion routines
-      GF2X f_tmp=convertFacCF2NTLGF2X(f);
-      GF2EX f1=to_GF2EX(f_tmp);
-
-      // no make monic necessary in GF2
+      GF2EX f1;
+      if (isPurePoly(f))
+      {
+        GF2X f_tmp=convertFacCF2NTLGF2X(f);
+        f1=to_GF2EX(f_tmp);
+      }
+      else
+      {
+        f1=convertFacCF2NTLGF2EX(f,minPo);
+      }
+
+      // make monic (in Z/2(a))
+      GF2E f1_coef=LeadCoeff(f1);
+      MakeMonic(f1);
 
       // factorize using NTL
@@ -427 +442 @@
 
       // return converted result
-      F=convertNTLvec_pair_GF2EX_long2FacCFFList(factors,LeadCoeff(f1),f.mvar(),alpha);
+      F=convertNTLvec_pair_GF2EX_long2FacCFFList(factors,f1_coef,f.mvar(),alpha);
     }