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.

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

More matrix features to MathObject matrices #1076

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from

Conversation

pstaabp
Copy link
Member

@pstaabp pstaabp commented May 17, 2024

This builds on #1012 and includes

  • new methods for setting elements, removing columns and rows and a submatrix.
  • A test suite for nearly all of the methods in the module.
  • updated POD.

lib/Value/Matrix.pm Outdated Show resolved Hide resolved
lib/Value/Matrix.pm Outdated Show resolved Hide resolved
lib/Value/Matrix.pm Outdated Show resolved Hide resolved
lib/Value/Matrix.pm Outdated Show resolved Hide resolved
lib/Value/Matrix.pm Outdated Show resolved Hide resolved
@Alex-Jordan
Copy link
Contributor

I was looking at the POD since a lot of that is in the diff here, and I left some comments. But I'm going to pause because I think if you proofread the actual POD output you will see a lot of the same things that I'm seeing. I'll move on to testing the new tools now.

lib/Value/Matrix.pm Outdated Show resolved Hide resolved
sub row {
my $self = (ref($_[0]) ? $_[0] : shift);
my $M = $self->promote(shift);
my $i = shift;
return if $i == 0;
$i-- if $i > 0;
Value::Error("Row must be a positive integer") unless $i =~ m/^[1-9]\d*$/;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't recall where, but there is somewhere else like this where we support having an explicit plus sign in front of the integer.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But maybe this would be better if if actually accessed the dimensions of the matrix, and required an integer that is a valid row index.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since $i is usually a Perl real (not a string, for example), an initial plus sign will not be in its stringified version, so won't be part of the comparison in $i =~ m/.../ even if you used $M->row(+3). It would only be there if you passed the row number as a string, as in $M->row("+3"), which I might consider to be an improper value to pass (it is not a positive integer, it is a string).

lib/Value/Matrix.pm Outdated Show resolved Hide resolved
$A->subMatrix([3,1,2],[1,4,2]); # returns Matrix([9,12,10],[1,4,2],[5,8,6]);
=cut

sub subMatrix {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has some issues as well. If I try it on a 1D matrix, I get an error:

$A = Matrix([ 1, 2, 3, 4 ]);
$B = $A->subMatrix([3]);

And if I try it on a 3D matrix, it is not returning what I would expect it to:

$A = Matrix([ [[1,2],[3,4]], [[5,6], [7,8]]]);
$B = $A->subMatrix([1], [1,2], [2]);
# $B seems to be what I would expect from subMatrix([1], [1,2], [1,2]);

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(It did seem to work when I tested with 2D matrices though.)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought of subMatrix only on 2D matrices, so will rework for other dimensions.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rewrote this now. Should be working on non-2D matrices.

Comment on lines 1001 to 1005
my $el = $self->{data}[ $ind->[0] - 1 ];
for my $i (1 .. scalar(@$ind) - 1) { $el = $el->{data}[ $ind->[$i] - 1 ]; }

# update the value of $el
$el = Value::makeValue($value);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be

Suggested change
my $el = $self->{data}[ $ind->[0] - 1 ];
for my $i (1 .. scalar(@$ind) - 1) { $el = $el->{data}[ $ind->[$i] - 1 ]; }
# update the value of $el
$el = Value::makeValue($value);
my $el = \($self->{data}[ $ind->[0] - 1 ]);
for my $i (1 .. scalar(@$ind) - 1) { $el = \($$el->{data}[ $ind->[$i] - 1 ]); }
# update the value of $el
$$el = Value::makeValue($value);
	my $el = \($self->{data}[ $ind->[0] - 1 ]);
	for my $i (1 .. scalar(@$ind) - 1) { $el = \($$el->{data}[ $ind->[$i] - 1 ]); }

	# update the value of $el
	$$el = Value::makeValue($value);

in order to actually mutate the matrix.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed this, but odd that the test works for the previous version of the code as well as this one, however, I think the test needs some help.

@drgrice1 drgrice1 deleted the branch openwebwork:develop August 6, 2024 19:46
@drgrice1 drgrice1 closed this Aug 6, 2024
@pstaabp pstaabp reopened this Aug 6, 2024
@pstaabp pstaabp changed the base branch from PG-2.19 to develop August 6, 2024 20:02
@pstaabp pstaabp force-pushed the more-matrix-features branch 2 times, most recently from 34fd8ed to 9ba941c Compare August 13, 2024 20:06
Also fix some documentation typos and clarifications.

u
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants