Changeset fc732a9 in git for factory/int_int.h

Timestamp:

Mar 17, 1998, 4:59:42 PM (26 years ago)

Author:

Jens Schmidt <schmidt@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e0fb8d31ff69374db7f865baedfda3e614804382

Parents:

bb17e813fdec9082fa78763093e18795ea0fdbb4

Message:

***** merge from branch `factory-gcd' to main trunk


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

File:

• factory/int_int.h (modified) (5 diffs)

factory/int_int.h

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: int_int.h,v 1.7 1998-01-22 10:54:22 schmidt Exp $ */
+/* $Id: int_int.h,v 1.8 1998-03-17 15:56:18 schmidt Exp $ */
 
 #ifndef INCL_INT_INT_H
@@ -7 +7 @@
 #include <config.h>
 
-#include "cf_gmp.h"
 #ifndef NOSTREAMIO
 #include <iostream.h>
@@ -15 +14 @@
 
 #include "int_cf.h"
+#include "cf_gmp.h"
+#include "gmpext.h"
 
 class InternalInteger : public InternalCF
@@ -20 +21 @@
 private:
     MP_INT thempi;
-    static int initialized;
-    static MP_INT & MPI( const InternalCF * const c );
+
+    // auxilliary methods
+    inline InternalCF * normalizeMyself ();
+    inline InternalCF * uiNormalizeMyself ();
+
+    static inline InternalCF * normalizeMPI ( MP_INT & );
+    static inline InternalCF * uiNormalizeMPI ( MP_INT & );
+
+    static inline MP_INT & MPI ( const InternalCF * const c );
+
 public:
     InternalInteger();
@@ -95 +104 @@
 };
 
-inline MP_INT & InternalInteger::MPI( const InternalCF * const c )
+//{{{ inline InternalCF * InternalInteger::normalizeMyself, uiNormalizeMyself ()
+//{{{ docu
+//
+// normalizeMyself(), uiNormalizeMyself() - normalize CO.
+//
+// If CO fits into an immediate integer, delete CO and return the
+// immediate.  Otherwise, return a pointer to CO.
+//
+// `uiNormalizeMyself()' is the same as `normalizeMyself()'
+// except that CO is expected to be non-begative.  In this case,
+// we may use `mpz_get_ui()' to convert the underlying mpi into
+// an immediate which is slightly faster than the signed variant.
+//
+// Note: We do not mind reference counting at this point!  CO is
+// deleted unconditionally!
+//
+//}}}
+inline InternalCF *
+InternalInteger::normalizeMyself ()
+{
+    ASSERT( getRefCount() == 1, "internal error: must not delete CO" );
+
+    if ( mpz_is_imm( &thempi ) ) {
+        InternalCF * result = int2imm( mpz_get_si( &thempi ) );
+        delete this;
+        return result;
+    } else
+        return this;
+}
+
+inline InternalCF *
+InternalInteger::uiNormalizeMyself ()
+{
+    ASSERT( getRefCount() == 1, "internal error: must not delete CO" );
+
+    if ( mpz_is_imm( &thempi ) ) {
+        InternalCF * result = int2imm( mpz_get_ui( &thempi ) );
+        delete this;
+        return result;
+    } else
+        return this;
+}
+//}}}
+
+//{{{ static inline InternalCF * InternalInteger::normalizeMPI, uiNormalizeMPI ( MP_INT & aMpi )
+//{{{ docu
+//
+// normalizeMPI(), uiNormalizeMPI() - normalize a mpi.
+//
+// If `aMpi' fits into an immediate integer, clear `aMpi' and
+// return the immediate.  Otherwise, return a new
+// `InternalInteger' with `aMpi' as underlying mpi.
+//
+// `uiNormalizeMPI()' is the same as `normalizeMPI()' except that
+// `aMpi' is expected to be non-begative.  In this case, we may
+// use `mpz_get_ui()' to convert `aMpi' into an immediate which
+// is slightly faster than the signed variant.
+//
+//}}}
+inline InternalCF *
+InternalInteger::normalizeMPI ( MP_INT & aMpi )
+{
+    if ( mpz_is_imm( &aMpi ) ) {
+        InternalCF * result = int2imm( mpz_get_si( &aMpi ) );
+        mpz_clear( &aMpi );
+        return result;
+    } else
+        return new InternalInteger( aMpi );
+}
+
+inline InternalCF *
+InternalInteger::uiNormalizeMPI ( MP_INT & aMpi )
+{
+    if ( mpz_is_imm( &aMpi ) ) {
+        InternalCF * result = int2imm( mpz_get_ui( &aMpi ) );
+        mpz_clear( &aMpi );
+        return result;
+    } else
+        return new InternalInteger( aMpi );
+}
+//}}}
+
+//{{{ inline MP_INT & InternalInteger::MPI ( const InternalCF * const c )
+//{{{ docu
+//
+// MPI() - return underlying mpi of `c'.
+//
+// `c' is expected to be an `InternalInteger *'.  `c's underlying
+// mpi is returned.
+//
+//}}}
+inline MP_INT &
+InternalInteger::MPI ( const InternalCF * const c )
 {
     return (((InternalInteger*)c)->thempi);
 }
+//}}}
 
 #endif /* ! INCL_INT_INT_H */