pspline 5.0.4 → 5.0.5

data/ext/pspline/example/exsspline.rb

@@ -1,35 +1,35 @@
-#! /usr/local/bin/ruby
-require 'pspline'
-include PSPLINE
-
-n = 8
-j = 3
-s = 3
-
-puts "# Riesenfeld interpolation （Closed curve）"
-
-X = [0, 1, 2, 3, 4, 5, 6, 7, 8]
-
-Y = [ [ 4.0, 0.0],[ 3.0, 3.0],[ 0.0, 4.0],[-3.0, 3.0],
-	  [-4.0, 0.0],[-3.0,-3.0],[ 0.0,-4.0],[ 3.0,-3.0] ]
-
-Jbn = ARGV[0].to_i
-
-Dp = 10
-
-Sp = Pspline.new(Y, [X], [n], [j], [s])
-
-Y.each do |p|
-	printf "% f, % f\n", p[0], p[1]	
-end
-printf "# value of interpolation points, Dp = %d", Dp
-if Jbn == 0
-	print "\n"
-else
-	printf ", Jbn = %d\n", Jbn
-end
-vv = [X]
-s = Sp.plot(vv, Dp, [Jbn]) do |a, b|
-	printf "% .2f, <% .7f, % .7f>\n", a[0], b[0], b[1]
-end
-#STDERR.puts s
+#! /usr/local/bin/ruby
+require 'pspline'
+include PSPLINE
+
+n = 8
+j = 3
+s = 3
+
+puts "# Riesenfeld interpolation （Closed curve）"
+
+X = [0, 1, 2, 3, 4, 5, 6, 7, 8]
+
+Y = [ [ 4.0, 0.0],[ 3.0, 3.0],[ 0.0, 4.0],[-3.0, 3.0],
+	  [-4.0, 0.0],[-3.0,-3.0],[ 0.0,-4.0],[ 3.0,-3.0] ]
+
+Jbn = ARGV[0].to_i
+
+Dp = 10
+
+Sp = Pspline.new(Y, [X], [n], [j], [s])
+
+Y.each do |p|
+	printf "% f, % f\n", p[0], p[1]	
+end
+printf "# value of interpolation points, Dp = %d", Dp
+if Jbn == 0
+	print "\n"
+else
+	printf ", Jbn = %d\n", Jbn
+end
+vv = [X]
+s = Sp.plot(vv, Dp, [Jbn]) do |a, b|
+	printf "% .2f, <% .7f, % .7f>\n", a[0], b[0], b[1]
+end
+#STDERR.puts s

data/ext/pspline/example/exsspline1.rb

@@ -1,35 +1,35 @@
-#! /usr/local/bin/ruby
-require 'pspline'
-include PSPLINE
-
-puts "# Riesenfeld interpolation （Closed curve interpolation）"
-
-n = 8
-j = 3
-s = 3
-
-XY = [ [0, 4.0, 0.0],[1, 3.0, 3.0],[2, 0.0, 4.0],[3,-3.0, 3.0],
-	   [4,-4.0, 0.0],[5,-3.0,-3.0],[6, 0.0,-4.0],[7, 3.0,-3.0],
-	   [8, 4.0, 0.0] ]
-
-Jbn = ARGV[0].to_i
-
-Dp = 10
-
-Sp = Bspline.new(XY, n, j, s)
-
-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 = Sp.plot(vv, Dp, Jbn) do |a, b|
-	printf "% .2f % .7f % .7f\n", a, b[0], b[1]
-end
-#STDERR.puts s
+#! /usr/local/bin/ruby
+require 'pspline'
+include PSPLINE
+
+puts "# Riesenfeld interpolation （Closed curve interpolation）"
+
+n = 8
+j = 3
+s = 3
+
+XY = [ [0, 4.0, 0.0],[1, 3.0, 3.0],[2, 0.0, 4.0],[3,-3.0, 3.0],
+	   [4,-4.0, 0.0],[5,-3.0,-3.0],[6, 0.0,-4.0],[7, 3.0,-3.0],
+	   [8, 4.0, 0.0] ]
+
+Jbn = ARGV[0].to_i
+
+Dp = 10
+
+Sp = Bspline.new(XY, n, j, s)
+
+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 = Sp.plot(vv, Dp, Jbn) do |a, b|
+	printf "% .2f % .7f % .7f\n", a, b[0], b[1]
+end
+#STDERR.puts s

data/ext/pspline/example/extspline.rb

@@ -1,32 +1,54 @@
-#! /usr/local/bin/ruby
-require 'pspline'
-include PSPLINE
-
-#
-#puts "# Interpolation of the Jacobi function"
-#
-XY = [ [ 0.0,    0.0    ],[ 0.5474, 0.5    ],[ 1.2837, 0.86603],[ 2.7681, 1.0    ],
-	   [ 4.2525, 0.86603],[ 4.9888, 0.5    ],[ 5.5362, 0.0    ],[ 6.0836,-0.5    ],
-	   [ 6.8199,-0.86603],[ 8.3043,-1.0    ],[ 9.7887,-0.86603],[10.5250,-0.5    ],
-	   [11.0724, 0.0    ] ]
-
-Jbn = ARGV[0].to_i
-
-Dp = 10
-
-Bs = Bspline.new(XY, 12, 5, 1)
-
-vv = []
-XY.each do |p|
-	printf "%7.4f, % f\n", p[0], p[1]
-	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 = Bs.plot(vv, 10, Jbn) do |u, v|
-	printf "%8.5f % f\n", u, v[0]
-end
+#! /usr/local/bin/ruby
+require 'pspline'
+include PSPLINE
+
+#
+#puts "# Interpolation of the Jacobi function"
+#
+XY = [ [ 0.0,    0.0    ],[ 0.5474, 0.5    ],[ 1.2837, 0.86603],[ 2.7681, 1.0    ],
+	   [ 4.2525, 0.86603],[ 4.9888, 0.5    ],[ 5.5362, 0.0    ],[ 6.0836,-0.5    ],
+	   [ 6.8199,-0.86603],[ 8.3043,-1.0    ],[ 9.7887,-0.86603],[10.5250,-0.5    ],
+	   [11.0724, 0.0    ] ]
+
+Jbn = ARGV[0].to_i
+
+Dp = 10
+
+Bs = Bspline.new(XY, 12, 5, 1)
+
+vv = []
+XY.each do |p|
+	printf "%7.4f, % f\n", p[0], p[1]
+	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 = Bs.plot(vv, 10, Jbn) do |u, v|
+	printf "%8.5f % f\n", u, v[0]
+end
+# Draw Graph
+require "gnuplot"
+ 
+Gnuplot.open do |gp|
+	Gnuplot::Plot.new( gp ) do |plot|
+		plot.title  'Jacobi'
+		plot.ylabel 'Y'
+		plot.xlabel 'X'
+		x = vv.map {|v| v[0]}
+		y = vv.map {|v| v[1]}
+		plot.data << Gnuplot::DataSet.new( [x, y] ) do |ds|
+			ds.with = "lines"
+			ds.linewidth = 2
+			ds.notitle
+		end
+		y = x.map {|v| Bs.value(v, 1)}
+		plot.data << Gnuplot::DataSet.new( [x, y] ) do |ds|
+			ds.with = "lines"
+			ds.title = "Differential"
+		end
+	end
+end

data/ext/pspline/include/basis/pspline.h

@@ -1,6 +1,18 @@
 #ifndef _PSPLINE_5_H_INCLUDED_
 #define _PSPLINE_5_H_INCLUDED_
 
+template <typename T>
+void poly_new_subst(int n, T **w)
+{
+	for (int i = 0; i < n; ++i) w[i] = NULL;
+}
+
+template <typename T, class... Args>
+void poly_new_subst(int n, T **w, const T *car, const Args... cdr)
+{
+	w[0] = new T(*car); if (n > 1) poly_new_subst(n-1, &w[1], cdr...);
+}
+
 /*******************************************************************************
 	define poly_spline[base_spline1*,...base_splineN*]
 *******************************************************************************/
@@ -26,6 +38,7 @@ struct values_ {
 } *values;
 
 // constructor
+poly_spline() : base(NULL), values(NULL) {}
 poly_spline(const comb_array<S>& x, const Int& n, const Int& j, const Int& s) : N(x.grid())
 {
 	base = new base_spline<S>*[N];
@@ -33,8 +46,42 @@ poly_spline(const comb_array<S>& x, const Int& n, const Int& j, const Int& s) :
 		base[i] = new base_spline<S>(n[i], x[i], j[i], -s[i]%2);
 	values = new values_(*this, n.unit_size());
 }
+template <class... Args>
+poly_spline(int k, const base_spline<S> *bsc, Args... bsd)
+ : N(sizeof...(bsd)+1), base(new base_spline<S>*[sizeof...(bsd)+1])
+{
+	base[0] = new base_spline<S>(*bsc);
+	if (N > 1) poly_new_subst(N-1, &base[1], bsd...);
+	values = new values_(*this, k);
+}
+poly_spline(int k, const poly_spline<S> *ps, const base_spline<S> *bs)
+ : N(ps->Grid()+1), base(new base_spline<S>*[ps->Grid()+1])
+{
+	for (int i = 0; i < N-1; i++) {
+		const base_spline<S>& b = (*ps)[i];
+		base[i] = new base_spline<S>(b);
+	}
+	base[N-1] = new base_spline<S>(*bs);
+	values = new values_(*this, k);
+}
+poly_spline(int k, const base_spline<S> *bs, const poly_spline<S> *ps)
+ : N(ps->Grid()+1), base(new base_spline<S>*[ps->Grid()+1])
+{
+	base[0] = new base_spline<S>(*bs);
+	for (int i = 1; i < N; i++) {
+		const base_spline<S>& b = (*ps)[i-1];
+		base[i] = new base_spline<S>(b);
+	}
+	values = new values_(*this, k);
+}
+poly_spline(int k, const base_spline<S>& bsc)
+ : N(1), base(new base_spline<S>*[1])
+{
+	base[0] = new base_spline<S>(bsc);
+	values = new values_(*this, k);
+}
 // copy constructor
-poly_spline(const poly_spline& p) : N(p.N)
+poly_spline(const poly_spline& p) : N(p.N), base(new base_spline<S>*[p.N])
 {
 	for (int i = 0; i < N; i++)
 		base[i] = new base_spline<S>(*p.base[i]);
@@ -47,9 +94,9 @@ poly_spline& operator=(const poly_spline& p)
 {
 	if (this != &p) {
 		delete[] base;
-		int N = p.N;
+		N = p.N; base = new base_spline<S>*[p.N];
 		for (int i = 0; i < N; i++) {
-			base[i] = base_spline<S>(*p.base[i]);
+			base[i] = new base_spline<S>(*p.base[i]);
 		}	delete values;
 		values = new values_(*this, p.values->imax.unit_size());
 	}
@@ -130,9 +177,9 @@ void sekibun(poly_view<T>& r, const poly_view<T>& clp, const poly<int>& h, const
 	FREE(sp);
 }
 
-base_spline<S>& operator[](int i) {return *base[i];}
+base_spline<S>& operator[](int i) const {return *base[i];}
 
-int Grid() {return N;}
+int Grid() const {return N;}
 
 Int Kset(const poly<S>& x) const
 {
@@ -182,6 +229,7 @@ size_t *Maxq() const
 // end poly_spline
 };
 
+template <class T, class S> class bspline;
 /*******************************************************************************
 	Ｎ変数Ｋ次元パラメトリック ＆ リーゼンフェルト スプライン補間
 	     int N : number of parameters (Grid)
@@ -204,11 +252,24 @@ class pspline : public poly_spline<S>
 	// constructor
 	pspline():clp(NULL){}
 	pspline(const poly_array<T>&, const comb_array<S>&, const Int&, const Int&);
+	template <class... Args>
+	pspline(int k, T *v, Args... bset)
+	 : poly_spline<S>(k, bset...), K(k), clp(v) {}
+	pspline(const bspline<T,S>& bs)
+	 : poly_spline<S>(bs.Unit_size(), base_spline<S>(bs)), K(bs.Unit_size())
+	{
+		const Int& c = poly_spline<S>::values->icox;
+		int s = c.data_size();
+		clp = new T[s];
+		memcpy(clp, (T*)bs, s * sizeof(T));
+	}
 	pspline(const pspline&);
 	// destructor
 	~pspline() { delete[] clp; }
 	// operator
 	pspline& operator=(const pspline&);
+	poly_array<T> operator[](S t) const { return (*this)(t); }
+	poly_array<T> operator()(S, int = 0) const;
 	poly_array<T> operator[](const poly<S>& p) const {return (*this)(p);}
 	poly_array<T> operator()(const poly<S>&, const int* = NULL) const;
 	poly_array<T> operator()(const poly<S>&, int, T*) const;
@@ -221,8 +282,8 @@ template <typename T, typename S>
 pspline<T,S>::pspline(const poly_array<T>& p, const comb_array<S>& x, const Int& j, const Int& s)
  : poly_spline<S>(x, Int(p), j, s), K(p.unit_size())
 {
-	Int a = poly_spline<S>::values->imax;
-	Int c = poly_spline<S>::values->icox;
+	const Int& a = poly_spline<S>::values->imax;
+	const Int& c = poly_spline<S>::values->icox;
 	T *alp = clp = new T[c.data_size()];
 	poly_view<T> alv(alp, a), clv(clp, c);
 	if (s < 2) {
@@ -237,7 +298,7 @@ pspline<T,S>::pspline(const poly_array<T>& p, const comb_array<S>& x, const Int&
 template <typename T, typename S>
 pspline<T,S>::pspline(const pspline& ps) : poly_spline<S>(ps), K(ps.K)
 {
-	Int c = poly_spline<S>::icox;
+	const Int& c = poly_spline<S>::values->icox;
 	int len = c.data_size();
 	clp = new T[len];
 	memcpy(clp, (T*)ps, len * sizeof(T));
@@ -249,7 +310,7 @@ pspline<T,S>& pspline<T,S>::operator=(const pspline& ps)
 	if (this != &ps) {
 		delete clp;
 		poly_spline<S>::operator=(ps); K = ps.K;
-		Int c = poly_spline<S>::icox;
+		const Int& c = poly_spline<S>::values->icox;
 		int len = c.data_size();
 		clp = new T[len];
 		memcpy(clp, (T*)ps, len * sizeof(T));
@@ -268,7 +329,7 @@ poly_array<T> pspline<T,S>::operator()(const poly<S>& t, const int *jb) const
 	T result[K]; for (int i = 0; i < K; ++i) result[i] = 0;
 	poly_view<T> res(result, K);
 	comp_array<S> pc = poly_spline<S>::basis(t, jb);
-	Int& c = poly_spline<S>::values->icox;
+	const Int& c = poly_spline<S>::values->icox;
 	poly_view<T> clv(clp, c);
 	Int offset = pc.offset(), size = pc.size();
 	int s = size.grid_size();
@@ -288,7 +349,7 @@ poly_array<T> pspline<T,S>::operator()(const poly<S>& t, int jbn, T *ds) const
 	T result[K]; for (int i = 0; i < K; ++i) result[i] = 0;
 	poly_view<T> res(result, K);
 	comp_array<S> pc = poly_spline<S>::bases(t, jbn);
-	Int& c = poly_spline<S>::values->icox;
+	const Int& c = poly_spline<S>::values->icox;
 	poly_view<T> clv(clp, c);
 	Int offset = pc.offset(), size = pc.size();
 	int s = size.grid_size();
@@ -318,6 +379,29 @@ poly_array<T> pspline<T,S>::sekibun(const poly<S>& t) const
 	return poly_array<T>(result, a);
 }
 
+template <typename T, typename S>
+poly_array<T> pspline<T,S>::operator()(S t, int b) const
+{
+	int N = this->Grid();
+	S w[N+1]; for (int i = 0; i < N; i++) w[i] = t; w[N] = 0;
+	poly<S> u(w, N);
+	if (!(poly_spline<S>::values->jisu >= b))
+		throw "out of range, pspline()";
+	T result[K]; for (int i = 0; i < K; ++i) result[i] = 0;
+	poly_view<T> res(result, K);
+	comp_array<S> pc = poly_spline<S>::bases(u, b);
+	const Int& c = poly_spline<S>::values->icox;
+	poly_view<T> clv(clp, c);
+	Int offset = pc.offset(), size = pc.size();
+	int s = size.grid_size();
+	for (int i = 0; i < s; ++i)
+	{
+		Int k = i % size, l = k + offset;
+		res += clv[l] * pc[k = b + 1][b];
+	}
+	return poly_array<T>(result, K);
+}
+
 //	１変数Ｎ次元パラメトリックスプライン
 typedef pspline<double,double> Pspline;
 //	１変数Ｎ次元パラメトリックスプライン
@@ -380,11 +464,11 @@ bspline<T,S>::bspline(
 }
 
 template <class T, class S>
-bspline<T,S>::bspline(const bspline& s) : base_spline<S>(s)
+bspline<T,S>::bspline(const bspline& s) : base_spline<S>(s), K(s.K)
 {
 	int c = base_spline<S>::icox;
-	clp = new T[c];
-	memcpy(clp, s, c * sizeof(T));
+	clp = new T[c * K];
+	memcpy(clp, (T*)s, c * K * sizeof(T));
 }
 
 template <class T, class S>
@@ -392,10 +476,11 @@ bspline<T,S>& bspline<T,S>::operator=(const bspline& s)
 {
 	if (this != &s) {
 		base_spline<S>::operator=(s);
+		K = s.K;
 		delete clp;
 		int c = base_spline<S>::icox;
-		clp = new T[c];
-		memcpy(clp, s, c * sizeof(T));
+		clp = new T[c * K];
+		memcpy(clp, (T*)s, c * K * sizeof(T));
 	}
 	return *this;
 }
@@ -485,21 +570,72 @@ bspline<T,S> *bspline<T,S>::line_integral(T(*F)(poly_array<S>&), int n, S *u, S
 	poly_array<T> Ya(Y, 1, N, 1);
 	return new bspline<T,S>(Ya, n, X, base_spline<S>::jisu, 0, D);
 }
+
+template <class T, class S>
+pspline<T,S> operator * (const bspline<T,S>& bs1, const bspline<T,S>& bs2)
+{
+	int k1 = bs1.Unit_size(), k2 = bs2.Unit_size();
+	assert(k1 == k2);
+	int c1 = bs1.Icox(), c2 = bs2.Icox();
+	T *cp1 = bs1, *cp2 = bs2, *cp3 = new T[c1*c2*k1];
+	for (int i = 0; i < k1; i++) {
+		varray_view<T> v1(cp1+i, c1, k1), v2(cp2+i, c2, k2), v3(cp3+i, c1*c2, k1);
+		kronecker(v1, v2, v3);
+	}
+	const base_spline<S>& bt1 = bs1;
+	const base_spline<S>& bt2 = bs2;
+	return pspline<T,S>(k1, cp3, &bt1, &bt2);
+}
+
+template <class T, class S>
+pspline<T,S> operator * (const pspline<T,S>& ps, const bspline<T,S>& bs2)
+{
+	int k2 = bs2.Unit_size(), c2 = bs2.Icox();
+	const poly_spline<S>& ps1 = ps;
+	const Int& c = ps1.values->icox;
+	int k1 = c.unit_size(), c1 = c.grid_size();
+	assert(k1 == k2);
+	T *cp1 = ps, *cp2 = bs2, *cp3 = new T[c1*c2*k2];
+	for (int i = 0; i < k1; i++) {
+		varray_view<T> v1(cp1+i, c1, k1), v2(cp2+i, c2, k2), v3(cp3+i, c1*c2, k1);
+		kronecker(v1, v2, v3);
+	}
+	const base_spline<S>& bt2 = bs2;
+	return pspline<T,S>(k2, cp3, &ps1, &bt2);
+}
+
+template <class T, class S>
+pspline<T,S> operator * (const bspline<T,S>& bs1, const pspline<T,S>& ps)
+{
+	int k1 = bs1.Unit_size(), c1 = bs1.Icox();
+	const poly_spline<S>& ps2 = ps;
+	const Int& c = ps2.values->icox;
+	int k2 = c.unit_size(), c2 = c.grid_size();
+	assert(k1 == k2);
+	T *cp1 = bs1, *cp2 = ps, *cp3 = new T[c1*c2*k1];
+	for (int i = 0; i < k1; i++) {
+		varray_view<T> v1(cp1+i, c1, k1), v2(cp2+i, c2, k2), v3(cp3+i, c1*c2, k1);
+		kronecker(v1, v2, v3);
+	}
+	const base_spline<S>& bt1 = bs1;
+	return pspline<T,S>(k1, cp3, &bt1, &ps2);
+}
 //
 //	misc
 //
+// 偏微分プロット
 template <class T, class S = double>
 int plot(const pspline<T,S>&, const comb_array<S>&, S**, T**, int, const int* = NULL);
-
+// 全微分プロット
 template <class T, class S = double>
 int plot(const pspline<T,S>&, const comb_array<S>&, S**, T**, int, int, S*);
-
+// １変数関数積プロット
 template <class T, class S = double>
 int plot(const pspline<T,S>&, int, S*, S**, T**, int, int = 0);
-
+// １変数関数プロット（インデックス）
 template <class T, class S = double>
 int plot(const bspline<T,S>&, const comb_array<S>&, S**, T**, int, int = 0);
-
+// １変数関数プロット
 template <class T, class S = double>
 int plot(const bspline<T,S>&, int, S*, S**, T**, int, int = 0);