ruby-dcl 1.8.1 → 1.8.2

data/ext/numru/dcl_narrayed_funcs.c

@@ -8,7 +8,7 @@
 
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
+#include "cdcl.h"
 #include "narray.h"
 
 /* for compatibility with ruby 1.6 */
@@ -38,29 +38,29 @@ extern void dcl_freeclogicalary(logical *);
 
 /* for functions which return real */
 /* fnclib */
-extern real rd2r_(real *);
-extern real rr2d_(real *);
-extern real rexp_(real *, integer *, integer *);
-extern real rfpi_(void);
-extern real rmod_(real *, real *);
+extern real rd2r__(real *);
+extern real rr2d__(real *);
+extern real rexp__(real *, integer *, integer *);
+extern real rfpi__(void);
+extern real rmod__(real *, real *);
 /* gnmlib */
-extern real rgnlt_(real *);
-extern real rgnle_(real *);
-extern real rgngt_(real *);
-extern real rgnge_(real *);
+extern real rgnlt__(real *);
+extern real rgnle__(real *);
+extern real rgngt__(real *);
+extern real rgnge__(real *);
 /* rfalib */
-extern real rmax_(real *, integer *, integer *);
-extern real rmin_(real *, integer *, integer *);
-extern real rsum_(real *, integer *, integer *);
-extern real rave_(real *, integer *, integer *);
-extern real rvar_(real *, integer *, integer *);
-extern real rstd_(real *, integer *, integer *);
-extern real rrms_(real *, integer *, integer *);
-extern real ramp_(real *, integer *, integer *);
+extern real rmax__(real *, integer *, integer *);
+extern real rmin__(real *, integer *, integer *);
+extern real rsum__(real *, integer *, integer *);
+extern real rave__(real *, integer *, integer *);
+extern real rvar__(real *, integer *, integer *);
+extern real rstd__(real *, integer *, integer *);
+extern real rrms__(real *, integer *, integer *);
+extern real ramp__(real *, integer *, integer *);
 /* rfblib */
-extern real rprd_(real *, real *, integer *, integer *, integer *);
-extern real rcov_(real *, real *, integer *, integer *, integer *);
-extern real rcor_(real *, real *, integer *, integer *, integer *);
+extern real rprd__(real *, real *, integer *, integer *, integer *);
+extern real rcov__(real *, real *, integer *, integer *, integer *);
+extern real rcor__(real *, real *, integer *, integer *, integer *);
 
 
 extern int stftrf_(real*,real*,real*,real*);

data/ext/numru/dcl_obj2cary.c

@@ -5,7 +5,7 @@
 
 #include <math.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
+#include "cdcl.h"
 #include "narray.h"
 
 #ifndef NARRAY_BIGMEM

data/ext/numru/dcl_rubydcloriginal.c

@@ -4,7 +4,6 @@
 
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
 #include "narray.h"
 #include "cdcl.h"
 

data/ext/numru/extconf.rb

@@ -24,7 +24,11 @@ end
 case na_type
 when "narray"
   narray_include = File.expand_path(File.dirname(Gem.find_files("narray.h")[0]))
-  narray_lib = File.expand_path(File.dirname(Gem.find_files("narray." + so)[0]))
+  if `ruby -v`.include?("mingw")
+    narray_lib = File.expand_path(File.dirname(Gem.find_files("src/libnarray.a")[0]))
+  else
+    narray_lib = File.expand_path(File.dirname(Gem.find_files("narray." + so)[0]))
+  end
   File.open("../../lib/numru/dcl/narray_type.rb","w"){|f| f.puts <<EOS
 module NumRu
   module DCL
@@ -35,7 +39,11 @@ EOS
   }
 when "numru-narray"
   narray_include = File.expand_path(File.dirname(Gem.find_files("numru/narray/narray.h")[0]))
-  narray_lib = File.expand_path(File.dirname(Gem.find_files("numru/narray/narray." + so)[0]))
+  if `ruby -v`.include?("mingw")
+    narray_lib = File.expand_path(File.dirname(Gem.find_files("numru/narray/narray.a")[0]))
+  else
+    narray_lib = File.expand_path(File.dirname(Gem.find_files("numru/narray/narray." + so)[0]))
+  end
   File.open("../../lib/numru/dcl/narray_type.rb","w"){|f| f.puts <<EOS
 module NumRu
   module DCL
@@ -72,12 +80,20 @@ end
 initcfile_default = $srcdir+"/init.c.default"
 initcfile = $srcdir+"/init.c"
 
-if(xsystem("which cdclconfig"))
-  cflags = `cdclconfig --cflags`.gsub(/\n/, " ")
-  ldflags = `cdclconfig --ldflags`.gsub(/\n/, " ")
-  ldlibs = `cdclconfig --ldlibs`.gsub(/-R.*?\s/, " ").gsub(/\n/, " ")
-  print "checking DCL version... "
-  dclversion = `cdclconfig --dclversion`.strip
+if(xsystem("which dclconfig"))
+  if `ruby -v`.include?("mingw")
+    cflags = `sh dclconfig --cflags`.gsub(/\n/, " ")
+    ldflags = `sh dclconfig --ldflags`.gsub(/\n/, " ")
+    ldlibs = `sh dclconfig --ldlibs`.gsub(/-R.*?\s/, " ").gsub(/\n/, " ")
+    print "checking DCL version... "
+    dclversion = `sh dclconfig --dclversion`.strip
+  else
+    cflags = `dclconfig --cflags`.gsub(/\n/, " ")
+    ldflags = `dclconfig --ldflags`.gsub(/\n/, " ")
+    ldlibs = `dclconfig --ldlibs`.gsub(/-R.*?\s/, " ").gsub(/\n/, " ")
+    print "checking DCL version... "
+    dclversion = `dclconfig --dclversion`.strip
+  end
   print "DCL Version: #{dclversion}\n"
   dclver = dclversion.gsub(/\./,'')
   dclver = dclver+'0' if dclver.length <= 2   # 53 --> 530 etc
@@ -89,6 +105,9 @@ if(xsystem("which cdclconfig"))
   $CFLAGS += ' '+cflags  + dclversionmacro
   $LOCAL_LIBS += ' ' + ldflags
   $LOCAL_LIBS += ldlibs
+  if `ruby -v`.include?("mingw")
+    $LOCAL_LIBS += ldlibs + " -lnarray"
+  end
 
   fin = File.open(initcfile_default)
   fout = File.open(initcfile,'w')
@@ -99,7 +118,7 @@ if(xsystem("which cdclconfig"))
   fin.close
 
 else
-  raise "cdclconfig is not found."
+  raise "dclconfig is not found."
 end
 
 create_makefile("numru/dcl_raw")

data/ext/numru/grph1_csgi.c

@@ -4,7 +4,6 @@
 
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
 #include "narray.h"
 #include "cdcl.h"
 
@@ -83,7 +82,7 @@ dcl_csgi(obj, ic)
     o_rtn_val= ALLOCA_N(char, (2));
     memset(o_rtn_val, '\0', 2);
 
-    csgi_(o_rtn_val, (ftnlen)1, &i_ic);
+    csgi__(o_rtn_val, (ftnlen)1, &i_ic);
 
     rtn_val = rb_str_new2(o_rtn_val);
 
@@ -107,11 +106,37 @@ dcl_isgc(obj, ch)
     i_ch = StringValuePtr(ch);
 
 
-    o_rtn_val = isgc_(i_ch, (ftnlen)strlen(i_ch));
+    o_rtn_val = isgc__(i_ch, (ftnlen)strlen(i_ch));
 
     rtn_val = INT2NUM(o_rtn_val);
 
 
+    return rtn_val;
+
+}
+
+static VALUE
+dcl_usgi(obj, ic)
+    VALUE obj, ic;
+{
+    integer i_ic;
+    char *o_rtn_val;
+    VALUE rtn_val;
+
+    if ((TYPE(ic) != T_BIGNUM) || (TYPE(ic) != T_FIXNUM)) {
+      ic = rb_funcall(ic, rb_intern("to_i"), 0);
+    }
+
+    i_ic = NUM2INT(ic);
+
+    o_rtn_val= ALLOCA_N(char, (3+1));
+    memset(o_rtn_val, '\0', 3+1);
+
+    usgi__(o_rtn_val, (ftnlen)3, &i_ic);
+
+    rtn_val = rb_str_new2(o_rtn_val);
+
+
     return rtn_val;
 
 }
@@ -121,4 +146,5 @@ VALUE mDCL;
 {
     rb_define_module_function(mDCL, "csgi", dcl_csgi, 1);
     rb_define_module_function(mDCL, "isgc", dcl_isgc, 1);
+    rb_define_module_function(mDCL, "usgi", dcl_usgi, 1);
 }

data/ext/numru/grph1_scpack.c

@@ -4,7 +4,6 @@
 
 #include <stdio.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
 #include "narray.h"
 #include "cdcl.h"
 
@@ -89,7 +88,7 @@ dcl_scsobj(obj, xobj3, yobj3, zobj3)
     i_zobj3 = (real)NUM2DBL(zobj3);
 
 
-    scsobj_(&i_xobj3, &i_yobj3, &i_zobj3);
+    scsobj__(&i_xobj3, &i_yobj3, &i_zobj3);
 
     return Qnil;
 
@@ -106,7 +105,7 @@ dcl_scqobj(obj)
     VALUE yobj3;
     VALUE zobj3;
 
-    scqobj_(&o_xobj3, &o_yobj3, &o_zobj3);
+    scqobj__(&o_xobj3, &o_yobj3, &o_zobj3);
 
     xobj3 = rb_float_new((double)o_xobj3);
     yobj3 = rb_float_new((double)o_yobj3);
@@ -140,7 +139,7 @@ dcl_scseye(obj, xeye3, yeye3, zeye3)
     i_zeye3 = (real)NUM2DBL(zeye3);
 
 
-    scseye_(&i_xeye3, &i_yeye3, &i_zeye3);
+    scseye__(&i_xeye3, &i_yeye3, &i_zeye3);
 
     return Qnil;
 
@@ -157,7 +156,7 @@ dcl_scqeye(obj)
     VALUE yeye3;
     VALUE zeye3;
 
-    scqeye_(&o_xeye3, &o_yeye3, &o_zeye3);
+    scqeye__(&o_xeye3, &o_yeye3, &o_zeye3);
 
     xeye3 = rb_float_new((double)o_xeye3);
     yeye3 = rb_float_new((double)o_yeye3);
@@ -191,7 +190,7 @@ dcl_scspln(obj, ixax, iyax, sect)
     i_sect = (real)NUM2DBL(sect);
 
 
-    scspln_(&i_ixax, &i_iyax, &i_sect);
+    scspln__(&i_ixax, &i_iyax, &i_sect);
 
     return Qnil;
 
@@ -208,7 +207,7 @@ dcl_scqpln(obj)
     VALUE iyax;
     VALUE sect;
 
-    scqpln_(&o_ixax, &o_iyax, &o_sect);
+    scqpln__(&o_ixax, &o_iyax, &o_sect);
 
     ixax = INT2NUM(o_ixax);
     iyax = INT2NUM(o_iyax);
@@ -223,7 +222,7 @@ static VALUE
 dcl_scsprj(obj)
     VALUE obj;
 {
-    scsprj_();
+    scsprj__();
 
     return Qnil;
 
@@ -267,7 +266,7 @@ dcl_scsvpt(obj, vxmin, vxmax, vymin, vymax, vzmin, vzmax)
     i_vzmax = (real)NUM2DBL(vzmax);
 
 
-    scsvpt_(&i_vxmin, &i_vxmax, &i_vymin, &i_vymax, &i_vzmin, &i_vzmax);
+    scsvpt__(&i_vxmin, &i_vxmax, &i_vymin, &i_vymax, &i_vzmin, &i_vzmax);
 
     return Qnil;
 
@@ -290,7 +289,7 @@ dcl_scqvpt(obj)
     VALUE vzmin;
     VALUE vzmax;
 
-    scqvpt_(&o_vxmin, &o_vxmax, &o_vymin, &o_vymax, &o_vzmin, &o_vzmax);
+    scqvpt__(&o_vxmin, &o_vxmax, &o_vymin, &o_vymax, &o_vzmin, &o_vzmax);
 
     vxmin = rb_float_new((double)o_vxmin);
     vxmax = rb_float_new((double)o_vxmax);
@@ -342,7 +341,7 @@ dcl_scswnd(obj, uxmin, uxmax, uymin, uymax, uzmin, uzmax)
     i_uzmax = (real)NUM2DBL(uzmax);
 
 
-    scswnd_(&i_uxmin, &i_uxmax, &i_uymin, &i_uymax, &i_uzmin, &i_uzmax);
+    scswnd__(&i_uxmin, &i_uxmax, &i_uymin, &i_uymax, &i_uzmin, &i_uzmax);
 
     return Qnil;
 
@@ -365,7 +364,7 @@ dcl_scqwnd(obj)
     VALUE uzmin;
     VALUE uzmax;
 
-    scqwnd_(&o_uxmin, &o_uxmax, &o_uymin, &o_uymax, &o_uzmin, &o_uzmax);
+    scqwnd__(&o_uxmin, &o_uxmax, &o_uymin, &o_uymax, &o_uzmin, &o_uzmax);
 
     uxmin = rb_float_new((double)o_uxmin);
     uxmax = rb_float_new((double)o_uxmax);
@@ -392,7 +391,7 @@ dcl_scslog(obj, lxlog3, lylog3, lzlog3)
     i_lzlog3 = ((lzlog3 == Qnil)||(lzlog3 == Qfalse)) ? FALSE_ : TRUE_;
 
 
-    scslog_(&i_lxlog3, &i_lylog3, &i_lzlog3);
+    scslog__(&i_lxlog3, &i_lylog3, &i_lzlog3);
 
     return Qnil;
 
@@ -409,7 +408,7 @@ dcl_scqlog(obj)
     VALUE lylog3;
     VALUE lzlog3;
 
-    scqlog_(&o_lxlog3, &o_lylog3, &o_lzlog3);
+    scqlog__(&o_lxlog3, &o_lylog3, &o_lzlog3);
 
     lxlog3 = (o_lxlog3 == FALSE_) ? Qfalse : Qtrue;
     lylog3 = (o_lylog3 == FALSE_) ? Qfalse : Qtrue;
@@ -448,7 +447,7 @@ dcl_scsorg(obj, simfac, vxorg3, vyorg3, vzorg3)
     i_vzorg3 = (real)NUM2DBL(vzorg3);
 
 
-    scsorg_(&i_simfac, &i_vxorg3, &i_vyorg3, &i_vzorg3);
+    scsorg__(&i_simfac, &i_vxorg3, &i_vyorg3, &i_vzorg3);
 
     return Qnil;
 
@@ -467,7 +466,7 @@ dcl_scqorg(obj)
     VALUE vyorg3;
     VALUE vzorg3;
 
-    scqorg_(&o_simfac, &o_vxorg3, &o_vyorg3, &o_vzorg3);
+    scqorg__(&o_simfac, &o_vxorg3, &o_vyorg3, &o_vzorg3);
 
     simfac = rb_float_new((double)o_simfac);
     vxorg3 = rb_float_new((double)o_vxorg3);
@@ -492,7 +491,7 @@ dcl_scstrn(obj, itr3)
     i_itr3 = NUM2INT(itr3);
 
 
-    scstrn_(&i_itr3);
+    scstrn__(&i_itr3);
 
     return Qnil;
 
@@ -505,7 +504,7 @@ dcl_scqtrn(obj)
     integer o_itr3;
     VALUE itr3;
 
-    scqtrn_(&o_itr3);
+    scqtrn__(&o_itr3);
 
     itr3 = INT2NUM(o_itr3);
 
@@ -518,7 +517,7 @@ static VALUE
 dcl_scstrf(obj)
     VALUE obj;
 {
-    scstrf_();
+    scstrf__();
 
     return Qnil;
 
@@ -564,7 +563,7 @@ dcl_scplu(obj, n, upx, upy, upz)
     i_upz = dcl_obj2crealary(upz);
 
 
-    scplu_(&i_n, i_upx, i_upy, i_upz);
+    scplu__(&i_n, i_upx, i_upy, i_upz);
 
     dcl_freecrealary(i_upx);
     dcl_freecrealary(i_upy);
@@ -614,7 +613,7 @@ dcl_scplv(obj, n, vpx, vpy, vpz)
     i_vpz = dcl_obj2crealary(vpz);
 
 
-    scplv_(&i_n, i_vpx, i_vpy, i_vpz);
+    scplv__(&i_n, i_vpx, i_vpy, i_vpz);
 
     dcl_freecrealary(i_vpx);
     dcl_freecrealary(i_vpy);
@@ -637,7 +636,7 @@ dcl_scspli(obj, index)
     i_index = NUM2INT(index);
 
 
-    scspli_(&i_index);
+    scspli__(&i_index);
 
     return Qnil;
 
@@ -650,7 +649,7 @@ dcl_scqpli(obj)
     integer o_index;
     VALUE index;
 
-    scqpli_(&o_index);
+    scqpli__(&o_index);
 
     index = INT2NUM(o_index);
 
@@ -704,7 +703,7 @@ dcl_scplzu(obj, n, upx, upy, upz, index)
     i_upz = dcl_obj2crealary(upz);
 
 
-    scplzu_(&i_n, i_upx, i_upy, i_upz, &i_index);
+    scplzu__(&i_n, i_upx, i_upy, i_upz, &i_index);
 
     dcl_freecrealary(i_upx);
     dcl_freecrealary(i_upy);
@@ -759,7 +758,7 @@ dcl_scplzv(obj, n, vpx, vpy, vpz, index)
     i_vpz = dcl_obj2crealary(vpz);
 
 
-    scplzv_(&i_n, i_vpx, i_vpy, i_vpz, &i_index);
+    scplzv__(&i_n, i_vpx, i_vpy, i_vpz, &i_index);
 
     dcl_freecrealary(i_vpx);
     dcl_freecrealary(i_vpy);
@@ -809,7 +808,7 @@ dcl_scpmu(obj, n, upx, upy, upz)
     i_upz = dcl_obj2crealary(upz);
 
 
-    scpmu_(&i_n, i_upx, i_upy, i_upz);
+    scpmu__(&i_n, i_upx, i_upy, i_upz);
 
     dcl_freecrealary(i_upx);
     dcl_freecrealary(i_upy);
@@ -859,7 +858,7 @@ dcl_scpmv(obj, n, vpx, vpy, vpz)
     i_vpz = dcl_obj2crealary(vpz);
 
 
-    scpmv_(&i_n, i_vpx, i_vpy, i_vpz);
+    scpmv__(&i_n, i_vpx, i_vpy, i_vpz);
 
     dcl_freecrealary(i_vpx);
     dcl_freecrealary(i_vpy);
@@ -882,7 +881,7 @@ dcl_scspmt(obj, itype)
     i_itype = NUM2INT(itype);
 
 
-    scspmt_(&i_itype);
+    scspmt__(&i_itype);
 
     return Qnil;
 
@@ -895,7 +894,7 @@ dcl_scqpmt(obj)
     integer o_itype;
     VALUE itype;
 
-    scqpmt_(&o_itype);
+    scqpmt__(&o_itype);
 
     itype = INT2NUM(o_itype);
 
@@ -917,7 +916,7 @@ dcl_scspmi(obj, index)
     i_index = NUM2INT(index);
 
 
-    scspmi_(&i_index);
+    scspmi__(&i_index);
 
     return Qnil;
 
@@ -930,7 +929,7 @@ dcl_scqpmi(obj)
     integer o_index;
     VALUE index;
 
-    scqpmi_(&o_index);
+    scqpmi__(&o_index);
 
     index = INT2NUM(o_index);
 
@@ -952,7 +951,7 @@ dcl_scspms(obj, rsize)
     i_rsize = (real)NUM2DBL(rsize);
 
 
-    scspms_(&i_rsize);
+    scspms__(&i_rsize);
 
     return Qnil;
 
@@ -965,7 +964,7 @@ dcl_scqpms(obj)
     real o_rsize;
     VALUE rsize;
 
-    scqpms_(&o_rsize);
+    scqpms__(&o_rsize);
 
     rsize = rb_float_new((double)o_rsize);
 
@@ -1029,7 +1028,7 @@ dcl_scpmzu(obj, n, upx, upy, upz, itype, index, rsize)
     i_upz = dcl_obj2crealary(upz);
 
 
-    scpmzu_(&i_n, i_upx, i_upy, i_upz, &i_itype, &i_index, &i_rsize);
+    scpmzu__(&i_n, i_upx, i_upy, i_upz, &i_itype, &i_index, &i_rsize);
 
     dcl_freecrealary(i_upx);
     dcl_freecrealary(i_upy);
@@ -1094,7 +1093,7 @@ dcl_scpmzv(obj, n, vpx, vpy, vpz, itype, index, rsize)
     i_vpz = dcl_obj2crealary(vpz);
 
 
-    scpmzv_(&i_n, i_vpx, i_vpy, i_vpz, &i_itype, &i_index, &i_rsize);
+    scpmzv__(&i_n, i_vpx, i_vpy, i_vpz, &i_itype, &i_index, &i_rsize);
 
     dcl_freecrealary(i_vpx);
     dcl_freecrealary(i_vpy);
@@ -1139,7 +1138,7 @@ dcl_sctnu(obj, upx, upy, upz)
     i_upz = dcl_obj2crealary(upz);
 
 
-    sctnu_(i_upx, i_upy, i_upz);
+    sctnu__(i_upx, i_upy, i_upz);
 
     dcl_freecrealary(i_upx);
     dcl_freecrealary(i_upy);
@@ -1184,7 +1183,7 @@ dcl_sctnv(obj, vpx, vpy, vpz)
     i_vpz = dcl_obj2crealary(vpz);
 
 
-    sctnv_(i_vpx, i_vpy, i_vpz);
+    sctnv__(i_vpx, i_vpy, i_vpz);
 
     dcl_freecrealary(i_vpx);
     dcl_freecrealary(i_vpy);
@@ -1212,7 +1211,7 @@ dcl_scstnp(obj, itpat1, itpat2)
     i_itpat2 = NUM2INT(itpat2);
 
 
-    scstnp_(&i_itpat1, &i_itpat2);
+    scstnp__(&i_itpat1, &i_itpat2);
 
     return Qnil;
 
@@ -1227,7 +1226,7 @@ dcl_scqtnp(obj)
     VALUE itpat1;
     VALUE itpat2;
 
-    scqtnp_(&o_itpat1, &o_itpat2);
+    scqtnp__(&o_itpat1, &o_itpat2);
 
     itpat1 = INT2NUM(o_itpat1);
     itpat2 = INT2NUM(o_itpat2);
@@ -1282,7 +1281,7 @@ dcl_sctnzu(obj, upx, upy, upz, itpat1, itpat2)
     i_upz = dcl_obj2crealary(upz);
 
 
-    sctnzu_(i_upx, i_upy, i_upz, &i_itpat1, &i_itpat2);
+    sctnzu__(i_upx, i_upy, i_upz, &i_itpat1, &i_itpat2);
 
     dcl_freecrealary(i_upx);
     dcl_freecrealary(i_upy);
@@ -1337,7 +1336,7 @@ dcl_sctnzv(obj, vpx, vpy, vpz, itpat1, itpat2)
     i_vpz = dcl_obj2crealary(vpz);
 
 
-    sctnzv_(i_vpx, i_vpy, i_vpz, &i_itpat1, &i_itpat2);
+    sctnzv__(i_vpx, i_vpy, i_vpz, &i_itpat1, &i_itpat2);
 
     dcl_freecrealary(i_vpx);
     dcl_freecrealary(i_vpy);