Skip to content

Commit a380c55

Browse files
committed
each_with_index => each.with_index
1 parent fb3f744 commit a380c55

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

lib/matrix.rb

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -562,35 +562,35 @@ def each(which = :all, &block) # :yield: e
562562
row.each(&block)
563563
end
564564
when :diagonal
565-
@rows.each_with_index do |row, row_index|
565+
@rows.each.with_index do |row, row_index|
566566
yield row.fetch(row_index){return self}
567567
end
568568
when :off_diagonal
569-
@rows.each_with_index do |row, row_index|
569+
@rows.each.with_index do |row, row_index|
570570
column_count.times do |col_index|
571571
yield row[col_index] unless row_index == col_index
572572
end
573573
end
574574
when :lower
575-
@rows.each_with_index do |row, row_index|
575+
@rows.each.with_index do |row, row_index|
576576
0.upto([row_index, last].min) do |col_index|
577577
yield row[col_index]
578578
end
579579
end
580580
when :strict_lower
581-
@rows.each_with_index do |row, row_index|
581+
@rows.each.with_index do |row, row_index|
582582
[row_index, column_count].min.times do |col_index|
583583
yield row[col_index]
584584
end
585585
end
586586
when :strict_upper
587-
@rows.each_with_index do |row, row_index|
587+
@rows.each.with_index do |row, row_index|
588588
(row_index+1).upto(last) do |col_index|
589589
yield row[col_index]
590590
end
591591
end
592592
when :upper
593-
@rows.each_with_index do |row, row_index|
593+
@rows.each.with_index do |row, row_index|
594594
row_index.upto(last) do |col_index|
595595
yield row[col_index]
596596
end
@@ -618,41 +618,41 @@ def each_with_index(which = :all) # :yield: e, row, column
618618
last = column_count - 1
619619
case which
620620
when :all
621-
@rows.each_with_index do |row, row_index|
622-
row.each_with_index do |e, col_index|
621+
@rows.each.with_index do |row, row_index|
622+
row.each.with_index do |e, col_index|
623623
yield e, row_index, col_index
624624
end
625625
end
626626
when :diagonal
627-
@rows.each_with_index do |row, row_index|
627+
@rows.each.with_index do |row, row_index|
628628
yield row.fetch(row_index){return self}, row_index, row_index
629629
end
630630
when :off_diagonal
631-
@rows.each_with_index do |row, row_index|
631+
@rows.each.with_index do |row, row_index|
632632
column_count.times do |col_index|
633633
yield row[col_index], row_index, col_index unless row_index == col_index
634634
end
635635
end
636636
when :lower
637-
@rows.each_with_index do |row, row_index|
637+
@rows.each.with_index do |row, row_index|
638638
0.upto([row_index, last].min) do |col_index|
639639
yield row[col_index], row_index, col_index
640640
end
641641
end
642642
when :strict_lower
643-
@rows.each_with_index do |row, row_index|
643+
@rows.each.with_index do |row, row_index|
644644
[row_index, column_count].min.times do |col_index|
645645
yield row[col_index], row_index, col_index
646646
end
647647
end
648648
when :strict_upper
649-
@rows.each_with_index do |row, row_index|
649+
@rows.each.with_index do |row, row_index|
650650
(row_index+1).upto(last) do |col_index|
651651
yield row[col_index], row_index, col_index
652652
end
653653
end
654654
when :upper
655-
@rows.each_with_index do |row, row_index|
655+
@rows.each.with_index do |row, row_index|
656656
row_index.upto(last) do |col_index|
657657
yield row[col_index], row_index, col_index
658658
end
@@ -873,10 +873,10 @@ def lower_triangular?
873873
#
874874
def normal?
875875
raise ErrDimensionMismatch unless square?
876-
rows.each_with_index do |row_i, i|
877-
rows.each_with_index do |row_j, j|
876+
rows.each.with_index do |row_i, i|
877+
rows.each.with_index do |row_j, j|
878878
s = 0
879-
rows.each_with_index do |row_k, k|
879+
rows.each.with_index do |row_k, k|
880880
s += row_i[k] * row_j[k].conj - row_k[i].conj * row_k[j]
881881
end
882882
return false unless s == 0
@@ -892,8 +892,8 @@ def normal?
892892
def orthogonal?
893893
raise ErrDimensionMismatch unless square?
894894

895-
rows.each_with_index do |row_i, i|
896-
rows.each_with_index do |row_j, j|
895+
rows.each.with_index do |row_i, i|
896+
rows.each.with_index do |row_j, j|
897897
s = 0
898898
row_count.times do |k|
899899
s += row_i[k] * row_j[k]
@@ -911,9 +911,9 @@ def orthogonal?
911911
def permutation?
912912
raise ErrDimensionMismatch unless square?
913913
cols = Array.new(column_count)
914-
rows.each_with_index do |row, i|
914+
rows.each.with_index do |row, i|
915915
found = false
916-
row.each_with_index do |e, j|
916+
row.each.with_index do |e, j|
917917
if e == 1
918918
return false if found || cols[j]
919919
found = cols[j] = true
@@ -985,8 +985,8 @@ def antisymmetric?
985985
#
986986
def unitary?
987987
raise ErrDimensionMismatch unless square?
988-
rows.each_with_index do |row_i, i|
989-
rows.each_with_index do |row_j, j|
988+
rows.each.with_index do |row_i, i|
989+
rows.each.with_index do |row_j, j|
990990
s = 0
991991
row_count.times do |k|
992992
s += row_i[k].conj * row_j[k]

0 commit comments

Comments
 (0)