[Dotgnu-libs-commits] CVS: GMP-Sharp gmp-z.cs,1.2,1.3

[Marcus Urban <address@hidden>]

Update of /cvsroot/dotgnu-libs/GMP-Sharp
In directory subversions:/tmp/cvs-serv16815

Modified Files:
        gmp-z.cs 
Log Message:
Modified API


Index: gmp-z.cs
===================================================================
RCS file: /cvsroot/dotgnu-libs/GMP-Sharp/gmp-z.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** gmp-z.cs    14 Dec 2002 09:07:20 -0000      1.2
--- gmp-z.cs    15 Dec 2002 07:55:10 -0000      1.3
***************
*** 669,692 ****
        // last one that's static)?
        
!       public Integer Power( Integer exp, Integer mod )
        {
                Integer result = new Integer();
!               __gmpz_powm( result.rawObject, this.rawObject, exp.rawObject, 
mod.rawObject);
                return result;
        }
        
        
!       public Integer Power( Culong exp, Integer mod )
        {
                Integer result = new Integer();
!               __gmpz_powm_ui( result.rawObject, this.rawObject, exp, 
mod.rawObject );
                return result;
        }
        
        
!       public Integer Power( Culong exp )
        {
                Integer result = new Integer();
!               __gmpz_pow_ui( result.rawObject, this.rawObject, exp);
                return result;
        }
--- 669,692 ----
        // last one that's static)?
        
!       public static Integer Power( Integer n, Integer exp, Integer mod )
        {
                Integer result = new Integer();
!               __gmpz_powm( result.rawObject, n.rawObject, exp.rawObject, 
mod.rawObject);
                return result;
        }
        
        
!       public static Integer Power( Integer n, Culong exp, Integer mod )
        {
                Integer result = new Integer();
!               __gmpz_powm_ui( result.rawObject, n.rawObject, exp, 
mod.rawObject );
                return result;
        }
        
        
!       public static Integer Power( Integer n, Culong exp )
        {
                Integer result = new Integer();
!               __gmpz_pow_ui( result.rawObject, n.rawObject, exp);
                return result;
        }
***************
*** 1037,1041 ****
        
  
!               // **********************************************
        // P/Invoke functions
        // **********************************************
--- 1037,1188 ----
        
  
!       // Number theory functions
!               
!       public static Integer GCD( Integer a, Integer b )
!       {
!               Integer result = new Integer();
!               __gmpz_gcd( result.rawObject, a.rawObject, b.rawObject );
!               return result;
!       }
!       
!       
!       public static Integer GCD( Integer a, Culong b )
!       {
!               Integer result = new Integer();
!               __gmpz_gcd_ui( result.rawObject, a.rawObject, b );
!               return result;
!       }
!       
!       
!       public static Integer GCD( Integer a, Integer b, out Integer s, out 
Integer t )
!       {
!               Integer result = new Integer();
!               s = new Integer();
!               t = new Integer();
!               __gmpz_gcdext( result.rawObject, s.rawObject, t.rawObject,
!                       a.rawObject, b.rawObject );
!               return result;
!       }
!       
!       
!       public static Integer LCM( Integer a, Integer b )
!       {
!               Integer result = new Integer();
!               __gmpz_lcm( result.rawObject, a.rawObject, b.rawObject );
!               return result;
!       }
!       
!       
!       public static Integer LCM( Integer a, Culong b )
!       {
!               Integer result = new Integer();
!               __gmpz_lcm_ui( result.rawObject, a.rawObject, b );
!               return result;
!       }
! 
!       
!       public static Cint Jacobi( Integer a, Integer b )
!       {
!               return __gmpz_jacobi( a.rawObject, b.rawObject );
!       }
!       
! 
!       public static Cint Legendre( Integer a, Integer p )
!       {
!               return __gmpz_legendre( a.rawObject, p.rawObject );
!       }
! 
!       
!       public static Cint Kronecker( Integer a, Integer b )
!       {
!               return __gmpz_kronecker( a.rawObject, b.rawObject );
!       }
!       
!       
!       public static Cint Kronecker( Integer a, Clong b )
!       {
!               return __gmpz_kronecker_si( a.rawObject, b );
!       }
!       
!       public static Cint Kronecker( Integer a, Culong b )
!       {
!               return __gmpz_kronecker_ui( a.rawObject, b );
!       }
!       
!       public static Cint Kronecker( Clong a, Integer b )
!       {
!               return __gmpz_si_kronecker( a, b.rawObject );
!       }
!       
!       
!       public static Cint Kronecker( Culong a, Integer b )
!       {
!               return __gmpz_ui_kronecker( a, b.rawObject );
!       }
!               
!       
!       public static Integer Factorial( Culong n )
!       {
!               Integer result = new Integer();
!               __gmpz_fac_ui( result.rawObject, n );
!               return result;
!       }
!       
!       
!       public static Integer Binomial( Integer n, Culong k )
!       {
!               Integer result = new Integer();
!               __gmpz_bin_ui( result.rawObject, n.rawObject, k );
!               return result;
!       }
!       
!       
!       public static Integer Binomial( Culong n, Culong k )
!       {
!               Integer result = new Integer();
!               __gmpz_bin_uiui( result.rawObject, n, k );
!               return result;
!       }
!       
!       
!       public static Integer Fib( Culong n )
!       {
!               Integer result = new Integer();
!               __gmpz_fib_ui( result.rawObject, n );
!               return result;
!       }
!       
!       
!       public static void Fib( Culong n, out Integer fn, out Integer fnsub1 )
!       {
!               fn = new Integer();
!               fnsub1 = new Integer();
!               __gmpz_fib2_ui( fn.rawObject, fnsub1.rawObject, n );
!       }
!       
!       
!       public static Integer Lucas( Culong n )
!       {
!               Integer result = new Integer();
!               __gmpz_lucnum_ui( result.rawObject, n );
!               return result;
!       }
!       
!       
!       public static void Lucas( Culong n, out Integer ln, out Integer lnsub1 )
!       {
!               ln = new Integer();
!               lnsub1 = new Integer();
!               __gmpz_lucnum2_ui( ln.rawObject, lnsub1.rawObject, n );
!       }
!       
!       
!       public static Culong HamDist( Integer a, Integer b )
!       {
!               return __gmpz_hamdist( a.rawObject, b.rawObject );
!       }       
!       
!       
!       // **********************************************
        // P/Invoke functions
        // **********************************************
***************
*** 1428,1438 ****
                ( IntPtr op, Cint @base );              
        
!       
                
- }
- 
- 
- public class AdvancedMath
- {
        [DllImport("libgmp", CharSet=CharSet.Ansi)]
        private static extern void __gmpz_gcd
--- 1575,1580 ----
                ( IntPtr op, Cint @base );              
        
!       // Number theory and other special functions    
                
        [DllImport("libgmp", CharSet=CharSet.Ansi)]
        private static extern void __gmpz_gcd
***************
*** 1513,1723 ****
        [DllImport("libgmp", CharSet=CharSet.Ansi)]
        private static extern Culong __gmpz_hamdist
!               ( IntPtr op1, IntPtr op2 );     
!               
!                               
!       public static Integer GCD( Integer a, Integer b )
!       {
!               Integer result = new Integer();
!               __gmpz_gcd( result.rawObject, a.rawObject, b.rawObject );
!               return result;
!       }
!       
!       
!       public static Integer GCD( Integer a, Culong b )
!       {
!               Integer result = new Integer();
!               __gmpz_gcd_ui( result.rawObject, a.rawObject, b );
!               return result;
!       }
!       
!       
!       public static Integer GCD( Integer a, Integer b, out Integer s, out 
Integer t )
!       {
!               Integer result = new Integer();
!               s = new Integer();
!               t = new Integer();
!               __gmpz_gcdext( result.rawObject, s.rawObject, t.rawObject,
!                       a.rawObject, b.rawObject );
!               return result;
!       }
!       
!       
!       public static Integer LCM( Integer a, Integer b )
!       {
!               Integer result = new Integer();
!               __gmpz_lcm( result.rawObject, a.rawObject, b.rawObject );
!               return result;
!       }
!       
!       
!       public static Integer LCM( Integer a, Culong b )
!       {
!               Integer result = new Integer();
!               __gmpz_lcm_ui( result.rawObject, a.rawObject, b );
!               return result;
!       }
! 
!       
!       public static Cint Jacobi( Integer a, Integer b )
!       {
!               return __gmpz_jacobi( a.rawObject, b.rawObject );
!       }
!       
! 
!       public static Cint Legendre( Integer a, Integer p )
!       {
!               return __gmpz_legendre( a.rawObject, p.rawObject );
!       }
! 
!       
!       public static Cint Kronecker( Integer a, Integer b )
!       {
!               return __gmpz_kronecker( a.rawObject, b.rawObject );
!       }
!       
!       
!       public static Cint Kronecker( Integer a, Clong b )
!       {
!               return __gmpz_kronecker_si( a.rawObject, b );
!       }
!       
!       public static Cint Kronecker( Integer a, Culong b )
!       {
!               return __gmpz_kronecker_ui( a.rawObject, b );
!       }
!       
!       public static Cint Kronecker( Clong a, Integer b )
!       {
!               return __gmpz_si_kronecker( a, b.rawObject );
!       }
!       
!       
!       public static Cint Kronecker( Culong a, Integer b )
!       {
!               return __gmpz_ui_kronecker( a, b.rawObject );
!       }
!               
!       
!       public static Integer Factorial( Culong n )
!       {
!               Integer result = new Integer();
!               __gmpz_fac_ui( result.rawObject, n );
!               return result;
!       }
!       
!       
!       public static Integer Binomial( Integer n, Culong k )
!       {
!               Integer result = new Integer();
!               __gmpz_bin_ui( result.rawObject, n.rawObject, k );
!               return result;
!       }
!       
!       
!       public static Integer Binomial( Culong n, Culong k )
!       {
!               Integer result = new Integer();
!               __gmpz_bin_uiui( result.rawObject, n, k );
!               return result;
!       }
!       
!       
!       public static Integer Fib( Culong n )
!       {
!               Integer result = new Integer();
!               __gmpz_fib_ui( result.rawObject, n );
!               return result;
!       }
!       
!       
!       public static void Fib( Culong n, out Integer fn, out Integer fnsub1 )
!       {
!               fn = new Integer();
!               fnsub1 = new Integer();
!               __gmpz_fib2_ui( fn.rawObject, fnsub1.rawObject, n );
!       }
!       
!       
!       public static Integer Lucas( Culong n )
!       {
!               Integer result = new Integer();
!               __gmpz_lucnum_ui( result.rawObject, n );
!               return result;
!       }
!       
!       
!       public static void Lucas( Culong n, out Integer ln, out Integer lnsub1 )
!       {
!               ln = new Integer();
!               lnsub1 = new Integer();
!               __gmpz_lucnum2_ui( ln.rawObject, lnsub1.rawObject, n );
!       }
!       
!       
!       public static Culong HamDist( Integer a, Integer b )
!       {
!               return __gmpz_hamdist( a.rawObject, b.rawObject );
!       }
!       
! }     
!       
! public class Random
! {
!       // Random number functions in Integer, Rational, and Float
!       // will need access to the rawObject
!       internal IntPtr rawObject;
!       
!               
!       // Create the C structure for random number state
!       [DllImport("libgmp_support", CharSet=CharSet.Ansi)]
!       private static extern IntPtr create_gmp_randstate_struct();
!       
!       [DllImport("libgmp", CharSet=CharSet.Ansi)]
!       private static extern void __gmp_randinit_default( IntPtr state );
!               
!       [DllImport("libgmp", CharSet=CharSet.Ansi)]
!       private static extern void __gmpz_urandomb
!               ( IntPtr result, IntPtr state, Culong n );
!       
!       [DllImport("libgmp", CharSet=CharSet.Ansi)]
!       private static extern void __gmpz_urandomm
!               ( IntPtr result, IntPtr state, IntPtr n );
!       
!       [DllImport("libgmp", CharSet=CharSet.Ansi)]
!       private static extern void __gmpz_rrandomb
!               ( IntPtr result, IntPtr state, Culong n );
!               
!               
!       public Random()
!       {
!               rawObject = create_gmp_randstate_struct();
!               __gmp_randinit_default( rawObject );
!       }
!       
!       
!       public Integer IntegerUB( Culong n )
!       {
!               Integer number = new Integer();
!               __gmpz_urandomb( number.rawObject, this.rawObject, n );
!               return number;
!       }
!       
!       
!       public Integer IntegerUM( Integer n )
!       {
!               Integer number = new Integer();
!               __gmpz_urandomm( number.rawObject, this.rawObject, n.rawObject 
);
!               return number;
!       }
!       
!       
!       public Integer IntegerRB( Culong n )
!       {
!               Integer number = new Integer();
!               __gmpz_rrandomb( number.rawObject, this.rawObject, n );
!               return number;
!       }
                
! }
  
  
--- 1655,1661 ----
        [DllImport("libgmp", CharSet=CharSet.Ansi)]
        private static extern Culong __gmpz_hamdist
!               ( IntPtr op1, IntPtr op2 );             
                
! } // Class Integer