Mercurial > mxe-octave

annotate src/of-nurbs-2-dev-fixes.patch @ 5534:372ea4c0afb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move of-ocs PKG_XXXX to inst dir and add break patch * src/of-ocs-3-break-fixes.patch, src/of-ocs-4-pkgadd-fixes.patch: new files * dist-files.mk: add ref to files
author John Donoghue <john.donoghue@ieee.org>
date Sun, 13 Sep 2020 08:15:14 -0400
parents fa3095a87fa7
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4933
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
1 diff -ur nurbs-1.3.13.orig/src/bspeval.cc nurbs-1.3.13/src/bspeval.cc
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
2 --- nurbs-1.3.13.orig/src/bspeval.cc 2019-01-02 14:26:02.941385714 -0500
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
3 +++ nurbs-1.3.13/src/bspeval.cc 2019-01-02 14:27:40.507737151 -0500
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
4 @@ -113,7 +113,7 @@
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
5 error("bspeval: the knot vector should be a real vector.");
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
6 return true;
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
7 }
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
8 - if (!args(3).is_real_type())
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
9 + if (!args(3).isreal())
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
10 {
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
11 error("bspeval: the set of parametric points should be an array of doubles.");
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
12 return true;
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
13 diff -ur nurbs-1.3.13.orig/src/tbasisfun.cc nurbs-1.3.13/src/tbasisfun.cc
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
14 --- nurbs-1.3.13.orig/src/tbasisfun.cc 2019-01-02 14:26:02.941385714 -0500
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
15 +++ nurbs-1.3.13/src/tbasisfun.cc 2019-01-02 14:27:54.744080103 -0500
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
16 @@ -156,7 +156,7 @@
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
17 RowVector N(u.cols ());
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
18 double *Nptr = N.fortran_vec ();
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
19
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
20 - if (! args(2).is_cell ())
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
21 + if (! args(2).iscell ())
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
22 {
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
23
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
24 double p = args(1).idx_type_value ();
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
25 diff -ur nurbs-1.3.13.orig/src/nrb_srf_basisfun__.cc nurbs-1.3.13/src/nrb_srf_basisfun__.cc
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
26 --- nurbs-1.3.13.orig/src/nrb_srf_basisfun__.cc 2019-01-02 14:34:00.900891192 -0500
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
27 +++ nurbs-1.3.13/src/nrb_srf_basisfun__.cc 2019-01-02 14:34:46.781994244 -0500
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
28 @@ -66,7 +66,7 @@
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
29 } // spu = findspan (m, p, u, U);
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
30
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
31 newargs(3) = U; newargs(2) = p; newargs(1) = u; newargs(0) = spu;
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
32 - Matrix Ik = feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Ik = numbasisfun (spu, u, p, U);
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
33 + Matrix Ik = octave::feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Ik = numbasisfun (spu, u, p, U);
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
34
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
35 RowVector spv(v);
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
36 for (octave_idx_type ii(0); ii < v.numel (); ii++)
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
37 @@ -75,7 +75,7 @@
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
38 } // spv = findspan (n, q, v, V);
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
39
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
40 newargs(3) = V; newargs(2) = q; newargs(1) = v; newargs(0) = spv;
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
41 - Matrix Jk = feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Jk = numbasisfun (spv, v, q, V);
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
42 + Matrix Jk = octave::feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Jk = numbasisfun (spv, v, q, V);
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
43
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
44 Matrix NuIkuk(npt, p+1, 0.0);
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
45 for (octave_idx_type ii(0); ii < npt; ii++)
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
46 diff -ur nurbs-1.3.13.orig/src/nrb_srf_basisfun_der__.cc nurbs-1.3.13/src/nrb_srf_basisfun_der__.cc
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
47 --- nurbs-1.3.13.orig/src/nrb_srf_basisfun_der__.cc 2019-01-02 14:34:00.900891192 -0500
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
48 +++ nurbs-1.3.13/src/nrb_srf_basisfun_der__.cc 2019-01-02 14:35:50.667529890 -0500
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
49 @@ -73,7 +73,7 @@
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
50 } // spu = findspan (m, p, u, U);
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
51
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
52 newargs(3) = U; newargs(2) = p; newargs(1) = u; newargs(0) = spu;
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
53 - Matrix Ik = feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Ik = numbasisfun (spu, u, p, U);
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
54 + Matrix Ik = octave::feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Ik = numbasisfun (spu, u, p, U);
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
55
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
56 RowVector spv(v);
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
57 for (octave_idx_type ii(0); ii < v.numel (); ii++)
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
58 @@ -82,7 +82,7 @@
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
59 } // spv = findspan (n, q, v, V);
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
60
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
61 newargs(3) = V; newargs(2) = q; newargs(1) = v; newargs(0) = spv;
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
62 - Matrix Jk = feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Jk = numbasisfun (spv, v, q, V);
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
63 + Matrix Jk = octave::feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Jk = numbasisfun (spv, v, q, V);
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
64
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
65 Matrix NuIkuk(npt, p+1, 0.0);
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
66 for (octave_idx_type ii(0); ii < npt; ii++)
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
67 @@ -100,11 +100,11 @@
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
68
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
69
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
70 newargs(4) = 1; newargs(3) = U; newargs(2) = u; newargs(1) = p; newargs(0) = spu;
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
71 - NDArray NuIkukprime = feval (std::string("basisfunder"), newargs, 1)(0).array_value (); // NuIkukprime = basisfunder (spu, p, u, U, 1);
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
72 + NDArray NuIkukprime = octave::feval (std::string("basisfunder"), newargs, 1)(0).array_value (); // NuIkukprime = basisfunder (spu, p, u, U, 1);
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
73 // NuIkukprime = squeeze(NuJkukprime(:,2,:));
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
74
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
75 newargs(4) = 1; newargs(3) = V; newargs(2) = v; newargs(1) = q; newargs(0) = spv;
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
76 - NDArray NvJkvkprime = feval (std::string("basisfunder"), newargs, 1)(0).array_value (); // NvJkvkprime = basisfunder (spv, q, v, V, 1);
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
77 + NDArray NvJkvkprime = octave::feval (std::string("basisfunder"), newargs, 1)(0).array_value (); // NvJkvkprime = basisfunder (spv, q, v, V, 1);
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
78 // NvJkvkprime = squeeze(NvJkvkprime(:,2,:));
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
79
fa3095a87fa7 of-nurbs: patch to compile with dev ctave
John Donoghue
parents:
diff changeset
80 for (octave_idx_type k(0); k < npt; k++)