@@ -1,4 +1,4 @@ -#!/usr/bin/perl5.10 -w +#!/usr/bin/perl -w use Math::GSL::Matrix; use strict; my $matrix = Math::GSL::Matrix->new(2,2) examples/matrix/nonsymmetric_eigen @@ -1,4 +1,4 @@ -#!/usr/bin/perl5.10 -w +#!/usr/bin/perl -w use Math::GSL qw/:all/; use Math::GSL::Eigen qw/:all/; use Math::GSL::Matrix qw/:all/; examples/matrix/nonsymmetric_eigen_old @@ -561,14 +561,12 @@ sub col croak (__PACKAGE__."::\$matrix->col(\$col) - $col not a valid column") unless ($col < $self->cols and $col >= 0); - my $colvec = Math::GSL::Vector->new($self->cols); my $colmat = Math::GSL::Matrix->new($self->rows, 1); - my @got; - for my $n (0 .. $self->rows-1) { - push (@got, gsl_matrix_get($self->raw, $n, $col)); - } - map { gsl_matrix_set($colmat->raw, $_, 0, $got[$_]) } (0 .. $self->rows-1); + map { gsl_matrix_set($colmat->raw, $_, 0, + gsl_matrix_get($self->raw, $_, $col), + ) + } (0 .. $self->rows-1); return $colmat; } pod/Matrix.pod @@ -1,9 +1,11 @@ -%perlcode %{ +%perlcode %{ use Carp qw/croak/; use Math::GSL qw/:all/; +use Math::GSL::Complex qw/:all/; use Math::GSL::Errno qw/:all/; use Math::Complex; +use Data::Dumper; @EXPORT_OK = qw/ gsl_matrix_complex_alloc @@ -182,12 +184,11 @@ sub row my $rowmat = Math::GSL::MatrixComplex->new(1,$self->cols); - my @got; for my $n (0 .. $self->cols-1) { - push (@got, gsl_matrix_complex_get($self->raw, $row, $n)); + gsl_matrix_complex_set( $rowmat->raw, 0, $n, + gsl_matrix_complex_get($self->raw, $row, $n) + ); } - for my $n (0 .. $self->cols-1) { - gsl_matrix_complex_set($rowmat->raw, 0, $n, $got[$n]); } return $rowmat; } @@ -202,21 +203,18 @@ Returns a col matrix of the column you enter. =cut -sub col +sub col { my ($self, $col) = @_; - croak (__PACKAGE__."::\$matrix->col(\$col) - $col not a valid column") - unless ($col < $self->cols and $col >= 0); + croak (__PACKAGE__."::\$matrix->col(\$col) - $col not a valid column") + unless ($col < $self->cols and $col >= 0); - my $colvec = Math::GSL::Vector->new($self->cols); my $colmat = Math::GSL::MatrixComplex->new($self->rows, 1); - my @got; - for my $n (0 .. $self->rows-1) { - push (@got, gsl_matrix_complex_get($self->raw, $n, $col)); - } - for my $n (0 .. $self->rows-1) { - gsl_matrix_complex_set($colmat->raw, $n, 0, $got[$n]); } + map { gsl_matrix_complex_set($colmat->raw, $_, 0, + gsl_matrix_complex_get($self->raw, $_, $col), + ) + } (0 .. $self->rows-1); return $colmat; } @@ -237,13 +235,16 @@ You can also set multiple rows at once with chained calls: =cut sub set_row { - my ($self, $row, $values) = @_; - my $length = $#$values; - die __PACKAGE__.'::new($x, $values) - $values must be a nonempty array reference' if $length == -1; - die __PACKAGE__.'::set_row($x, $values) - $x must be a valid row number' if ($row < 0 || $row >= $self->rows); - die __PACKAGE__.'::set_row($x, $values) - $values must contains the same number of elements as there is columns in the matrix' if($length != $self->cols-1); - map { gsl_matrix_complex_set($self->raw, $row, $_, $values->[$_]) } (0..$length); - return $self; + my ($self, $row, $values) = @_; + my $length = $#$values; + die __PACKAGE__.'::set_row($x, $values) - $values must be a nonempty array reference' if $length == -1; + die __PACKAGE__.'::set_row($x, $values) - $x must be a valid row number' if ($row < 0 || $row >= $self->rows); + die __PACKAGE__.'::set_row($x, $values) - $values must contains the same number of elements as there is columns in the matrix' if($length != $self->cols-1); + # $values may have Math::Complex objects + @$values = map { Math::GSL::Complex::gsl_complex_rect(Re($_), Im($_)) } @$values; + # warn Dumper [ @$values ]; + map { gsl_matrix_complex_set($self->raw, $row, $_, $values->[$_]) } (0..$length); + return $self; } =head2 set_col() @@ -262,19 +263,19 @@ You can also set multiple columns at once with chained calls: =cut sub set_col { - my ($self, $col, $values) = @_; - my $length = $#$values; - die __PACKAGE__.'::new($x, $values) - $values must be a nonempty array reference' if $length == -1; - die __PACKAGE__.'::set_row($x, $values) - $x must be a valid column number' if ($col < 0 || $col >= $self->cols); - die __PACKAGE__.'::set_row($x, $values) - $values must contains the same number of elements as there is rowss in the matrix' if($length != $self->rows-1); - map { gsl_matrix_complex_set($self->raw, $_, $col, $values->[$_]) } (0..$length); - return $self; + my ($self, $col, $values) = @_; + my $length = $#$values; + die __PACKAGE__.'::set_col($x, $values) - $values must be a nonempty array reference' if $length == -1; + die __PACKAGE__.'::set_col($x, $values) - $x must be a valid column number' if ($col < 0 || $col >= $self->cols); + die __PACKAGE__.'::set_col($x, $values) - $values must contains the same number of elements as there is rowss in the matrix' if($length != $self->rows-1); + # $values may have Math::Complex objects + @$values = map { gsl_complex_rect(Re($_), Im($_)) } @$values; + map { gsl_matrix_complex_set($self->raw, $_, $col, $values->[$_]) } (0..$length); + return $self; } =head1 DESCRIPTION -The following functions are specific to matrices containing complex numbers : - =over 1 =item C<gsl_matrix_complex_alloc > pod/MatrixComplex.pod @@ -74,7 +74,7 @@ sub new { my $this = {}; my $vector; - # we expected $values to have Math::Complex objects + # we expect $values to have Math::Complex objects @$values = map { gsl_complex_rect(Re($_), Im($_)) } @$values; if ( ref $values eq 'ARRAY' ){ pod/VectorComplex.pod @@ -1,10 +1,11 @@ package Math::GSL::MatrixComplex::Test; use base q{Test::Class}; -use Test::More tests => 3; +use Test::More tests => 5; use Math::GSL qw/:all/; use Math::GSL::Test qw/:all/; use Math::GSL::Errno qw/:all/; use Math::GSL::MatrixComplex qw/:all/; +use Math::Complex; use Data::Dumper; use strict; @@ -18,11 +19,19 @@ sub teardown : Test(teardown) { unlink 'matrix' if -f 'matrix'; } -sub GSL_MATRIX_COMPLEX_NEW: Tests { +sub GSL_MATRIX_COMPLEX_NEW: Tests(3) { my $u = Math::GSL::MatrixComplex->new(10,20); isa_ok($u, 'Math::GSL::MatrixComplex'); ok( $u->rows == 10, 'rows'); ok( $u->cols == 20, 'cols'); } +sub GSL_MATRIX_COMPLEX_SET : Tests(2) { + my $u = Math::GSL::MatrixComplex->new(2,2); + $u->set_row(0, [ 1+7*i, 2*i ] ) + ->set_row(1, [ 3*i, -4 ] ); + ok_similar( [ map { Re $_ } $u->as_list ], [ 1, 0, 0, -4 ] ); + ok_similar( [ map { Im $_ } $u->as_list ], [ 7, 2, 3, 0 ] ); +} + Test::Class->runtests; t/MatrixComplex.t e8062b074d592d68e83f274df9c8ffc1e582af4c Duke Leto jonathan@leto.net http://github.com/leto/math--gsl/commit/f67a116c2c8978b8a450efec788e785e8e7a9703 f67a116c2c8978b8a450efec788e785e8e7a9703 2008-12-21T14:47:38-08:00 2008-12-21T14:47:38-08:00 Refactoring row()/col() in Matrix/MatrixComplex as well trying to get set_row to work on MatrixComplex 451a188292721ff26cb0413ea3aa1a41fa021bfe Duke Leto jonathan@leto.net