Changeset 36fd8e in git for factory

Timestamp:

Nov 27, 2017, 2:29:04 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

55547cd0fba1913878deb04d393e354ac9d7fc2f

Parents:

ecce2d81ff6101080904784705fc360910896b1b

Message:

opt: mpz_*set_ui/_si and inline stuff

Location:

factory

Files:

• cfNewtonPolygon.cc (modified) (2 diffs)
• int_rat.cc (modified) (9 diffs)
• int_rat.h (modified) (2 diffs)

factory/cfNewtonPolygon.cc

@@ -604 +604 @@
     else if (sizePoints == 1)
     {
-      mpz_set_ui (M[0], 1);
-      mpz_set_ui (M[3], 1);
+      mpz_set_si (M[0], 1);
+      mpz_set_si (M[3], 1);
     }
     return;
   }
-  mpz_set_ui (M[0], 1);
-  mpz_set_ui (M[3], 1);
+  mpz_set_si (M[0], 1);
+  mpz_set_si (M[3], 1);
 
   mpz_t * Mu= new mpz_t[4];
-  mpz_init_set_ui (Mu[1], 1);
-  mpz_init_set_ui (Mu[2], 1);
+  mpz_init_set_si (Mu[1], 1);
+  mpz_init_set_si (Mu[2], 1);
   mpz_init (Mu[0]);
   mpz_init (Mu[3]);
 
   mpz_t * Lambda= new mpz_t[4];
-  mpz_init_set_ui (Lambda[0], 1);
+  mpz_init_set_si (Lambda[0], 1);
   mpz_init_set_si (Lambda[1], -1);
   mpz_init_set_si (Lambda[3], 1);
@@ -625 +625 @@
 
   mpz_t * InverseLambda= new mpz_t[4];
-  mpz_init_set_ui (InverseLambda[0], 1);
-  mpz_init_set_ui (InverseLambda[1], 1);
-  mpz_init_set_ui (InverseLambda[3], 1);
+  mpz_init_set_si (InverseLambda[0], 1);
+  mpz_init_set_si (InverseLambda[1], 1);
+  mpz_init_set_si (InverseLambda[3], 1);
   mpz_init (InverseLambda[2]);
 

factory/int_rat.cc

@@ -32 +32 @@
 
 
+InternalRational::InternalRational()
+{
+    mpz_init( _num );
+    mpz_init_set_si( _den, 1 );
+}
+
+InternalRational::InternalRational( const int i )
+{
+    mpz_init_set_si( _num, i );
+    mpz_init_set_si( _den, 1 );
+}
+
 InternalRational::InternalRational( const int n, const int d )
 {
@@ -37 +49 @@
     if ( n == 0 )
     {
-        mpz_init_set_ui( _num, 0 );
-        mpz_init_set_ui( _den, 1 );
+        mpz_init_set_si( _num, 0 );
+        mpz_init_set_si( _den, 1 );
     }
     else
@@ -56 +68 @@
 }
 
+InternalRational::InternalRational( const long i )
+{
+    mpz_init_set_si( _num, i );
+    mpz_init_set_si( _den, 1 );
+}
+
 InternalRational::InternalRational( const long n, const long d )
 {
@@ -61 +79 @@
     if ( n == 0 )
     {
-        mpz_init_set_ui( _num, 0 );
-        mpz_init_set_ui( _den, 1 );
+        mpz_init_set_si( _num, 0 );
+        mpz_init_set_si( _den, 1 );
     }
     else
@@ -92 +110 @@
 //    mpz_init_set_si( _den, 1 );
 //}
+
+InternalRational::InternalRational( const mpz_ptr n )
+{
+    _num[0]=*n;
+    mpz_init_set_si( _den, 1 );
+}
+
+InternalRational::InternalRational( const mpz_ptr n, const mpz_ptr d )
+{
+  _num[0]=*n;
+  _den[0]=*d;
+}
+
+InternalRational::~InternalRational()
+{
+    mpz_clear( _num );
+    mpz_clear( _den );
+}
 
 InternalCF* InternalRational::deepCopyObject() const
@@ -115 +151 @@
 }
 #endif /* NOSTREAMIO */
+
+bool InternalRational::is_imm() const
+{
+    return mpz_cmp_si( _den, 1 ) == 0 && mpz_is_imm( _num );
+}
 
 InternalCF* InternalRational::genZero()
@@ -527 +568 @@
             return this;
         else
-      {
+        {
           mpz_init( n );
-        if ( cc < 0 )
+          if ( cc < 0 )
           {
             mpz_mul_ui( n, _den, -cc );
@@ -539 +580 @@
             mpz_add( n, _num, n );
           }
-      }
+        }
     }
     else
@@ -862 +903 @@
 }
 
-bool InternalRational::is_imm() const
-{ return mpz_cmp_si( _den, 1 ) == 0 && mpz_is_imm( _num ); }
-
+/**
+ * @sa CanonicalForm::sign()
+**/
+int
+InternalRational::sign () const
+{
+    return mpz_sgn( _num );
+}

factory/int_rat.h

@@ -46 +46 @@
     static void normalize( const mpz_ptr, const mpz_ptr, mpz_ptr, mpz_ptr );
 public:
-    InternalRational()
-    {
-      mpz_init( _num );
-      mpz_init_set_ui( _den, 1 );
-    }
+    InternalRational();
     InternalRational( const InternalCF& )
     {
-      ASSERT( 0, "ups there is something wrong in your code" );
+        ASSERT( 0, "ups there is something wrong in your code" );
     }
-    InternalRational( const int i )
-    {
-      mpz_init_set_si( _num, i );
-      mpz_init_set_ui( _den, 1 );
-    }
+    InternalRational( const int i );
     InternalRational( const int n, const int d );
-    InternalRational( const long i )
-    {
-      mpz_init_set_si( _num, i );
-      mpz_init_set_ui( _den, 1 );
-    }
+    InternalRational( const long i );
     InternalRational( const long n, const long d );
     InternalRational( const char * str );
-    InternalRational( const mpz_ptr n)
-    {
-      _num[0]=*n;
-      mpz_init_set_ui( _den, 1 );
-    }
-    InternalRational( const mpz_ptr n, const mpz_ptr d)
-    {
-      _num[0]=*n;
-      _den[0]=*d;
-    }
-    ~InternalRational()
-    {
-      mpz_clear( _num );
-      mpz_clear( _den );
-    }
+    InternalRational( const mpz_ptr );
+    InternalRational( const mpz_ptr , const mpz_ptr );
+    ~InternalRational();
     InternalCF* deepCopyObject() const;
     const char * classname() const { return "InternalRational"; }
@@ -131 +107 @@
     long intval() const;
 
-    int sign() const { return mpz_sgn( _num ); }
+    int sign() const;
 
     InternalCF * normalize_myself();