Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates for octave 6.x. #31

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updates for octave 6.x. #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions examples/octave/mps_regenerate.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ This function will take that b_i chosen as nodes and return the respective a_i s

ComplexColumnVector b = args(0).complex_column_vector_value();
int degree = nargin - 2;
ComplexColumnVector a(b.length());
ComplexColumnVector a(b.numel());

cplx_t * fa = (cplx_t*) a.fortran_vec();
cplx_t * fb = (cplx_t*) b.fortran_vec();
Expand All @@ -41,15 +41,15 @@ This function will take that b_i chosen as nodes and return the respective a_i s
ComplexMatrix A = args(1).complex_matrix_value().transpose();
cplx_t * A_data = (cplx_t*) A.fortran_vec();

for (int i = 0; i < a.length(); i++)
for (int i = 0; i < a.numel(); i++)
{
long int exponent = 0;
cplx_t prod;

mps_fhessenberg_shifted_determinant (ctx, A_data, fb[i], A.rows(), fa[i], &exponent);
cplx_set (prod, cplx_one);

for (int j = 0; j < b.length(); j++)
for (int j = 0; j < b.numel(); j++)
{
if (i == j)
continue;
Expand Down
4 changes: 2 additions & 2 deletions examples/octave/mps_roots.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ fields: \n\n\

/* If the string conversion triggers an error try to recover
* a struct. */
if (args(1).is_map())
if (args(1).isstruct())
smap = args(1).map_value();
else
{
Expand Down Expand Up @@ -179,7 +179,7 @@ fields: \n\n\
poly->fstart = _custom_start_function;
poly->dstart = _custom_dpe_start_function;

if (starting_points.length() != n -1)
if (starting_points.numel() != n -1)
{
octave_stdout << "Warning: The length of the starting points should be equal to the degree" << std::endl;
return retval;
Expand Down
2 changes: 1 addition & 1 deletion examples/octave/mps_secular.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ values are 's' for secsolve and 'u' for unisolve.\n\
ComplexColumnVector a = args(0).complex_column_vector_value();
ComplexColumnVector b = args(1).complex_column_vector_value();

int n = a.length();
int n = a.numel();

mps_context * ctx = mps_context_new();
mps_secular_equation * sec = mps_secular_equation_new (ctx, (cplx_t*) a.fortran_vec(),
Expand Down