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

Diff for /OpenXM_contrib2/asir2018/builtin/dp.c between version 1.7 and 1.8

version 1.7, 2019/03/18 07:09:58 version 1.8, 2019/03/18 10:30:41
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/asir2018/builtin/dp.c,v 1.6 2019/03/18 07:00:33 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2018/builtin/dp.c,v 1.7 2019/03/18 07:09:58 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "base.h"  #include "base.h"
Line 503  P binpoly(P n,int a,int b)
Line 503  P binpoly(P n,int a,int b)
   return r;    return r;
 }  }
   
 void mhp_to_hf(VL vl,P hp,int n,P *plist,VECT *head,P *hf,Z *den)  void mhp_to_hf(VL vl,P hp,int n,P *plist,VECT *head,P *hf)
 {  {
   P tv,gcd,q,h,hphead,tt,ai,hpoly,nv,bp,w;    P tv,gcd,q,h,hphead,tt,ai,hpoly,nv,bp,w;
   Z d;    Z d,z;
   DCP dc,topdc;    DCP dc,topdc;
   VECT hfhead;    VECT hfhead;
   int i,s,qd;    int i,s,qd;
   
   if ( !hp ) {    if ( !hp ) {
     MKVECT(hfhead,0); *head = hfhead;      MKVECT(hfhead,0); *head = hfhead;
     *hf = 0; *den = ONE;      *hf = 0;
   } else {    } else {
     makevar("t",&tv);      makevar("t",&tv);
     ezgcdp(CO,hp,plist[n],&gcd);      ezgcdp(CO,hp,plist[n],&gcd);
Line 533  void mhp_to_hf(VL vl,P hp,int n,P *plist,VECT *head,P 
Line 533  void mhp_to_hf(VL vl,P hp,int n,P *plist,VECT *head,P 
       }        }
       *head = hfhead;        *head = hfhead;
       *hf = 0;        *hf = 0;
       *den = ONE;  
     } else {      } else {
       if ( qd ) {        if ( qd ) {
         topdc = 0;          topdc = 0;
Line 559  void mhp_to_hf(VL vl,P hp,int n,P *plist,VECT *head,P 
Line 558  void mhp_to_hf(VL vl,P hp,int n,P *plist,VECT *head,P 
         addp(CO,hpoly,tt,&w);          addp(CO,hpoly,tt,&w);
         hpoly = w;          hpoly = w;
       }        }
         if ( s > 2 ) {
           factorialz(s-1,&z);
           divsp(CO,hpoly,(P)z,&tt); hpoly = tt;
         }
       *hf = hpoly;        *hf = hpoly;
       factorialz(s-1,den);        for ( i = qd-1; i >= 0; i-- ) {
           UTOZ(i,z);
           substp(CO,hpoly,VR(nv),(P)z,&tt);
           if ( cmpz((Z)tt,(Z)BDY(hfhead)[i]) ) break;
         }
         hfhead->len = i+1;
     }      }
   }    }
 }  }
Line 626  void Pdp_monomial_hilbert_poincare(NODE arg,LIST *rp)
Line 634  void Pdp_monomial_hilbert_poincare(NODE arg,LIST *rp)
   make_reduced(b,n);    make_reduced(b,n);
   mhp_rec(b,x,tv,r);    mhp_rec(b,x,tv,r);
   hp = mhp_ctop(r,plist,n);    hp = mhp_ctop(r,plist,n);
   mhp_to_hf(CO,hp,n,plist,&hfhead,&hpoly,&den);    mhp_to_hf(CO,hp,n,plist,&hfhead,&hpoly);
   UTOZ(n,z);    UTOZ(n,z);
   nd = mknode(5,hp,z,hfhead,hpoly,den);    nd = mknode(4,hp,z,hfhead,hpoly);
   MKLIST(*rp,nd);    MKLIST(*rp,nd);
 }  }
   
Legend:
Removed from v.1.7  
changed lines
  Added in v.1.8
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>