From 98218106c08ce68266153ef2b6e43626ef803889 Mon Sep 17 00:00:00 2001 From: sasha Date: Sun, 9 Dec 2018 14:52:16 +0200 Subject: [PATCH 1/2] jg-102added mycollection --- .../javageeks/mycollection/MyList.java | 70 +++++++++++++++++++ .../javageeks/mycollection/MyListTest.java | 25 +++++++ 2 files changed, 95 insertions(+) create mode 100644 modules/sasha/src/main/java/com/hillel/elementary/javageeks/mycollection/MyList.java create mode 100644 modules/sasha/src/test/java/com/hillel/elementary/javageeks/mycollection/MyListTest.java diff --git a/modules/sasha/src/main/java/com/hillel/elementary/javageeks/mycollection/MyList.java b/modules/sasha/src/main/java/com/hillel/elementary/javageeks/mycollection/MyList.java new file mode 100644 index 0000000..08a98d9 --- /dev/null +++ b/modules/sasha/src/main/java/com/hillel/elementary/javageeks/mycollection/MyList.java @@ -0,0 +1,70 @@ +package com.hillel.elementary.javageeks.mycollection; + +import java.util.LinkedList; + +public class MyList { + private static LinkedList matrixToList(int[][] arr){ + LinkedList list = new LinkedList(); + for (int i = 0;i < arr.length;i++){ + for (int k = 0;k < arr[0].length;k++){ + if(arr[i][k] != 0){ + list.add(arr[i][k]); + } + } + } + return list; + } + private static LinkedList sumList(LinkedList listOne,LinkedList listTwo){ + LinkedList list = new LinkedList(); + int minSize = 0; + if(listOne.size() <= listTwo.size()){ + minSize = listOne.size(); + } + else { + minSize = listTwo.size(); + } + + + for(int i = 0;i < minSize;i++){ + list.add(listOne.get(i) + listTwo.get(i)); + } + return list; + } + private static LinkedList multiplyList(LinkedList listOne,LinkedList listTwo){ + LinkedList list = new LinkedList(); + int minSize = 0; + if(listOne.size() <= listTwo.size()){ + minSize = listOne.size(); + } + else { + minSize = listTwo.size(); + } + + for(int i = 0;i < minSize;i++){ + list.add(listOne.get(i) * listTwo.get(i)); + } + return list; + } + + public static LinkedList sumMatrix(int[][] arrOne,int[][] arrTwo){ + LinkedList listFist = matrixToList(arrOne); + LinkedList listSecond = matrixToList(arrTwo); + + LinkedList listResult = sumList(listFist, listSecond); + + return listResult; + + } + public static LinkedList multyplyMatrix(int[][] arrOne,int[][] arrTwo){ + LinkedList listFist = matrixToList(arrOne); + LinkedList listSecond = matrixToList(arrTwo); + + LinkedList listResult = multiplyList(listFist,listSecond); + + return listResult; + + } + + + +} diff --git a/modules/sasha/src/test/java/com/hillel/elementary/javageeks/mycollection/MyListTest.java b/modules/sasha/src/test/java/com/hillel/elementary/javageeks/mycollection/MyListTest.java new file mode 100644 index 0000000..ebce2e2 --- /dev/null +++ b/modules/sasha/src/test/java/com/hillel/elementary/javageeks/mycollection/MyListTest.java @@ -0,0 +1,25 @@ +package com.hillel.elementary.javageeks.mycollection; + +import org.junit.jupiter.api.Test; + +import java.util.LinkedList; + +import static org.junit.jupiter.api.Assertions.*; + +class MyListTest { + @Test + void shouldsumMatrix(){ + int [][] matrixOne = {{0,2,0},{1,0,0},{0,0,3}}; + int [][] matrixTwo = {{0,2,0,1},{1,0,0,2},{0,0,3,0}}; + Integer[] num = {4,2,4}; + assertArrayEquals(num,MyList.sumMatrix(matrixOne, matrixTwo).toArray()); + } + @Test + void shouldmultyplyMatrix(){ + int [][] matrixOne = {{0,2,0},{1,0,0},{0,0,3}}; + int [][] matrixTwo = {{0,2,0,1},{1,0,0,2},{0,0,3,0}}; + Integer[] num = {4, 1, 3}; + assertArrayEquals(num,MyList.multyplyMatrix(matrixOne, matrixTwo).toArray()); + } + +} \ No newline at end of file From 032dc8876b7cdd380e3e7bc3242a6843316a47d0 Mon Sep 17 00:00:00 2001 From: sasha Date: Thu, 13 Dec 2018 12:47:55 +0200 Subject: [PATCH 2/2] jg-102Mycollection ficsing --- .../javageeks/mycollection/MyList.java | 61 +++++++------------ .../javageeks/mycollection/MyListTest.java | 4 +- 2 files changed, 24 insertions(+), 41 deletions(-) diff --git a/modules/sasha/src/main/java/com/hillel/elementary/javageeks/mycollection/MyList.java b/modules/sasha/src/main/java/com/hillel/elementary/javageeks/mycollection/MyList.java index 08a98d9..b011e58 100644 --- a/modules/sasha/src/main/java/com/hillel/elementary/javageeks/mycollection/MyList.java +++ b/modules/sasha/src/main/java/com/hillel/elementary/javageeks/mycollection/MyList.java @@ -3,6 +3,16 @@ import java.util.LinkedList; public class MyList { + + public static LinkedList actMatrix(int[][] arrOne,int[][] arrTwo,String argument){ + LinkedList listFist = matrixToList(arrOne); + LinkedList listSecond = matrixToList(arrTwo); + + LinkedList listResult = actList(listFist, listSecond,argument); + return listResult; + + } + private static LinkedList matrixToList(int[][] arr){ LinkedList list = new LinkedList(); for (int i = 0;i < arr.length;i++){ @@ -14,7 +24,8 @@ private static LinkedList matrixToList(int[][] arr){ } return list; } - private static LinkedList sumList(LinkedList listOne,LinkedList listTwo){ + + private static LinkedList actList(LinkedList listOne,LinkedList listTwo,String argument){ LinkedList list = new LinkedList(); int minSize = 0; if(listOne.size() <= listTwo.size()){ @@ -24,47 +35,19 @@ private static LinkedList sumList(LinkedList listOne,LinkedList listOne,LinkedList listTwo){ - LinkedList list = new LinkedList(); - int minSize = 0; - if(listOne.size() <= listTwo.size()){ - minSize = listOne.size(); - } - else { - minSize = listTwo.size(); + if(argument == "sum") { + for (int i = 0; i < minSize; i++) { + list.add(listOne.get(i) + listTwo.get(i)); + } + return list; } - - for(int i = 0;i < minSize;i++){ - list.add(listOne.get(i) * listTwo.get(i)); + if(argument == "multiply"){ + for(int i = 0;i < minSize;i++){ + list.add(listOne.get(i) * listTwo.get(i)); + } + return list; } return list; } - public static LinkedList sumMatrix(int[][] arrOne,int[][] arrTwo){ - LinkedList listFist = matrixToList(arrOne); - LinkedList listSecond = matrixToList(arrTwo); - - LinkedList listResult = sumList(listFist, listSecond); - - return listResult; - - } - public static LinkedList multyplyMatrix(int[][] arrOne,int[][] arrTwo){ - LinkedList listFist = matrixToList(arrOne); - LinkedList listSecond = matrixToList(arrTwo); - - LinkedList listResult = multiplyList(listFist,listSecond); - - return listResult; - - } - - - } diff --git a/modules/sasha/src/test/java/com/hillel/elementary/javageeks/mycollection/MyListTest.java b/modules/sasha/src/test/java/com/hillel/elementary/javageeks/mycollection/MyListTest.java index ebce2e2..81a1948 100644 --- a/modules/sasha/src/test/java/com/hillel/elementary/javageeks/mycollection/MyListTest.java +++ b/modules/sasha/src/test/java/com/hillel/elementary/javageeks/mycollection/MyListTest.java @@ -12,14 +12,14 @@ void shouldsumMatrix(){ int [][] matrixOne = {{0,2,0},{1,0,0},{0,0,3}}; int [][] matrixTwo = {{0,2,0,1},{1,0,0,2},{0,0,3,0}}; Integer[] num = {4,2,4}; - assertArrayEquals(num,MyList.sumMatrix(matrixOne, matrixTwo).toArray()); + assertArrayEquals(num,MyList.actMatrix(matrixOne, matrixTwo,"sum").toArray()); } @Test void shouldmultyplyMatrix(){ int [][] matrixOne = {{0,2,0},{1,0,0},{0,0,3}}; int [][] matrixTwo = {{0,2,0,1},{1,0,0,2},{0,0,3,0}}; Integer[] num = {4, 1, 3}; - assertArrayEquals(num,MyList.multyplyMatrix(matrixOne, matrixTwo).toArray()); + assertArrayEquals(num,MyList.actMatrix(matrixOne, matrixTwo,"multiply").toArray()); } } \ No newline at end of file