Группа :: Науки/Математика
Пакет: octave-level-set
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: octave-6.patch
Скачать
Скачать
diff --git a/level-set/src/geomGamma.cpp b/level-set/src/geomGamma.cpp
index 032f717..962352e 100644
--- a/level-set/src/geomGamma.cpp
+++ b/level-set/src/geomGamma.cpp
@@ -192,7 +192,7 @@ DEFUN_DLD (__levelset_geomGamma, args, nargout,
const Matrix inout = args(4).matrix_value ();
/* Extract and check the dimensions. */
- const unsigned nNodes = phi.nelem ();
+ const unsigned nNodes = phi.numel ();
const unsigned nElem = getDimension (nodelist, -1, 4);
const unsigned nBdryEl = getDimension (bdryInd, -1, 1);
getDimension (edges, nBdryEl, 4);
diff --git a/level-set/src/internal_fastmarching.cpp b/level-set/src/internal_fastmarching.cpp
index 543e6dd..cfccf08 100644
--- a/level-set/src/internal_fastmarching.cpp
+++ b/level-set/src/internal_fastmarching.cpp
@@ -74,7 +74,7 @@ DEFUN_DLD (__levelset_internal_fastmarching, args, nargout,
{
const Array<octave_idx_type> idx = getOctaveIdx (c);
assert (c.size () == D
- && static_cast<dimensionT> (idx.length ()) == D);
+ && static_cast<dimensionT> (idx.numel ()) == D);
if (domain(idx))
{
@@ -99,7 +99,7 @@ DEFUN_DLD (__levelset_internal_fastmarching, args, nargout,
{
const Array<octave_idx_type> idx = getOctaveIdx (c);
assert (c.size () == D
- && static_cast<dimensionT> (idx.length ()) == D);
+ && static_cast<dimensionT> (idx.numel ()) == D);
const Grid& constGrid(grid);
const Entry* e = constGrid.get (c);
diff --git a/level-set/src/internal_mesh.cpp b/level-set/src/internal_mesh.cpp
index b772615..acf4cf4 100644
--- a/level-set/src/internal_mesh.cpp
+++ b/level-set/src/internal_mesh.cpp
@@ -300,7 +300,7 @@ getInnerSegment (const octave_scalar_map& segs,
assert (innerPts.empty ());
const ColumnVector inners = segs.contents ("inners").column_vector_value ();
- const unsigned nInners = inners.nelem ();
+ const unsigned nInners = inners.numel ();
for (unsigned i = 0; i < nInners; ++i)
innerPts.push_back (inners(nInners - i - 1) - 1);
}
@@ -387,7 +387,7 @@ DEFUN_DLD (__levelset_internal_mesh, args, nargout,
{
const unsigned cur = bdryElems(i) - 1;
const Cell cellSegs = bdryelSegs(i).cell_value ();
- const unsigned nSegs = cellSegs.nelem ();
+ const unsigned nSegs = cellSegs.numel ();
std::vector<octave_scalar_map> segs;
indexArr endEdges;