Mercurial > forge

changeset 12672:59e8aae64812 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
prepare for release
author cdf
date Mon, 17 Aug 2015 10:23:44 +0000
parents 20e8aca47b2c
children 88676c510f30
files extra/nurbs/src/basisfun.cc extra/nurbs/src/basisfunder.cc extra/nurbs/src/bspeval.cc extra/nurbs/src/low_level_functions.cc extra/nurbs/src/nrb_srf_basisfun__.cc extra/nurbs/src/nrb_srf_basisfun_der__.cc extra/nurbs/src/tbasisfun.cc
diffstat 7 files changed, 33 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/extra/nurbs/src/basisfun.cc	Mon Aug 17 10:19:39 2015 +0000
+++ b/extra/nurbs/src/basisfun.cc	Mon Aug 17 10:23:44 2015 +0000
@@ -46,11 +46,11 @@
   int       p = args(2).idx_type_value();
   const RowVector U = args(3).row_vector_value();
   RowVector N(p+1, 0.0);
-  Matrix    B(u.length(), p+1, 0.0);
+  Matrix    B(u.numel (), p+1, 0.0);
   
   if (!error_state)
     {
-      for (octave_idx_type ii(0); ii < u.length(); ii++)
+      for (octave_idx_type ii(0); ii < u.numel (); ii++)
 	{
 	  basisfun(int(i(ii)), u(ii), p, U, N);
 	  B.insert(N, ii, 0);
--- a/extra/nurbs/src/basisfunder.cc	Mon Aug 17 10:19:39 2015 +0000
+++ b/extra/nurbs/src/basisfunder.cc	Mon Aug 17 10:23:44 2015 +0000
@@ -50,12 +50,12 @@
 
   if (!error_state)
     {
-      if (i.length () != u.length ())
+      if (i.numel () != u.numel ())
 	print_usage ();
  
-      NDArray dersv (dim_vector (i.length (), nd+1, pl+1), 0.0);
+      NDArray dersv (dim_vector (i.numel (), nd+1, pl+1), 0.0);
       NDArray ders(dim_vector(nd+1, pl+1), 0.0);
-      for ( octave_idx_type jj(0); jj < i.length (); jj++)
+      for ( octave_idx_type jj(0); jj < i.numel (); jj++)
 	{
 	  basisfunder (int (i(jj)), pl, u(jj), U, nd, ders);
 
--- a/extra/nurbs/src/bspeval.cc	Mon Aug 17 10:19:39 2015 +0000
+++ b/extra/nurbs/src/bspeval.cc	Mon Aug 17 10:23:44 2015 +0000
@@ -49,7 +49,7 @@
       RowVector k = args(2).row_vector_value();
       NDArray   u = args(3).array_value();
       
-      octave_idx_type nu = u.length();
+      octave_idx_type nu = u.numel ();
       octave_idx_type mc = c.rows(),
         nc = c.cols();
       
@@ -57,14 +57,14 @@
       
       if (!error_state)
         {
-          if (nc + d == k.length() - 1) 
+          if (nc + d == k.numel () - 1) 
             {	 
-#pragma omp parallel default (none) shared (d, c, k, u, nu, mc, nc, p)
+              //#pragma omp parallel default (none) shared (d, c, k, u, nu, mc, nc, p)
               {
                 RowVector N(d+1,0.0);
                 int s, tmp1;
                 double tmp2;
-#pragma omp for 
+                //#pragma omp for 
                 for (octave_idx_type col=0; col<nu; col++)
                   {	
                     //printf ("thread %d, col %d\n", omp_get_thread_num (), col);
@@ -83,7 +83,7 @@
             }
           else 
             {
-              error("inconsistent bspline data, d + columns(c) != length(k) - 1.");
+              error("inconsistent bspline data, d + columns(c) != numel(k) - 1.");
             }
           retval(0) = octave_value(p);
         }
@@ -93,7 +93,7 @@
 
 static bool bspeval_bad_arguments (const octave_value_list& args) 
 { 
-  if (args.length() != 4)
+  if (args.length () != 4)
     {
       error("bspeval: wrong number of input arguments.");
       return true;
--- a/extra/nurbs/src/low_level_functions.cc	Mon Aug 17 10:19:39 2015 +0000
+++ b/extra/nurbs/src/low_level_functions.cc	Mon Aug 17 10:23:44 2015 +0000
@@ -309,14 +309,16 @@
 	  idxva (0) = idx_vector(k); idxva (1) = idx_vector(0);
 	  idxva (2) = idx_vector(i); idxva (3) = idx_vector(':');
 	  NDArray temp2 (pkl.index (idxva));
-	  curvederivcpts (m, q, V.extract (s1, V.length ()-1), temp2.squeeze (), dd, 0, s, temp);
+	  curvederivcpts (m, q, V.extract (s1, V.numel () - 1),
+                          temp2.squeeze (), dd, 0, s, temp);
 	  
 	  for (octave_idx_type l(1); l<=dd; l++)
 	    {
 
 	      for (octave_idx_type j(0); j<=s-l; j++)
 		{
-		  assert (k<idxa(0) && l<idxa(1) && i<idxa(2) && j<idxa(3));
+		  assert (k<idxa(0) && l<idxa(1)
+                          && i<idxa(2) && j<idxa(3));
 		  idxta (0) = k; idxta (1) = l;
 		  idxta (2) = i; idxta (3) = j;
 		  pkl(idxta) = temp (l, j);
--- a/extra/nurbs/src/nrb_srf_basisfun__.cc	Mon Aug 17 10:19:39 2015 +0000
+++ b/extra/nurbs/src/nrb_srf_basisfun__.cc	Mon Aug 17 10:23:44 2015 +0000
@@ -46,7 +46,7 @@
       idx(0) = 1;
       const NDArray v(points.index (idx).squeeze ()); // v = points(2,:);      
 
-      octave_idx_type npt = u.length (); // npt = length(u);
+      octave_idx_type npt = u.numel (); // npt = length(u);
       RowVector M(p+1, 0.0), N (q+1, 0.0);
       Matrix RIkJk(npt, (p+1)*(q+1), 0.0);
       Matrix indIkJk(npt, (p+1)*(q+1), 0.0);
@@ -69,7 +69,7 @@
       Matrix Ik = feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Ik = numbasisfun (spu, u, p, U);
 
       RowVector spv(v);
-      for (octave_idx_type ii(0); ii < v.length(); ii++)
+      for (octave_idx_type ii(0); ii < v.numel (); ii++)
 	{
 	  spv(ii) = findspan(n, q, v(ii), V);
 	} // spv  =  findspan (n, q, v, V);
@@ -84,7 +84,7 @@
 	  NuIkuk.insert (M, ii, 0);
 	} // NuIkuk = basisfun (spu, u, p, U);
 
-      Matrix NvJkvk(v.length (), q+1, 0.0);
+      Matrix NvJkvk(v.numel (), q+1, 0.0);
       for (octave_idx_type ii(0); ii < npt; ii++)
 	{
 	  basisfun(int(spv(ii)), v(ii), q, V, N);
--- a/extra/nurbs/src/nrb_srf_basisfun_der__.cc	Mon Aug 17 10:19:39 2015 +0000
+++ b/extra/nurbs/src/nrb_srf_basisfun_der__.cc	Mon Aug 17 10:23:44 2015 +0000
@@ -46,7 +46,7 @@
       idx(0) = 1;
       const NDArray v(points.index (idx).squeeze ()); // v = points(2,:);      
       
-      octave_idx_type npt = u.length (); // npt = length(u);
+      octave_idx_type npt = u.numel (); // npt = length(u);
 
       RowVector M(p+1, 0.0), N (q+1, 0.0);
       Matrix Nout(npt, (p+1)*(q+1), 0.0);
@@ -76,7 +76,7 @@
       Matrix Ik = feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Ik = numbasisfun (spu, u, p, U);
 
       RowVector spv(v);
-      for (octave_idx_type ii(0); ii < v.length(); ii++)
+      for (octave_idx_type ii(0); ii < v.numel (); ii++)
 	{
 	  spv(ii) = findspan(n, q, v(ii), V);
 	} // spv  =  findspan (n, q, v, V);
@@ -91,7 +91,7 @@
 	  NuIkuk.insert (M, ii, 0);
 	} // NuIkuk = basisfun (spu, u, p, U);
 
-      Matrix NvJkvk(v.length (), q+1, 0.0);
+      Matrix NvJkvk(v.numel (), q+1, 0.0);
       for (octave_idx_type ii(0); ii < npt; ii++)
 	{
 	  basisfun(int(spv(ii)), v(ii), q, V, N);
--- a/extra/nurbs/src/tbasisfun.cc	Mon Aug 17 10:19:39 2015 +0000
+++ b/extra/nurbs/src/tbasisfun.cc	Mon Aug 17 10:23:44 2015 +0000
@@ -69,19 +69,19 @@
     }
  
   double ln = u - U(0);
-  double ld = U(U.length () - 2) - U(0);
+  double ld = U(U.numel () - 2) - U(0);
   if (ld != 0)
     {
       double tmp;
-      onebasisfun__ (u, p-1, U.extract (0, U.length () - 2), &tmp);
+      onebasisfun__ (u, p-1, U.extract (0, U.numel () - 2), &tmp);
       *N += ln * tmp / ld; 
     }
-  double dn = U(U.length () - 1) - u;
-  double dd = U(U.length () - 1) - U(1);
+  double dn = U(U.numel () - 1) - u;
+  double dd = U(U.numel () - 1) - U(1);
   if (dd != 0)
     {
       double tmp;
-      onebasisfun__ (u, p-1, U.extract (1, U.length () - 1), &tmp);
+      onebasisfun__ (u, p-1, U.extract (1, U.numel () - 1), &tmp);
       *N += dn * tmp / dd;
     }
   return;
@@ -104,22 +104,22 @@
     }  
   else {    
     double ln = u - U(0);
-    double ld = U(U.length () - 2) - U(0);
+    double ld = U(U.numel () - 2) - U(0);
 
     if (ld != 0)
       {
-        onebasisfun__ (u, p-1, U.extract (0, U.length () - 2), &aux);
+        onebasisfun__ (u, p-1, U.extract (0, U.numel () - 2), &aux);
         aux = aux / ld;
         *N += ln * aux;
         *Nder += p * aux;
       }
     
-    double dn = U(U.length () - 1) - u;
-    double dd = U(U.length () - 1) - U(1);
+    double dn = U(U.numel () - 1) - u;
+    double dd = U(U.numel () - 1) - U(1);
 
     if (dd != 0)
       { 
-        onebasisfun__ (u, p-1, U.extract (1, U.length () - 1), &aux);
+        onebasisfun__ (u, p-1, U.extract (1, U.numel () - 1), &aux);
         aux = aux / dd;
         *N    += dn *aux;
         *Nder -= p * aux;
@@ -181,7 +181,7 @@
   else 
     {
       RowVector p = args(1).row_vector_value ();
-      if (p.length() == 2) 
+      if (p.numel () == 2) 
         {
           Cell C = args(2).cell_value ();
           RowVector U = C(0).row_vector_value (true, true);
@@ -215,7 +215,7 @@
             }
         
         } 
-      else if (p.length() == 3) 
+      else if (p.numel () == 3) 
         {
           Cell C = args(2).cell_value ();
           RowVector U = C(0).row_vector_value (true, true);