[BACK]Return to fctr.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / builtin

Diff for /OpenXM_contrib2/asir2000/builtin/fctr.c between version 1.2 and 1.6

version 1.2, 2000/08/21 08:31:19 version 1.6, 2001/06/20 09:30:33
Line 23 
Line 23 
  * shall be made on your publication or presentation in any form of the   * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.   * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by   * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
  * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification   * 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   * for such modification or the source code of the modified part of the
  * SOFTWARE.   * SOFTWARE.
  *   *
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_contrib2/asir2000/builtin/fctr.c,v 1.1.1.1 1999/12/03 07:39:07 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/builtin/fctr.c,v 1.5 2001/05/28 08:25:30 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
Line 54  void Pfctr(), Pgcd(), Pgcdz(), Plcm(), Psqfr(), Pufctr
Line 54  void Pfctr(), Pgcd(), Pgcdz(), Plcm(), Psqfr(), Pufctr
 void Pptozp(), Pcont();  void Pptozp(), Pcont();
 void Pafctr(), Pagcd();  void Pafctr(), Pagcd();
 void Pmodsqfr(),Pmodfctr(),Pddd(),Pnewddd(),Pddd_tab();  void Pmodsqfr(),Pmodfctr(),Pddd(),Pnewddd(),Pddd_tab();
   void Psffctr();
 void Pirred_check(), Pnfctr_mod();  void Pirred_check(), Pnfctr_mod();
   
 struct ftab fctr_tab[] = {  struct ftab fctr_tab[] = {
         {"fctr",Pfctr,1},          {"fctr",Pfctr,-2},
         {"gcd",Pgcd,-3},          {"gcd",Pgcd,-3},
         {"gcdz",Pgcdz,2},          {"gcdz",Pgcdz,2},
         {"lcm",Plcm,2},          {"lcm",Plcm,2},
Line 69  struct ftab fctr_tab[] = {
Line 70  struct ftab fctr_tab[] = {
         {"agcd",Pagcd,3},          {"agcd",Pagcd,3},
         {"modsqfr",Pmodsqfr,2},          {"modsqfr",Pmodsqfr,2},
         {"modfctr",Pmodfctr,2},          {"modfctr",Pmodfctr,2},
           {"sffctr",Psffctr,1},
 #if 0  #if 0
         {"ddd",Pddd,2},          {"ddd",Pddd,2},
         {"newddd",Pnewddd,2},          {"newddd",Pnewddd,2},
Line 86  LIST *rp;
Line 88  LIST *rp;
         DCP dc;          DCP dc;
   
         asir_assert(ARG0(arg),O_P,"fctr");          asir_assert(ARG0(arg),O_P,"fctr");
         fctrp(CO,(P)ARG0(arg),&dc);          if ( argc(arg) == 1 )
                   fctrp(CO,(P)ARG0(arg),&dc);
           else {
                   asir_assert(ARG1(arg),O_P,"fctr");
                   fctr_wrt_v_p(CO,(P)ARG0(arg),VR((P)ARG1(arg)),&dc);
           }
         dcptolist(dc,rp);          dcptolist(dc,rp);
 }  }
   
Line 106  P *rp;
Line 113  P *rp;
         else if ( !p2 )          else if ( !p2 )
                 *rp = p1;                  *rp = p1;
         else if ( !qpcheck((Obj)p1) || !qpcheck((Obj)p2) )          else if ( !qpcheck((Obj)p1) || !qpcheck((Obj)p2) )
                 error("gcd : invalid argument");                  gcdprsp(CO,p1,p2,rp);
         else if ( argc(arg) == 2 )          else if ( argc(arg) == 2 )
                 ezgcdp(CO,p1,p2,rp);                  ezgcdp(CO,p1,p2,rp);
         else {          else {
Line 306  LIST *rp;
Line 313  LIST *rp;
         if ( mod < 0 )          if ( mod < 0 )
                 error("modfctr : invalid modulus");                  error("modfctr : invalid modulus");
         modfctrp(ARG0(arg),mod,NEWDDD,&dc);          modfctrp(ARG0(arg),mod,NEWDDD,&dc);
           if ( !dc ) {
                   NEWDC(dc); COEF(dc) = 0; DEG(dc) = ONE; NEXT(dc) = 0;
           }
           dcptolist(dc,rp);
   }
   
   void Psffctr(arg,rp)
   NODE arg;
   LIST *rp;
   {
           DCP dc;
           int mod;
   
           fctrsf(ARG0(arg),&dc);
         if ( !dc ) {          if ( !dc ) {
                 NEWDC(dc); COEF(dc) = 0; DEG(dc) = ONE; NEXT(dc) = 0;                  NEWDC(dc); COEF(dc) = 0; DEG(dc) = ONE; NEXT(dc) = 0;
         }          }
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.6
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>