Changeset 84bac9 in git

Timestamp:

Jun 5, 2018, 12:20:40 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

d16f9cafaea19a094331583401a2c636168f5157

Parents:

480978c837b761f00f135f8c3c49ffbccb5ff8fb

Message:

opt: conversion to factory

Files:

• factory/cf_factory.cc (modified) (2 diffs)
• factory/int_poly.cc (modified) (2 diffs)
• libpolys/coeffs/modulop.cc (modified) (1 diff)
• libpolys/polys/clapconv.cc (modified) (2 diffs)

factory/cf_factory.cc

@@ -30 +30 @@
 CFFactory::basic ( long value )
 {
-    if ( currenttype == IntegerDomain )
+  switch(currenttype)
+  {
+    case IntegerDomain:
         if (LIKELY( value >= MINIMMEDIATE && value <= MAXIMMEDIATE ))
             return int2imm( value );
@@ -40 +42 @@
 //         else
 //             return new InternalRational( value );
-    else  if ( currenttype == FiniteFieldDomain )
+    case FiniteFieldDomain:
         return int2imm_p( ff_norm( value ) );
-    else  if ( currenttype == GaloisFieldDomain )
+    case GaloisFieldDomain:
         return int2imm_gf( gf_int2gf( value ) );
-    else {
-        ASSERT( 0, "illegal basic domain!" );
-        return 0;
-    }
+    default: {
+        ASSERT( 0, "illegal basic domain!" );
+        return 0;
+    }
+  }
 }
 

factory/int_poly.cc

@@ -30 +30 @@
 #include "variable.h"
 #include "imm.h"
+
+#ifdef __GNUC__
+#define LIKELY(X)   (__builtin_expect(!!(X), 1))
+#define UNLIKELY(X) (__builtin_expect(!!(X), 0))
+#else
+#define LIKELY(X)   (X)
+#define UNLIKELY(X) (X)
+#endif
 
 #ifdef HAVE_OMALLOC
@@ -2155 +2163 @@
         {
             theCursor->coeff += aCursor->coeff * coeff;
-            if ( theCursor->coeff.isZero() )
+            if(UNLIKELY(( theCursor->coeff.isZero() )))
             {
                 if ( predCursor )

libpolys/coeffs/modulop.cc

@@ -344 +344 @@
 {
   if (setChar) setCharacteristic( r->ch );
-  CanonicalForm term(npInt( n,r ));
-  return term;
+  return CanonicalForm(npInt( n,r ));
 }
 

libpolys/polys/clapconv.cc

@@ -94 +94 @@
   while ( p!=NULL )
   {
-    CanonicalForm term;
-    term=r->cf->convSingNFactoryN(pGetCoeff( p ),setChar, r->cf);
+    CanonicalForm term=r->cf->convSingNFactoryN(pGetCoeff( p ),setChar, r->cf);
     if (errorreported) break;
     setChar=FALSE;
@@ -101 +100 @@
     {
       if ( (e = p_GetExp( p, i, r)) != 0 )
-        term *= power( Variable( i ), e );
+        term *= CanonicalForm( Variable( i ), e );
     }
     result += term;