[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.172 and 1.173

version 1.172, 2009/02/15 03:07:41 version 1.173, 2009/02/15 09:22:07
Line 1 
Line 1 
 /* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.171 2009/02/11 06:30:21 noro Exp $ */  /* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.172 2009/02/15 03:07:41 noro Exp $ */
   
 #include "nd.h"  #include "nd.h"
   
Line 49  static int nd_demand;
Line 49  static int nd_demand;
 static int nd_module,nd_ispot,nd_mpos;  static int nd_module,nd_ispot,nd_mpos;
 static NODE nd_tracelist;  static NODE nd_tracelist;
 static NODE nd_alltracelist;  static NODE nd_alltracelist;
 static int nd_gentrace,nd_gensyz;  static int nd_gentrace,nd_gensyz,nd_nora;
   
 NumberField get_numberfield();  NumberField get_numberfield();
 UINT *nd_det_compute_bound(NDV **dm,int n,int j);  UINT *nd_det_compute_bound(NDV **dm,int n,int j);
Line 2192  NODE ndv_reduceall(int m,NODE f)
Line 2192  NODE ndv_reduceall(int m,NODE f)
     union oNDC hc;      union oNDC hc;
     P cont,cont1;      P cont,cont1;
   
       if ( nd_nora ) return f;
     n = length(f);      n = length(f);
     ndv_setup(m,0,f,0,1);      ndv_setup(m,0,f,0,1);
         perm = (int *)MALLOC(n*sizeof(int));          perm = (int *)MALLOC(n*sizeof(int));
Line 3144  void nd_gr_trace(LIST f,LIST v,int trace,int homo,int 
Line 3145  void nd_gr_trace(LIST f,LIST v,int trace,int homo,int 
         cand = ndv_reduceall(0,cand);          cand = ndv_reduceall(0,cand);
         cbpe = nd_bpe;          cbpe = nd_bpe;
         if ( nd_gentrace ) { tl2 = nd_alltracelist; nd_alltracelist = 0; }          if ( nd_gentrace ) { tl2 = nd_alltracelist; nd_alltracelist = 0; }
           get_eg(&eg0);
         if ( nocheck )          if ( nocheck )
             break;              break;
         get_eg(&eg0);  
         if ( ret = ndv_check_membership(0,in0,obpe,oadv,oepos,cand) ) {          if ( ret = ndv_check_membership(0,in0,obpe,oadv,oepos,cand) ) {
             if ( nd_gentrace ) {              if ( nd_gentrace ) {
                             tl3 = nd_alltracelist; nd_alltracelist = 0;                              tl3 = nd_alltracelist; nd_alltracelist = 0;
Line 6800  void parse_nd_option(NODE opt)
Line 6801  void parse_nd_option(NODE opt)
     char *key;      char *key;
     Obj value;      Obj value;
   
     nd_gentrace = 0; nd_gensyz = 0;      nd_gentrace = 0; nd_gensyz = 0; nd_nora = 0;
     for ( t = opt; t; t = NEXT(t) ) {      for ( t = opt; t; t = NEXT(t) ) {
         p = BDY((LIST)BDY(t));          p = BDY((LIST)BDY(t));
         key = BDY((STRING)BDY(p));          key = BDY((STRING)BDY(p));
Line 6809  void parse_nd_option(NODE opt)
Line 6810  void parse_nd_option(NODE opt)
             nd_gentrace = value?1:0;              nd_gentrace = value?1:0;
         else if ( !strcmp(key,"gensyz") )          else if ( !strcmp(key,"gensyz") )
             nd_gensyz = value?1:0;              nd_gensyz = value?1:0;
           else if ( !strcmp(key,"nora") )
               nd_nora = value?1:0;
     }      }
 }  }
Legend:
Removed from v.1.172  
changed lines
  Added in v.1.173
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>