[BACK]Return to nd.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / engine

Diff for /OpenXM_contrib2/asir2000/engine/nd.c between version 1.200 and 1.202

version 1.200, 2012/12/17 07:20:44 version 1.202, 2013/01/30 08:03:18
Line 1 
Line 1 
 /* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.199 2012/08/27 05:38:00 noro Exp $ */  /* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.201 2013/01/30 07:44:48 noro Exp $ */
   
 #include "nd.h"  #include "nd.h"
   
 struct oEGT eg_search;  struct oEGT eg_search;
   
 int diag_period = 6;  int diag_period = 6;
   int weight_check = 1;
 int (*ndl_compare_function)(UINT *a1,UINT *a2);  int (*ndl_compare_function)(UINT *a1,UINT *a2);
 int nd_dcomp;  int nd_dcomp;
 NM _nm_free_list;  NM _nm_free_list;
Line 3952  void nd_setup_parameters(int nvar,int max) {
Line 3953  void nd_setup_parameters(int nvar,int max) {
         else if ( max < 65536 ) nd_bpe = 16;          else if ( max < 65536 ) nd_bpe = 16;
         else nd_bpe = 32;          else nd_bpe = 32;
     }      }
       if ( !do_weyl && weight_check && current_dl_weight_vector ) {
           UINT t;
                   /* t = max(weights) */
           for ( i = 0, t = 0; i < nd_nvar; i++ )
                           if ( t < current_dl_weight_vector[i] )
                                   t = current_dl_weight_vector[i];
                   /* i = bitsize of t */
                   for ( i = 0; t; t >>=1, i++ );
                   /* i += bitsize of nd_nvar */
                   for ( t = nd_nvar; t; t >>=1, i++);
                   /* nd_bpe+i = bitsize of max(weights)*max(exp)*nd_nvar */
                   if ( (nd_bpe+i) >= 31 )
                           error("nd_setup_parameters : too large weight");
           }
     nd_epw = (sizeof(UINT)*8)/nd_bpe;      nd_epw = (sizeof(UINT)*8)/nd_bpe;
     elen = nd_nvar/nd_epw+(nd_nvar%nd_epw?1:0);      elen = nd_nvar/nd_epw+(nd_nvar%nd_epw?1:0);
     nd_exporigin = nd_get_exporigin(nd_ord);      nd_exporigin = nd_get_exporigin(nd_ord);

Legend:
Removed from v.1.200  
changed lines
  Added in v.1.202

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>