[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.235 and 1.237

version 1.235, 2017/02/28 07:06:28 version 1.237, 2017/04/09 02:23:12
Line 1 
Line 1 
 /* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.234 2017/02/21 09:20:23 noro Exp $ */  /* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.236 2017/03/27 09:05:46 noro Exp $ */
   
 #include "nd.h"  #include "nd.h"
   
Line 652  int ndl_composite_compare(UINT *d1,UINT *d2)
Line 652  int ndl_composite_compare(UINT *d1,UINT *d2)
                             else if ( nd_work_vector[j] < 0 ) return -1;                              else if ( nd_work_vector[j] < 0 ) return -1;
                         break;                          break;
                     case 2:                      case 2:
                           end = start+len;
                         for ( j = start; j < end; j++ )                          for ( j = start; j < end; j++ )
                             if ( nd_work_vector[j] > 0 ) return 1;                              if ( nd_work_vector[j] > 0 ) return 1;
                             else if ( nd_work_vector[j] < 0 ) return -1;                              else if ( nd_work_vector[j] < 0 ) return -1;
Line 3927  void ndl_print(UINT *dl)
Line 3928  void ndl_print(UINT *dl)
         for ( i = 0; i < n; i++ ) printf(i==n-1?"%d":"%d,",GET_EXP(dl,i));          for ( i = 0; i < n; i++ ) printf(i==n-1?"%d":"%d,",GET_EXP(dl,i));
     }      }
     printf(">>");      printf(">>");
     if ( MPOS(dl) )      if ( nd_module && MPOS(dl) )
         printf("*e%d",MPOS(dl));          printf("*e%d",MPOS(dl));
 }  }
   
Line 4368  int nd_get_exporigin(struct order_spec *ord)
Line 4369  int nd_get_exporigin(struct order_spec *ord)
             /* module d[0]:weight d[1]:w0,...,d[nd_exporigin-2]:w(n-1) */              /* module d[0]:weight d[1]:w0,...,d[nd_exporigin-2]:w(n-1) */
             return ord->ord.block.length+1+nd_module;              return ord->ord.block.length+1+nd_module;
         case 3: case 259:          case 3: case 259:
   #if 0
             error("nd_get_exporigin : composite order is not supported yet.");              error("nd_get_exporigin : composite order is not supported yet.");
   #else
               return 1+nd_module;
   #endif
     }      }
 }  }
   
Line 7079  init_eg(&eg_search);
Line 7084  init_eg(&eg_search);
     else if ( m == -2 )      else if ( m == -2 )
         r0 = nd_f4_red_lf_main(m,sp0,nsp,trace,s0vect,col,rvect,rhead,imat,nred);          r0 = nd_f4_red_lf_main(m,sp0,nsp,trace,s0vect,col,rvect,rhead,imat,nred);
     else      else
   #if defined(VISUAL)
           r0 = nd_f4_red_q_main(sp0,nsp,trace,s0vect,col,rvect,rhead,imat,nred);
   #else
         r0 = nd_f4_red_gz_main(sp0,nsp,trace,s0vect,col,rvect,rhead,imat,nred);          r0 = nd_f4_red_gz_main(sp0,nsp,trace,s0vect,col,rvect,rhead,imat,nred);
   #endif
     if ( DP_Print ) print_eg("search",&eg_search);      if ( DP_Print ) print_eg("search",&eg_search);
     return r0;      return r0;
 }  }
Legend:
Removed from v.1.235  
changed lines
  Added in v.1.237
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>