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

Diff for /OpenXM_contrib2/asir2018/engine/up_lm.c between version 1.1 and 1.2

version 1.1, 2018/09/19 05:45:07 version 1.2, 2018/09/28 08:20:28
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *   *
  * $OpenXM$   * $OpenXM: OpenXM_contrib2/asir2018/engine/up_lm.c,v 1.1 2018/09/19 05:45:07 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include <math.h>  #include <math.h>
Line 92  void fft_mulup_lm(UP n1,UP n2,UP *nr)
Line 92  void fft_mulup_lm(UP n1,UP n2,UP *nr)
     cond = FFT_pol_product(d1,f1,d2,f2,fr,i,w);      cond = FFT_pol_product(d1,f1,d2,f2,fr,i,w);
     if ( cond )      if ( cond )
       error("fft_mulup : error in FFT_pol_product");        error("fft_mulup : error in FFT_pol_product");
     STOQ(mod,m1); mulz(m,m1,&m2); m = m2;      STOZ(mod,m1); mulz(m,m1,&m2); m = m2;
     if ( z_bits((Q)m) > bound ) {      if ( z_bits((Q)m) > bound ) {
       crup_lm(frarray,d1+d2,modarray,frarray_index,m,lm_mod,&r);        crup_lm(frarray,d1+d2,modarray,frarray_index,m,lm_mod,&r);
       uptolmup(r,nr);        uptolmup(r,nr);
Line 137  void fft_squareup_lm(UP n1,UP *nr)
Line 137  void fft_squareup_lm(UP n1,UP *nr)
     cond = FFT_pol_square(d1,f1,fr,i,w);      cond = FFT_pol_square(d1,f1,fr,i,w);
     if ( cond )      if ( cond )
       error("fft_mulup : error in FFT_pol_product");        error("fft_mulup : error in FFT_pol_product");
     STOQ(mod,m1); mulz(m,m1,&m2); m = m2;      STOZ(mod,m1); mulz(m,m1,&m2); m = m2;
     if ( z_bits((Q)m) > bound ) {      if ( z_bits((Q)m) > bound ) {
       crup_lm(frarray,2*d1,modarray,frarray_index,m,lm_mod,&r);        crup_lm(frarray,2*d1,modarray,frarray_index,m,lm_mod,&r);
       uptolmup(r,nr);        uptolmup(r,nr);
Line 185  void trunc_fft_mulup_lm(UP n1,UP n2,int dbd,UP *nr)
Line 185  void trunc_fft_mulup_lm(UP n1,UP n2,int dbd,UP *nr)
     cond = FFT_pol_product(d1,f1,d2,f2,fr,i,w);      cond = FFT_pol_product(d1,f1,d2,f2,fr,i,w);
     if ( cond )      if ( cond )
       error("fft_mulup : error in FFT_pol_product");        error("fft_mulup : error in FFT_pol_product");
     STOQ(mod,m1); mulz(m,m1,&m2); m = m2;      STOZ(mod,m1); mulz(m,m1,&m2); m = m2;
     if ( z_bits((Q)m) > bound ) {      if ( z_bits((Q)m) > bound ) {
       crup_lm(frarray,MIN(dbd-1,d1+d2),modarray,frarray_index,m,lm_mod,&r);        crup_lm(frarray,MIN(dbd-1,d1+d2),modarray,frarray_index,m,lm_mod,&r);
       uptolmup(r,nr);        uptolmup(r,nr);

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2

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