From f277c7e4c0bef4dd775698350e0105bffa4378e4 Mon Sep 17 00:00:00 2001 From: Erla Bjorg Date: Thu, 15 Oct 2015 20:37:44 +0000 Subject: [PATCH 1/6] breyting a add falli --- src/main/java/is/ru/stringcalculator/Calculator.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/is/ru/stringcalculator/Calculator.java b/src/main/java/is/ru/stringcalculator/Calculator.java index 5b416a9a..13efe8b9 100644 --- a/src/main/java/is/ru/stringcalculator/Calculator.java +++ b/src/main/java/is/ru/stringcalculator/Calculator.java @@ -1,13 +1,13 @@ -package is.ru.stringcalculator; +apckage is.ru.stringcalculator; -public class Calculator { +public class Calculator - public static int add(String text){ + public static int(x,y,z){ if(text.equals("")){ return 0; } else if(text.contains(",")){ - return sum(splitNumbers(text)); + return sum(splitNumbers(x+y+z)); } else return 1; @@ -30,5 +30,4 @@ private static int sum(String[] numbers){ } - -} \ No newline at end of file +} From de4fb4c534a8c3d1e423f7cc43989b6829526fcd Mon Sep 17 00:00:00 2001 From: Erla Bjorg Date: Thu, 15 Oct 2015 20:40:30 +0000 Subject: [PATCH 2/6] onnur breyting a add --- src/main/java/is/ru/stringcalculator/Calculator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/is/ru/stringcalculator/Calculator.java b/src/main/java/is/ru/stringcalculator/Calculator.java index 13efe8b9..bda926ef 100644 --- a/src/main/java/is/ru/stringcalculator/Calculator.java +++ b/src/main/java/is/ru/stringcalculator/Calculator.java @@ -1,8 +1,8 @@ -apckage is.ru.stringcalculator; +package is.ru.stringcalculator; public class Calculator - public static int(x,y,z){ + public static int add(x,y,z){ if(text.equals("")){ return 0; } From 43c83a8cdc35c984c668ecab2f9e7008e205808c Mon Sep 17 00:00:00 2001 From: Erla Bjorg Date: Thu, 15 Oct 2015 20:56:43 +0000 Subject: [PATCH 3/6] Laga add --- src/main/java/is/ru/stringcalculator/Calculator.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/is/ru/stringcalculator/Calculator.java b/src/main/java/is/ru/stringcalculator/Calculator.java index bda926ef..ec285eab 100644 --- a/src/main/java/is/ru/stringcalculator/Calculator.java +++ b/src/main/java/is/ru/stringcalculator/Calculator.java @@ -1,13 +1,14 @@ package is.ru.stringcalculator; public class Calculator - - public static int add(x,y,z){ +{ +int x,y,z = 0; + public static int add(String text){ if(text.equals("")){ return 0; } else if(text.contains(",")){ - return sum(splitNumbers(x+y+z)); + return sum(splitNumbers(text)); } else return 1; From 35156ff55c35d6a3e4dafbd7158a8856c07fba86 Mon Sep 17 00:00:00 2001 From: Erla Bjorg Date: Thu, 15 Oct 2015 20:59:21 +0000 Subject: [PATCH 4/6] aftur laga add --- src/main/java/is/ru/stringcalculator/Calculator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/is/ru/stringcalculator/Calculator.java b/src/main/java/is/ru/stringcalculator/Calculator.java index ec285eab..b3eb698e 100644 --- a/src/main/java/is/ru/stringcalculator/Calculator.java +++ b/src/main/java/is/ru/stringcalculator/Calculator.java @@ -2,7 +2,7 @@ public class Calculator { -int x,y,z = 0; + public static int add(String text){ if(text.equals("")){ return 0; From 338272b8b2501a03dc5ab079352c0cff4d912996 Mon Sep 17 00:00:00 2001 From: Erla Bjorg Date: Fri, 16 Oct 2015 10:06:20 +0000 Subject: [PATCH 5/6] testin profud --- src/test/java/is/ru/stringcalculator/CalculatorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/is/ru/stringcalculator/CalculatorTest.java b/src/test/java/is/ru/stringcalculator/CalculatorTest.java index 9a642b9d..a306e621 100644 --- a/src/test/java/is/ru/stringcalculator/CalculatorTest.java +++ b/src/test/java/is/ru/stringcalculator/CalculatorTest.java @@ -29,4 +29,4 @@ public void testMultipleNumbers(){ assertEquals(6, Calculator.add("1,2,3")); } -} \ No newline at end of file +} From 978cc6c2cf1cd36c5bd909915dba6509c253e903 Mon Sep 17 00:00:00 2001 From: Erla Bjorg Date: Fri, 16 Oct 2015 12:43:45 +0000 Subject: [PATCH 6/6] acceptar multiple numbers --- src/test/java/is/ru/stringcalculator/CalculatorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/is/ru/stringcalculator/CalculatorTest.java b/src/test/java/is/ru/stringcalculator/CalculatorTest.java index a306e621..5d61e676 100644 --- a/src/test/java/is/ru/stringcalculator/CalculatorTest.java +++ b/src/test/java/is/ru/stringcalculator/CalculatorTest.java @@ -26,7 +26,7 @@ public void testTwoNumbers() { @Test public void testMultipleNumbers(){ - assertEquals(6, Calculator.add("1,2,3")); + assertEquals(18,Calculator.add("1,2,3,5,7")); } }