#159 MappedColumn and MappedRow bug

vssekorin · Mar 29, 2018 · 5eb7fc0 · 5eb7fc0
1 parent f3fa198
commit 5eb7fc0
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/src/main/java/com/vssekorin/cactoosmath/matrix/MappedColumn.java b/src/main/java/com/vssekorin/cactoosmath/matrix/MappedColumn.java
@@ -52,11 +52,22 @@ public final class MappedColumn<T> extends MatrixEnvelope<T> {
     public MappedColumn(final Matrix<T> src, final int number,
         final Func<T, T> map) {
         super(() -> () -> {
+            final int rows = new NmbRows<>(src).value();
+            final int cols = new NmbColumns<>(src).value();
+            final T[][] result = (T[][]) new Object[rows][cols];
             final T[][] array = src.asArray();
-            for (int row = 0; row < new NmbRows<>(src).value(); ++row) {
-                array[row][number] = map.apply(array[row][number]);
+            for (int col = 0; col < cols; ++col) {
+                if (col == number) {
+                    for (int row = 0; row < rows; ++row) {
+                        result[row][col] = map.apply(array[row][col]);
+                    }
+                } else {
+                    for (int row = 0; row < rows; ++row) {
+                        result[row][col] = array[row][col];
+                    }
+                }
             }
-            return array;
+            return result;
         });
     }
 }
diff --git a/src/main/java/com/vssekorin/cactoosmath/matrix/MappedRow.java b/src/main/java/com/vssekorin/cactoosmath/matrix/MappedRow.java
@@ -52,11 +52,20 @@ public final class MappedRow<T> extends MatrixEnvelope<T> {
     public MappedRow(final Matrix<T> src, final int number,
         final Func<T, T> map) {
         super(() -> () -> {
+            final int rows = new NmbRows<>(src).value();
+            final int cols = new NmbColumns<>(src).value();
+            final T[][] result = (T[][]) new Object[rows][cols];
             final T[][] array = src.asArray();
-            for (int col = 0; col < new NmbColumns<>(src).value(); ++col) {
-                array[number][col] = map.apply(array[number][col]);
+            for (int row = 0; row < rows; ++row) {
+                if (row == number) {
+                    for (int col = 0; col < cols; ++col) {
+                        result[row][col] = map.apply(array[row][col]);
+                    }
+                } else {
+                    System.arraycopy(array[row], 0, result[row], 0, cols);
+                }
             }
-            return array;
+            return result;
         });
     }
 }