pspline 5.0.3 → 5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb96468c596ae7908fdd735008f4a5a22a68a56b
-  data.tar.gz: 7239450009f59fcda3844416ec1a7b575e8aa2ad
+  metadata.gz: dd676129ee15c3a24f0aba8101aa3c4e2f0a6ac1
+  data.tar.gz: 28632b037254bcef8dee32470ee0ab513864e21f
 SHA512:
-  metadata.gz: a4e07bd3ba5932852d9bdcfa5ec22b7b1826a276b5830b3dab7f639f2a6fd51a9dbdf48c6faacd33cc3a7e4c9298777df5159834095b412210988a26510faf14
-  data.tar.gz: 78858c5c8f9ca31ee18551cfee1877a165ba909ec60f5dbedb3c338398f912224cb372fdc6bd998333edc05b2ce851780d0711ea5f657922087385c86ff6d32e
+  metadata.gz: b029fa56366d6557ae1d97fc2f9f4124b393b9c35afe0ccdbca1c8da5e51aacb64da8f00ca3f7446bf857eee0c61a068f9bce55d2d8ea56ba961c56d6ecea19d
+  data.tar.gz: f5f54d6eabcfb247a31f3d91bf415b84cc4834dccb6c151e1dd90bbd41846639e1adf4279a9e79fd4176d710f407acf1e2e03ef1bff846253dc1b4892d002986

data/README.md

@@ -28,6 +28,7 @@ See pspline.wiki at https://github.com/vsp2old/pspline .
 5.0.1	Upload for test.   
 5.0.2	Upload for release.   
 5.0.3	Add class PSPLINE::Rfft, class PSPLINE::Cfft.   
+5.0.4	Add method line_integral.   
 
 ## Development
 

data/ext/pspline/example/example.rb

@@ -0,0 +1,34 @@
+require 'pspline'
+include PSPLINE
+nn = [4, 6]
+jj = [3, 2]
+ss = [3, 2]
+puts "# 2 variable parametric Reisenfeld interpolation"
+S = [0, 1, 2, 3, 4]
+T = [0, 1, 2, 3, 4, 5]
+XYZ = [ [[ 0.0, 5.0, 9.0],[ 0.0, 5.0, 6.0],[ 0.0, 0.5, 6.0],[ 0.0, 0.5, 2.0],[ 0.0, 3.0, 1.0],[ 0.0, 3.0, 0.0]],
+        [[ 5.0,-2.5, 6.5],[ 5.0,-2.5, 3.5],[ 0.5,-0.25,5.75],[0.5,-0.25,1.75],[3.0,-1.5,-0.5],[ 3.0,-1.5,-1.5]],
+        [[ 0.0,-5.0, 9.0],[ 0.0,-5.0, 6.0],[ 0.0,-0.5, 6.0],[ 0.0,-0.5, 2.0],[ 0.0,-3.0, 1.0],[ 0.0,-3.0, 0.0]],
+        [[-5.0, 2.5,11.5],[-5.0, 2.5, 8.5],[-0.5,0.25,6.25],[-0.5,0.25,2.25],[-3.0, 1.5, 2.5],[-3.0, 1.5, 1.5]] ]
+Jbn = ARGV[0].to_i
+Dp = 8
+Rs = Pspline.new(XYZ, [S, T], nn, jj, ss)
+for i in 0..3
+    for j in 0..5
+        printf("<%d,%d>", S[i], T[j])
+        u = XYZ[i][j]
+        printf(" % .7f % .7f %10.7f\n", u[0], u[1], u[2])
+    end
+end
+printf "# value of interpolation points, Dp = %d", Dp
+if Jbn == 0
+    print "\n"
+else
+    printf ", Jbn = %d\n", Jbn
+end
+vv = [S, T]
+N = Rs.plot(vv, Dp, [Jbn,0]) do |a, b|
+    if (a[1] == 0.0)
+        printf("%.3f %.3f % .7f % .7f %10.7f\n", a[0], a[1], b[0], b[1], b[2])
+    end
+end

data/ext/pspline/example/exqspline1.rb

@@ -1,31 +1,31 @@
-#! /usr/local/bin/ruby
-require 'pspline'
-include PSPLINE
-
-puts "# Parametric period interpolation (Closed curve interpolation)"
-
-XY = [ [0, 1.0, 0.0],[1, 0.707107, 0.707107],[2, 0.0, 1.0],[3,-0.707107, 0.707107],
-	   [4,-1.0, 0.0],[5,-0.707107,-0.707107],[6, 0.0,-1.0],[7, 0.707107,-0.707107],
-	   [8, 1.0, 0.0] ]
-
-Jbn = ARGV[0].to_i
-
-Dp = 8
-
-Qs = Bspline.new(XY, 8, 5, 1)
-
-vv = []
-XY.each do |p|
-	printf "% f, % f\n", p[1], p[2]
-	vv.push p[0]
-end
-printf "# value of interpolation points, Dp = %d", Dp
-if Jbn == 0
-	print "\n"
-else
-	printf ", Jbn = %d\n", Jbn
-end
-s = Qs.plot(vv, Dp, Jbn) do |a, b|
-	printf "% .2f % f % f\n", a, b[0], b[1]
-end
-#STDERR.puts s
+#! /usr/local/bin/ruby
+require 'pspline'
+include PSPLINE
+
+puts "# Parametric period interpolation (Closed curve interpolation)"
+
+XY = [ [0, 1.0, 0.0],[1, 0.707107, 0.707107],[2, 0.0, 1.0],[3,-0.707107, 0.707107],
+	   [4,-1.0, 0.0],[5,-0.707107,-0.707107],[6, 0.0,-1.0],[7, 0.707107,-0.707107],
+	   [8, 1.0, 0.0] ]
+
+Jbn = ARGV[0].to_i
+
+Dp = 8
+
+Qs = Bspline.new(XY, 8, 5, 1)
+
+vv = []
+XY.each do |p|
+	printf "% f, % f\n", p[1], p[2]
+	vv.push p[0]
+end
+printf "# value of interpolation points, Dp = %d", Dp
+if Jbn == 0
+	print "\n"
+else
+	printf ", Jbn = %d\n", Jbn
+end
+s = Qs.plot(vv, Dp, Jbn) do |a, b|
+	printf "% .2f % f % f\n", a, b[0], b[1]
+end
+#STDERR.puts s

data/ext/pspline/pspline.cpp

@@ -83,8 +83,8 @@ _wrap_init_bspline(int argc, VALUE *argv, VALUE self)
 	int D = argp - argn;
 	if (D < 0)
 		rb_raise(rb_eArgError, "Data points %d < Data size %d", argp, argn);
-	if (D >= argj)
-		rb_raise(rb_eArgError, "Additional points %d >= Degree %d", D, argj);
+	if (D > argj)
+		rb_raise(rb_eArgError, "Additional points %d > Degree %d", D, argj);
 	if (argn <= argj)
 		rb_raise(rb_eArgError, "Data points %d <= Degree %d", argn, argj);
 	if (argc > 3) {
@@ -494,6 +494,52 @@ try {
 	return Wrap_bspline(cBspline, result);
 }
 
+static VALUE vfunc;
+
+static double ufunc(poly_array<double>& pa)
+{
+	int K = pa.unit_size();
+	VALUE *vp = ALLOC_N(VALUE, K);
+	for (int i = 0; i < K; i++) vp[i] = rb_float_new(pa[i]);
+	VALUE vresult = rb_funcall2(vfunc, rb_intern("call"), K, vp);
+	free(vp);
+	return NUM2DBL(vresult);
+}
+
+static VALUE
+_wrap_bspline_lint(int argc, VALUE *argv, VALUE self)
+{
+	bspline<double> *arg0;		// bspline object
+	VALUE vargu, vargx, vargy;
+	Get_bspline(self, arg0);
+	rb_scan_args(argc, argv, "22", &vfunc, &vargu, &vargx, &vargy);
+	int c = arg0->Icox(), j = arg0->Jisu(), n;
+	double *q = arg0->Knots(), x = arg0->x_min(), y = arg0->x_max();
+	Check_Type(vargu, T_ARRAY);
+	int argn = RARRAY_LEN(vargu);
+	n = argn > 0 ? argn : c - j + 1;
+	double *u = ALLOC_N(double, n);
+	for (int i = 0; i < n; i++)
+		if (argn > 0) {
+			u[i] = NUM2DBL(RARRAY_PTR(vargu)[i]);
+			if (u[i] < x || y < u[i] || (i > 0 && u[i] <= u[i-1]))
+				rb_raise(rb_eArgError, "Illegal argument");
+		} else {
+			u[i] = x + i * (y - x) / (n - 1);
+			rb_ary_push(vargu, rb_float_new(u[i]));
+		}
+	x = (argc >= 3) ? NUM2DBL(vargx) : u[0];
+	y = (argc == 4) ? NUM2DBL(vargy) :   0 ;
+	bspline<double> *result;
+try {
+	result = arg0->line_integral(ufunc, n, u, x, y);
+} catch (const char *c) {
+	rb_raise(rb_eRuntimeError, "%s", c);
+}
+	free(u);
+	return Wrap_bspline(cBspline, result);
+}
+
 static void
 _wrap_Init_bspline(void)
 {
@@ -505,6 +551,7 @@ _wrap_Init_bspline(void)
 	rb_define_method(cBspline, "value", VALUEFUNC(_wrap_bspline_value), -1);
 	rb_define_method(cBspline, "sekibun", VALUEFUNC(_wrap_bspline_sekibun), 1);
 	rb_define_method(cBspline, "plot", VALUEFUNC(_wrap_bspline_plot), -1);
+	rb_define_method(cBspline, "line_integral", VALUEFUNC(_wrap_bspline_lint), -1);
 	rb_define_module_function(mPspline, "fft_complex_transform", VALUEFUNC(_wrap_complex_trans), 2);
 	rb_define_module_function(mPspline, "fft_complex_get", VALUEFUNC(_wrap_complex_get), 2);
 	rb_define_module_function(mPspline, "fft_complex_bspline", VALUEFUNC(_wrap_complex_bspline), 2);

data/lib/pspline/version.rb

@@ -1,3 +1,3 @@
 module PSPLINE
-  VERSION = "5.0.3"
+  VERSION = "5.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pspline
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.0.4
 platform: ruby
 authors:
 - vsp2old
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-28 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,7 @@ files:
 - bin/console
 - bin/setup
 - ext/pspline/basis.cpp
+- ext/pspline/example/example.rb
 - ext/pspline/example/exbspline.ps
 - ext/pspline/example/exbspline.rb
 - ext/pspline/example/excspline.ps