Changeset 4a7a45 in git for factory/canonicalform.cc

Timestamp:

Jul 29, 2020, 5:33:12 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

700b89d0131c4b3d214f49af1eeb67501875ec89

Parents:

4772b1b4621f2ab68acc9d2b5a568604d4d5e790

Message:

fix: factorize in Z[x,..] w/o NTL

File:

• factory/canonicalform.cc (modified) (6 diffs)

factory/canonicalform.cc

@@ -15 +15 @@
 #include "cf_algorithm.h"
 #include "imm.h"
+#include "int_pp.h"
 #include "gfops.h"
 #include "facMul.h"
 #include "facAlgFuncUtil.h"
 #include "FLINTconvert.h"
+#include "cf_binom.h"
 
 #ifndef NOSTREAMIO
@@ -204 +206 @@
 }
 
+
 CanonicalForm
 CanonicalForm::mapinto () const
@@ -216 +219 @@
             else
                 return *this;
+        else  if ( CFFactory::gettype() == PrimePowerDomain )
+            return CanonicalForm( CFFactory::basic( imm2int( value ) ) );
         else  if ( getGFDegree() == 1 )
             return CanonicalForm( int2imm_p( ff_norm( imm2int( value ) ) ) );
@@ -222 +227 @@
     else  if ( value->inBaseDomain() )
         if ( getCharacteristic() == 0 )
-             return *this;
+            if ( value->levelcoeff() == PrimePowerDomain )
+            {
+              mpz_t d;
+              getmpi( value,d);
+              if ( mpz_cmp( InternalPrimePower::primepowhalf, d ) < 0 )
+                mpz_sub( d, d, InternalPrimePower::primepow );
+              return CFFactory::basic( d );
+            }
+            else
+                return *this;
+        else  if ( CFFactory::gettype() == PrimePowerDomain )
+        {
+            ASSERT( value->levelcoeff() == PrimePowerDomain || value->levelcoeff() == IntegerDomain, "no proper map defined" );
+            if ( value->levelcoeff() == PrimePowerDomain )
+                return *this;
+            else
+            {
+              mpz_t d;
+              getmpi(value,d);
+              if ( mpz_cmp( InternalPrimePower::primepowhalf, d ) < 0 )
+                mpz_sub( d, d, InternalPrimePower::primepow );
+              return CFFactory::basic( d );
+            }
+        }
         else
         {
@@ -248 +276 @@
     }
 }
-
 /** CanonicalForm CanonicalForm::lc (), Lc (), LC (), LC ( v ) const
  *
@@ -1935 +1962 @@
     return cf_glob_switches.isOn( sw );
 }
+
+#ifndef HAVE_NTL
+static int initialized=0;
+int
+initCanonicalForm( void )
+{
+  if ( ! initialized )
+  {
+    initPT();
+    initialized = true;
+  }
+}
+#endif
+