[BACK]Return to tk_jack.rr CVS log [TXT][DIR] Up to [local] / OpenXM / src / asir-contrib / packages / src

Diff for /OpenXM/src/asir-contrib/packages/src/tk_jack.rr between version 1.4 and 1.7

version 1.4, 2014/03/11 01:46:19 version 1.7, 2016/02/01 05:50:23
Line 1 
Line 1 
 /*  /*
 $OpenXM: OpenXM/src/asir-contrib/packages/src/tk_jack.rr,v 1.3 2014/03/10 05:30:58 takayama Exp $  $OpenXM: OpenXM/src/asir-contrib/packages/src/tk_jack.rr,v 1.6 2014/09/12 05:04:01 takayama Exp $
 Koev-Edelman for higher order derivatives.  Koev-Edelman for higher order derivatives.
 Series solution obtained by an interpolation and Koev-Edelman evaluation.  Series solution obtained by an interpolation and Koev-Edelman evaluation.
 Previous version: misc-2011/10/wishart/Prog/mh.rr  Previous version: misc-2011/10/wishart/Prog/mh.rr
 */  */
   #define USE_MODULE 1
 module tk_jack$  module tk_jack$
 localf permutation;  localf permutation;
 localf mysum;  localf mysum;
Line 594  def genDarray(M,N) {
Line 594  def genDarray(M,N) {
   /*extern Darray;    /*extern Darray;
   extern Parray; */    extern Parray; */
   L = partition_a(N,M);    L = partition_a(N,M);
   L = qsort(newvect(length(L),L),plength2);    L = qsort(newvect(length(L),L),tk_jack.plength2);
   Pmn = length(L);    Pmn = length(L);
   printf("Degree M = %a, N of vars N = %a, Pmn=%a\n",M,N,Pmn);    printf("Degree M = %a, N of vars N = %a, Pmn=%a\n",M,N,Pmn);
   printf("L=%a\n",L);    printf("L=%a\n",L);
Line 667  def pListPartition2(Less,From,To,M) {
Line 667  def pListPartition2(Less,From,To,M) {
 /*  /*
   Implement works for partition here.    Implement works for partition here.
 */  */
   #ifdef USE_MODULE
   M_pExec=tk_jack.pExec_0$
   #else
 M_pExec=pExec_0$  M_pExec=pExec_0$
   #endif
 def pExec_0() {  def pExec_0() {
   M_plist = cons(cdr(vtol(M_kap)),M_plist);    M_plist = cons(cdr(vtol(M_kap)),M_plist);
   printf("pExec:%a\n", M_kap);    printf("pExec:%a\n", M_kap);
Line 746  def genDarray2(M,N) {
Line 750  def genDarray2(M,N) {
   printf("Degree M = %a, N of vars N = %a, Pmn+1=%a\n",M,N,Pmn);    printf("Degree M = %a, N of vars N = %a, Pmn+1=%a\n",M,N,Pmn);
   Darray=newvect(Pmn);    Darray=newvect(Pmn);
   Parray=newvect(Pmn); DR_parray=0;    Parray=newvect(Pmn); DR_parray=0;
   #ifdef USE_MODULE
     M_pExec = tk_jack.pExec_darray;
   #else
   M_pExec = pExec_darray;    M_pExec = pExec_darray;
   #endif
   pListPartition(M,N);  /* pExec_darray() is executed for all partitions */    pListPartition(M,N);  /* pExec_darray() is executed for all partitions */
   L = Parray;    L = Parray;
   
Line 830  def genBeta(Kap) {
Line 838  def genBeta(Kap) {
   M_beta_pt = 0;    M_beta_pt = 0;
   N = plength(Kap);    N = plength(Kap);
   for (I=0; I<=P_pmn; I++) for (J=0; J<2; J++) M_beta[J][I] = nan;    for (I=0; I<=P_pmn; I++) for (J=0; J<2; J++) M_beta[J][I] = nan;
   #ifdef USE_MODULE
     HS_hsExec = tk_jack.hsExec_beta;
   #else
   HS_hsExec = hsExec_beta;    HS_hsExec = hsExec_beta;
   #endif
   M_beta_kap = Kap;    M_beta_kap = Kap;
   pListHS(cons(0,Kap),N);    pListHS(cons(0,Kap),N);
 }  }
Legend:
Removed from v.1.4  
changed lines
  Added in v.1.7
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>