Changeset d07137 in git for factory

Timestamp:

Oct 15, 2003, 7:19:41 PM (21 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ecd23349865d588d280037e46df36f300536d5a2

Parents:

2499bf918092002632ace751f0bbae7bd5a2cccb

Message:

*hannes: faster conversions


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

Location:

factory

Files:

• NTLconvert.cc (modified) (5 diffs)
• canonicalform.cc (modified) (2 diffs)
• canonicalform.h (modified) (2 diffs)
• cf_factory.cc (modified) (2 diffs)
• cf_factory.h (modified) (2 diffs)
• int_int.cc (modified) (2 diffs)
• int_int.h (modified) (2 diffs)
• int_pp.cc (modified) (2 diffs)
• int_pp.h (modified) (2 diffs)

factory/NTLconvert.cc

@@ -1 @@
-/* $Id: NTLconvert.cc,v 1.11 2003-08-28 11:54:31 Singular Exp $ */
+/* $Id: NTLconvert.cc,v 1.12 2003-10-15 17:19:38 Singular Exp $ */
 #include <config.h>
 
@@ -453 +453 @@
   char dummy[2];
   int minusremainder=0;
+  char numbers[]="0123456789abcdef";
 
   coeff_long=to_long(coefficient);
@@ -479 +480 @@
 
     int l=0;
-    while (coefficient>9)
+    while (coefficient>15)
     {
       ZZ quotient,remaind;
-      ZZ ten;ten=10;
+      ZZ ten;ten=16;
       DivRem(quotient,remaind,coefficient,ten);
-      dummy[0]=(char)(to_long(remaind)+'0');
+      dummy[0]=numbers[to_long(remaind)];
       //tmp*=10; tmp+=to_long(remaind);
 
@@ -505 +506 @@
     }
     //built up the string in dummy[0]
-    dummy[0]=(char)(to_long(coefficient)+'0');
+    dummy[0]=numbers[to_long(coefficient)];
     strcat(cf_stringtemp,dummy);
     //tmp*=10; tmp+=to_long(coefficient);
@@ -526 +527 @@
 
   //convert the string to canonicalform using the char*-Constructor
-  return CanonicalForm(cf_stringtemp2);
+  return CanonicalForm(cf_stringtemp2,16);
   //return tmp;
 }

factory/canonicalform.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: canonicalform.cc,v 1.32 2001-06-18 08:44:35 pfister Exp $ */
+/* $Id: canonicalform.cc,v 1.33 2003-10-15 17:19:39 Singular Exp $ */
 
 #include <config.h>
@@ -49 +49 @@
 
 //{{{ constructors, destructors, selectors
-CanonicalForm::CanonicalForm( const char * str ) : value( CFFactory::basic( str ) )
+CanonicalForm::CanonicalForm( const char * str, const int base ) : value( CFFactory::basic( str, base ) )
 {
 }

factory/canonicalform.h

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: canonicalform.h,v 1.27 2001-06-22 15:57:41 Singular Exp $ */
+/* $Id: canonicalform.h,v 1.28 2003-10-15 17:19:39 Singular Exp $ */
 
 #ifndef INCL_CANONICALFORM_H
@@ -56 +56 @@
     CF_INLINE CanonicalForm( const Variable & );
     CF_INLINE CanonicalForm( const Variable &, int );
-    CanonicalForm( const char * ); // use with caution - does only handle integers !!!
+    CanonicalForm( const char *, const int base=10 ); // use with caution - does only handle integers !!!
 
     CF_NO_INLINE ~CanonicalForm();

factory/cf_factory.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_factory.cc,v 1.3 1997-06-19 12:27:13 schmidt Exp $ */
+/* $Id: cf_factory.cc,v 1.4 2003-10-15 17:19:40 Singular Exp $ */
 
 #include <config.h>
@@ -119 +119 @@
 
 InternalCF *
+CFFactory::basic ( const char * str, int base )
+{
+    if ( currenttype == IntegerDomain ) {
+        InternalInteger * dummy = new InternalInteger( str, base );
+        if ( dummy->is_imm() ) {
+            InternalCF * res = int2imm( dummy->intval() );
+            delete dummy;
+            return res;
+        }
+        else
+            return dummy;
+    }
+//     else  if ( currenttype == RationalDomain ) {
+//      InternalRational * dummy = new InternalRational( str );
+//      if ( dummy->is_imm() ) {
+//          InternalCF * res = int2imm( dummy->intval() );
+//          delete dummy;
+//          return res;
+//      }
+//      else
+//          return dummy;
+//     }
+    else  if ( currenttype == FiniteFieldDomain ) {
+        InternalInteger * dummy = new InternalInteger( str, base );
+        InternalCF * res = int2imm_p( dummy->intmod( ff_prime ) );
+        delete dummy;
+        return res;
+    }
+    else  if ( currenttype == GaloisFieldDomain ) {
+        InternalInteger * dummy = new InternalInteger( str, base );
+        InternalCF * res = int2imm_gf( gf_int2gf( dummy->intmod( ff_prime ) ) );
+        delete dummy;
+        return res;
+    }
+    else  if ( currenttype == PrimePowerDomain )
+        return new InternalPrimePower( str, base );
+    else {
+        ASSERT( 0, "illegal basic domain!" );
+        return 0;
+    }
+}
+
+InternalCF *
 CFFactory::basic ( int type, const char * const str )
 {

factory/cf_factory.h

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_factory.h,v 1.3 2001-11-05 17:07:12 Singular Exp $ */
+/* $Id: cf_factory.h,v 1.4 2003-10-15 17:19:40 Singular Exp $ */
 
 #ifndef INCL_CF_FACTORY_H
@@ -25 +25 @@
     static InternalCF * basic ( int type, int value );
     static InternalCF * basic ( const char * str );
+    static InternalCF * basic ( const char * str, int base );
     static InternalCF * basic ( int type, const char * const str );
     static InternalCF * basic ( int type, int value, bool nonimm );

factory/int_int.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: int_int.cc,v 1.16 2001-01-24 12:59:36 Singular Exp $ */
+/* $Id: int_int.cc,v 1.17 2003-10-15 17:19:40 Singular Exp $ */
 
 #include <config.h>
@@ -27 +27 @@
 InternalInteger::InternalInteger( const MP_INT & mpi) : thempi( mpi ) {}
 
-InternalInteger::InternalInteger( const char * str )
-{
-    mpz_init_set_str( &thempi, str, 10 );
+InternalInteger::InternalInteger( const char * str, const int base )
+{
+    mpz_init_set_str( &thempi, str, base );
 }
 

factory/int_int.h

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: int_int.h,v 1.10 2000-09-04 13:31:30 obachman Exp $ */
+/* $Id: int_int.h,v 1.11 2003-10-15 17:19:41 Singular Exp $ */
 
 #ifndef INCL_INT_INT_H
@@ -58 +58 @@
     }
     InternalInteger( const int i );
-    InternalInteger( const char * str );
+    InternalInteger( const char * str, const int base=10 );
     InternalInteger( const MP_INT & );
     ~InternalInteger();

factory/int_pp.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: int_pp.cc,v 1.9 1998-06-26 16:14:26 schmidt Exp $ */
+/* $Id: int_pp.cc,v 1.10 2003-10-15 17:19:41 Singular Exp $ */
 
 #include <config.h>
@@ -38 +38 @@
 InternalPrimePower::InternalPrimePower( const MP_INT & mpi ) : thempi( mpi ) {}
 
-InternalPrimePower::InternalPrimePower( const char * str )
-{
-    mpz_init_set_str( &thempi, str, 10 );
+InternalPrimePower::InternalPrimePower( const char * str, const int base )
+{
+    mpz_init_set_str( &thempi, str, base );
     if ( mpz_cmp_si( &thempi, 0 ) < 0 ) {
         mpz_neg( &thempi, &thempi );

factory/int_pp.h

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: int_pp.h,v 1.3 1997-06-19 12:22:29 schmidt Exp $ */
+/* $Id: int_pp.h,v 1.4 2003-10-15 17:19:41 Singular Exp $ */
 
 #ifndef INCL_INT_PP_H
@@ -36 +36 @@
     }
     InternalPrimePower( const int i );
-    InternalPrimePower( const char * str );
+    InternalPrimePower( const char * str, const int base=10 );
     InternalPrimePower( const MP_INT & );
     ~InternalPrimePower();