OpenXM_contrib2/asir2000/engine/NEZ.c - diff

Return to NEZ.c CVS log

Up to [local] / OpenXM_contrib2 / asir2000 / engine

Diff for /OpenXM_contrib2/asir2000/engine/NEZ.c between version 1.1.1.1 and 1.4

-version 1.1.1.1, 1999/12/03 07:39:08
+version 1.4, 2002/12/09 07:24:52
 Line 1
 Line 1
 Line 1
- /* $OpenXM: OpenXM/src/asir99/engine/NEZ.c,v 1.1.1.1 1999/11/10 08:12:26 noro Exp $ */
+ /*
+  * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED
+  * All rights reserved.
+  *
+  * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited,
+  * non-exclusive and royalty-free license to use, copy, modify and
+  * redistribute, solely for non-commercial and non-profit purposes, the
+  * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and
+  * conditions of this Agreement. For the avoidance of doubt, you acquire
+  * only a limited right to use the SOFTWARE hereunder, and FLL or any
+  * third party developer retains all rights, including but not limited to
+  * copyrights, in and to the SOFTWARE.
+  *
+  * (1) FLL does not grant you a license in any way for commercial
+  * purposes. You may use the SOFTWARE only for non-commercial and
+  * non-profit purposes only, such as academic, research and internal
+  * business use.
+  * (2) The SOFTWARE is protected by the Copyright Law of Japan and
+  * international copyright treaties. If you make copies of the SOFTWARE,
+  * with or without modification, as permitted hereunder, you shall affix
+  * to all such copies of the SOFTWARE the above copyright notice.
+  * (3) An explicit reference to this SOFTWARE and its copyright owner
+  * shall be made on your publication or presentation in any form of the
+  * results obtained by use of the SOFTWARE.
+  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
+  * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
+  * for such modification or the source code of the modified part of the
+  * SOFTWARE.
+  *
+  * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL
+  * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND
+  * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
+  * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES'
+  * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY
+  * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY.
+  * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT,
+  * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY
+  * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+  * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES
+  * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES
+  * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY
+  * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
+  * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART
+  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
+  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
+  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
+  *
+  * $OpenXM: OpenXM_contrib2/asir2000/engine/NEZ.c,v 1.3 2000/08/22 05:04:04 noro Exp $
+ */
  #include "ca.h"
  void nezgcdnpz(vl,ps,m,pr)
-Line 304  P p0,*ps,*pr;
+Line 352  P p0,*ps,*pr;
 Line 304  P p0,*ps,*pr;
 Line 352  P p0,*ps,*pr;
          W_CALLOC(nv,struct oVN,vn1);
          for ( i = 0, tvl = NEXT(nvl); tvl; tvl = NEXT(tvl), i++ )
                  vn1[i].v = vn0[i].v = tvl->v;
+         if ( !nonzero_const_term(p0) ) {
+                 for ( i = 0; i < nv; i++ )
+                         vn0[i].n = ((unsigned int)random())%256+1;
+         }
          /* main loop */
          for ( dg = deg(v,tps[0]) + 1; ; next(vn0) )
-Line 445  P p;
+Line 497  P p;
 Line 445  P p;
 Line 497  P p;
                  for ( dc = DC(p), n = 0; dc; dc = NEXT(dc) )
                          n += lengthp(COEF(dc));
                  return n;
+         }
+ }
+ int nonzero_const_term(P p)
+ {
+         DCP dc;
+         if ( !p )
+                 return 0;
+         else if ( NUM(p) )
+                 return 1;
+         else {
+                 dc = DC(p);
+                 for ( ; NEXT(dc); dc = NEXT(dc) );
+                 if ( DEG(dc) )
+                         return 0;
+                 else
+                         return nonzero_const_term(COEF(dc));
          }
  }

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