[BACK]Return to ox.c CVS log [TXT][DIR] Up to [local] / OpenXM / src / ox_toolkit

Diff for /OpenXM/src/ox_toolkit/ox.c between version 1.32 and 1.35

version 1.32, 2005/03/03 06:38:15 version 1.35, 2013/10/20 14:58:20
Line 1 
Line 1 
 /* -*- mode: C; coding: euc-japan -*- */  /* -*- mode: C; coding: euc-japan -*- */
 /* $OpenXM: OpenXM/src/ox_toolkit/ox.c,v 1.31 2003/11/12 15:24:06 iwane Exp $ */  /* $OpenXM: OpenXM/src/ox_toolkit/ox.c,v 1.34 2007/03/14 10:30:54 ohara Exp $ */
   
 /*  /*
    This module includes functions for sending/receiveng CMO's.     This module includes functions for sending/receiveng CMO's.
Line 208  static cmo_zz* receive_cmo_zz(OXFILE *oxfp)
Line 208  static cmo_zz* receive_cmo_zz(OXFILE *oxfp)
     return c;      return c;
 }  }
   
   static cmo_qq* receive_cmo_qq(OXFILE *oxfp)
   {
       mpz_t num, den;
       mpz_init(num);
       mpz_init(den);
       receive_mpz(oxfp, num);
       receive_mpz(oxfp, den);
       return new_cmo_qq_set_mpz(num, den);
   }
   
 static cmo_zero* receive_cmo_zero(OXFILE *oxfp)  static cmo_zero* receive_cmo_zero(OXFILE *oxfp)
 {  {
     return new_cmo_zero();      return new_cmo_zero();
Line 329  cmo *receive_cmo_tag(OXFILE *oxfp, int tag)
Line 339  cmo *receive_cmo_tag(OXFILE *oxfp, int tag)
     case CMO_ZZ:      case CMO_ZZ:
         m = (cmo *)receive_cmo_zz(oxfp);          m = (cmo *)receive_cmo_zz(oxfp);
         break;          break;
       case CMO_QQ:
           m = (cmo *)receive_cmo_qq(oxfp);
           break;
     case CMO_ZERO:      case CMO_ZERO:
         m = (cmo *)receive_cmo_zero(oxfp);          m = (cmo *)receive_cmo_zero(oxfp);
         break;          break;
Line 364  cmo *receive_cmo_tag(OXFILE *oxfp, int tag)
Line 377  cmo *receive_cmo_tag(OXFILE *oxfp, int tag)
         m = (cmo *)receive_cmo_error2(oxfp);          m = (cmo *)receive_cmo_error2(oxfp);
         break;          break;
     case CMO_DATUM:      case CMO_DATUM:
     case CMO_QQ:  
     default:      default:
         m = NULL;          m = NULL;
         ox_printf("the CMO (%d) is not implemented.\n", tag);          ox_printf("the CMO (%d) is not implemented.\n", tag);
Line 375  cmo *receive_cmo_tag(OXFILE *oxfp, int tag)
Line 387  cmo *receive_cmo_tag(OXFILE *oxfp, int tag)
 static void receive_mpz(OXFILE *oxfp, mpz_ptr mpz)  static void receive_mpz(OXFILE *oxfp, mpz_ptr mpz)
 {  {
     int i;      int i;
           int n = sizeof(mpz->_mp_d[0]) / sizeof(int);
     int size  = receive_int32(oxfp);      int size  = receive_int32(oxfp);
     int len   = abs(size);      int len   = abs(size);
     resize_mpz(mpz, size);          int *ptr;
           if (n == 1) {
               resize_mpz(mpz, size);
           } else {
               resize_mpz(mpz, (size+1) / n);
           }
   
     for(i=0; i<len; i++) {          ptr = (int *)mpz->_mp_d;
         mpz->_mp_d[i] = receive_int32(oxfp);          for(i= len-1; i>=0; i--) {
     }                  ptr[i] = receive_int32(oxfp);
           }
 }  }
   
 void send_ox_command(OXFILE *oxfp, int sm_command)  void send_ox_command(OXFILE *oxfp, int sm_command)
Line 593  static int send_cmo_zz(OXFILE *oxfp, cmo_zz* c)
Line 612  static int send_cmo_zz(OXFILE *oxfp, cmo_zz* c)
     return 0;      return 0;
 }  }
   
   static int send_cmo_qq(OXFILE *oxfp, cmo_qq* c)
   {
       send_mpz(oxfp, mpq_numref(c->mpq));
       send_mpz(oxfp, mpq_denref(c->mpq));
       return 0;
   }
   
 static int send_cmo_recursive_polynomial(OXFILE *oxfp, cmo_recursive_polynomial* c)  static int send_cmo_recursive_polynomial(OXFILE *oxfp, cmo_recursive_polynomial* c)
 {  {
         send_cmo(oxfp, (cmo *)c->ringdef);          send_cmo(oxfp, (cmo *)c->ringdef);
Line 656  void send_cmo(OXFILE *oxfp, cmo* c)
Line 682  void send_cmo(OXFILE *oxfp, cmo* c)
     case CMO_ZZ:      case CMO_ZZ:
         send_cmo_zz(oxfp, (cmo_zz *)c);          send_cmo_zz(oxfp, (cmo_zz *)c);
         break;          break;
       case CMO_QQ:
           send_cmo_qq(oxfp, (cmo_qq *)c);
           break;
     case CMO_DISTRIBUTED_POLYNOMIAL:      case CMO_DISTRIBUTED_POLYNOMIAL:
         send_cmo_distributed_polynomial(oxfp, (cmo_distributed_polynomial *)c);          send_cmo_distributed_polynomial(oxfp, (cmo_distributed_polynomial *)c);
         break;          break;
Line 683  void send_cmo(OXFILE *oxfp, cmo* c)
Line 712  void send_cmo(OXFILE *oxfp, cmo* c)
 static int send_mpz(OXFILE *oxfp, mpz_ptr mpz)  static int send_mpz(OXFILE *oxfp, mpz_ptr mpz)
 {  {
     int i;      int i;
     int len = abs(mpz->_mp_size);          int n = sizeof(mpz->_mp_d[0]) / sizeof(int);
     send_int32(oxfp, mpz->_mp_size);      int len = abs(mpz->_mp_size) * n;
           int *ptr = (int *)mpz->_mp_d;
       send_int32(oxfp, mpz->_mp_size * n);
     for(i=0; i<len; i++) {      for(i=0; i<len; i++) {
         send_int32(oxfp, mpz->_mp_d[i]);          send_int32(oxfp, ptr[i]);
     }      }
     return 0;      return 0;
 }  }
Legend:
Removed from v.1.32  
changed lines
  Added in v.1.35
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>