[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.212 and 1.213

version 1.212, 2013/09/27 02:35:15 version 1.213, 2013/09/27 02:45:17
Line 1 
Line 1 
 /* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.211 2013/09/26 08:55:11 noro Exp $ */  /* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.212 2013/09/27 02:35:15 noro Exp $ */
   
 #include "nd.h"  #include "nd.h"
   
Line 6184  NODE nd_f4_red_main(int m,ND_pairs sp0,int nsp,UINT *s
Line 6184  NODE nd_f4_red_main(int m,ND_pairs sp0,int nsp,UINT *s
         rank = nd_gauss_elim_mod(spmat,spsugar,spactive,sprow,spcol,m,colstat);          rank = nd_gauss_elim_mod(spmat,spsugar,spactive,sprow,spcol,m,colstat);
     r0 = 0;      r0 = 0;
     for ( i = 0; i < rank; i++ ) {      for ( i = 0; i < rank; i++ ) {
 #if 0  
         NEXTNODE(r0,r); BDY(r) =          NEXTNODE(r0,r); BDY(r) =
             (pointer)vect_to_ndv(spmat[i],spcol,col,rhead,s0vect);              (pointer)vect_to_ndv(spmat[i],spcol,col,rhead,s0vect);
         SG((NDV)BDY(r)) = spsugar[i];          SG((NDV)BDY(r)) = spsugar[i];
         GCFREE(spmat[i]);          GCFREE(spmat[i]);
 #else  
         NEXTNODE(r0,r); BDY(r) =  
             (pointer)vect_to_ndv(spmat[rank-i-1],spcol,col,rhead,s0vect);  
         SG((NDV)BDY(r)) = spsugar[rank-i-1];  
         GCFREE(spmat[rank-i-1]);  
 #endif  
     }      }
     if ( r0 ) NEXT(r) = 0;      if ( r0 ) NEXT(r) = 0;
   
Line 6269  NODE nd_f4_red_q_main(ND_pairs sp0,int nsp,int trace,U
Line 6262  NODE nd_f4_red_q_main(ND_pairs sp0,int nsp,int trace,U
     rank = nd_gauss_elim_q(spmat,spsugar,sprow,spcol,colstat);      rank = nd_gauss_elim_q(spmat,spsugar,sprow,spcol,colstat);
     w = (pointer *)ALLOCA(rank*sizeof(pointer));      w = (pointer *)ALLOCA(rank*sizeof(pointer));
     for ( i = 0; i < rank; i++ ) {      for ( i = 0; i < rank; i++ ) {
   #if 0
         w[rank-i-1] = (pointer)vect_to_ndv_q(spmat[i],spcol,col,rhead,s0vect);          w[rank-i-1] = (pointer)vect_to_ndv_q(spmat[i],spcol,col,rhead,s0vect);
         SG((NDV)w[rank-i-1]) = spsugar[i];          SG((NDV)w[rank-i-1]) = spsugar[i];
   #else
           w[i] = (pointer)vect_to_ndv_q(spmat[i],spcol,col,rhead,s0vect);
           SG((NDV)w[i]) = spsugar[i];
   #endif
 /*        GCFREE(spmat[i]); */  /*        GCFREE(spmat[i]); */
     }      }
 #if 0  #if 0

Legend:
Removed from v.1.212  
changed lines
  Added in v.1.213

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