OpenXM/src/asir-port/cgi/r-fd.rr - diff

Return to r-fd.rr CVS log

Up to [local] / OpenXM / src / asir-port / cgi

Diff for /OpenXM/src/asir-port/cgi/r-fd.rr between version 1.5 and 1.8

-version 1.5, 2014/08/27 02:14:40
+version 1.8, 2015/02/28 11:39:13
 Line 1
 Line 1
 Line 1
- /* $OpenXM: OpenXM/src/asir-port/cgi/r-fd.rr,v 1.4 2014/08/06 07:39:47 takayama Exp $ */
+ /* $OpenXM: OpenXM/src/asir-port/cgi/r-fd.rr,v 1.7 2015/02/25 04:47:50 takayama Exp $ */
  load("tk_fd.rr")$
  import("tk_r.rr")$
  import("oh_number.rr")$
 Line 18  def r_d2rat(Y) {
 Line 18  def r_d2rat(Y) {
 Line 18  def r_d2rat(Y) {
  }
  def r_ahvec(A,B,C,Y) {
    Y = r_d2rat(Y);
+   Ans=a_ahvec(A,B,C,Y);
+   /*  Fans=map(rtostr,map(tk_fd.tk_number_rattofloat,Ans)); */
+   Fans=map(deval,Ans);
+   Fans = tk_r.asir2r_c(Fans);
+   return Fans;
+ }
+ def a_ahvec(A,B,C,Y) {
    R=tk_fd.ahvec_abc(A,B,C,Y|all=1);
    Gamma=R[1];
    Der=R[0];
-Line 26  def r_ahvec(A,B,C,Y) {
+Line 34  def r_ahvec(A,B,C,Y) {
 Line 26  def r_ahvec(A,B,C,Y) {
 Line 34  def r_ahvec(A,B,C,Y) {
    for (I=0; I<length(Der); I++) Der2[I] = Der[I]*Gamma;
    Der2 = vtol(Der2);
    Ans=cons(Z,Der2);
-   /*  Fans=map(rtostr,map(tk_fd.tk_number_rattofloat,Ans)); */
+   return(Ans);
-   Fans=map(deval,Ans);
-   Fans = tk_r.asir2r_c(Fans);
-   return Fans;
  }
  /* temporary */
-Line 53  def checkrats2() {
+Line 58  def checkrats2() {
 Line 53  def checkrats2() {
 Line 58  def checkrats2() {
          printf("error: X = %a, Y=%a\n",X,Y);
       }
    }
+ }
+ def a_expect(A,B,C,Y) {
+   E=tk_fd.expectation_abc(A,B,C,Y);
+   return(E);
+ }
+ def r_expect(A,B,C,Y) {
+   Y = r_d2rat(Y);
+   E=a_expect(A,B,C,Y);
+   Fans=map_deval(E);
+   Fans = tk_r.asir2r_c(Fans);
+   return Fans;
+ }
+ def r_ahmat(A,B,C,Y) {
+   Y = r_d2rat(Y);
+   Ans=a_ahmat(A,B,C,Y);
+   Fans=map_deval(Ans);
+   Fans = tk_r.asir2r_c(Fans);
+   return Fans;
+ }
+ def a_ahmat(A,B,C,Y) {
+   return(tk_fd.ahmat_abc(A,B,C,Y));
+ }
+ def r_log_ahmat(A,B,C,Y) {
+   Y = r_d2rat(Y);
+   Ans=a_log_ahmat(A,B,C,Y);
+   Fans=map_deval(Ans);
+   Fans = tk_r.asir2r_c(Fans);
+   return Fans;
+ }
+ def a_log_ahmat(A,B,C,Y) {
+   Ans=tk_fd.log_ahmat_abc(A,B,C,Y);
+   return Ans;
+ }
+ def map_deval(L) {
+   if (type(L) >=4) return(map(map_deval,L));
+   return(deval(L));
  }
  end$

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