From 685896e22355aa6b296d03aed231f839edcc48bd Mon Sep 17 00:00:00 2001 From: julaakko Date: Fri, 30 Sep 2016 16:57:27 +0300 Subject: [PATCH 01/23] Assigment Finished --- src/RomanNumerals.java | 74 +++++++++++++++++++++++++++- tests/TestRomanNumerals.java | 94 +++++++++++++++++++++++++++++++++++- 2 files changed, 164 insertions(+), 4 deletions(-) diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 20904f0..475aa1d 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -1,8 +1,78 @@ public class RomanNumerals { + + + + private static final String ROMAN10 = "X"; + private static final String ROMAN5 = "V"; + private static final String ROMAN1 = "I"; public int convertToInteger(String romanNum) { - // To be Implemented - return 0; + // if literal repeats sum + + + if(romanNum == "II") + return SumDoubleRepeat(romanNum); + + if(romanNum == "III") + return SumDoubleRepeat(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1)); + + if(romanNum == "IV") + return SubstractTwoValues(romanNum); + + if(romanNum == "VI") + return SumDoubleRepeat(romanNum); + + if(romanNum == "VII") + return SumDoubleRepeat(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1)); + + if(romanNum == "VIII") + return SumDoubleRepeat(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1))+ReturnSingleValue(romanNum.substring(3,4)); + + if(romanNum == "IX") + return SubstractTwoValues(romanNum); + + if(romanNum == "XX") + return SumDoubleRepeat(romanNum); + + + return ReturnSingleValue(romanNum); + } + + + private int SubstractTwoValues(String romanNum) { + return ReturnSingleValue(romanNum.substring(1,2))-ReturnSingleValue(romanNum.substring(0,1)); + } + + + private int SumDoubleRepeat(String romanNum) { + return ReturnSingleValue(romanNum.substring(0,1))+ReturnSingleValue(romanNum.substring(1,2)); + } + + + private int ReturnSingleValue(String romanNum) { + if(romanNum.equals(ROMAN1)) + return 1; + + if(romanNum.equals(ROMAN5)) + return 5; + + if(romanNum.equals(ROMAN10)) + return 10; + + if(romanNum.equals("L")) + return 50; + + if(romanNum.equals("C")) + return 100; + + if(romanNum.equals("D")) + return 500; + + if(romanNum.equals("M")) + return 1000; + + else + return 0; } } diff --git a/tests/TestRomanNumerals.java b/tests/TestRomanNumerals.java index 5d1de75..a943ac1 100644 --- a/tests/TestRomanNumerals.java +++ b/tests/TestRomanNumerals.java @@ -5,8 +5,98 @@ public class TestRomanNumerals { @Test - public void test() { - fail("Not yet implemented"); + public void test_CreateRomanNumerals() { + assertNotNull(converter); } + + private RomanNumerals converter = new RomanNumerals(); + + @Test + public void test_IReturns1() { + AssertNumeral(1, "I"); + } + + @Test + public void test_IIReturns2() { + AssertNumeral(2, "II"); + } + + @Test + public void test_IIIReturns3() { + AssertNumeral(3, "III"); + } + + @Test + public void test_IVReturns4() { + AssertNumeral(4, "IV"); + } + + + @Test + public void test_VReturns5() { + AssertNumeral(5, "V"); + } + + @Test + public void test_VIReturns6() { + AssertNumeral(6, "VI"); + } + + @Test + public void test_VIIReturns7() { + AssertNumeral(7, "VII"); + } + + @Test + public void test_VIIIReturns8() { + AssertNumeral(8, "VIII"); + } + + @Test + public void test_IXReturns9() { + AssertNumeral(9, "IX"); + } + + + @Test + public void test_XReturns10() { + AssertNumeral(10, "X"); + } + + @Test + public void test_XXReturns20() { + AssertNumeral(20, "XX"); + } + + + @Test + public void test_LReturns50() { + AssertNumeral(50, "L"); + } + + @Test + public void test_CReturns100() { + AssertNumeral(100, "C"); + } + + @Test + public void test_DReturns500() { + AssertNumeral(500, "D"); + } + + @Test + public void test_MReturns1000() { + AssertNumeral(1000, "M"); + } + + + + + private void AssertNumeral(int arabic, String roman) { + int result = converter.convertToInteger(roman); + assertEquals(arabic, result); + } + + } From 1e95e17962b3aaef6466351eeffbfbfb03fb00fd Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:33:19 +0300 Subject: [PATCH 02/23] besouro automatic message --- .besouro/20161007142857696/actions.txt | 4 ++++ .besouro/20161007142857696/besouroEpisodes.txt | 0 .besouro/20161007142857696/disagreements.txt | 0 .besouro/20161007142857696/randomHeuristicEpisodes.txt | 0 .besouro/20161007142857696/userComments.txt | 0 .besouro/20161007142857696/zorroEpisodes.txt | 0 tests/TestRomanNumerals.java | 5 +++++ 7 files changed, 9 insertions(+) create mode 100644 .besouro/20161007142857696/actions.txt create mode 100644 .besouro/20161007142857696/besouroEpisodes.txt create mode 100644 .besouro/20161007142857696/disagreements.txt create mode 100644 .besouro/20161007142857696/randomHeuristicEpisodes.txt create mode 100644 .besouro/20161007142857696/userComments.txt create mode 100644 .besouro/20161007142857696/zorroEpisodes.txt diff --git a/.besouro/20161007142857696/actions.txt b/.besouro/20161007142857696/actions.txt new file mode 100644 index 0000000..7abb21c --- /dev/null +++ b/.besouro/20161007142857696/actions.txt @@ -0,0 +1,4 @@ +FileOpenedAction 1475839737951 RomanNumerals.java 1732 4 18 0 +FileOpenedAction 1475839912937 TestRomanNumerals.java 1492 17 18 2 +RefactoringAction 1475839965002 TestRomanNumerals.java ADD void test FIELD +EditAction 1475839998790 TestRomanNumerals.java 1563 17 18 2 diff --git a/.besouro/20161007142857696/besouroEpisodes.txt b/.besouro/20161007142857696/besouroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161007142857696/disagreements.txt b/.besouro/20161007142857696/disagreements.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161007142857696/randomHeuristicEpisodes.txt b/.besouro/20161007142857696/randomHeuristicEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161007142857696/userComments.txt b/.besouro/20161007142857696/userComments.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161007142857696/zorroEpisodes.txt b/.besouro/20161007142857696/zorroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/tests/TestRomanNumerals.java b/tests/TestRomanNumerals.java index a943ac1..b57a0eb 100644 --- a/tests/TestRomanNumerals.java +++ b/tests/TestRomanNumerals.java @@ -68,6 +68,11 @@ public void test_XXReturns20() { AssertNumeral(20, "XX"); } + @Test + public void test XLReturns40{ + AssertNumeral(40, "XL"); + } + @Test public void test_LReturns50() { From bcbc2f3beab579baed2af999225272f6df7ba24c Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:33:38 +0300 Subject: [PATCH 03/23] besouro automatic message --- .besouro/20161007142857696/actions.txt | 4 ++++ tests/TestRomanNumerals.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007142857696/actions.txt b/.besouro/20161007142857696/actions.txt index 7abb21c..f22cda9 100644 --- a/.besouro/20161007142857696/actions.txt +++ b/.besouro/20161007142857696/actions.txt @@ -2,3 +2,7 @@ FileOpenedAction 1475839737951 RomanNumerals.java 1732 4 18 0 FileOpenedAction 1475839912937 TestRomanNumerals.java 1492 17 18 2 RefactoringAction 1475839965002 TestRomanNumerals.java ADD void test FIELD EditAction 1475839998790 TestRomanNumerals.java 1563 17 18 2 +CompilationAction 1475840000316 TestRomanNumerals.java +CompilationAction 1475840000318 TestRomanNumerals.java +CompilationAction 1475840000319 TestRomanNumerals.java +EditAction 1475840018072 TestRomanNumerals.java 1563 17 18 2 diff --git a/tests/TestRomanNumerals.java b/tests/TestRomanNumerals.java index b57a0eb..50bbc33 100644 --- a/tests/TestRomanNumerals.java +++ b/tests/TestRomanNumerals.java @@ -69,7 +69,7 @@ public void test_XXReturns20() { } @Test - public void test XLReturns40{ + public void test_XLReturns40{ AssertNumeral(40, "XL"); } From 26a7a3e7a195c85316286d31d944a8fbf70cf1a3 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:34:51 +0300 Subject: [PATCH 04/23] besouro automatic message --- .besouro/20161007142857696/actions.txt | 4 ++++ tests/TestRomanNumerals.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007142857696/actions.txt b/.besouro/20161007142857696/actions.txt index f22cda9..78af30e 100644 --- a/.besouro/20161007142857696/actions.txt +++ b/.besouro/20161007142857696/actions.txt @@ -6,3 +6,7 @@ CompilationAction 1475840000316 TestRomanNumerals.java CompilationAction 1475840000318 TestRomanNumerals.java CompilationAction 1475840000319 TestRomanNumerals.java EditAction 1475840018072 TestRomanNumerals.java 1563 17 18 2 +CompilationAction 1475840019429 TestRomanNumerals.java +CompilationAction 1475840019429 TestRomanNumerals.java +CompilationAction 1475840019429 TestRomanNumerals.java +EditAction 1475840090629 TestRomanNumerals.java 1564 17 18 2 diff --git a/tests/TestRomanNumerals.java b/tests/TestRomanNumerals.java index 50bbc33..808ee6e 100644 --- a/tests/TestRomanNumerals.java +++ b/tests/TestRomanNumerals.java @@ -69,7 +69,7 @@ public void test_XXReturns20() { } @Test - public void test_XLReturns40{ + public void test_XLReturns40 { AssertNumeral(40, "XL"); } From 8aa83a0dbcf56e623f41d8304fae947c467fb4ff Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:35:04 +0300 Subject: [PATCH 05/23] besouro automatic message --- .besouro/20161007142857696/actions.txt | 4 ++++ tests/TestRomanNumerals.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007142857696/actions.txt b/.besouro/20161007142857696/actions.txt index 78af30e..5694af2 100644 --- a/.besouro/20161007142857696/actions.txt +++ b/.besouro/20161007142857696/actions.txt @@ -10,3 +10,7 @@ CompilationAction 1475840019429 TestRomanNumerals.java CompilationAction 1475840019429 TestRomanNumerals.java CompilationAction 1475840019429 TestRomanNumerals.java EditAction 1475840090629 TestRomanNumerals.java 1564 17 18 2 +CompilationAction 1475840092220 TestRomanNumerals.java +CompilationAction 1475840092220 TestRomanNumerals.java +CompilationAction 1475840092220 TestRomanNumerals.java +EditAction 1475840103670 TestRomanNumerals.java 1566 18 19 2 diff --git a/tests/TestRomanNumerals.java b/tests/TestRomanNumerals.java index 808ee6e..9d584bc 100644 --- a/tests/TestRomanNumerals.java +++ b/tests/TestRomanNumerals.java @@ -69,7 +69,7 @@ public void test_XXReturns20() { } @Test - public void test_XLReturns40 { + public void test_XLReturns40() { AssertNumeral(40, "XL"); } From 0df3a2f5f72e03fa1666f9f5d52bb751815daa1b Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:36:51 +0300 Subject: [PATCH 06/23] besouro automatic message --- .besouro/20161007142857696/actions.txt | 6 ++++++ src/RomanNumerals.java | 2 ++ 2 files changed, 8 insertions(+) diff --git a/.besouro/20161007142857696/actions.txt b/.besouro/20161007142857696/actions.txt index 5694af2..befb4d8 100644 --- a/.besouro/20161007142857696/actions.txt +++ b/.besouro/20161007142857696/actions.txt @@ -14,3 +14,9 @@ CompilationAction 1475840092220 TestRomanNumerals.java CompilationAction 1475840092220 TestRomanNumerals.java CompilationAction 1475840092220 TestRomanNumerals.java EditAction 1475840103670 TestRomanNumerals.java 1566 18 19 2 +UnitTestCaseAction 1475840147652 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475840147652 RomanNumerals.java FAIL +UnitTestCaseAction 1475840170814 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475840170814 RomanNumerals.java FAIL +FileOpenedAction 1475840180580 RomanNumerals.java 1732 4 18 0 +EditAction 1475840210969 RomanNumerals.java 1795 4 19 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 475aa1d..c242717 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -35,6 +35,8 @@ public int convertToInteger(String romanNum) { if(romanNum == "XX") return SumDoubleRepeat(romanNum); + if(romanNum == "XL") + return SubstractTwoValues(romanNum); return ReturnSingleValue(romanNum); } From 66333a66f093222f8809ccde203dc84591323d21 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:43:59 +0300 Subject: [PATCH 07/23] besouro automatic message --- .besouro/20161007142857696/actions.txt | 6 +++ .../20161007142857696/besouroEpisodes.txt | 4 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161007142857696/zorroEpisodes.txt | 1 + src/RomanNumerals.java | 38 +++++++++++-------- 5 files changed, 34 insertions(+), 16 deletions(-) diff --git a/.besouro/20161007142857696/actions.txt b/.besouro/20161007142857696/actions.txt index befb4d8..fdad402 100644 --- a/.besouro/20161007142857696/actions.txt +++ b/.besouro/20161007142857696/actions.txt @@ -20,3 +20,9 @@ UnitTestCaseAction 1475840170814 TestRomanNumerals.java FAIL UnitTestSessionAction 1475840170814 RomanNumerals.java FAIL FileOpenedAction 1475840180580 RomanNumerals.java 1732 4 18 0 EditAction 1475840210969 RomanNumerals.java 1795 4 19 0 +UnitTestCaseAction 1475840216619 TestRomanNumerals.java OK +UnitTestSessionAction 1475840216634 RomanNumerals.java OK +RefactoringAction 1475840331669 RomanNumerals.java ADD int Return FIELD +RefactoringAction 1475840334633 RomanNumerals.java RENAME Return=>int ReturnDoubleValue() METHOD +RefactoringAction 1475840338549 RomanNumerals.java RENAME ReturnDoubleValue()=>int ReturnDoubleValue(String) METHOD +EditAction 1475840638756 RomanNumerals.java 1856 5 19 0 diff --git a/.besouro/20161007142857696/besouroEpisodes.txt b/.besouro/20161007142857696/besouroEpisodes.txt index e69de29..d318aae 100644 --- a/.besouro/20161007142857696/besouroEpisodes.txt +++ b/.besouro/20161007142857696/besouroEpisodes.txt @@ -0,0 +1,4 @@ +1475840216634 refactoring 3 478 true +1475840216635 refactoring 3 478 true +1475840216636 refactoring 3 478 true +1475840216637 refactoring 3 478 true diff --git a/.besouro/20161007142857696/randomHeuristicEpisodes.txt b/.besouro/20161007142857696/randomHeuristicEpisodes.txt index e69de29..eec77dc 100644 --- a/.besouro/20161007142857696/randomHeuristicEpisodes.txt +++ b/.besouro/20161007142857696/randomHeuristicEpisodes.txt @@ -0,0 +1 @@ +1475840216634 refactoring 3 478 false diff --git a/.besouro/20161007142857696/zorroEpisodes.txt b/.besouro/20161007142857696/zorroEpisodes.txt index e69de29..eec77dc 100644 --- a/.besouro/20161007142857696/zorroEpisodes.txt +++ b/.besouro/20161007142857696/zorroEpisodes.txt @@ -0,0 +1 @@ +1475840216634 refactoring 3 478 false diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index c242717..748f1b7 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -14,29 +14,18 @@ public int convertToInteger(String romanNum) { if(romanNum == "II") return SumDoubleRepeat(romanNum); - if(romanNum == "III") - return SumDoubleRepeat(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1)); - - if(romanNum == "IV") - return SubstractTwoValues(romanNum); - - if(romanNum == "VI") + if(romanNum == "XX") return SumDoubleRepeat(romanNum); + if(romanNum == "III") + return SumDoubleRepeat(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1)); + if(romanNum == "VII") return SumDoubleRepeat(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1)); if(romanNum == "VIII") return SumDoubleRepeat(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1))+ReturnSingleValue(romanNum.substring(3,4)); - - if(romanNum == "IX") - return SubstractTwoValues(romanNum); - - if(romanNum == "XX") - return SumDoubleRepeat(romanNum); - - if(romanNum == "XL") - return SubstractTwoValues(romanNum); + return ReturnSingleValue(romanNum); } @@ -50,7 +39,24 @@ private int SubstractTwoValues(String romanNum) { private int SumDoubleRepeat(String romanNum) { return ReturnSingleValue(romanNum.substring(0,1))+ReturnSingleValue(romanNum.substring(1,2)); } + + private int ReturnDoubleValue(String romanNum) { + + + if(romanNum == "IV") + SubstractTwoValues(romanNum); + + if(romanNum == "VI") + return SumDoubleRepeat(romanNum); + + if(romanNum == "IX") + return SubstractTwoValues(romanNum); + + if(romanNum == "XL") + return SubstractTwoValues(romanNum); + } + private int ReturnSingleValue(String romanNum) { if(romanNum.equals(ROMAN1)) From dcf34554fac00f54846ce97103d56a9834cce24b Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:45:33 +0300 Subject: [PATCH 08/23] besouro automatic message --- .besouro/20161007142857696/actions.txt | 2 ++ src/RomanNumerals.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007142857696/actions.txt b/.besouro/20161007142857696/actions.txt index fdad402..31e1925 100644 --- a/.besouro/20161007142857696/actions.txt +++ b/.besouro/20161007142857696/actions.txt @@ -26,3 +26,5 @@ RefactoringAction 1475840331669 RomanNumerals.java ADD int Return FIELD RefactoringAction 1475840334633 RomanNumerals.java RENAME Return=>int ReturnDoubleValue() METHOD RefactoringAction 1475840338549 RomanNumerals.java RENAME ReturnDoubleValue()=>int ReturnDoubleValue(String) METHOD EditAction 1475840638756 RomanNumerals.java 1856 5 19 0 +CompilationAction 1475840640347 RomanNumerals.java +EditAction 1475840732559 RomanNumerals.java 1851 5 20 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 748f1b7..bc88929 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -80,7 +80,7 @@ private int ReturnSingleValue(String romanNum) { if(romanNum.equals("M")) return 1000; - else - return 0; + + return 0; } } From d004c61608afd49d8a3030bbb574f2447c938639 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:45:39 +0300 Subject: [PATCH 09/23] besouro automatic message --- .besouro/20161007142857696/actions.txt | 2 ++ src/RomanNumerals.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007142857696/actions.txt b/.besouro/20161007142857696/actions.txt index 31e1925..bedfc8e 100644 --- a/.besouro/20161007142857696/actions.txt +++ b/.besouro/20161007142857696/actions.txt @@ -28,3 +28,5 @@ RefactoringAction 1475840338549 RomanNumerals.java RENAME ReturnDoubleValue()=>i EditAction 1475840638756 RomanNumerals.java 1856 5 19 0 CompilationAction 1475840640347 RomanNumerals.java EditAction 1475840732559 RomanNumerals.java 1851 5 20 0 +CompilationAction 1475840734243 RomanNumerals.java +EditAction 1475840739079 RomanNumerals.java 1862 5 21 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index bc88929..32e3153 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -54,7 +54,8 @@ private int ReturnDoubleValue(String romanNum) { if(romanNum == "XL") return SubstractTwoValues(romanNum); - + + return 0; } From 9cd0667b45e511b2017c3f40463dddd8a80db954 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:47:26 +0300 Subject: [PATCH 10/23] besouro automatic message --- .besouro/20161007142857696/actions.txt | 3 +++ src/RomanNumerals.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007142857696/actions.txt b/.besouro/20161007142857696/actions.txt index bedfc8e..7c8bd07 100644 --- a/.besouro/20161007142857696/actions.txt +++ b/.besouro/20161007142857696/actions.txt @@ -30,3 +30,6 @@ CompilationAction 1475840640347 RomanNumerals.java EditAction 1475840732559 RomanNumerals.java 1851 5 20 0 CompilationAction 1475840734243 RomanNumerals.java EditAction 1475840739079 RomanNumerals.java 1862 5 21 0 +UnitTestCaseAction 1475840746539 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475840746539 RomanNumerals.java FAIL +EditAction 1475840845678 RomanNumerals.java 1922 5 21 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 32e3153..4fbb0f5 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -47,7 +47,7 @@ private int ReturnDoubleValue(String romanNum) { SubstractTwoValues(romanNum); if(romanNum == "VI") - return SumDoubleRepeat(romanNum); + return ReturnSingleValue(romanNum.substring(0,1))+ReturnSingleValue(romanNum.substring(1,2)); if(romanNum == "IX") return SubstractTwoValues(romanNum); From 24f6eb882659f2f254673c70b3cbbb4a980472b9 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:48:58 +0300 Subject: [PATCH 11/23] besouro automatic message --- .besouro/20161007142857696/actions.txt | 3 +++ src/RomanNumerals.java | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.besouro/20161007142857696/actions.txt b/.besouro/20161007142857696/actions.txt index 7c8bd07..000ed06 100644 --- a/.besouro/20161007142857696/actions.txt +++ b/.besouro/20161007142857696/actions.txt @@ -33,3 +33,6 @@ EditAction 1475840739079 RomanNumerals.java 1862 5 21 0 UnitTestCaseAction 1475840746539 TestRomanNumerals.java FAIL UnitTestSessionAction 1475840746539 RomanNumerals.java FAIL EditAction 1475840845678 RomanNumerals.java 1922 5 21 0 +UnitTestCaseAction 1475840847897 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475840847897 RomanNumerals.java FAIL +EditAction 1475840937956 RomanNumerals.java 1942 5 21 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 4fbb0f5..6599e2a 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -43,16 +43,16 @@ private int SumDoubleRepeat(String romanNum) { private int ReturnDoubleValue(String romanNum) { - if(romanNum == "IV") + if(romanNum.equals("IV")) SubstractTwoValues(romanNum); - if(romanNum == "VI") + if(romanNum.equals("VI")) return ReturnSingleValue(romanNum.substring(0,1))+ReturnSingleValue(romanNum.substring(1,2)); - if(romanNum == "IX") + if(romanNum.equals("IX")) return SubstractTwoValues(romanNum); - if(romanNum == "XL") + if(romanNum.equals("XL")) return SubstractTwoValues(romanNum); return 0; From 3fdeeeb19130f0033a5ec3ce519a762324e2246c Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:49:11 +0300 Subject: [PATCH 12/23] besouro automatic message --- .besouro/20161007142857696/actions.txt | 3 +++ src/RomanNumerals.java | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007142857696/actions.txt b/.besouro/20161007142857696/actions.txt index 000ed06..bca2428 100644 --- a/.besouro/20161007142857696/actions.txt +++ b/.besouro/20161007142857696/actions.txt @@ -36,3 +36,6 @@ EditAction 1475840845678 RomanNumerals.java 1922 5 21 0 UnitTestCaseAction 1475840847897 TestRomanNumerals.java FAIL UnitTestSessionAction 1475840847897 RomanNumerals.java FAIL EditAction 1475840937956 RomanNumerals.java 1942 5 21 0 +UnitTestCaseAction 1475840941406 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475840941406 RomanNumerals.java FAIL +EditAction 1475840950548 RomanNumerals.java 1941 5 21 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 6599e2a..856bded 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -41,8 +41,7 @@ private int SumDoubleRepeat(String romanNum) { } private int ReturnDoubleValue(String romanNum) { - - + if(romanNum.equals("IV")) SubstractTwoValues(romanNum); From 8810cf51ef000733ce0b8ee2ece5e7fff02d9507 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:59:49 +0300 Subject: [PATCH 13/23] besouro automatic message --- .besouro/20161007142857696/actions.txt | 12 +++++++++ .../20161007142857696/besouroEpisodes.txt | 4 +++ .../randomHeuristicEpisodes.txt | 2 ++ .besouro/20161007142857696/zorroEpisodes.txt | 2 ++ src/RomanNumerals.java | 27 ++++++++++--------- 5 files changed, 35 insertions(+), 12 deletions(-) diff --git a/.besouro/20161007142857696/actions.txt b/.besouro/20161007142857696/actions.txt index bca2428..1193c0a 100644 --- a/.besouro/20161007142857696/actions.txt +++ b/.besouro/20161007142857696/actions.txt @@ -39,3 +39,15 @@ EditAction 1475840937956 RomanNumerals.java 1942 5 21 0 UnitTestCaseAction 1475840941406 TestRomanNumerals.java FAIL UnitTestSessionAction 1475840941406 RomanNumerals.java FAIL EditAction 1475840950548 RomanNumerals.java 1941 5 21 0 +UnitTestCaseAction 1475841046850 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475841046850 RomanNumerals.java FAIL +CompilationAction 1475841123773 RomanNumerals.java +CompilationAction 1475841128594 RomanNumerals.java +UnitTestCaseAction 1475841130781 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475841130781 RomanNumerals.java FAIL +UnitTestCaseAction 1475841306549 TestRomanNumerals.java OK +UnitTestSessionAction 1475841306549 RomanNumerals.java OK +UnitTestCaseAction 1475841513504 TestRomanNumerals.java OK +UnitTestSessionAction 1475841513505 RomanNumerals.java OK +RefactoringAction 1475841588197 RomanNumerals.java RENAME SumDoubleRepeat(String)=>int SumTwoValuess(String) METHOD +EditAction 1475841588727 RomanNumerals.java 1931 5 15 0 diff --git a/.besouro/20161007142857696/besouroEpisodes.txt b/.besouro/20161007142857696/besouroEpisodes.txt index d318aae..5522a05 100644 --- a/.besouro/20161007142857696/besouroEpisodes.txt +++ b/.besouro/20161007142857696/besouroEpisodes.txt @@ -2,3 +2,7 @@ 1475840216635 refactoring 3 478 true 1475840216636 refactoring 3 478 true 1475840216637 refactoring 3 478 true +1475841306549 refactoring 2A 974 true +1475841306550 production 1 974 false +1475841306551 production 2 974 false +1475841513505 regression 1 0 true diff --git a/.besouro/20161007142857696/randomHeuristicEpisodes.txt b/.besouro/20161007142857696/randomHeuristicEpisodes.txt index eec77dc..a0723b5 100644 --- a/.besouro/20161007142857696/randomHeuristicEpisodes.txt +++ b/.besouro/20161007142857696/randomHeuristicEpisodes.txt @@ -1 +1,3 @@ 1475840216634 refactoring 3 478 false +1475841306549 refactoring 2A 974 false +1475841513505 regression 1 0 true diff --git a/.besouro/20161007142857696/zorroEpisodes.txt b/.besouro/20161007142857696/zorroEpisodes.txt index eec77dc..76ce613 100644 --- a/.besouro/20161007142857696/zorroEpisodes.txt +++ b/.besouro/20161007142857696/zorroEpisodes.txt @@ -1 +1,3 @@ 1475840216634 refactoring 3 478 false +1475841306549 refactoring 2A 1089 false +1475841513505 regression 1 206 false diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 856bded..acf5698 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -11,12 +11,9 @@ public int convertToInteger(String romanNum) { // if literal repeats sum - if(romanNum == "II") - return SumDoubleRepeat(romanNum); - - if(romanNum == "XX") - return SumDoubleRepeat(romanNum); - + if(romanNum.length() == 2) + return ReturnDoubleValue(romanNum); + if(romanNum == "III") return SumDoubleRepeat(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1)); @@ -36,24 +33,30 @@ private int SubstractTwoValues(String romanNum) { } - private int SumDoubleRepeat(String romanNum) { + private int SumTwoValues(String romanNum) { return ReturnSingleValue(romanNum.substring(0,1))+ReturnSingleValue(romanNum.substring(1,2)); } private int ReturnDoubleValue(String romanNum) { - - if(romanNum.equals("IV")) - SubstractTwoValues(romanNum); + + if(romanNum == "II") + return SumDoubleRepeat(romanNum); + + if(romanNum == "XX") + return SumDoubleRepeat(romanNum); + + if(romanNum == "IV") + return SubstractTwoValues(romanNum); if(romanNum.equals("VI")) - return ReturnSingleValue(romanNum.substring(0,1))+ReturnSingleValue(romanNum.substring(1,2)); + return Sum if(romanNum.equals("IX")) return SubstractTwoValues(romanNum); if(romanNum.equals("XL")) return SubstractTwoValues(romanNum); - + return 0; } From 496bae225590d87c3f29a03df4b87f076a67c9f9 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:01:33 +0300 Subject: [PATCH 14/23] besouro automatic message --- .besouro/20161007142857696/actions.txt | 17 ++++++++++++++ src/RomanNumerals.java | 31 +++++++++++++++++--------- 2 files changed, 37 insertions(+), 11 deletions(-) diff --git a/.besouro/20161007142857696/actions.txt b/.besouro/20161007142857696/actions.txt index 1193c0a..cc0803e 100644 --- a/.besouro/20161007142857696/actions.txt +++ b/.besouro/20161007142857696/actions.txt @@ -51,3 +51,20 @@ UnitTestCaseAction 1475841513504 TestRomanNumerals.java OK UnitTestSessionAction 1475841513505 RomanNumerals.java OK RefactoringAction 1475841588197 RomanNumerals.java RENAME SumDoubleRepeat(String)=>int SumTwoValuess(String) METHOD EditAction 1475841588727 RomanNumerals.java 1931 5 15 0 +CompilationAction 1475841590178 RomanNumerals.java +CompilationAction 1475841590178 RomanNumerals.java +CompilationAction 1475841590178 RomanNumerals.java +CompilationAction 1475841617322 RomanNumerals.java +CompilationAction 1475841617322 RomanNumerals.java +CompilationAction 1475841617322 RomanNumerals.java +CompilationAction 1475841617462 RomanNumerals.java +RefactoringAction 1475841669145 RomanNumerals.java ADD int Return FIELD +RefactoringAction 1475841672374 RomanNumerals.java RENAME Return=>int ReturnTripleValue FIELD +RefactoringAction 1475841674122 RomanNumerals.java RENAME ReturnTripleValue=>int ReturnTripleValue() METHOD +RefactoringAction 1475841676555 RomanNumerals.java RENAME ReturnTripleValue()=>int ReturnTripleValue(string) METHOD +CompilationAction 1475841681610 RomanNumerals.java +CompilationAction 1475841681610 RomanNumerals.java +CompilationAction 1475841681610 RomanNumerals.java +CompilationAction 1475841681610 RomanNumerals.java +CompilationAction 1475841681610 RomanNumerals.java +EditAction 1475841692904 RomanNumerals.java 2082 6 24 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index acf5698..43e534e 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -13,15 +13,11 @@ public int convertToInteger(String romanNum) { if(romanNum.length() == 2) return ReturnDoubleValue(romanNum); - - if(romanNum == "III") - return SumDoubleRepeat(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1)); - - if(romanNum == "VII") - return SumDoubleRepeat(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1)); - if(romanNum == "VIII") - return SumDoubleRepeat(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1))+ReturnSingleValue(romanNum.substring(3,4)); + if(romanNum.lenght() == 3) + return TripleValue(romanNum); + + return ReturnSingleValue(romanNum); @@ -37,19 +33,32 @@ private int SumTwoValues(String romanNum) { return ReturnSingleValue(romanNum.substring(0,1))+ReturnSingleValue(romanNum.substring(1,2)); } + private int ReturnTripleValue(string romanNUm) { + if(romanNum == "III") + return SumDoubleRepeat(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1)); + + if(romanNum == "VII") + return SumDoubleRepeat(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1)); + + if(romanNum == "VIII") + return SumDoubleRepeat(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1))+ReturnSingleValue(romanNum.substring(3,4)); + + return 0; + } + private int ReturnDoubleValue(String romanNum) { if(romanNum == "II") - return SumDoubleRepeat(romanNum); + return SumTwoValues(romanNum); if(romanNum == "XX") - return SumDoubleRepeat(romanNum); + return SumTwoValues(romanNum); if(romanNum == "IV") return SubstractTwoValues(romanNum); if(romanNum.equals("VI")) - return Sum + return SumTwoValues(romanNum); if(romanNum.equals("IX")) return SubstractTwoValues(romanNum); From f2b0dfc071d0e6b287c730624e891cb54e5ce70d Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:01:43 +0300 Subject: [PATCH 15/23] besouro automatic message --- .besouro/20161007142857696/actions.txt | 6 ++++++ src/RomanNumerals.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007142857696/actions.txt b/.besouro/20161007142857696/actions.txt index cc0803e..36c62b3 100644 --- a/.besouro/20161007142857696/actions.txt +++ b/.besouro/20161007142857696/actions.txt @@ -68,3 +68,9 @@ CompilationAction 1475841681610 RomanNumerals.java CompilationAction 1475841681610 RomanNumerals.java CompilationAction 1475841681610 RomanNumerals.java EditAction 1475841692904 RomanNumerals.java 2082 6 24 0 +CompilationAction 1475841694261 RomanNumerals.java +CompilationAction 1475841694261 RomanNumerals.java +CompilationAction 1475841694261 RomanNumerals.java +CompilationAction 1475841694261 RomanNumerals.java +CompilationAction 1475841694261 RomanNumerals.java +EditAction 1475841703138 RomanNumerals.java 2082 6 24 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 43e534e..6d3f5d5 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -33,7 +33,7 @@ private int SumTwoValues(String romanNum) { return ReturnSingleValue(romanNum.substring(0,1))+ReturnSingleValue(romanNum.substring(1,2)); } - private int ReturnTripleValue(string romanNUm) { + private int ReturnTripleValue(string romanNum) { if(romanNum == "III") return SumDoubleRepeat(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1)); From a986eeca758b01444b1ae2a0229a63b8b9148392 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:09:50 +0300 Subject: [PATCH 16/23] besouro automatic message --- .besouro/20161007142857696/actions.txt | 59 ++++++++++++++++++++++++++ src/RomanNumerals.java | 23 ++++------ 2 files changed, 67 insertions(+), 15 deletions(-) diff --git a/.besouro/20161007142857696/actions.txt b/.besouro/20161007142857696/actions.txt index 36c62b3..38c681c 100644 --- a/.besouro/20161007142857696/actions.txt +++ b/.besouro/20161007142857696/actions.txt @@ -74,3 +74,62 @@ CompilationAction 1475841694261 RomanNumerals.java CompilationAction 1475841694261 RomanNumerals.java CompilationAction 1475841694261 RomanNumerals.java EditAction 1475841703138 RomanNumerals.java 2082 6 24 0 +CompilationAction 1475841704479 RomanNumerals.java +CompilationAction 1475841704479 RomanNumerals.java +CompilationAction 1475841704479 RomanNumerals.java +RefactoringAction 1475841709393 RomanNumerals.java ADD import javax.print.DocFlavor.STRING IMPORT +RefactoringAction 1475841715727 RomanNumerals.java RENAME ReturnTripleValue(STRING)=>int ReturnTripleValue(string) METHOD +RefactoringAction 1475841722622 RomanNumerals.java ADD import com.sun.org.apache.xpath.internal.operations.String IMPORT +CompilationAction 1475841753432 RomanNumerals.java +CompilationAction 1475841753432 RomanNumerals.java +CompilationAction 1475841753432 RomanNumerals.java +CompilationAction 1475841753619 RomanNumerals.java +CompilationAction 1475841753619 RomanNumerals.java +CompilationAction 1475841753619 RomanNumerals.java +CompilationAction 1475841753619 RomanNumerals.java +CompilationAction 1475841753619 RomanNumerals.java +CompilationAction 1475841753619 RomanNumerals.java +CompilationAction 1475841753619 TestRomanNumerals.java +CompilationAction 1475841766661 RomanNumerals.java +CompilationAction 1475841766661 RomanNumerals.java +CompilationAction 1475841766661 RomanNumerals.java +CompilationAction 1475841766708 RomanNumerals.java +CompilationAction 1475841766708 RomanNumerals.java +CompilationAction 1475841766708 RomanNumerals.java +CompilationAction 1475841766708 RomanNumerals.java +CompilationAction 1475841766708 RomanNumerals.java +CompilationAction 1475841876022 RomanNumerals.java +CompilationAction 1475841876023 RomanNumerals.java +CompilationAction 1475841876024 RomanNumerals.java +CompilationAction 1475841876026 RomanNumerals.java +CompilationAction 1475841876194 RomanNumerals.java +CompilationAction 1475841876195 RomanNumerals.java +CompilationAction 1475841876196 RomanNumerals.java +CompilationAction 1475841876196 RomanNumerals.java +CompilationAction 1475841927867 RomanNumerals.java +CompilationAction 1475841927867 RomanNumerals.java +CompilationAction 1475841927867 RomanNumerals.java +CompilationAction 1475841928038 RomanNumerals.java +CompilationAction 1475841928038 RomanNumerals.java +CompilationAction 1475841928038 RomanNumerals.java +CompilationAction 1475841928038 RomanNumerals.java +CompilationAction 1475841928038 RomanNumerals.java +CompilationAction 1475841928054 RomanNumerals.java +CompilationAction 1475841928054 RomanNumerals.java +CompilationAction 1475842025882 RomanNumerals.java +CompilationAction 1475842025882 RomanNumerals.java +CompilationAction 1475842025882 RomanNumerals.java +CompilationAction 1475842025897 RomanNumerals.java +CompilationAction 1475842025897 RomanNumerals.java +CompilationAction 1475842026053 RomanNumerals.java +CompilationAction 1475842026069 RomanNumerals.java +CompilationAction 1475842026069 RomanNumerals.java +CompilationAction 1475842052916 RomanNumerals.java +CompilationAction 1475842052916 RomanNumerals.java +CompilationAction 1475842052979 RomanNumerals.java +CompilationAction 1475842052979 RomanNumerals.java +CompilationAction 1475842052979 RomanNumerals.java +CompilationAction 1475842142893 RomanNumerals.java +CompilationAction 1475842142940 RomanNumerals.java +CompilationAction 1475842142956 RomanNumerals.java +EditAction 1475842189787 RomanNumerals.java 1865 6 21 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 6d3f5d5..330b830 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -1,3 +1,4 @@ +import com.sun.org.apache.xpath.internal.operations.String; public class RomanNumerals { @@ -6,18 +7,12 @@ public class RomanNumerals { private static final String ROMAN10 = "X"; private static final String ROMAN5 = "V"; private static final String ROMAN1 = "I"; + public int convertToInteger(String romanNum) { // if literal repeats sum - if(romanNum.length() == 2) - return ReturnDoubleValue(romanNum); - - if(romanNum.lenght() == 3) - return TripleValue(romanNum); - - return ReturnSingleValue(romanNum); @@ -33,28 +28,26 @@ private int SumTwoValues(String romanNum) { return ReturnSingleValue(romanNum.substring(0,1))+ReturnSingleValue(romanNum.substring(1,2)); } - private int ReturnTripleValue(string romanNum) { - if(romanNum == "III") + private int ReturnTripleValue(String romanNum) { + if(romanNum.equals("III")) return SumDoubleRepeat(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1)); - if(romanNum == "VII") + if(romanNum.equals("VII")) return SumDoubleRepeat(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1)); - if(romanNum == "VIII") - return SumDoubleRepeat(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1))+ReturnSingleValue(romanNum.substring(3,4)); return 0; } private int ReturnDoubleValue(String romanNum) { - if(romanNum == "II") + if(romanNum.equals("II")) return SumTwoValues(romanNum); - if(romanNum == "XX") + if(romanNum.equals("XX")) return SumTwoValues(romanNum); - if(romanNum == "IV") + if(romanNum.equals("IV")) return SubstractTwoValues(romanNum); if(romanNum.equals("VI")) From ba1b203c3147e0b20d8ed0cf15bac24097a3dada Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:18:12 +0300 Subject: [PATCH 17/23] besouro automatic message --- .besouro/20161007142857696/actions.txt | 22 +++++++++++++++++++ .../20161007142857696/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161007142857696/zorroEpisodes.txt | 1 + src/RomanNumerals.java | 15 ++++++++----- tests/TestRomanNumerals.java | 5 +++++ 6 files changed, 41 insertions(+), 5 deletions(-) diff --git a/.besouro/20161007142857696/actions.txt b/.besouro/20161007142857696/actions.txt index 38c681c..01f32a9 100644 --- a/.besouro/20161007142857696/actions.txt +++ b/.besouro/20161007142857696/actions.txt @@ -133,3 +133,25 @@ CompilationAction 1475842142893 RomanNumerals.java CompilationAction 1475842142940 RomanNumerals.java CompilationAction 1475842142956 RomanNumerals.java EditAction 1475842189787 RomanNumerals.java 1865 6 21 0 +CompilationAction 1475842191207 RomanNumerals.java +CompilationAction 1475842191207 RomanNumerals.java +CompilationAction 1475842240363 RomanNumerals.java +CompilationAction 1475842240363 RomanNumerals.java +CompilationAction 1475842240441 RomanNumerals.java +CompilationAction 1475842246868 RomanNumerals.java +CompilationAction 1475842247024 RomanNumerals.java +CompilationAction 1475842268771 RomanNumerals.java +CompilationAction 1475842268818 RomanNumerals.java +CompilationAction 1475842279348 RomanNumerals.java +CompilationAction 1475842279472 RomanNumerals.java +CompilationAction 1475842279472 RomanNumerals.java +CompilationAction 1475842290658 RomanNumerals.java +CompilationAction 1475842290658 RomanNumerals.java +CompilationAction 1475842290704 RomanNumerals.java +CompilationAction 1475842310579 RomanNumerals.java +UnitTestCaseAction 1475842314622 TestRomanNumerals.java OK +UnitTestSessionAction 1475842314622 RomanNumerals.java OK +RefactoringAction 1475842681457 TestRomanNumerals.java ADD void test_XXReturns20()/2 METHOD +RefactoringAction 1475842687135 TestRomanNumerals.java RENAME test_XXReturns20()/2=>void test_XXXReturns20() METHOD +RefactoringAction 1475842688680 TestRomanNumerals.java RENAME test_XXXReturns20()=>void test_XXXReturns30() METHOD +EditAction 1475842692283 TestRomanNumerals.java 1641 19 20 2 diff --git a/.besouro/20161007142857696/besouroEpisodes.txt b/.besouro/20161007142857696/besouroEpisodes.txt index 5522a05..d2a1cd4 100644 --- a/.besouro/20161007142857696/besouroEpisodes.txt +++ b/.besouro/20161007142857696/besouroEpisodes.txt @@ -6,3 +6,5 @@ 1475841306550 production 1 974 false 1475841306551 production 2 974 false 1475841513505 regression 1 0 true +1475842314622 refactoring 2A 726 true +1475842314623 production 3 726 false diff --git a/.besouro/20161007142857696/randomHeuristicEpisodes.txt b/.besouro/20161007142857696/randomHeuristicEpisodes.txt index a0723b5..fc368bd 100644 --- a/.besouro/20161007142857696/randomHeuristicEpisodes.txt +++ b/.besouro/20161007142857696/randomHeuristicEpisodes.txt @@ -1,3 +1,4 @@ 1475840216634 refactoring 3 478 false 1475841306549 refactoring 2A 974 false 1475841513505 regression 1 0 true +1475842314622 refactoring 2A 726 false diff --git a/.besouro/20161007142857696/zorroEpisodes.txt b/.besouro/20161007142857696/zorroEpisodes.txt index 76ce613..c4c34c2 100644 --- a/.besouro/20161007142857696/zorroEpisodes.txt +++ b/.besouro/20161007142857696/zorroEpisodes.txt @@ -1,3 +1,4 @@ 1475840216634 refactoring 3 478 false 1475841306549 refactoring 2A 1089 false 1475841513505 regression 1 206 false +1475842314622 refactoring 2A 801 false diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 330b830..f577dbc 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -1,5 +1,3 @@ -import com.sun.org.apache.xpath.internal.operations.String; - public class RomanNumerals { @@ -11,9 +9,16 @@ public class RomanNumerals { public int convertToInteger(String romanNum) { // if literal repeats sum + + + if(romanNum.length() == 2) + return ReturnDoubleValue(romanNum); + if(romanNum.length() == 3) + return ReturnTripleValue(romanNum); - + if(romanNum.equals("VIII")) + return SumTwoValues(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1))+ReturnSingleValue(romanNum.substring(3,4)); return ReturnSingleValue(romanNum); } @@ -30,10 +35,10 @@ private int SumTwoValues(String romanNum) { private int ReturnTripleValue(String romanNum) { if(romanNum.equals("III")) - return SumDoubleRepeat(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1)); + return SumTwoValues(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1)); if(romanNum.equals("VII")) - return SumDoubleRepeat(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1)); + return SumTwoValues(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1)); return 0; diff --git a/tests/TestRomanNumerals.java b/tests/TestRomanNumerals.java index 9d584bc..500ef73 100644 --- a/tests/TestRomanNumerals.java +++ b/tests/TestRomanNumerals.java @@ -68,6 +68,11 @@ public void test_XXReturns20() { AssertNumeral(20, "XX"); } + @Test + public void test_XXXReturns30() { + AssertNumeral(30, "XXX"); + } + @Test public void test_XLReturns40() { AssertNumeral(40, "XL"); From 683c46124d180e67af012dedd4478978cc9016c8 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:24:44 +0300 Subject: [PATCH 18/23] besouro automatic message --- .besouro/20161007142857696/actions.txt | 3 +++ src/RomanNumerals.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007142857696/actions.txt b/.besouro/20161007142857696/actions.txt index 01f32a9..905a742 100644 --- a/.besouro/20161007142857696/actions.txt +++ b/.besouro/20161007142857696/actions.txt @@ -155,3 +155,6 @@ RefactoringAction 1475842681457 TestRomanNumerals.java ADD void test_XXReturns20 RefactoringAction 1475842687135 TestRomanNumerals.java RENAME test_XXReturns20()/2=>void test_XXXReturns20() METHOD RefactoringAction 1475842688680 TestRomanNumerals.java RENAME test_XXXReturns20()=>void test_XXXReturns30() METHOD EditAction 1475842692283 TestRomanNumerals.java 1641 19 20 2 +UnitTestCaseAction 1475842694392 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475842694392 TestRomanNumerals.java FAIL +EditAction 1475843083755 RomanNumerals.java 2134 6 24 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index f577dbc..caa14d2 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -34,13 +34,13 @@ private int SumTwoValues(String romanNum) { } private int ReturnTripleValue(String romanNum) { - if(romanNum.equals("III")) + if(romanNum.equals("III") || romanNum.equals("XXX")) return SumTwoValues(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1)); if(romanNum.equals("VII")) return SumTwoValues(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1)); - + return 0; } From f5402f43b24ee81bf263fd75da7efdce93115d1b Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:28:27 +0300 Subject: [PATCH 19/23] besouro automatic message --- .besouro/20161007142857696/actions.txt | 5 +++++ src/RomanNumerals.java | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/.besouro/20161007142857696/actions.txt b/.besouro/20161007142857696/actions.txt index 905a742..6b56aa2 100644 --- a/.besouro/20161007142857696/actions.txt +++ b/.besouro/20161007142857696/actions.txt @@ -158,3 +158,8 @@ EditAction 1475842692283 TestRomanNumerals.java 1641 19 20 2 UnitTestCaseAction 1475842694392 TestRomanNumerals.java FAIL UnitTestSessionAction 1475842694392 TestRomanNumerals.java FAIL EditAction 1475843083755 RomanNumerals.java 2134 6 24 0 +RefactoringAction 1475843097557 RomanNumerals.java ADD int CheckRepeats() METHOD +RefactoringAction 1475843101584 RomanNumerals.java RENAME CheckRepeats()=>int CheckRepeats(String) METHOD +RefactoringAction 1475843258617 RomanNumerals.java RENAME CheckRepeats(String)=>int CheckRepeats(char) METHOD +RefactoringAction 1475843262221 RomanNumerals.java RENAME CheckRepeats(char)=>int CheckRepeats(char, String) METHOD +EditAction 1475843307024 RomanNumerals.java 2312 7 26 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index caa14d2..7898e8c 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -44,6 +44,15 @@ private int ReturnTripleValue(String romanNum) { return 0; } + private int CheckRepeats(char c, String string) { + int num = 0; + for(int i = 0; i != string.length(); i++) + if(string.charAt(i) == c) + num++; + else + return -1; + } + private int ReturnDoubleValue(String romanNum) { if(romanNum.equals("II")) From dc561c3eea4d425ac58e2436905ee630edd6010b Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:28:38 +0300 Subject: [PATCH 20/23] besouro automatic message --- .besouro/20161007142857696/actions.txt | 2 ++ src/RomanNumerals.java | 1 + 2 files changed, 3 insertions(+) diff --git a/.besouro/20161007142857696/actions.txt b/.besouro/20161007142857696/actions.txt index 6b56aa2..67ed0ba 100644 --- a/.besouro/20161007142857696/actions.txt +++ b/.besouro/20161007142857696/actions.txt @@ -163,3 +163,5 @@ RefactoringAction 1475843101584 RomanNumerals.java RENAME CheckRepeats()=>int Ch RefactoringAction 1475843258617 RomanNumerals.java RENAME CheckRepeats(String)=>int CheckRepeats(char) METHOD RefactoringAction 1475843262221 RomanNumerals.java RENAME CheckRepeats(char)=>int CheckRepeats(char, String) METHOD EditAction 1475843307024 RomanNumerals.java 2312 7 26 0 +CompilationAction 1475843308569 RomanNumerals.java +EditAction 1475843318069 RomanNumerals.java 2326 7 27 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 7898e8c..de77c24 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -51,6 +51,7 @@ private int CheckRepeats(char c, String string) { num++; else return -1; + return num; } private int ReturnDoubleValue(String romanNum) { From bf42ae8eb3cc32d8a05262c307fd5d959a8cb02f Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:31:36 +0300 Subject: [PATCH 21/23] besouro automatic message --- .besouro/20161007142857696/actions.txt | 5 +++++ .besouro/20161007142857696/besouroEpisodes.txt | 3 +++ .besouro/20161007142857696/randomHeuristicEpisodes.txt | 1 + .besouro/20161007142857696/zorroEpisodes.txt | 9 +++++---- src/RomanNumerals.java | 10 ++++------ 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.besouro/20161007142857696/actions.txt b/.besouro/20161007142857696/actions.txt index 67ed0ba..902b8f5 100644 --- a/.besouro/20161007142857696/actions.txt +++ b/.besouro/20161007142857696/actions.txt @@ -165,3 +165,8 @@ RefactoringAction 1475843262221 RomanNumerals.java RENAME CheckRepeats(char)=>in EditAction 1475843307024 RomanNumerals.java 2312 7 26 0 CompilationAction 1475843308569 RomanNumerals.java EditAction 1475843318069 RomanNumerals.java 2326 7 27 0 +CompilationAction 1475843406786 RomanNumerals.java +CompilationAction 1475843426162 RomanNumerals.java +UnitTestCaseAction 1475843431141 TestRomanNumerals.java OK +UnitTestSessionAction 1475843431141 TestRomanNumerals.java OK +EditAction 1475843496459 RomanNumerals.java 2289 7 26 0 diff --git a/.besouro/20161007142857696/besouroEpisodes.txt b/.besouro/20161007142857696/besouroEpisodes.txt index d2a1cd4..d4953e0 100644 --- a/.besouro/20161007142857696/besouroEpisodes.txt +++ b/.besouro/20161007142857696/besouroEpisodes.txt @@ -8,3 +8,6 @@ 1475841513505 regression 1 0 true 1475842314622 refactoring 2A 726 true 1475842314623 production 3 726 false +1475843431141 test-first 3 749 true +1475843431142 test-first 3 749 true +1475843431143 test-first 3 749 true diff --git a/.besouro/20161007142857696/randomHeuristicEpisodes.txt b/.besouro/20161007142857696/randomHeuristicEpisodes.txt index fc368bd..1609d3e 100644 --- a/.besouro/20161007142857696/randomHeuristicEpisodes.txt +++ b/.besouro/20161007142857696/randomHeuristicEpisodes.txt @@ -2,3 +2,4 @@ 1475841306549 refactoring 2A 974 false 1475841513505 regression 1 0 true 1475842314622 refactoring 2A 726 false +1475843431141 test-first 3 749 true diff --git a/.besouro/20161007142857696/zorroEpisodes.txt b/.besouro/20161007142857696/zorroEpisodes.txt index c4c34c2..417823a 100644 --- a/.besouro/20161007142857696/zorroEpisodes.txt +++ b/.besouro/20161007142857696/zorroEpisodes.txt @@ -1,4 +1,5 @@ -1475840216634 refactoring 3 478 false -1475841306549 refactoring 2A 1089 false -1475841513505 regression 1 206 false -1475842314622 refactoring 2A 801 false +1475840216634 refactoring 3 478 true +1475841306549 refactoring 2A 1089 true +1475841513505 regression 1 206 true +1475842314622 refactoring 2A 801 true +1475843431141 test-first 3 1116 true diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index de77c24..90d2337 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -34,7 +34,8 @@ private int SumTwoValues(String romanNum) { } private int ReturnTripleValue(String romanNum) { - if(romanNum.equals("III") || romanNum.equals("XXX")) + + if(CheckRepeats(romanNum.charAt(0), romanNum) == 2) return SumTwoValues(romanNum.substring(1,3))+ReturnSingleValue(romanNum.substring(0,1)); if(romanNum.equals("VII")) @@ -46,7 +47,7 @@ private int ReturnTripleValue(String romanNum) { private int CheckRepeats(char c, String string) { int num = 0; - for(int i = 0; i != string.length(); i++) + for(int i = 1; i != string.length(); i++) if(string.charAt(i) == c) num++; else @@ -56,10 +57,7 @@ private int CheckRepeats(char c, String string) { private int ReturnDoubleValue(String romanNum) { - if(romanNum.equals("II")) - return SumTwoValues(romanNum); - - if(romanNum.equals("XX")) + if(CheckRepeats(romanNum.charAt(0), romanNum) == 1) return SumTwoValues(romanNum); if(romanNum.equals("IV")) From c722927639f6eac992defd5214a342fea6ffd6d3 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:51:21 +0300 Subject: [PATCH 22/23] besouro automatic message --- .besouro/20161007142857696/actions.txt | 3 +++ .besouro/20161007142857696/besouroEpisodes.txt | 1 + .besouro/20161007142857696/randomHeuristicEpisodes.txt | 1 + .besouro/20161007142857696/zorroEpisodes.txt | 1 + src/RomanNumerals.java | 10 ++-------- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.besouro/20161007142857696/actions.txt b/.besouro/20161007142857696/actions.txt index 902b8f5..8c56d12 100644 --- a/.besouro/20161007142857696/actions.txt +++ b/.besouro/20161007142857696/actions.txt @@ -170,3 +170,6 @@ CompilationAction 1475843426162 RomanNumerals.java UnitTestCaseAction 1475843431141 TestRomanNumerals.java OK UnitTestSessionAction 1475843431141 TestRomanNumerals.java OK EditAction 1475843496459 RomanNumerals.java 2289 7 26 0 +UnitTestCaseAction 1475843499848 TestRomanNumerals.java OK +UnitTestSessionAction 1475843499848 TestRomanNumerals.java OK +EditAction 1475844680839 RomanNumerals.java 2198 7 24 0 diff --git a/.besouro/20161007142857696/besouroEpisodes.txt b/.besouro/20161007142857696/besouroEpisodes.txt index d4953e0..6b8e6b8 100644 --- a/.besouro/20161007142857696/besouroEpisodes.txt +++ b/.besouro/20161007142857696/besouroEpisodes.txt @@ -11,3 +11,4 @@ 1475843431141 test-first 3 749 true 1475843431142 test-first 3 749 true 1475843431143 test-first 3 749 true +1475843499848 refactoring 2A 3 true diff --git a/.besouro/20161007142857696/randomHeuristicEpisodes.txt b/.besouro/20161007142857696/randomHeuristicEpisodes.txt index 1609d3e..ffccfa1 100644 --- a/.besouro/20161007142857696/randomHeuristicEpisodes.txt +++ b/.besouro/20161007142857696/randomHeuristicEpisodes.txt @@ -3,3 +3,4 @@ 1475841513505 regression 1 0 true 1475842314622 refactoring 2A 726 false 1475843431141 test-first 3 749 true +1475843499848 refactoring 2A 3 true diff --git a/.besouro/20161007142857696/zorroEpisodes.txt b/.besouro/20161007142857696/zorroEpisodes.txt index 417823a..33f6b45 100644 --- a/.besouro/20161007142857696/zorroEpisodes.txt +++ b/.besouro/20161007142857696/zorroEpisodes.txt @@ -3,3 +3,4 @@ 1475841513505 regression 1 206 true 1475842314622 refactoring 2A 801 true 1475843431141 test-first 3 1116 true +1475843499848 refactoring 2A 68 true diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 90d2337..985ff03 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -60,17 +60,11 @@ private int ReturnDoubleValue(String romanNum) { if(CheckRepeats(romanNum.charAt(0), romanNum) == 1) return SumTwoValues(romanNum); - if(romanNum.equals("IV")) + if(romanNum.equals("IV") || romanNum.equals("IX") || romanNum.equals("XL") ) return SubstractTwoValues(romanNum); if(romanNum.equals("VI")) - return SumTwoValues(romanNum); - - if(romanNum.equals("IX")) - return SubstractTwoValues(romanNum); - - if(romanNum.equals("XL")) - return SubstractTwoValues(romanNum); + return SumTwoValues(romanNum); return 0; } From 79b80ab3de9d742f867694968171fe7308220893 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:02:44 +0300 Subject: [PATCH 23/23] besouro automatic message --- .besouro/20161007142857696/actions.txt | 2 ++ .besouro/20161007142857696/besouroEpisodes.txt | 1 + .besouro/20161007142857696/randomHeuristicEpisodes.txt | 1 + .besouro/20161007142857696/zorroEpisodes.txt | 1 + 4 files changed, 5 insertions(+) diff --git a/.besouro/20161007142857696/actions.txt b/.besouro/20161007142857696/actions.txt index 8c56d12..496e4d2 100644 --- a/.besouro/20161007142857696/actions.txt +++ b/.besouro/20161007142857696/actions.txt @@ -173,3 +173,5 @@ EditAction 1475843496459 RomanNumerals.java 2289 7 26 0 UnitTestCaseAction 1475843499848 TestRomanNumerals.java OK UnitTestSessionAction 1475843499848 TestRomanNumerals.java OK EditAction 1475844680839 RomanNumerals.java 2198 7 24 0 +UnitTestCaseAction 1475844683529 TestRomanNumerals.java OK +UnitTestSessionAction 1475844683544 TestRomanNumerals.java OK diff --git a/.besouro/20161007142857696/besouroEpisodes.txt b/.besouro/20161007142857696/besouroEpisodes.txt index 6b8e6b8..3410ae6 100644 --- a/.besouro/20161007142857696/besouroEpisodes.txt +++ b/.besouro/20161007142857696/besouroEpisodes.txt @@ -12,3 +12,4 @@ 1475843431142 test-first 3 749 true 1475843431143 test-first 3 749 true 1475843499848 refactoring 2A 3 true +1475844683544 refactoring 2A 2 true diff --git a/.besouro/20161007142857696/randomHeuristicEpisodes.txt b/.besouro/20161007142857696/randomHeuristicEpisodes.txt index ffccfa1..f606df3 100644 --- a/.besouro/20161007142857696/randomHeuristicEpisodes.txt +++ b/.besouro/20161007142857696/randomHeuristicEpisodes.txt @@ -4,3 +4,4 @@ 1475842314622 refactoring 2A 726 false 1475843431141 test-first 3 749 true 1475843499848 refactoring 2A 3 true +1475844683544 refactoring 2A 2 true diff --git a/.besouro/20161007142857696/zorroEpisodes.txt b/.besouro/20161007142857696/zorroEpisodes.txt index 33f6b45..b0b8b68 100644 --- a/.besouro/20161007142857696/zorroEpisodes.txt +++ b/.besouro/20161007142857696/zorroEpisodes.txt @@ -4,3 +4,4 @@ 1475842314622 refactoring 2A 801 true 1475843431141 test-first 3 1116 true 1475843499848 refactoring 2A 68 true +1475844683544 refactoring 2A 1183 true