From a0af5d308441408e9a90f5e520bd122595bb1c6b Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:24:09 +0300 Subject: [PATCH 1/6] besouro automatic message --- .besouro/20160930153322118/actions.txt | 28 +++++++++++++++++++ .../20160930153322118/besouroEpisodes.txt | 0 .besouro/20160930153322118/disagreements.txt | 0 .../randomHeuristicEpisodes.txt | 0 .besouro/20160930153322118/userComments.txt | 0 .besouro/20160930153322118/zorroEpisodes.txt | 0 src/RomanNumerals.java | 22 +++++++++++++-- 7 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 .besouro/20160930153322118/actions.txt create mode 100644 .besouro/20160930153322118/besouroEpisodes.txt create mode 100644 .besouro/20160930153322118/disagreements.txt create mode 100644 .besouro/20160930153322118/randomHeuristicEpisodes.txt create mode 100644 .besouro/20160930153322118/userComments.txt create mode 100644 .besouro/20160930153322118/zorroEpisodes.txt diff --git a/.besouro/20160930153322118/actions.txt b/.besouro/20160930153322118/actions.txt new file mode 100644 index 0000000..23ccff6 --- /dev/null +++ b/.besouro/20160930153322118/actions.txt @@ -0,0 +1,28 @@ +FileOpenedAction 1475238802348 RomanNumerals.java 121 1 1 0 +RefactoringAction 1475238944009 TestRomanNumerals.java ADD void test()/2 METHOD +RefactoringAction 1475238979562 TestRomanNumerals.java RENAME test()/2=>void i() METHOD +RefactoringAction 1475238981106 TestRomanNumerals.java RENAME i()=>void ixcm() METHOD +RefactoringAction 1475239059902 TestRomanNumerals.java RENAME ixcm()=>void ixcmCan() METHOD +RefactoringAction 1475239062476 TestRomanNumerals.java RENAME ixcmCan()=>void ixcmCanBe() METHOD +RefactoringAction 1475239065066 TestRomanNumerals.java RENAME ixcmCanBe()=>void ixcmCanBeRepated() METHOD +RefactoringAction 1475239067140 TestRomanNumerals.java RENAME ixcmCanBeRepated()=>void ixcmCanBeRepated3() METHOD +RefactoringAction 1475239076953 TestRomanNumerals.java ADD void test()/2 METHOD +RefactoringAction 1475239086219 TestRomanNumerals.java RENAME test()/2=>void vld() METHOD +RefactoringAction 1475239088809 TestRomanNumerals.java RENAME vld()=>void vldCannot() METHOD +RefactoringAction 1475239092943 TestRomanNumerals.java RENAME vldCannot()=>void vldCannotBeRepeta() METHOD +RefactoringAction 1475239096562 TestRomanNumerals.java RENAME vldCannotBeRepeta()=>void vldCannotBeRepea() METHOD +RefactoringAction 1475239097607 TestRomanNumerals.java RENAME vldCannotBeRepea()=>void vldCannotBeRepeated() METHOD +RefactoringAction 1475239107919 TestRomanNumerals.java RENAME ixcmCanBeRepated3()=>void ixcmcanBeRepated3() METHOD +RefactoringAction 1475239112037 TestRomanNumerals.java RENAME ixcmcanBeRepated3()=>void IXCMcanBeRepated3() METHOD +RefactoringAction 1475239116686 TestRomanNumerals.java RENAME vldCannotBeRepeated()=>void vldcannotBeRepeated() METHOD +RefactoringAction 1475239119276 TestRomanNumerals.java RENAME vldcannotBeRepeated()=>void cannotBeRepeated() METHOD +RefactoringAction 1475239121351 TestRomanNumerals.java RENAME cannotBeRepeated()=>void VLDcannotBeRepeated() METHOD +RefactoringAction 1475239302610 TestRomanNumerals.java RENAME test()=>void plus1() METHOD +RefactoringAction 1475239303638 TestRomanNumerals.java RENAME plus1()=>void plus1is() METHOD +RefactoringAction 1475239304662 TestRomanNumerals.java RENAME plus1is()=>void plus1isTwo() METHOD +RefactoringAction 1475239317701 TestRomanNumerals.java RENAME plus1isTwo()=>void test() METHOD +RefactoringAction 1475239372220 TestRomanNumerals.java RENAME test()=>void testAddition() METHOD +RefactoringAction 1475240787783 TestRomanNumerals.java RENAME testAddition()=>void test() METHOD +RefactoringAction 1475240790872 TestRomanNumerals.java RENAME test()=>void testIs() METHOD +RefactoringAction 1475240791902 TestRomanNumerals.java RENAME testIs()=>void testIs1() METHOD +EditAction 1475241849305 RomanNumerals.java 451 1 0 0 diff --git a/.besouro/20160930153322118/besouroEpisodes.txt b/.besouro/20160930153322118/besouroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20160930153322118/disagreements.txt b/.besouro/20160930153322118/disagreements.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20160930153322118/randomHeuristicEpisodes.txt b/.besouro/20160930153322118/randomHeuristicEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20160930153322118/userComments.txt b/.besouro/20160930153322118/userComments.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20160930153322118/zorroEpisodes.txt b/.besouro/20160930153322118/zorroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 20904f0..5640d07 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -1,8 +1,26 @@ public class RomanNumerals { public int convertToInteger(String romanNum) { - // To be Implemented - return 0; + + int decimalNum = 0; + + // Convert romanNums to upper case, if they are lower case + String romanNum = romanNum.toUpperCase(); + + for (int x romanNum.length() - 1; x >= 0; x--) { + char convertToDecimalNum = romanNum.charAt(x); + + switch (convertToDecimalNum) { + + case 'I': + decimalNum = 1; + + break; + + } + } + + return decimalNum; } } From 27f61db8abb2f34edb7e8775f7f7ef3a2b725ba3 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:30:14 +0300 Subject: [PATCH 2/6] besouro automatic message --- .besouro/20160930153322118/actions.txt | 3 +++ src/RomanNumerals.java | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/.besouro/20160930153322118/actions.txt b/.besouro/20160930153322118/actions.txt index 23ccff6..0bb77c5 100644 --- a/.besouro/20160930153322118/actions.txt +++ b/.besouro/20160930153322118/actions.txt @@ -26,3 +26,6 @@ RefactoringAction 1475240787783 TestRomanNumerals.java RENAME testAddition()=>vo RefactoringAction 1475240790872 TestRomanNumerals.java RENAME test()=>void testIs() METHOD RefactoringAction 1475240791902 TestRomanNumerals.java RENAME testIs()=>void testIs1() METHOD EditAction 1475241849305 RomanNumerals.java 451 1 0 0 +CompilationAction 1475241849586 RomanNumerals.java +CompilationAction 1475241849586 RomanNumerals.java +EditAction 1475242214862 RomanNumerals.java 545 1 0 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 5640d07..c059ec1 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -14,7 +14,14 @@ public int convertToInteger(String romanNum) { case 'I': decimalNum = 1; + break; + + case 'V': + decimalNum = 1; + break; + case 'X': + decimalNum = 10; break; } From 3a59a0b24181eb546fbb61fb3d9ac5e98a35d0be Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:33:32 +0300 Subject: [PATCH 3/6] besouro automatic message --- .besouro/20160930153322118/actions.txt | 3 +++ tests/TestRomanNumerals.java | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930153322118/actions.txt b/.besouro/20160930153322118/actions.txt index 0bb77c5..8ad43c4 100644 --- a/.besouro/20160930153322118/actions.txt +++ b/.besouro/20160930153322118/actions.txt @@ -29,3 +29,6 @@ EditAction 1475241849305 RomanNumerals.java 451 1 0 0 CompilationAction 1475241849586 RomanNumerals.java CompilationAction 1475241849586 RomanNumerals.java EditAction 1475242214862 RomanNumerals.java 545 1 0 0 +CompilationAction 1475242214940 RomanNumerals.java +CompilationAction 1475242214940 RomanNumerals.java +EditAction 1475242412266 TestRomanNumerals.java 319 3 2 0 diff --git a/tests/TestRomanNumerals.java b/tests/TestRomanNumerals.java index 5d1de75..57c930f 100644 --- a/tests/TestRomanNumerals.java +++ b/tests/TestRomanNumerals.java @@ -5,8 +5,17 @@ public class TestRomanNumerals { @Test - public void test() { + public void testIs1() { + String number = RomanNumerals + } + + @Test + public void IXCMcanBeRepated3() { fail("Not yet implemented"); } + @Test + public void VLDcannotBeRepeated() { + fail("Not yet implemented"); + } } From bd16b18a82ee69bfb40031e7854d42586ab8bfde Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:35:07 +0300 Subject: [PATCH 4/6] besouro automatic message --- .besouro/20160930153322118/actions.txt | 6 ++++++ src/RomanNumerals.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930153322118/actions.txt b/.besouro/20160930153322118/actions.txt index 8ad43c4..d81f27d 100644 --- a/.besouro/20160930153322118/actions.txt +++ b/.besouro/20160930153322118/actions.txt @@ -32,3 +32,9 @@ EditAction 1475242214862 RomanNumerals.java 545 1 0 0 CompilationAction 1475242214940 RomanNumerals.java CompilationAction 1475242214940 RomanNumerals.java EditAction 1475242412266 TestRomanNumerals.java 319 3 2 0 +CompilationAction 1475242412360 TestRomanNumerals.java +CompilationAction 1475242412360 TestRomanNumerals.java +CompilationAction 1475242412360 TestRomanNumerals.java +UnitTestCaseAction 1475242417682 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475242417682 TestRomanNumerals.java FAIL +EditAction 1475242507102 RomanNumerals.java 545 1 0 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index c059ec1..39bfce6 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -17,7 +17,7 @@ public int convertToInteger(String romanNum) { break; case 'V': - decimalNum = 1; + decimalNum = 5; break; case 'X': From 865ee54b5f52bcc5c3a45ddaa6235020beb67390 Mon Sep 17 00:00:00 2001 From: akairala Date: Fri, 30 Sep 2016 17:01:20 +0300 Subject: [PATCH 5/6] Project finished --- tests/TestRomanNumerals.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestRomanNumerals.java b/tests/TestRomanNumerals.java index 57c930f..44e2e32 100644 --- a/tests/TestRomanNumerals.java +++ b/tests/TestRomanNumerals.java @@ -6,7 +6,7 @@ public class TestRomanNumerals { @Test public void testIs1() { - String number = RomanNumerals + assertEquals("I gives an invalid value."); } @Test From a2b5847fbd6883c63ec25a88806eac19eceae2bd Mon Sep 17 00:00:00 2001 From: akairala Date: Fri, 7 Oct 2016 16:27:46 +0300 Subject: [PATCH 6/6] Project finished --- src/RomanNumerals.java | 86 +++++++++++++++++++++++++----------- tests/TestRomanNumerals.java | 6 ++- 2 files changed, 65 insertions(+), 27 deletions(-) diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 39bfce6..30f9338 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -1,33 +1,67 @@ - public class RomanNumerals { public int convertToInteger(String romanNum) { - int decimalNum = 0; + int arabicNum = 0; - // Convert romanNums to upper case, if they are lower case - String romanNum = romanNum.toUpperCase(); + String roman = romanNum.toUpperCase(); + for(int x = 0;x= 0; x--) { - char convertToDecimalNum = romanNum.charAt(x); - - switch (convertToDecimalNum) { - - case 'I': - decimalNum = 1; - break; - - case 'V': - decimalNum = 5; - break; - - case 'X': - decimalNum = 10; - break; - - } + switch (convertToDecimal) { + case 'M': + arabicNum += 1000; + break; + + case 'D': + arabicNum += 500; + break; + + case 'C': + arabicNum += 100; + break; + + case 'L': + arabicNum += 50; + break; + + case 'X': + arabicNum += 10; + break; + + case 'V': + arabicNum += 5; + break; + + case 'I': + arabicNum += 1; + break; + } } - - return decimalNum; - + if (roman.contains("IV")) + { + arabicNum-=2; + } + if (roman.contains("IX")) + { + arabicNum-=2; + } + if (roman.contains("XL")) + { + arabicNum-=10; + } + if (roman.contains("XC")) + { + arabicNum-=10; + } + if (roman.contains("CD")) + { + arabicNum-=100; + } + if (roman.contains("CM")) + { + arabicNum-=100; + } + return arabicNum; } -} +} \ No newline at end of file diff --git a/tests/TestRomanNumerals.java b/tests/TestRomanNumerals.java index 44e2e32..308af58 100644 --- a/tests/TestRomanNumerals.java +++ b/tests/TestRomanNumerals.java @@ -3,10 +3,14 @@ import org.junit.Test; public class TestRomanNumerals { + + private static void assertRomanNumeralsEquals(String romanNum, int arabNum) { + //assertThat(roman, is(RomanNumerals.convert(arabNum))); + } @Test public void testIs1() { - assertEquals("I gives an invalid value."); + assertRomanNumeralsEquals("I", 200); } @Test