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.3 and 1.7

-version 1.3, 2014/07/31 07:00:41
+version 1.7, 2015/02/25 04:47:50
 Line 1
 Line 1
 Line 1
- /* $OpenXM: OpenXM/src/asir-port/cgi/r-fd.rr,v 1.2 2014/07/31 06:24:11 takayama Exp $ */
+ /* $OpenXM: OpenXM/src/asir-port/cgi/r-fd.rr,v 1.6 2014/12/12 08:29:53 takayama Exp $ */
  load("tk_fd.rr")$
  import("tk_r.rr")$
  import("oh_number.rr")$
 Line 11  def r_d2rat(Y) {
 Line 11  def r_d2rat(Y) {
 Line 11  def r_d2rat(Y) {
      S = rtostr(Y);  Y = "eval(("+S+")*exp(0));";
      /* print(Y); */
      Y = eval_str(Y);
-     return oh_number.rats(Y);
+     /* printf("Y=%a\n",Y); */
+     /* return oh_number.rats(Y); */
+     return rats2(Y);  /* temporary  */
    }else return Y;
  }
  def r_ahvec(A,B,C,Y) {
    Y = r_d2rat(Y);
-   R=tk_fd.ygahvec(A,B,C,Y|all=1);
+   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];
    Z=R[2]*Gamma;
-Line 24  def r_ahvec(A,B,C,Y) {
+Line 34  def r_ahvec(A,B,C,Y) {
 Line 24  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);
+ }
+ /* temporary */
+ def rats2(X) {
+   if (X == 0) return 0;
+   Sign=1;
+   if (X <0) {Sign=-1  ; X = -X;}
+   Digit = number_floor(eval(log(X)/log(10)));
+   Num = number_floor((X/(10^Digit))*10^20);
+   return Sign*(Num/(10^20))*(10^Digit);
+ }
+ def checkrats2() {
+   for (I=0; I<10; I++) {
+      Sign=(-1)^(random()%2);
+      X = eval(exp(0)*(random()/random())*10^(Sign*(random()%300))); /* 308 */
+      printf("X=%a\n",X);
+      Y = rats2(X);
+      printf("Y=%a\n",Y);
+      if (number_abs(eval(Y*exp(0))/X-1) > 0.0000001) {
+         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;
  }
  end$

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