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

Return to r-fd.rr CVS log

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

-version 1.7, 2015/02/25 04:47:50
+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.6 2014/12/12 08:29:53 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 67  def a_expect(A,B,C,Y) {
 Line 67  def a_expect(A,B,C,Y) {
 Line 67  def a_expect(A,B,C,Y) {
  def r_expect(A,B,C,Y) {
    Y = r_d2rat(Y);
    E=a_expect(A,B,C,Y);
-   Fans=map(deval,E);
+   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$