ruby-dcl 1.7.1 → 1.8.2

data/ext/numru/math1_oslib.c

@@ -1,10 +1,9 @@
 /*
- * $Id: p_header,v 1.3 2015/03/18 03:27:42 horinout Exp $
+ * $Id$
  */
 
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
 #include "narray.h"
 #include "cdcl.h"
 
@@ -15,6 +14,10 @@
 
 #define DFLT_SIZE 32
 
+#ifndef NARRAY_BIGMEM
+typedef int    na_shape_t;
+#endif
+
 extern char    *dcl_obj2ccharary(VALUE, int, int);
 extern integer *dcl_obj2cintegerary(VALUE);
 extern real    *dcl_obj2crealary(VALUE);
@@ -22,10 +25,10 @@ extern complex *dcl_obj2ccomplexary(VALUE);
 extern logical *dcl_obj2clogicalary(VALUE);
 
 extern VALUE dcl_ccharary2obj(char *, int, int);
-extern VALUE dcl_cintegerary2obj(integer *, int, int, int *);
-extern VALUE dcl_crealary2obj(real *, int, int, int *);
-extern VALUE dcl_ccomplexary2obj(complex *, int, char *);
-extern VALUE dcl_clogicalary2obj(logical *, int, int, int *);
+extern VALUE dcl_cintegerary2obj(integer *, na_shape_t, int, na_shape_t *);
+extern VALUE dcl_crealary2obj(real *, na_shape_t, int, na_shape_t *);
+/* extern VALUE dcl_ccomplexary2obj(complex *, int, char *); */
+extern VALUE dcl_clogicalary2obj(logical *, na_shape_t, int, na_shape_t *);
 
 extern void dcl_freeccharary(char *);
 extern void dcl_freecintegerary(integer *);
@@ -69,7 +72,7 @@ dcl_osqarn(obj)
     integer o_n;
     VALUE n;
 
-    osqarn_(&o_n);
+    osqarn__(&o_n);
 
     n = INT2NUM(o_n);
 
@@ -95,7 +98,7 @@ dcl_osgarg(obj, n)
     o_chr= ALLOCA_N(char, (DFLT_SIZE+1));
     memset(o_chr, '\0', DFLT_SIZE+1);
 
-    osgarg_(&i_n, o_chr, (ftnlen)DFLT_SIZE);
+    osgarg__(&i_n, o_chr, (ftnlen)DFLT_SIZE);
 
     chr = rb_str_new2(o_chr);
 

data/ext/numru/math1_rfalib.c

@@ -1,10 +1,9 @@
 /*
- * $Id: p_header,v 1.3 2015/03/18 03:27:42 horinout Exp $
+ * $Id$
  */
 
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
 #include "narray.h"
 #include "cdcl.h"
 
@@ -15,6 +14,10 @@
 
 #define DFLT_SIZE 32
 
+#ifndef NARRAY_BIGMEM
+typedef int    na_shape_t;
+#endif
+
 extern char    *dcl_obj2ccharary(VALUE, int, int);
 extern integer *dcl_obj2cintegerary(VALUE);
 extern real    *dcl_obj2crealary(VALUE);
@@ -22,10 +25,10 @@ extern complex *dcl_obj2ccomplexary(VALUE);
 extern logical *dcl_obj2clogicalary(VALUE);
 
 extern VALUE dcl_ccharary2obj(char *, int, int);
-extern VALUE dcl_cintegerary2obj(integer *, int, int, int *);
-extern VALUE dcl_crealary2obj(real *, int, int, int *);
-extern VALUE dcl_ccomplexary2obj(complex *, int, char *);
-extern VALUE dcl_clogicalary2obj(logical *, int, int, int *);
+extern VALUE dcl_cintegerary2obj(integer *, na_shape_t, int, na_shape_t *);
+extern VALUE dcl_crealary2obj(real *, na_shape_t, int, na_shape_t *);
+/* extern VALUE dcl_ccomplexary2obj(complex *, int, char *); */
+extern VALUE dcl_clogicalary2obj(logical *, na_shape_t, int, na_shape_t *);
 
 extern void dcl_freeccharary(char *);
 extern void dcl_freecintegerary(integer *);
@@ -91,7 +94,7 @@ dcl_rmax(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = rmax_(i_rx, &i_n, &i_jx);
+    o_rtn_val = rmax__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -130,7 +133,7 @@ dcl_rmax0(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = rmax0_(i_rx, &i_n, &i_jx);
+    o_rtn_val = rmax0__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -169,7 +172,7 @@ dcl_rmax1(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = rmax1_(i_rx, &i_n, &i_jx);
+    o_rtn_val = rmax1__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -208,7 +211,7 @@ dcl_rmin(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = rmin_(i_rx, &i_n, &i_jx);
+    o_rtn_val = rmin__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -247,7 +250,7 @@ dcl_rmin0(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = rmin0_(i_rx, &i_n, &i_jx);
+    o_rtn_val = rmin0__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -286,7 +289,7 @@ dcl_rmin1(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = rmin1_(i_rx, &i_n, &i_jx);
+    o_rtn_val = rmin1__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -325,7 +328,7 @@ dcl_rsum(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = rsum_(i_rx, &i_n, &i_jx);
+    o_rtn_val = rsum__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -364,7 +367,7 @@ dcl_rsum0(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = rsum0_(i_rx, &i_n, &i_jx);
+    o_rtn_val = rsum0__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -403,7 +406,7 @@ dcl_rsum1(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = rsum1_(i_rx, &i_n, &i_jx);
+    o_rtn_val = rsum1__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -442,7 +445,7 @@ dcl_rave(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = rave_(i_rx, &i_n, &i_jx);
+    o_rtn_val = rave__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -481,7 +484,7 @@ dcl_rave0(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = rave0_(i_rx, &i_n, &i_jx);
+    o_rtn_val = rave0__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -520,7 +523,7 @@ dcl_rave1(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = rave1_(i_rx, &i_n, &i_jx);
+    o_rtn_val = rave1__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -559,7 +562,7 @@ dcl_rvar(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = rvar_(i_rx, &i_n, &i_jx);
+    o_rtn_val = rvar__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -598,7 +601,7 @@ dcl_rvar0(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = rvar0_(i_rx, &i_n, &i_jx);
+    o_rtn_val = rvar0__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -637,7 +640,7 @@ dcl_rvar1(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = rvar1_(i_rx, &i_n, &i_jx);
+    o_rtn_val = rvar1__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -676,7 +679,7 @@ dcl_rstd(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = rstd_(i_rx, &i_n, &i_jx);
+    o_rtn_val = rstd__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -715,7 +718,7 @@ dcl_rstd0(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = rstd0_(i_rx, &i_n, &i_jx);
+    o_rtn_val = rstd0__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -754,7 +757,7 @@ dcl_rstd1(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = rstd1_(i_rx, &i_n, &i_jx);
+    o_rtn_val = rstd1__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -793,7 +796,7 @@ dcl_rrms(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = rrms_(i_rx, &i_n, &i_jx);
+    o_rtn_val = rrms__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -832,7 +835,7 @@ dcl_rrms0(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = rrms0_(i_rx, &i_n, &i_jx);
+    o_rtn_val = rrms0__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -871,7 +874,7 @@ dcl_rrms1(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = rrms1_(i_rx, &i_n, &i_jx);
+    o_rtn_val = rrms1__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -910,7 +913,7 @@ dcl_ramp(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = ramp_(i_rx, &i_n, &i_jx);
+    o_rtn_val = ramp__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -949,7 +952,7 @@ dcl_ramp0(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = ramp0_(i_rx, &i_n, &i_jx);
+    o_rtn_val = ramp0__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -988,7 +991,7 @@ dcl_ramp1(obj, rx, n, jx)
     i_rx = dcl_obj2crealary(rx);
 
 
-    o_rtn_val = ramp1_(i_rx, &i_n, &i_jx);
+    o_rtn_val = ramp1__(i_rx, &i_n, &i_jx);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -1049,7 +1052,7 @@ dcl_rvmax(obj, rx, ns, np, nq, nd)
     i_nq = dcl_obj2cintegerary(nq);
 
 
-    o_rtn_val = rvmax_(i_rx, i_ns, i_np, i_nq, &i_nd);
+    o_rtn_val = rvmax__(i_rx, i_ns, i_np, i_nq, &i_nd);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -1113,7 +1116,7 @@ dcl_rvmax0(obj, rx, ns, np, nq, nd)
     i_nq = dcl_obj2cintegerary(nq);
 
 
-    o_rtn_val = rvmax0_(i_rx, i_ns, i_np, i_nq, &i_nd);
+    o_rtn_val = rvmax0__(i_rx, i_ns, i_np, i_nq, &i_nd);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -1177,7 +1180,7 @@ dcl_rvmin(obj, rx, ns, np, nq, nd)
     i_nq = dcl_obj2cintegerary(nq);
 
 
-    o_rtn_val = rvmin_(i_rx, i_ns, i_np, i_nq, &i_nd);
+    o_rtn_val = rvmin__(i_rx, i_ns, i_np, i_nq, &i_nd);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -1241,7 +1244,7 @@ dcl_rvmax1(obj, rx, ns, np, nq, nd)
     i_nq = dcl_obj2cintegerary(nq);
 
 
-    o_rtn_val = rvmax1_(i_rx, i_ns, i_np, i_nq, &i_nd);
+    o_rtn_val = rvmax1__(i_rx, i_ns, i_np, i_nq, &i_nd);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -1305,7 +1308,7 @@ dcl_rvmin1(obj, rx, ns, np, nq, nd)
     i_nq = dcl_obj2cintegerary(nq);
 
 
-    o_rtn_val = rvmin1_(i_rx, i_ns, i_np, i_nq, &i_nd);
+    o_rtn_val = rvmin1__(i_rx, i_ns, i_np, i_nq, &i_nd);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -1369,7 +1372,7 @@ dcl_rvmin0(obj, rx, ns, np, nq, nd)
     i_nq = dcl_obj2cintegerary(nq);
 
 
-    o_rtn_val = rvmin0_(i_rx, i_ns, i_np, i_nq, &i_nd);
+    o_rtn_val = rvmin0__(i_rx, i_ns, i_np, i_nq, &i_nd);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 

data/ext/numru/math1_rfblib.c

@@ -1,10 +1,9 @@
 /*
- * $Id: p_header,v 1.3 2015/03/18 03:27:42 horinout Exp $
+ * $Id$
  */
 
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
 #include "narray.h"
 #include "cdcl.h"
 
@@ -15,6 +14,10 @@
 
 #define DFLT_SIZE 32
 
+#ifndef NARRAY_BIGMEM
+typedef int    na_shape_t;
+#endif
+
 extern char    *dcl_obj2ccharary(VALUE, int, int);
 extern integer *dcl_obj2cintegerary(VALUE);
 extern real    *dcl_obj2crealary(VALUE);
@@ -22,10 +25,10 @@ extern complex *dcl_obj2ccomplexary(VALUE);
 extern logical *dcl_obj2clogicalary(VALUE);
 
 extern VALUE dcl_ccharary2obj(char *, int, int);
-extern VALUE dcl_cintegerary2obj(integer *, int, int, int *);
-extern VALUE dcl_crealary2obj(real *, int, int, int *);
-extern VALUE dcl_ccomplexary2obj(complex *, int, char *);
-extern VALUE dcl_clogicalary2obj(logical *, int, int, int *);
+extern VALUE dcl_cintegerary2obj(integer *, na_shape_t, int, na_shape_t *);
+extern VALUE dcl_crealary2obj(real *, na_shape_t, int, na_shape_t *);
+/* extern VALUE dcl_ccomplexary2obj(complex *, int, char *); */
+extern VALUE dcl_clogicalary2obj(logical *, na_shape_t, int, na_shape_t *);
 
 extern void dcl_freeccharary(char *);
 extern void dcl_freecintegerary(integer *);
@@ -105,7 +108,7 @@ dcl_rprd(obj, rx, ry, n, jx, jy)
     i_ry = dcl_obj2crealary(ry);
 
 
-    o_rtn_val = rprd_(i_rx, i_ry, &i_n, &i_jx, &i_jy);
+    o_rtn_val = rprd__(i_rx, i_ry, &i_n, &i_jx, &i_jy);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -159,7 +162,7 @@ dcl_rcov(obj, rx, ry, n, jx, jy)
     i_ry = dcl_obj2crealary(ry);
 
 
-    o_rtn_val = rcov_(i_rx, i_ry, &i_n, &i_jx, &i_jy);
+    o_rtn_val = rcov__(i_rx, i_ry, &i_n, &i_jx, &i_jy);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 
@@ -213,7 +216,7 @@ dcl_rcor(obj, rx, ry, n, jx, jy)
     i_ry = dcl_obj2crealary(ry);
 
 
-    o_rtn_val = rcor_(i_rx, i_ry, &i_n, &i_jx, &i_jy);
+    o_rtn_val = rcor__(i_rx, i_ry, &i_n, &i_jx, &i_jy);
 
     rtn_val = rb_float_new((double)o_rtn_val);
 

data/ext/numru/math1_sublib.c

@@ -1,10 +1,9 @@
 /*
- * $Id: p_header,v 1.3 2015/03/18 03:27:42 horinout Exp $
+ * $Id$
  */
 
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
 #include "narray.h"
 #include "cdcl.h"
 
@@ -15,6 +14,10 @@
 
 #define DFLT_SIZE 32
 
+#ifndef NARRAY_BIGMEM
+typedef int    na_shape_t;
+#endif
+
 extern char    *dcl_obj2ccharary(VALUE, int, int);
 extern integer *dcl_obj2cintegerary(VALUE);
 extern real    *dcl_obj2crealary(VALUE);
@@ -22,10 +25,10 @@ extern complex *dcl_obj2ccomplexary(VALUE);
 extern logical *dcl_obj2clogicalary(VALUE);
 
 extern VALUE dcl_ccharary2obj(char *, int, int);
-extern VALUE dcl_cintegerary2obj(integer *, int, int, int *);
-extern VALUE dcl_crealary2obj(real *, int, int, int *);
-extern VALUE dcl_ccomplexary2obj(complex *, int, char *);
-extern VALUE dcl_clogicalary2obj(logical *, int, int, int *);
+extern VALUE dcl_cintegerary2obj(integer *, na_shape_t, int, na_shape_t *);
+extern VALUE dcl_crealary2obj(real *, na_shape_t, int, na_shape_t *);
+/* extern VALUE dcl_ccomplexary2obj(complex *, int, char *); */
+extern VALUE dcl_clogicalary2obj(logical *, na_shape_t, int, na_shape_t *);
 
 extern void dcl_freeccharary(char *);
 extern void dcl_freecintegerary(integer *);
@@ -83,7 +86,7 @@ dcl_vignn(obj, n, jx)
 
     o_ix= ALLOCA_N(integer, i_jx*(i_n-1)+1);
 
-    vignn_(o_ix, &i_n, &i_jx);
+    vignn__(o_ix, &i_n, &i_jx);
 
     {int array_shape[1] = {i_jx*(i_n-1)+1};
      ix = dcl_cintegerary2obj(o_ix, i_jx*(i_n-1)+1, 1, array_shape);
@@ -115,7 +118,7 @@ dcl_vrgnn(obj, n, jx)
 
     o_rx= ALLOCA_N(real, i_jx*(i_n-1)+1);
 
-    vrgnn_(o_rx, &i_n, &i_jx);
+    vrgnn__(o_rx, &i_n, &i_jx);
 
     {int array_shape[1] = {i_jx*(i_n-1)+1};
      rx = dcl_crealary2obj(o_rx, i_jx*(i_n-1)+1, 1, array_shape);
@@ -159,7 +162,7 @@ dcl_dxfloc(obj, nd, ns, np)
     i_np = dcl_obj2cintegerary(np);
 
 
-    dxfloc_(&i_nd, i_ns, i_np, &o_ncp);
+    dxfloc__(&i_nd, i_ns, i_np, &o_ncp);
 
     ncp = INT2NUM(o_ncp);
 
@@ -200,7 +203,7 @@ dcl_dxiloc(obj, nd, ns, ncp)
 
     o_np= ALLOCA_N(integer, (i_nd));
 
-    dxiloc_(&i_nd, i_ns, o_np, &i_ncp);
+    dxiloc__(&i_nd, i_ns, o_np, &i_ncp);
 
     {int array_shape[1] = {i_nd};
      np = dcl_cintegerary2obj(o_np, (i_nd), 1, array_shape);