From b38ca3ebed075dc017a29f49c675cde1917c9b75 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 15:30:39 +0300 Subject: [PATCH 01/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 4 ++++ .besouro/20160930152921209/besouroEpisodes.txt | 0 .besouro/20160930152921209/disagreements.txt | 0 .besouro/20160930152921209/randomHeuristicEpisodes.txt | 0 .besouro/20160930152921209/userComments.txt | 0 .besouro/20160930152921209/zorroEpisodes.txt | 0 src/RomanNumerals.java | 3 +++ 7 files changed, 7 insertions(+) create mode 100644 .besouro/20160930152921209/actions.txt create mode 100644 .besouro/20160930152921209/besouroEpisodes.txt create mode 100644 .besouro/20160930152921209/disagreements.txt create mode 100644 .besouro/20160930152921209/randomHeuristicEpisodes.txt create mode 100644 .besouro/20160930152921209/userComments.txt create mode 100644 .besouro/20160930152921209/zorroEpisodes.txt diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt new file mode 100644 index 0000000..72f1422 --- /dev/null +++ b/.besouro/20160930152921209/actions.txt @@ -0,0 +1,4 @@ +FileOpenedAction 1475238561413 RomanNumerals.java 148 1 1 0 +RefactoringAction 1475238604782 RomanNumerals.java ADD Int N FIELD +RefactoringAction 1475238638348 RomanNumerals.java REMOVE N FIELD +EditAction 1475238639097 RomanNumerals.java 148 1 1 0 diff --git a/.besouro/20160930152921209/besouroEpisodes.txt b/.besouro/20160930152921209/besouroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20160930152921209/disagreements.txt b/.besouro/20160930152921209/disagreements.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20160930152921209/randomHeuristicEpisodes.txt b/.besouro/20160930152921209/randomHeuristicEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20160930152921209/userComments.txt b/.besouro/20160930152921209/userComments.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20160930152921209/zorroEpisodes.txt b/.besouro/20160930152921209/zorroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 20904f0..9ca4308 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -1,5 +1,8 @@ public class RomanNumerals { + + String romanNum = ""; + public int convertToInteger(String romanNum) { // To be Implemented return 0; From 99e8fdbf3a6b7472d2297a4733d8f2a012ffcb7b Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 15:37:36 +0300 Subject: [PATCH 02/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 72f1422..9296432 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -2,3 +2,4 @@ FileOpenedAction 1475238561413 RomanNumerals.java 148 1 1 0 RefactoringAction 1475238604782 RomanNumerals.java ADD Int N FIELD RefactoringAction 1475238638348 RomanNumerals.java REMOVE N FIELD EditAction 1475238639097 RomanNumerals.java 148 1 1 0 +EditAction 1475239056002 RomanNumerals.java 157 1 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 9ca4308..df04b3a 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -4,7 +4,7 @@ public class RomanNumerals { String romanNum = ""; public int convertToInteger(String romanNum) { - // To be Implemented + if (romanNum == "") return 0; return 0; } From 58c87ec321e2576b273a72d2910769bd8ae93a31 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 15:38:56 +0300 Subject: [PATCH 03/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 1 + 2 files changed, 2 insertions(+) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 9296432..cabf13c 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -3,3 +3,4 @@ RefactoringAction 1475238604782 RomanNumerals.java ADD Int N FIELD RefactoringAction 1475238638348 RomanNumerals.java REMOVE N FIELD EditAction 1475238639097 RomanNumerals.java 148 1 1 0 EditAction 1475239056002 RomanNumerals.java 157 1 2 0 +EditAction 1475239136232 RomanNumerals.java 201 1 0 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index df04b3a..b207244 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -5,6 +5,7 @@ public class RomanNumerals { public int convertToInteger(String romanNum) { if (romanNum == "") return 0; + if (romanNum.startsWith("M")) return 1000 return 0; } From f2e2c219a9236719357d9af3366b412cfa4e70d5 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 15:42:52 +0300 Subject: [PATCH 04/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 2 ++ src/RomanNumerals.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index cabf13c..cfdd744 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -4,3 +4,5 @@ RefactoringAction 1475238638348 RomanNumerals.java REMOVE N FIELD EditAction 1475238639097 RomanNumerals.java 148 1 1 0 EditAction 1475239056002 RomanNumerals.java 157 1 2 0 EditAction 1475239136232 RomanNumerals.java 201 1 0 0 +CompilationAction 1475239136471 RomanNumerals.java +EditAction 1475239372721 RomanNumerals.java 231 1 0 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index b207244..44b583f 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -5,7 +5,7 @@ public class RomanNumerals { public int convertToInteger(String romanNum) { if (romanNum == "") return 0; - if (romanNum.startsWith("M")) return 1000 + if (romanNum.startsWith("M")) return 1000 + convertToInteger(romanNum.) return 0; } From d7ec5621551a58a9f06af286932a426947f946a7 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 15:47:38 +0300 Subject: [PATCH 05/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 3 +++ src/RomanNumerals.java | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index cfdd744..c4fb813 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -6,3 +6,6 @@ EditAction 1475239056002 RomanNumerals.java 157 1 2 0 EditAction 1475239136232 RomanNumerals.java 201 1 0 0 CompilationAction 1475239136471 RomanNumerals.java EditAction 1475239372721 RomanNumerals.java 231 1 0 0 +CompilationAction 1475239372962 RomanNumerals.java +CompilationAction 1475239541309 RomanNumerals.java +EditAction 1475239658712 RomanNumerals.java 703 1 8 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 44b583f..204c241 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -5,7 +5,12 @@ public class RomanNumerals { public int convertToInteger(String romanNum) { if (romanNum == "") return 0; - if (romanNum.startsWith("M")) return 1000 + convertToInteger(romanNum.) + if (romanNum.startsWith("M")) return 1000 + convertToInteger(romanNum.replace("M", "")); + if (romanNum.startsWith("CM")) return 900 + convertToInteger(romanNum.replace("CM", "")); + if (romanNum.startsWith("C")) return 500 + convertToInteger(romanNum.replace("M", "")); + if (romanNum.startsWith("CD")) return 400 + convertToInteger(romanNum.replace("M", "")); + if (romanNum.startsWith("C")) return 100 + convertToInteger(romanNum.replace("M", "")); + if (romanNum.startsWith("CX")) return 1000 + convertToInteger(romanNum.replace("M", "")); return 0; } From 19347f8a6b6bb3cdf0fe3360410957aba30510f8 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 15:47:48 +0300 Subject: [PATCH 06/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index c4fb813..9b2f148 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -9,3 +9,4 @@ EditAction 1475239372721 RomanNumerals.java 231 1 0 0 CompilationAction 1475239372962 RomanNumerals.java CompilationAction 1475239541309 RomanNumerals.java EditAction 1475239658712 RomanNumerals.java 703 1 8 0 +EditAction 1475239668135 RomanNumerals.java 701 1 8 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 204c241..2723a1d 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -10,7 +10,7 @@ public int convertToInteger(String romanNum) { if (romanNum.startsWith("C")) return 500 + convertToInteger(romanNum.replace("M", "")); if (romanNum.startsWith("CD")) return 400 + convertToInteger(romanNum.replace("M", "")); if (romanNum.startsWith("C")) return 100 + convertToInteger(romanNum.replace("M", "")); - if (romanNum.startsWith("CX")) return 1000 + convertToInteger(romanNum.replace("M", "")); + if (romanNum.startsWith("CX")) return 90 + convertToInteger(romanNum.replace("M", "")); return 0; } From bd46b77e872034dad903e40d6f0ec969837b8ec0 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 15:48:10 +0300 Subject: [PATCH 07/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 9b2f148..0cb0ce8 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -10,3 +10,4 @@ CompilationAction 1475239372962 RomanNumerals.java CompilationAction 1475239541309 RomanNumerals.java EditAction 1475239658712 RomanNumerals.java 703 1 8 0 EditAction 1475239668135 RomanNumerals.java 701 1 8 0 +EditAction 1475239690746 RomanNumerals.java 702 1 8 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 2723a1d..2261f03 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -7,9 +7,9 @@ public int convertToInteger(String romanNum) { if (romanNum == "") return 0; if (romanNum.startsWith("M")) return 1000 + convertToInteger(romanNum.replace("M", "")); if (romanNum.startsWith("CM")) return 900 + convertToInteger(romanNum.replace("CM", "")); - if (romanNum.startsWith("C")) return 500 + convertToInteger(romanNum.replace("M", "")); - if (romanNum.startsWith("CD")) return 400 + convertToInteger(romanNum.replace("M", "")); - if (romanNum.startsWith("C")) return 100 + convertToInteger(romanNum.replace("M", "")); + if (romanNum.startsWith("D")) return 500 + convertToInteger(romanNum.replace("D", "")); + if (romanNum.startsWith("CD")) return 400 + convertToInteger(romanNum.replace("CD", "")); + if (romanNum.startsWith("C")) return 100 + convertToInteger(romanNum.replace("C", "")); if (romanNum.startsWith("CX")) return 90 + convertToInteger(romanNum.replace("M", "")); return 0; From 7bdcb9d44b9dc4bf5d71e6f4f848e5bc5814a008 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 15:49:00 +0300 Subject: [PATCH 08/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 0cb0ce8..b34720c 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -11,3 +11,4 @@ CompilationAction 1475239541309 RomanNumerals.java EditAction 1475239658712 RomanNumerals.java 703 1 8 0 EditAction 1475239668135 RomanNumerals.java 701 1 8 0 EditAction 1475239690746 RomanNumerals.java 702 1 8 0 +EditAction 1475239740556 RomanNumerals.java 706 1 8 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 2261f03..744b448 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -10,7 +10,8 @@ public int convertToInteger(String romanNum) { if (romanNum.startsWith("D")) return 500 + convertToInteger(romanNum.replace("D", "")); if (romanNum.startsWith("CD")) return 400 + convertToInteger(romanNum.replace("CD", "")); if (romanNum.startsWith("C")) return 100 + convertToInteger(romanNum.replace("C", "")); - if (romanNum.startsWith("CX")) return 90 + convertToInteger(romanNum.replace("M", "")); + if (romanNum.startsWith("CX")) return 90 + convertToInteger(romanNum.replace("CX", "")); + return 0; } From a770111cd891232de8ece3ca131eb4a441c486ee Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 15:50:00 +0300 Subject: [PATCH 09/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 3 +++ src/RomanNumerals.java | 9 +-------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index b34720c..e192435 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -12,3 +12,6 @@ EditAction 1475239658712 RomanNumerals.java 703 1 8 0 EditAction 1475239668135 RomanNumerals.java 701 1 8 0 EditAction 1475239690746 RomanNumerals.java 702 1 8 0 EditAction 1475239740556 RomanNumerals.java 706 1 8 0 +FileOpenedAction 1475239772063 BowlingException.java 58 0 0 0 +FileOpenedAction 1475239790324 RomanNumerals.java 706 1 8 0 +EditAction 1475239800279 RomanNumerals.java 126 1 1 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 744b448..2bbd389 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -4,14 +4,7 @@ public class RomanNumerals { String romanNum = ""; public int convertToInteger(String romanNum) { - if (romanNum == "") return 0; - if (romanNum.startsWith("M")) return 1000 + convertToInteger(romanNum.replace("M", "")); - if (romanNum.startsWith("CM")) return 900 + convertToInteger(romanNum.replace("CM", "")); - if (romanNum.startsWith("D")) return 500 + convertToInteger(romanNum.replace("D", "")); - if (romanNum.startsWith("CD")) return 400 + convertToInteger(romanNum.replace("CD", "")); - if (romanNum.startsWith("C")) return 100 + convertToInteger(romanNum.replace("C", "")); - if (romanNum.startsWith("CX")) return 90 + convertToInteger(romanNum.replace("CX", "")); - + return 0; } From caead9ac3dc040ee9fbe1c0e19a067ef813b0bea Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 15:53:02 +0300 Subject: [PATCH 10/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 2 ++ src/RomanNumerals.java | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index e192435..9a9194a 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -15,3 +15,5 @@ EditAction 1475239740556 RomanNumerals.java 706 1 8 0 FileOpenedAction 1475239772063 BowlingException.java 58 0 0 0 FileOpenedAction 1475239790324 RomanNumerals.java 706 1 8 0 EditAction 1475239800279 RomanNumerals.java 126 1 1 0 +RefactoringAction 1475239938345 RomanNumerals.java REMOVE romanNum FIELD +EditAction 1475239982282 RomanNumerals.java 140 1 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 2bbd389..b8773db 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -1,11 +1,12 @@ public class RomanNumerals { - String romanNum = ""; + public int convertToInteger(String romanNum) { - + if (romanNum == "I"){ + return 1; + } return 0; - } } From 0446915300975b8130be3c98f57fb94403a34b0d Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 15:56:45 +0300 Subject: [PATCH 11/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 9a9194a..9dd8a26 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -17,3 +17,4 @@ FileOpenedAction 1475239790324 RomanNumerals.java 706 1 8 0 EditAction 1475239800279 RomanNumerals.java 126 1 1 0 RefactoringAction 1475239938345 RomanNumerals.java REMOVE romanNum FIELD EditAction 1475239982282 RomanNumerals.java 140 1 2 0 +EditAction 1475240204993 RomanNumerals.java 225 1 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index b8773db..0b5d8e8 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -6,6 +6,10 @@ public class RomanNumerals { public int convertToInteger(String romanNum) { if (romanNum == "I"){ return 1; + }else if (romanNum == "IV"){ + return 4; + }else if (romanNum == "V"){ + return 5; } return 0; } From 91c6c47fbc4e24675867b0d53af48b98c8a932a9 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:01:36 +0300 Subject: [PATCH 12/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 3 +++ src/RomanNumerals.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 9dd8a26..5dbd37a 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -18,3 +18,6 @@ EditAction 1475239800279 RomanNumerals.java 126 1 1 0 RefactoringAction 1475239938345 RomanNumerals.java REMOVE romanNum FIELD EditAction 1475239982282 RomanNumerals.java 140 1 2 0 EditAction 1475240204993 RomanNumerals.java 225 1 2 0 +FileOpenedAction 1475240374390 BowlingGame.java 698 4 2 0 +FileOpenedAction 1475240389382 SudokuVerifier.java 1493 4 6 0 +EditAction 1475240496164 RomanNumerals.java 261 1 0 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 0b5d8e8..3ad9023 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -6,11 +6,11 @@ public class RomanNumerals { public int convertToInteger(String romanNum) { if (romanNum == "I"){ return 1; - }else if (romanNum == "IV"){ + }else if (romanNum.contains("IV") == true){ return 4; }else if (romanNum == "V"){ return 5; - } + }else if (romanNum ==) return 0; } } From 6ae04477ab3589f0ecf13c0f5b0e7c197945605c Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:04:49 +0300 Subject: [PATCH 13/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 3 +++ src/RomanNumerals.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 5dbd37a..5b50536 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -21,3 +21,6 @@ EditAction 1475240204993 RomanNumerals.java 225 1 2 0 FileOpenedAction 1475240374390 BowlingGame.java 698 4 2 0 FileOpenedAction 1475240389382 SudokuVerifier.java 1493 4 6 0 EditAction 1475240496164 RomanNumerals.java 261 1 0 0 +CompilationAction 1475240496337 RomanNumerals.java +CompilationAction 1475240673040 RomanNumerals.java +EditAction 1475240689959 RomanNumerals.java 274 1 0 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 3ad9023..fb5df05 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -4,10 +4,10 @@ public class RomanNumerals { public int convertToInteger(String romanNum) { - if (romanNum == "I"){ + if (romanNum.contains("I")==true){ return 1; - }else if (romanNum.contains("IV") == true){ - return 4; + }else if (romanNum.contains("II") == true){ + return 2; }else if (romanNum == "V"){ return 5; }else if (romanNum ==) From ce02e0eec730c288554a86ae3ee8be9cf3b59b47 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:05:58 +0300 Subject: [PATCH 14/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 5 +++++ src/RomanNumerals.java | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 5b50536..a326524 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -24,3 +24,8 @@ EditAction 1475240496164 RomanNumerals.java 261 1 0 0 CompilationAction 1475240496337 RomanNumerals.java CompilationAction 1475240673040 RomanNumerals.java EditAction 1475240689959 RomanNumerals.java 274 1 0 0 +CompilationAction 1475240690202 RomanNumerals.java +CompilationAction 1475240722269 RomanNumerals.java +CompilationAction 1475240722426 RomanNumerals.java +CompilationAction 1475240751578 RomanNumerals.java +EditAction 1475240758859 RomanNumerals.java 328 1 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index fb5df05..08da80c 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -8,9 +8,11 @@ public int convertToInteger(String romanNum) { return 1; }else if (romanNum.contains("II") == true){ return 2; - }else if (romanNum == "V"){ - return 5; - }else if (romanNum ==) + }else if (romanNum.contains("III") == true){ + return 3; + }else if (romanNum.contains("IV") == true){ + return 4; + } return 0; } } From 2bd870bbde67418d97370532c12ab126ea6a94c0 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:09:27 +0300 Subject: [PATCH 15/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 2 ++ tests/TestRomanNumerals.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index a326524..99a4c46 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -29,3 +29,5 @@ CompilationAction 1475240722269 RomanNumerals.java CompilationAction 1475240722426 RomanNumerals.java CompilationAction 1475240751578 RomanNumerals.java EditAction 1475240758859 RomanNumerals.java 328 1 2 0 +FileOpenedAction 1475240824170 TestRomanNumerals.java 159 1 1 0 +EditAction 1475240967608 TestRomanNumerals.java 219 1 2 0 diff --git a/tests/TestRomanNumerals.java b/tests/TestRomanNumerals.java index 5d1de75..853adff 100644 --- a/tests/TestRomanNumerals.java +++ b/tests/TestRomanNumerals.java @@ -6,7 +6,9 @@ public class TestRomanNumerals { @Test public void test() { - fail("Not yet implemented"); + RomanNumerals roman = new RomanNumerals(); + int result = roman.convertToInteger("I"); } + } From 2800ab2308fb6ae1712fb0ee2307107822d214b5 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:10:36 +0300 Subject: [PATCH 16/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + tests/TestRomanNumerals.java | 1 + 2 files changed, 2 insertions(+) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 99a4c46..13dfd7c 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -31,3 +31,4 @@ CompilationAction 1475240751578 RomanNumerals.java EditAction 1475240758859 RomanNumerals.java 328 1 2 0 FileOpenedAction 1475240824170 TestRomanNumerals.java 159 1 1 0 EditAction 1475240967608 TestRomanNumerals.java 219 1 2 0 +EditAction 1475241036336 TestRomanNumerals.java 246 1 3 1 diff --git a/tests/TestRomanNumerals.java b/tests/TestRomanNumerals.java index 853adff..0ca74a1 100644 --- a/tests/TestRomanNumerals.java +++ b/tests/TestRomanNumerals.java @@ -8,6 +8,7 @@ public class TestRomanNumerals { public void test() { RomanNumerals roman = new RomanNumerals(); int result = roman.convertToInteger("I"); + assertEquals(1, result); } From 1980ad0f2a0cdac505a8d67116d7b8843b69e68a Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:11:15 +0300 Subject: [PATCH 17/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 7 +++++++ .besouro/20160930152921209/besouroEpisodes.txt | 13 +++++++++++++ .../20160930152921209/randomHeuristicEpisodes.txt | 1 + .besouro/20160930152921209/zorroEpisodes.txt | 1 + tests/TestRomanNumerals.java | 9 ++++++++- 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 13dfd7c..80e2b4e 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -32,3 +32,10 @@ EditAction 1475240758859 RomanNumerals.java 328 1 2 0 FileOpenedAction 1475240824170 TestRomanNumerals.java 159 1 1 0 EditAction 1475240967608 TestRomanNumerals.java 219 1 2 0 EditAction 1475241036336 TestRomanNumerals.java 246 1 3 1 +UnitTestCaseAction 1475241044692 TestRomanNumerals.java OK +UnitTestSessionAction 1475241044693 TestRomanNumerals.java OK +RefactoringAction 1475241060144 TestRomanNumerals.java ADD void test()/2 METHOD +RefactoringAction 1475241063157 TestRomanNumerals.java RENAME test()/2=>void test_() METHOD +RefactoringAction 1475241064171 TestRomanNumerals.java RENAME test_()=>void test_I() METHOD +RefactoringAction 1475241068184 TestRomanNumerals.java RENAME test()=>void test_II() METHOD +EditAction 1475241075958 TestRomanNumerals.java 402 2 6 2 diff --git a/.besouro/20160930152921209/besouroEpisodes.txt b/.besouro/20160930152921209/besouroEpisodes.txt index e69de29..03b2e4a 100644 --- a/.besouro/20160930152921209/besouroEpisodes.txt +++ b/.besouro/20160930152921209/besouroEpisodes.txt @@ -0,0 +1,13 @@ +1475241044693 test-last 1 2483 false +1475241044694 test-last 1 2483 false +1475241044695 test-last 1 2483 false +1475241044696 test-last 1 2483 false +1475241044697 test-last 1 2483 false +1475241044698 test-last 1 2483 false +1475241044699 test-last 1 2483 false +1475241044700 test-last 1 2483 false +1475241044701 test-last 1 2483 false +1475241044702 test-last 1 2483 false +1475241044703 test-last 1 2483 false +1475241044704 test-last 1 2483 false +1475241044705 test-last 1 2483 false diff --git a/.besouro/20160930152921209/randomHeuristicEpisodes.txt b/.besouro/20160930152921209/randomHeuristicEpisodes.txt index e69de29..01dc503 100644 --- a/.besouro/20160930152921209/randomHeuristicEpisodes.txt +++ b/.besouro/20160930152921209/randomHeuristicEpisodes.txt @@ -0,0 +1 @@ +1475241044693 test-last 1 2483 false diff --git a/.besouro/20160930152921209/zorroEpisodes.txt b/.besouro/20160930152921209/zorroEpisodes.txt index e69de29..01dc503 100644 --- a/.besouro/20160930152921209/zorroEpisodes.txt +++ b/.besouro/20160930152921209/zorroEpisodes.txt @@ -0,0 +1 @@ +1475241044693 test-last 1 2483 false diff --git a/tests/TestRomanNumerals.java b/tests/TestRomanNumerals.java index 0ca74a1..73225af 100644 --- a/tests/TestRomanNumerals.java +++ b/tests/TestRomanNumerals.java @@ -5,11 +5,18 @@ public class TestRomanNumerals { @Test - public void test() { + public void test_I() { RomanNumerals roman = new RomanNumerals(); int result = roman.convertToInteger("I"); assertEquals(1, result); } + @Test + public void test_II() { + RomanNumerals roman = new RomanNumerals(); + int result = roman.convertToInteger("II"); + assertEquals(2, result); + } + } From 33950e99697e6c4d0fd0b093918abc695df74272 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:14:42 +0300 Subject: [PATCH 18/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 5 +++++ tests/TestRomanNumerals.java | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 80e2b4e..35da1b5 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -39,3 +39,8 @@ RefactoringAction 1475241063157 TestRomanNumerals.java RENAME test()/2=>void tes RefactoringAction 1475241064171 TestRomanNumerals.java RENAME test_()=>void test_I() METHOD RefactoringAction 1475241068184 TestRomanNumerals.java RENAME test()=>void test_II() METHOD EditAction 1475241075958 TestRomanNumerals.java 402 2 6 2 +UnitTestCaseAction 1475241077976 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475241077976 TestRomanNumerals.java FAIL +RefactoringAction 1475241185733 TestRomanNumerals.java ADD void test_II()/2 METHOD +RefactoringAction 1475241190247 TestRomanNumerals.java RENAME test_II()/2=>void test_spike() METHOD +EditAction 1475241282883 TestRomanNumerals.java 547 3 9 3 diff --git a/tests/TestRomanNumerals.java b/tests/TestRomanNumerals.java index 73225af..e4f4920 100644 --- a/tests/TestRomanNumerals.java +++ b/tests/TestRomanNumerals.java @@ -17,6 +17,13 @@ public void test_II() { assertEquals(2, result); } + @Test + public void test_spike() { + RomanNumerals roman = new RomanNumerals(); + String ii = "II"; + + assertEquals("I", ii.substring(0, 1)); + } } From 35593ae1a921576b60218af57b8ab197201f5c0f Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:14:48 +0300 Subject: [PATCH 19/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 1 + 2 files changed, 2 insertions(+) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 35da1b5..c64409c 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -44,3 +44,4 @@ UnitTestSessionAction 1475241077976 TestRomanNumerals.java FAIL RefactoringAction 1475241185733 TestRomanNumerals.java ADD void test_II()/2 METHOD RefactoringAction 1475241190247 TestRomanNumerals.java RENAME test_II()/2=>void test_spike() METHOD EditAction 1475241282883 TestRomanNumerals.java 547 3 9 3 +EditAction 1475241288372 RomanNumerals.java 340 1 0 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 08da80c..92aadcd 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -12,6 +12,7 @@ public int convertToInteger(String romanNum) { return 3; }else if (romanNum.contains("IV") == true){ return 4; + romanNum. } return 0; } From f3c12ee089ac001b53986dbe8926f067169d434e Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:15:25 +0300 Subject: [PATCH 20/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 7 +++++++ src/RomanNumerals.java | 1 - tests/TestRomanNumerals.java | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index c64409c..4ef5a88 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -45,3 +45,10 @@ RefactoringAction 1475241185733 TestRomanNumerals.java ADD void test_II()/2 METH RefactoringAction 1475241190247 TestRomanNumerals.java RENAME test_II()/2=>void test_spike() METHOD EditAction 1475241282883 TestRomanNumerals.java 547 3 9 3 EditAction 1475241288372 RomanNumerals.java 340 1 0 0 +CompilationAction 1475241288439 RomanNumerals.java +UnitTestCaseAction 1475241290331 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475241290331 TestRomanNumerals.java FAIL +CompilationAction 1475241301754 RomanNumerals.java +UnitTestCaseAction 1475241305163 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475241305163 TestRomanNumerals.java FAIL +EditAction 1475241325210 TestRomanNumerals.java 590 3 10 4 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 92aadcd..08da80c 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -12,7 +12,6 @@ public int convertToInteger(String romanNum) { return 3; }else if (romanNum.contains("IV") == true){ return 4; - romanNum. } return 0; } diff --git a/tests/TestRomanNumerals.java b/tests/TestRomanNumerals.java index e4f4920..a337411 100644 --- a/tests/TestRomanNumerals.java +++ b/tests/TestRomanNumerals.java @@ -23,6 +23,7 @@ public void test_spike() { String ii = "II"; assertEquals("I", ii.substring(0, 1)); + assertEquals("I", ii.substring(1, 2)); } From b1e32bd2bcb903b3dc0b3bd7f891e26937bfb9da Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:17:24 +0300 Subject: [PATCH 21/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 3 +++ src/RomanNumerals.java | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 4ef5a88..2395903 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -52,3 +52,6 @@ CompilationAction 1475241301754 RomanNumerals.java UnitTestCaseAction 1475241305163 TestRomanNumerals.java FAIL UnitTestSessionAction 1475241305163 TestRomanNumerals.java FAIL EditAction 1475241325210 TestRomanNumerals.java 590 3 10 4 +UnitTestCaseAction 1475241330880 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475241330881 TestRomanNumerals.java FAIL +EditAction 1475241444526 RomanNumerals.java 303 1 0 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 08da80c..f6738bf 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -4,10 +4,10 @@ public class RomanNumerals { public int convertToInteger(String romanNum) { - if (romanNum.contains("I")==true){ - return 1; - }else if (romanNum.contains("II") == true){ - return 2; + if (romanNum == "I"){ + return 1; + }else if (romanNum == ("II"){ + return 2; }else if (romanNum.contains("III") == true){ return 3; }else if (romanNum.contains("IV") == true){ From 5ce058800b3582182644b78d503b3138bb03b6c3 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:17:39 +0300 Subject: [PATCH 22/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 4 ++++ src/RomanNumerals.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 2395903..87dd279 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -55,3 +55,7 @@ EditAction 1475241325210 TestRomanNumerals.java 590 3 10 4 UnitTestCaseAction 1475241330880 TestRomanNumerals.java FAIL UnitTestSessionAction 1475241330881 TestRomanNumerals.java FAIL EditAction 1475241444526 RomanNumerals.java 303 1 0 0 +CompilationAction 1475241444759 RomanNumerals.java +CompilationAction 1475241453026 RomanNumerals.java +CompilationAction 1475241453191 RomanNumerals.java +EditAction 1475241459663 RomanNumerals.java 303 1 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index f6738bf..6c74491 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -6,7 +6,7 @@ public class RomanNumerals { public int convertToInteger(String romanNum) { if (romanNum == "I"){ return 1; - }else if (romanNum == ("II"){ + }else if (romanNum == "II") { return 2; }else if (romanNum.contains("III") == true){ return 3; From 8628f9f510a8c4f565b1be818ddc37525c3862dd Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:18:04 +0300 Subject: [PATCH 23/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 87dd279..1158fb9 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -59,3 +59,4 @@ CompilationAction 1475241444759 RomanNumerals.java CompilationAction 1475241453026 RomanNumerals.java CompilationAction 1475241453191 RomanNumerals.java EditAction 1475241459663 RomanNumerals.java 303 1 2 0 +EditAction 1475241484480 RomanNumerals.java 288 1 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 6c74491..2280e82 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -8,7 +8,7 @@ public int convertToInteger(String romanNum) { return 1; }else if (romanNum == "II") { return 2; - }else if (romanNum.contains("III") == true){ + }else if (romanNum == "III"){ return 3; }else if (romanNum.contains("IV") == true){ return 4; From dc599a27332551867fec6079ce373c0db599efcc Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:18:15 +0300 Subject: [PATCH 24/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 1158fb9..2f8e1cf 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -60,3 +60,4 @@ CompilationAction 1475241453026 RomanNumerals.java CompilationAction 1475241453191 RomanNumerals.java EditAction 1475241459663 RomanNumerals.java 303 1 2 0 EditAction 1475241484480 RomanNumerals.java 288 1 2 0 +EditAction 1475241495010 RomanNumerals.java 290 1 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 2280e82..795cee8 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -9,9 +9,9 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "II") { return 2; }else if (romanNum == "III"){ - return 3; + return 3; }else if (romanNum.contains("IV") == true){ - return 4; + return 4; } return 0; } From ed887df77ddb02f44afc961e4ca5a91a63bce0d0 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:18:31 +0300 Subject: [PATCH 25/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 2f8e1cf..073fa9b 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -61,3 +61,4 @@ CompilationAction 1475241453191 RomanNumerals.java EditAction 1475241459663 RomanNumerals.java 303 1 2 0 EditAction 1475241484480 RomanNumerals.java 288 1 2 0 EditAction 1475241495010 RomanNumerals.java 290 1 2 0 +EditAction 1475241511715 RomanNumerals.java 276 1 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 795cee8..f5d2177 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -10,7 +10,7 @@ public int convertToInteger(String romanNum) { return 2; }else if (romanNum == "III"){ return 3; - }else if (romanNum.contains("IV") == true){ + }else if (romanNum == "IV"){ return 4; } return 0; From 5008310d5af82d2d0303253b43a6a9bcca0e5b7c Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:22:49 +0300 Subject: [PATCH 26/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 11 +++ .../20160930152921209/besouroEpisodes.txt | 80 +++++++++++++++++++ .../randomHeuristicEpisodes.txt | 3 + .besouro/20160930152921209/zorroEpisodes.txt | 3 + src/RomanNumerals.java | 12 +++ tests/TestRomanNumerals.java | 15 ++++ 6 files changed, 124 insertions(+) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 073fa9b..ecb58d8 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -62,3 +62,14 @@ EditAction 1475241459663 RomanNumerals.java 303 1 2 0 EditAction 1475241484480 RomanNumerals.java 288 1 2 0 EditAction 1475241495010 RomanNumerals.java 290 1 2 0 EditAction 1475241511715 RomanNumerals.java 276 1 2 0 +UnitTestCaseAction 1475241516848 TestRomanNumerals.java OK +UnitTestSessionAction 1475241516849 TestRomanNumerals.java OK +RefactoringAction 1475241592279 TestRomanNumerals.java ADD void test_II()/2 METHOD +RefactoringAction 1475241596792 TestRomanNumerals.java RENAME test_II()/2=>void test_III() METHOD +UnitTestCaseAction 1475241607331 TestRomanNumerals.java OK +UnitTestSessionAction 1475241607332 TestRomanNumerals.java OK +RefactoringAction 1475241617864 TestRomanNumerals.java ADD void test_II()/2 METHOD +RefactoringAction 1475241623375 TestRomanNumerals.java RENAME test_II()/2=>void test_IV() METHOD +UnitTestCaseAction 1475241634348 TestRomanNumerals.java OK +UnitTestSessionAction 1475241634348 TestRomanNumerals.java OK +EditAction 1475241769372 RomanNumerals.java 542 1 2 0 diff --git a/.besouro/20160930152921209/besouroEpisodes.txt b/.besouro/20160930152921209/besouroEpisodes.txt index 03b2e4a..2b20060 100644 --- a/.besouro/20160930152921209/besouroEpisodes.txt +++ b/.besouro/20160930152921209/besouroEpisodes.txt @@ -11,3 +11,83 @@ 1475241044703 test-last 1 2483 false 1475241044704 test-last 1 2483 false 1475241044705 test-last 1 2483 false +1475241516849 test-first 3 456 true +1475241516850 test-first 3 456 true +1475241516851 test-first 3 456 true +1475241516852 test-first 3 456 true +1475241516853 test-first 3 456 true +1475241516854 test-first 3 456 true +1475241516855 test-first 3 456 true +1475241516856 test-first 3 456 true +1475241516857 test-first 3 456 true +1475241516858 test-first 3 456 true +1475241516859 test-first 3 456 true +1475241516860 test-first 3 456 true +1475241516861 test-first 3 456 true +1475241516862 test-first 3 456 true +1475241516863 test-first 3 456 true +1475241516864 test-first 3 456 true +1475241516865 test-first 3 456 true +1475241516866 test-first 3 456 true +1475241516867 test-first 3 456 true +1475241516868 test-last 1 456 false +1475241516869 test-first 3 456 true +1475241516870 test-first 3 456 true +1475241516871 test-first 3 456 true +1475241516872 test-first 3 456 true +1475241516873 test-first 3 456 true +1475241516874 test-first 3 456 true +1475241516875 test-first 3 456 true +1475241516876 test-first 3 456 true +1475241516877 test-first 3 456 true +1475241516878 test-first 3 456 true +1475241516879 test-first 3 456 true +1475241516880 test-first 3 456 true +1475241516881 test-first 3 456 true +1475241516882 test-first 3 456 true +1475241516883 test-first 3 456 true +1475241516884 test-first 3 456 true +1475241516885 test-first 3 456 true +1475241516886 test-first 3 456 true +1475241516887 test-first 3 456 true +1475241516888 test-first 3 456 true +1475241516889 test-first 3 456 true +1475241516890 test-first 3 456 true +1475241516891 test-first 3 456 true +1475241516892 test-first 3 456 true +1475241516893 test-first 3 456 true +1475241516894 test-first 3 456 true +1475241516895 test-first 3 456 true +1475241516896 test-first 3 456 true +1475241516897 test-first 3 456 true +1475241516898 test-first 3 456 true +1475241516899 test-first 3 456 true +1475241516900 test-first 3 456 true +1475241516901 test-first 3 456 true +1475241516902 test-first 3 456 true +1475241516903 test-first 3 456 true +1475241516904 test-first 3 456 true +1475241516905 test-first 3 456 true +1475241516906 test-first 3 456 true +1475241516907 test-first 3 456 true +1475241516908 test-first 3 456 true +1475241516909 test-first 3 456 true +1475241516910 test-first 3 456 true +1475241516911 test-first 3 456 true +1475241516912 test-first 3 456 true +1475241516913 test-first 3 456 true +1475241516914 test-first 3 456 true +1475241516915 test-first 3 456 true +1475241516916 test-first 3 456 true +1475241516917 test-first 3 456 true +1475241516918 test-first 3 456 true +1475241516919 test-first 3 456 true +1475241516920 test-first 3 456 true +1475241516921 test-first 3 456 true +1475241516922 test-first 3 456 true +1475241516923 test-first 3 456 true +1475241516924 test-first 3 456 true +1475241516925 test-first 3 456 true +1475241516926 test-first 3 456 true +1475241607332 test-addition 1 15 true +1475241634348 test-addition 1 16 true diff --git a/.besouro/20160930152921209/randomHeuristicEpisodes.txt b/.besouro/20160930152921209/randomHeuristicEpisodes.txt index 01dc503..68fa689 100644 --- a/.besouro/20160930152921209/randomHeuristicEpisodes.txt +++ b/.besouro/20160930152921209/randomHeuristicEpisodes.txt @@ -1 +1,4 @@ 1475241044693 test-last 1 2483 false +1475241516849 test-first 3 456 true +1475241607332 test-addition 1 15 true +1475241634348 test-addition 1 16 true diff --git a/.besouro/20160930152921209/zorroEpisodes.txt b/.besouro/20160930152921209/zorroEpisodes.txt index 01dc503..baae981 100644 --- a/.besouro/20160930152921209/zorroEpisodes.txt +++ b/.besouro/20160930152921209/zorroEpisodes.txt @@ -1 +1,4 @@ 1475241044693 test-last 1 2483 false +1475241516849 test-first 3 472 true +1475241607332 test-addition 1 90 true +1475241634348 test-addition 1 27 true diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index f5d2177..ba6d3be 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -12,6 +12,18 @@ public int convertToInteger(String romanNum) { return 3; }else if (romanNum == "IV"){ return 4; + }else if (romanNum == "V"){ + return 5; + }else if (romanNum == "VI"){ + return 6; + }else if (romanNum == "VII"){ + return 7; + }else if (romanNum == "VIII"){ + return 8; + }else if (romanNum == "IX"){ + return 9; + }else if (romanNum == "X"){ + return 10; } return 0; } diff --git a/tests/TestRomanNumerals.java b/tests/TestRomanNumerals.java index a337411..2d43259 100644 --- a/tests/TestRomanNumerals.java +++ b/tests/TestRomanNumerals.java @@ -16,6 +16,21 @@ public void test_II() { int result = roman.convertToInteger("II"); assertEquals(2, result); } + + @Test + public void test_III() { + RomanNumerals roman = new RomanNumerals(); + int result = roman.convertToInteger("III"); + assertEquals(3, result); + } + @Test + public void test_IV() { + RomanNumerals roman = new RomanNumerals(); + int result = roman.convertToInteger("IV"); + assertEquals(4, result); + } + + @Test public void test_spike() { From 46d89c5e83b3fb8caf3f9cec58ed737045061d30 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:27:06 +0300 Subject: [PATCH 27/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 16 +++++++++ .../20160930152921209/besouroEpisodes.txt | 6 ++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20160930152921209/zorroEpisodes.txt | 1 + src/RomanNumerals.java | 6 ++++ tests/TestRomanNumerals.java | 36 +++++++++++++++++++ 6 files changed, 66 insertions(+) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index ecb58d8..b5ea26f 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -73,3 +73,19 @@ RefactoringAction 1475241623375 TestRomanNumerals.java RENAME test_II()/2=>void UnitTestCaseAction 1475241634348 TestRomanNumerals.java OK UnitTestSessionAction 1475241634348 TestRomanNumerals.java OK EditAction 1475241769372 RomanNumerals.java 542 1 2 0 +RefactoringAction 1475241779941 TestRomanNumerals.java ADD void test_II()/2 METHOD +RefactoringAction 1475241781957 TestRomanNumerals.java ADD void test_II()/3 METHOD +RefactoringAction 1475241781957 TestRomanNumerals.java ADD void test_II()/4 METHOD +RefactoringAction 1475241785975 TestRomanNumerals.java RENAME test_II()/4=>void test_V() METHOD +RefactoringAction 1475241797504 TestRomanNumerals.java RENAME test_II()/3=>void test_V()/2 METHOD +RefactoringAction 1475241798518 TestRomanNumerals.java RENAME test_V()/2=>void test_VI() METHOD +RefactoringAction 1475241810060 TestRomanNumerals.java RENAME test_II()/2=>void test_VII() METHOD +RefactoringAction 1475241825097 TestRomanNumerals.java ADD void test_II()/2 METHOD +RefactoringAction 1475241831610 TestRomanNumerals.java RENAME test_II()/2=>void test_VIII() METHOD +RefactoringAction 1475241844165 TestRomanNumerals.java ADD void test_II()/2 METHOD +RefactoringAction 1475241849179 TestRomanNumerals.java RENAME test_II()/2=>void test_IX() METHOD +RefactoringAction 1475241865718 TestRomanNumerals.java ADD void test_II()/2 METHOD +RefactoringAction 1475241871231 TestRomanNumerals.java RENAME test_II()/2=>void test_X() METHOD +UnitTestCaseAction 1475241918965 TestRomanNumerals.java OK +UnitTestSessionAction 1475241918966 TestRomanNumerals.java OK +EditAction 1475242026534 RomanNumerals.java 678 1 2 0 diff --git a/.besouro/20160930152921209/besouroEpisodes.txt b/.besouro/20160930152921209/besouroEpisodes.txt index 2b20060..f563761 100644 --- a/.besouro/20160930152921209/besouroEpisodes.txt +++ b/.besouro/20160930152921209/besouroEpisodes.txt @@ -91,3 +91,9 @@ 1475241516926 test-first 3 456 true 1475241607332 test-addition 1 15 true 1475241634348 test-addition 1 16 true +1475241918966 test-last 1 149 false +1475241918967 test-last 1 149 false +1475241918968 test-last 1 149 false +1475241918969 test-last 1 149 false +1475241918970 test-last 1 149 false +1475241918971 test-last 1 149 false diff --git a/.besouro/20160930152921209/randomHeuristicEpisodes.txt b/.besouro/20160930152921209/randomHeuristicEpisodes.txt index 68fa689..f39e3c7 100644 --- a/.besouro/20160930152921209/randomHeuristicEpisodes.txt +++ b/.besouro/20160930152921209/randomHeuristicEpisodes.txt @@ -2,3 +2,4 @@ 1475241516849 test-first 3 456 true 1475241607332 test-addition 1 15 true 1475241634348 test-addition 1 16 true +1475241918966 test-last 1 149 false diff --git a/.besouro/20160930152921209/zorroEpisodes.txt b/.besouro/20160930152921209/zorroEpisodes.txt index baae981..a26f575 100644 --- a/.besouro/20160930152921209/zorroEpisodes.txt +++ b/.besouro/20160930152921209/zorroEpisodes.txt @@ -2,3 +2,4 @@ 1475241516849 test-first 3 472 true 1475241607332 test-addition 1 90 true 1475241634348 test-addition 1 27 true +1475241918966 test-last 1 284 false diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index ba6d3be..18e9c6f 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -24,6 +24,12 @@ public int convertToInteger(String romanNum) { return 9; }else if (romanNum == "X"){ return 10; + }else if (romanNum == "XX"){ + return 20; + }else if (romanNum == "XXX"){ + return 30; + }else if (romanNum == "XL"){ + return 40; } return 0; } diff --git a/tests/TestRomanNumerals.java b/tests/TestRomanNumerals.java index 2d43259..6b8526e 100644 --- a/tests/TestRomanNumerals.java +++ b/tests/TestRomanNumerals.java @@ -29,6 +29,42 @@ public void test_IV() { int result = roman.convertToInteger("IV"); assertEquals(4, result); } + @Test + public void test_V() { + RomanNumerals roman = new RomanNumerals(); + int result = roman.convertToInteger("V"); + assertEquals(5, result); + } + @Test + public void test_VI() { + RomanNumerals roman = new RomanNumerals(); + int result = roman.convertToInteger("VI"); + assertEquals(6, result); + } + @Test + public void test_VII() { + RomanNumerals roman = new RomanNumerals(); + int result = roman.convertToInteger("VII"); + assertEquals(7, result); + } + @Test + public void test_VIII() { + RomanNumerals roman = new RomanNumerals(); + int result = roman.convertToInteger("VIII"); + assertEquals(8, result); + } + @Test + public void test_IX() { + RomanNumerals roman = new RomanNumerals(); + int result = roman.convertToInteger("IX"); + assertEquals(9, result); + } + @Test + public void test_X() { + RomanNumerals roman = new RomanNumerals(); + int result = roman.convertToInteger("X"); + assertEquals(10, result); + } From 5d313fe6dab74ffc3b469e6c69f0607ce1e2014f Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:27:35 +0300 Subject: [PATCH 28/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index b5ea26f..b82a1ac 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -89,3 +89,4 @@ RefactoringAction 1475241871231 TestRomanNumerals.java RENAME test_II()/2=>void UnitTestCaseAction 1475241918965 TestRomanNumerals.java OK UnitTestSessionAction 1475241918966 TestRomanNumerals.java OK EditAction 1475242026534 RomanNumerals.java 678 1 2 0 +EditAction 1475242055444 RomanNumerals.java 722 1 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 18e9c6f..3ed368f 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -30,6 +30,8 @@ public int convertToInteger(String romanNum) { return 30; }else if (romanNum == "XL"){ return 40; + }else if (romanNum == "L"){ + return 50; } return 0; } From 0d1f59e9c1e29560f942f7eef8c2cf8304372bcf Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:28:00 +0300 Subject: [PATCH 29/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index b82a1ac..fb5216d 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -90,3 +90,4 @@ UnitTestCaseAction 1475241918965 TestRomanNumerals.java OK UnitTestSessionAction 1475241918966 TestRomanNumerals.java OK EditAction 1475242026534 RomanNumerals.java 678 1 2 0 EditAction 1475242055444 RomanNumerals.java 722 1 2 0 +EditAction 1475242080590 RomanNumerals.java 767 1 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 3ed368f..d1761d4 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -32,6 +32,8 @@ public int convertToInteger(String romanNum) { return 40; }else if (romanNum == "L"){ return 50; + }else if (romanNum == "LX"){ + return 60; } return 0; } From c534fe8850d52f042e32e81a93a1e742de389085 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:28:24 +0300 Subject: [PATCH 30/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index fb5216d..392df33 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -91,3 +91,4 @@ UnitTestSessionAction 1475241918966 TestRomanNumerals.java OK EditAction 1475242026534 RomanNumerals.java 678 1 2 0 EditAction 1475242055444 RomanNumerals.java 722 1 2 0 EditAction 1475242080590 RomanNumerals.java 767 1 2 0 +EditAction 1475242104863 RomanNumerals.java 812 1 0 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index d1761d4..5cc4acd 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -34,6 +34,8 @@ public int convertToInteger(String romanNum) { return 50; }else if (romanNum == "LX"){ return 60; + }else if (romanNum == "LXX"){ + return 70 } return 0; } From 297ff12740a0373a3a5dd6627f4bd1f58a5db902 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:28:44 +0300 Subject: [PATCH 31/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 2 ++ src/RomanNumerals.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 392df33..9fdb30e 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -92,3 +92,5 @@ EditAction 1475242026534 RomanNumerals.java 678 1 2 0 EditAction 1475242055444 RomanNumerals.java 722 1 2 0 EditAction 1475242080590 RomanNumerals.java 767 1 2 0 EditAction 1475242104863 RomanNumerals.java 812 1 0 0 +CompilationAction 1475242105100 RomanNumerals.java +EditAction 1475242124887 RomanNumerals.java 860 1 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 5cc4acd..678b9ad 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -35,7 +35,9 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "LX"){ return 60; }else if (romanNum == "LXX"){ - return 70 + return 70; + }else if (romanNum == "LXXX"){ + return 80; } return 0; } From c1d0e135c01425533df80c1aa068f5f0db52204d Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:29:26 +0300 Subject: [PATCH 32/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 9fdb30e..d6392c2 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -94,3 +94,4 @@ EditAction 1475242080590 RomanNumerals.java 767 1 2 0 EditAction 1475242104863 RomanNumerals.java 812 1 0 0 CompilationAction 1475242105100 RomanNumerals.java EditAction 1475242124887 RomanNumerals.java 860 1 2 0 +EditAction 1475242166313 RomanNumerals.java 945 1 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 678b9ad..6b3af35 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -38,7 +38,10 @@ public int convertToInteger(String romanNum) { return 70; }else if (romanNum == "LXXX"){ return 80; - } + }else if (romanNum == "XC"){ + return 90; + }else if (romanNum == "C") + return 100; return 0; } } From 8fb5c3910ba30fb2cbba58dd76d5f86b45509196 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:29:47 +0300 Subject: [PATCH 33/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index d6392c2..4bbee9f 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -95,3 +95,4 @@ EditAction 1475242104863 RomanNumerals.java 812 1 0 0 CompilationAction 1475242105100 RomanNumerals.java EditAction 1475242124887 RomanNumerals.java 860 1 2 0 EditAction 1475242166313 RomanNumerals.java 945 1 2 0 +EditAction 1475242187738 RomanNumerals.java 950 1 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 6b3af35..281de79 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -40,8 +40,9 @@ public int convertToInteger(String romanNum) { return 80; }else if (romanNum == "XC"){ return 90; - }else if (romanNum == "C") + }else if (romanNum == "C"){ return 100; + } return 0; } } From 251b636c6a67024cdd5bfc563c57b48b7e6c271e Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:30:18 +0300 Subject: [PATCH 34/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 4bbee9f..e6a3a34 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -96,3 +96,4 @@ CompilationAction 1475242105100 RomanNumerals.java EditAction 1475242124887 RomanNumerals.java 860 1 2 0 EditAction 1475242166313 RomanNumerals.java 945 1 2 0 EditAction 1475242187738 RomanNumerals.java 950 1 2 0 +EditAction 1475242218230 RomanNumerals.java 996 1 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 281de79..18a1694 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -42,6 +42,8 @@ public int convertToInteger(String romanNum) { return 90; }else if (romanNum == "C"){ return 100; + }else if (romanNum == "CC"){ + return 200; } return 0; } From c7e8878d728bf427017eb7b8254304f19101399a Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:30:59 +0300 Subject: [PATCH 35/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index e6a3a34..0fb2e5b 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -97,3 +97,4 @@ EditAction 1475242124887 RomanNumerals.java 860 1 2 0 EditAction 1475242166313 RomanNumerals.java 945 1 2 0 EditAction 1475242187738 RomanNumerals.java 950 1 2 0 EditAction 1475242218230 RomanNumerals.java 996 1 2 0 +EditAction 1475242259661 RomanNumerals.java 1043 1 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 18a1694..1d3872b 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -44,6 +44,8 @@ public int convertToInteger(String romanNum) { return 100; }else if (romanNum == "CC"){ return 200; + }else if (romanNum == "CCC"){ + return 300; } return 0; } From b8196b4886cbade17505a46d497e434de4ed6d05 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:31:54 +0300 Subject: [PATCH 36/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 0fb2e5b..c9a671b 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -98,3 +98,4 @@ EditAction 1475242166313 RomanNumerals.java 945 1 2 0 EditAction 1475242187738 RomanNumerals.java 950 1 2 0 EditAction 1475242218230 RomanNumerals.java 996 1 2 0 EditAction 1475242259661 RomanNumerals.java 1043 1 2 0 +EditAction 1475242314548 RomanNumerals.java 1134 1 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 1d3872b..35f5da9 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -46,6 +46,10 @@ public int convertToInteger(String romanNum) { return 200; }else if (romanNum == "CCC"){ return 300; + }else if (romanNum == "CD"){ + return 400; + }else if (romanNum == "D"){ + return 500; } return 0; } From 96cf7f0d0e3c948e30ea144b945cc7539da0f793 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:32:25 +0300 Subject: [PATCH 37/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index c9a671b..71a54e9 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -99,3 +99,4 @@ EditAction 1475242187738 RomanNumerals.java 950 1 2 0 EditAction 1475242218230 RomanNumerals.java 996 1 2 0 EditAction 1475242259661 RomanNumerals.java 1043 1 2 0 EditAction 1475242314548 RomanNumerals.java 1134 1 2 0 +EditAction 1475242345119 RomanNumerals.java 1180 1 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 35f5da9..0de6cda 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -50,6 +50,8 @@ public int convertToInteger(String romanNum) { return 400; }else if (romanNum == "D"){ return 500; + }else if (romanNum == "DC"){ + return 600; } return 0; } From e4d3f23826cdb48f39fa97166124bb607e42e556 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:33:30 +0300 Subject: [PATCH 38/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 71a54e9..6bd014b 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -100,3 +100,4 @@ EditAction 1475242218230 RomanNumerals.java 996 1 2 0 EditAction 1475242259661 RomanNumerals.java 1043 1 2 0 EditAction 1475242314548 RomanNumerals.java 1134 1 2 0 EditAction 1475242345119 RomanNumerals.java 1180 1 2 0 +EditAction 1475242410644 RomanNumerals.java 1321 1 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 0de6cda..f597bde 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -52,6 +52,12 @@ public int convertToInteger(String romanNum) { return 500; }else if (romanNum == "DC"){ return 600; + }else if (romanNum == "DCC"){ + return 700; + }else if (romanNum == "DCCC"){ + return 800; + }else if (romanNum == "CM"){ + return 900; } return 0; } From bccab84098f630a4561bdc052bf3fc66cb6a5f11 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:34:25 +0300 Subject: [PATCH 39/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 6bd014b..c341f4f 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -101,3 +101,4 @@ EditAction 1475242259661 RomanNumerals.java 1043 1 2 0 EditAction 1475242314548 RomanNumerals.java 1134 1 2 0 EditAction 1475242345119 RomanNumerals.java 1180 1 2 0 EditAction 1475242410644 RomanNumerals.java 1321 1 2 0 +EditAction 1475242465941 RomanNumerals.java 1367 1 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index f597bde..4588739 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -58,6 +58,8 @@ public int convertToInteger(String romanNum) { return 800; }else if (romanNum == "CM"){ return 900; + }else if (romanNum == "M"){ + return 1000; } return 0; } From 908772c45687472e72cdf9ed51b220460abc49a5 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:36:02 +0300 Subject: [PATCH 40/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index c341f4f..7264ff3 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -102,3 +102,4 @@ EditAction 1475242314548 RomanNumerals.java 1134 1 2 0 EditAction 1475242345119 RomanNumerals.java 1180 1 2 0 EditAction 1475242410644 RomanNumerals.java 1321 1 2 0 EditAction 1475242465941 RomanNumerals.java 1367 1 2 0 +EditAction 1475242562798 RomanNumerals.java 1379 1 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 4588739..bf09528 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -7,9 +7,9 @@ public int convertToInteger(String romanNum) { if (romanNum == "I"){ return 1; }else if (romanNum == "II") { - return 2; + return 1 + 1; }else if (romanNum == "III"){ - return 3; + return 1 + 1 + 1; }else if (romanNum == "IV"){ return 4; }else if (romanNum == "V"){ From b9b500ad54857ff315821d9ae3132ffb52bcccce Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:37:51 +0300 Subject: [PATCH 41/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 5 +++++ src/RomanNumerals.java | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 7264ff3..1ee1a93 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -103,3 +103,8 @@ EditAction 1475242345119 RomanNumerals.java 1180 1 2 0 EditAction 1475242410644 RomanNumerals.java 1321 1 2 0 EditAction 1475242465941 RomanNumerals.java 1367 1 2 0 EditAction 1475242562798 RomanNumerals.java 1379 1 2 0 +RefactoringAction 1475242649368 RomanNumerals.java ADD int convert FIELD +RefactoringAction 1475242650879 RomanNumerals.java RENAME convert=>int convertOne FIELD +RefactoringAction 1475242658891 RomanNumerals.java RENAME convertOne=>int convertSingleRoman() METHOD +RefactoringAction 1475242663411 RomanNumerals.java RENAME convertSingleRoman()=>int convertSingleRoman(String) METHOD +EditAction 1475242671700 RomanNumerals.java 1441 2 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index bf09528..63fe172 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -11,7 +11,7 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "III"){ return 1 + 1 + 1; }else if (romanNum == "IV"){ - return 4; + return 5 - 1; }else if (romanNum == "V"){ return 5; }else if (romanNum == "VI"){ @@ -63,4 +63,9 @@ public int convertToInteger(String romanNum) { } return 0; } + + private int convertSingleRoman(String roman) { + + } + } From 1ee2e74889231ad0df2b9cb5b8b38c83aebfb1b2 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:38:25 +0300 Subject: [PATCH 42/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 2 ++ src/RomanNumerals.java | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 1ee1a93..719a637 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -108,3 +108,5 @@ RefactoringAction 1475242650879 RomanNumerals.java RENAME convert=>int convertOn RefactoringAction 1475242658891 RomanNumerals.java RENAME convertOne=>int convertSingleRoman() METHOD RefactoringAction 1475242663411 RomanNumerals.java RENAME convertSingleRoman()=>int convertSingleRoman(String) METHOD EditAction 1475242671700 RomanNumerals.java 1441 2 2 0 +CompilationAction 1475242671949 RomanNumerals.java +EditAction 1475242705805 RomanNumerals.java 1521 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 63fe172..562154a 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -65,7 +65,11 @@ public int convertToInteger(String romanNum) { } private int convertSingleRoman(String roman) { - + if (romanNum == "I") + return 1; + else if (romanNum == "V"){ + return 5; + } } From b71bbfa163afc800d314a53a43b17c0f80b00ebf Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:41:09 +0300 Subject: [PATCH 43/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 15 +++++++++++++++ src/RomanNumerals.java | 12 +++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 719a637..6b8b157 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -110,3 +110,18 @@ RefactoringAction 1475242663411 RomanNumerals.java RENAME convertSingleRoman()=> EditAction 1475242671700 RomanNumerals.java 1441 2 2 0 CompilationAction 1475242671949 RomanNumerals.java EditAction 1475242705805 RomanNumerals.java 1521 2 3 0 +CompilationAction 1475242706032 RomanNumerals.java +CompilationAction 1475242706032 RomanNumerals.java +CompilationAction 1475242729871 RomanNumerals.java +CompilationAction 1475242729871 RomanNumerals.java +CompilationAction 1475242730028 RomanNumerals.java +CompilationAction 1475242730029 RomanNumerals.java +CompilationAction 1475242749037 RomanNumerals.java +CompilationAction 1475242749038 RomanNumerals.java +CompilationAction 1475242749175 RomanNumerals.java +CompilationAction 1475242749176 RomanNumerals.java +CompilationAction 1475242765864 RomanNumerals.java +CompilationAction 1475242766018 RomanNumerals.java +CompilationAction 1475242791984 RomanNumerals.java +CompilationAction 1475242792138 RomanNumerals.java +EditAction 1475242869373 RomanNumerals.java 1659 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 562154a..b8c7464 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -5,7 +5,7 @@ public class RomanNumerals { public int convertToInteger(String romanNum) { if (romanNum == "I"){ - return 1; + return convertSingleRoman(romanNum); }else if (romanNum == "II") { return 1 + 1; }else if (romanNum == "III"){ @@ -65,10 +65,16 @@ public int convertToInteger(String romanNum) { } private int convertSingleRoman(String roman) { - if (romanNum == "I") + if (roman == "I") return 1; - else if (romanNum == "V"){ + else if (roman == "V") return 5; + else if (roman == "X") + return 10; + else if (roman == "L") + return 50; + else if (roman == "C") + return 100; } From b9f0baeecff0044f7f494590bcca211990144cdc Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:42:13 +0300 Subject: [PATCH 44/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 2 ++ src/RomanNumerals.java | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 6b8b157..fba55b8 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -125,3 +125,5 @@ CompilationAction 1475242766018 RomanNumerals.java CompilationAction 1475242791984 RomanNumerals.java CompilationAction 1475242792138 RomanNumerals.java EditAction 1475242869373 RomanNumerals.java 1659 2 3 0 +CompilationAction 1475242869579 RomanNumerals.java +EditAction 1475242933933 RomanNumerals.java 1760 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index b8c7464..0b02460 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -75,6 +75,12 @@ else if (roman == "L") return 50; else if (roman == "C") return 100; + else if (roman == "D") + return 500; + else if (roman == "M") + return 1000; + else + return 0; } From 16eeed3d939f7da61b47f206dcf9ffdf0d390156 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:42:39 +0300 Subject: [PATCH 45/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index fba55b8..c84834f 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -127,3 +127,4 @@ CompilationAction 1475242792138 RomanNumerals.java EditAction 1475242869373 RomanNumerals.java 1659 2 3 0 CompilationAction 1475242869579 RomanNumerals.java EditAction 1475242933933 RomanNumerals.java 1760 2 3 0 +EditAction 1475242959239 RomanNumerals.java 1787 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 0b02460..65bbd6f 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -13,7 +13,7 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "IV"){ return 5 - 1; }else if (romanNum == "V"){ - return 5; + return convertSingleRoman(romanNum); }else if (romanNum == "VI"){ return 6; }else if (romanNum == "VII"){ From 2e76009b3a69a7912df9df1bf22f2cec7e7cb155 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:43:03 +0300 Subject: [PATCH 46/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index c84834f..0b6e905 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -128,3 +128,4 @@ EditAction 1475242869373 RomanNumerals.java 1659 2 3 0 CompilationAction 1475242869579 RomanNumerals.java EditAction 1475242933933 RomanNumerals.java 1760 2 3 0 EditAction 1475242959239 RomanNumerals.java 1787 2 3 0 +EditAction 1475242983533 RomanNumerals.java 1813 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 65bbd6f..b708679 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -23,7 +23,7 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "IX"){ return 9; }else if (romanNum == "X"){ - return 10; + return convertSingleRoman(romanNum); }else if (romanNum == "XX"){ return 20; }else if (romanNum == "XXX"){ From 47597eddac30581f7544dc9cab6a4f715d8d2b4e Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:43:17 +0300 Subject: [PATCH 47/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 0b6e905..621c595 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -129,3 +129,4 @@ CompilationAction 1475242869579 RomanNumerals.java EditAction 1475242933933 RomanNumerals.java 1760 2 3 0 EditAction 1475242959239 RomanNumerals.java 1787 2 3 0 EditAction 1475242983533 RomanNumerals.java 1813 2 3 0 +EditAction 1475242997221 RomanNumerals.java 1839 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index b708679..3daf592 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -31,7 +31,7 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "XL"){ return 40; }else if (romanNum == "L"){ - return 50; + return convertSingleRoman(romanNum); }else if (romanNum == "LX"){ return 60; }else if (romanNum == "LXX"){ From 9554edf843bd722b0c4c1bcff4e5052328e128b3 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:43:34 +0300 Subject: [PATCH 48/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 621c595..381b573 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -130,3 +130,4 @@ EditAction 1475242933933 RomanNumerals.java 1760 2 3 0 EditAction 1475242959239 RomanNumerals.java 1787 2 3 0 EditAction 1475242983533 RomanNumerals.java 1813 2 3 0 EditAction 1475242997221 RomanNumerals.java 1839 2 3 0 +EditAction 1475243014179 RomanNumerals.java 1864 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 3daf592..e8a6d65 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -41,7 +41,7 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "XC"){ return 90; }else if (romanNum == "C"){ - return 100; + return convertSingleRoman(romanNum); }else if (romanNum == "CC"){ return 200; }else if (romanNum == "CCC"){ From 374891847b4256e5c9df84acab31a6c208a0be75 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:43:49 +0300 Subject: [PATCH 49/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 381b573..49c4f00 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -131,3 +131,4 @@ EditAction 1475242959239 RomanNumerals.java 1787 2 3 0 EditAction 1475242983533 RomanNumerals.java 1813 2 3 0 EditAction 1475242997221 RomanNumerals.java 1839 2 3 0 EditAction 1475243014179 RomanNumerals.java 1864 2 3 0 +EditAction 1475243029515 RomanNumerals.java 1889 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index e8a6d65..7431d65 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -49,7 +49,7 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "CD"){ return 400; }else if (romanNum == "D"){ - return 500; + return convertSingleRoman(romanNum); }else if (romanNum == "DC"){ return 600; }else if (romanNum == "DCC"){ From e4d04e2096e24283bbb9ef403e9d60fff2104a7b Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:44:01 +0300 Subject: [PATCH 50/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 49c4f00..2b1d692 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -132,3 +132,4 @@ EditAction 1475242983533 RomanNumerals.java 1813 2 3 0 EditAction 1475242997221 RomanNumerals.java 1839 2 3 0 EditAction 1475243014179 RomanNumerals.java 1864 2 3 0 EditAction 1475243029515 RomanNumerals.java 1889 2 3 0 +EditAction 1475243041755 RomanNumerals.java 1913 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 7431d65..e0196f1 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -59,7 +59,7 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "CM"){ return 900; }else if (romanNum == "M"){ - return 1000; + return convertSingleRoman(romanNum); } return 0; } From 33bd228c2e204e864e9dd4188f5448f20957f4dc Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:44:16 +0300 Subject: [PATCH 51/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 2b1d692..3a279cc 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -133,3 +133,4 @@ EditAction 1475242997221 RomanNumerals.java 1839 2 3 0 EditAction 1475243014179 RomanNumerals.java 1864 2 3 0 EditAction 1475243029515 RomanNumerals.java 1889 2 3 0 EditAction 1475243041755 RomanNumerals.java 1913 2 3 0 +EditAction 1475243056555 RomanNumerals.java 1917 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index e0196f1..6087fcc 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -15,7 +15,7 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "V"){ return convertSingleRoman(romanNum); }else if (romanNum == "VI"){ - return 6; + return 5 + 1; }else if (romanNum == "VII"){ return 7; }else if (romanNum == "VIII"){ From babe9c84cb3c57b5874a420bd18017430e54862f Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:44:24 +0300 Subject: [PATCH 52/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 3a279cc..96692f0 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -134,3 +134,4 @@ EditAction 1475243014179 RomanNumerals.java 1864 2 3 0 EditAction 1475243029515 RomanNumerals.java 1889 2 3 0 EditAction 1475243041755 RomanNumerals.java 1913 2 3 0 EditAction 1475243056555 RomanNumerals.java 1917 2 3 0 +EditAction 1475243064952 RomanNumerals.java 1925 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 6087fcc..938700d 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -17,7 +17,7 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "VI"){ return 5 + 1; }else if (romanNum == "VII"){ - return 7; + return 5 + 1 + 1; }else if (romanNum == "VIII"){ return 8; }else if (romanNum == "IX"){ From 86470b15a563f733ed505f5d805f23b62567028d Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:45:23 +0300 Subject: [PATCH 53/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 96692f0..0635fed 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -135,3 +135,4 @@ EditAction 1475243029515 RomanNumerals.java 1889 2 3 0 EditAction 1475243041755 RomanNumerals.java 1913 2 3 0 EditAction 1475243056555 RomanNumerals.java 1917 2 3 0 EditAction 1475243064952 RomanNumerals.java 1925 2 3 0 +EditAction 1475243123300 RomanNumerals.java 1937 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 938700d..835cace 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -19,7 +19,7 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "VII"){ return 5 + 1 + 1; }else if (romanNum == "VIII"){ - return 8; + return 5 + 1 + 1 + 1; }else if (romanNum == "IX"){ return 9; }else if (romanNum == "X"){ From e5980e0c2c727c449661327e89349b5f9ab62869 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:45:44 +0300 Subject: [PATCH 54/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 0635fed..049b2cb 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -136,3 +136,4 @@ EditAction 1475243041755 RomanNumerals.java 1913 2 3 0 EditAction 1475243056555 RomanNumerals.java 1917 2 3 0 EditAction 1475243064952 RomanNumerals.java 1925 2 3 0 EditAction 1475243123300 RomanNumerals.java 1937 2 3 0 +EditAction 1475243144355 RomanNumerals.java 1942 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 835cace..76f0d48 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -21,7 +21,7 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "VIII"){ return 5 + 1 + 1 + 1; }else if (romanNum == "IX"){ - return 9; + return 10 - 1; }else if (romanNum == "X"){ return convertSingleRoman(romanNum); }else if (romanNum == "XX"){ From 03dc7329d5b79a927c630307a2026081f1a02540 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:45:59 +0300 Subject: [PATCH 55/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 049b2cb..fe46c7c 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -137,3 +137,4 @@ EditAction 1475243056555 RomanNumerals.java 1917 2 3 0 EditAction 1475243064952 RomanNumerals.java 1925 2 3 0 EditAction 1475243123300 RomanNumerals.java 1937 2 3 0 EditAction 1475243144355 RomanNumerals.java 1942 2 3 0 +EditAction 1475243158981 RomanNumerals.java 1957 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 76f0d48..4728578 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -25,9 +25,9 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "X"){ return convertSingleRoman(romanNum); }else if (romanNum == "XX"){ - return 20; + return 10 + 10; }else if (romanNum == "XXX"){ - return 30; + return 10 + 10 + 10; }else if (romanNum == "XL"){ return 40; }else if (romanNum == "L"){ From 836b837c1c7aabc9f06a53bbb1586b74dcc5d40d Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:46:09 +0300 Subject: [PATCH 56/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index fe46c7c..f22cd1d 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -138,3 +138,4 @@ EditAction 1475243064952 RomanNumerals.java 1925 2 3 0 EditAction 1475243123300 RomanNumerals.java 1937 2 3 0 EditAction 1475243144355 RomanNumerals.java 1942 2 3 0 EditAction 1475243158981 RomanNumerals.java 1957 2 3 0 +EditAction 1475243169256 RomanNumerals.java 1962 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 4728578..6f36fb1 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -29,7 +29,7 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "XXX"){ return 10 + 10 + 10; }else if (romanNum == "XL"){ - return 40; + return 50 - 10; }else if (romanNum == "L"){ return convertSingleRoman(romanNum); }else if (romanNum == "LX"){ From 2aba8689d3df17dcd6842bd8307bcc58fa2490d0 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:46:39 +0300 Subject: [PATCH 57/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index f22cd1d..d7ab8b8 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -139,3 +139,4 @@ EditAction 1475243123300 RomanNumerals.java 1937 2 3 0 EditAction 1475243144355 RomanNumerals.java 1942 2 3 0 EditAction 1475243158981 RomanNumerals.java 1957 2 3 0 EditAction 1475243169256 RomanNumerals.java 1962 2 3 0 +EditAction 1475243199587 RomanNumerals.java 1992 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 6f36fb1..7a81ed2 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -33,11 +33,11 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "L"){ return convertSingleRoman(romanNum); }else if (romanNum == "LX"){ - return 60; + return 50 + 10; }else if (romanNum == "LXX"){ - return 70; + return 50 + 10 + 10; }else if (romanNum == "LXXX"){ - return 80; + return 50 + 10 + 10 + 10; }else if (romanNum == "XC"){ return 90; }else if (romanNum == "C"){ From 778ee6de4851274e8115149f487ab820c9c66f0a Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:46:46 +0300 Subject: [PATCH 58/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index d7ab8b8..50b46e3 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -140,3 +140,4 @@ EditAction 1475243144355 RomanNumerals.java 1942 2 3 0 EditAction 1475243158981 RomanNumerals.java 1957 2 3 0 EditAction 1475243169256 RomanNumerals.java 1962 2 3 0 EditAction 1475243199587 RomanNumerals.java 1992 2 3 0 +EditAction 1475243206473 RomanNumerals.java 1998 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 7a81ed2..724dcdb 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -39,7 +39,7 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "LXXX"){ return 50 + 10 + 10 + 10; }else if (romanNum == "XC"){ - return 90; + return 100 - 10; }else if (romanNum == "C"){ return convertSingleRoman(romanNum); }else if (romanNum == "CC"){ From 053b9d9e735fd0324a3dae39a8e030b96e1d74ae Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:47:00 +0300 Subject: [PATCH 59/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 50b46e3..3c34b8f 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -141,3 +141,4 @@ EditAction 1475243158981 RomanNumerals.java 1957 2 3 0 EditAction 1475243169256 RomanNumerals.java 1962 2 3 0 EditAction 1475243199587 RomanNumerals.java 1992 2 3 0 EditAction 1475243206473 RomanNumerals.java 1998 2 3 0 +EditAction 1475243220769 RomanNumerals.java 2016 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 724dcdb..382de77 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -43,9 +43,9 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "C"){ return convertSingleRoman(romanNum); }else if (romanNum == "CC"){ - return 200; + return 100 + 100; }else if (romanNum == "CCC"){ - return 300; + return 100 + 100 + 100; }else if (romanNum == "CD"){ return 400; }else if (romanNum == "D"){ From 5abf9d5b5e2e10cedec1d60f446ca1967e2449f1 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:47:05 +0300 Subject: [PATCH 60/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 3c34b8f..982e9cf 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -142,3 +142,4 @@ EditAction 1475243169256 RomanNumerals.java 1962 2 3 0 EditAction 1475243199587 RomanNumerals.java 1992 2 3 0 EditAction 1475243206473 RomanNumerals.java 1998 2 3 0 EditAction 1475243220769 RomanNumerals.java 2016 2 3 0 +EditAction 1475243225777 RomanNumerals.java 2022 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 382de77..e8d416f 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -47,7 +47,7 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "CCC"){ return 100 + 100 + 100; }else if (romanNum == "CD"){ - return 400; + return 500 - 100; }else if (romanNum == "D"){ return convertSingleRoman(romanNum); }else if (romanNum == "DC"){ From 575620a2ee269944a0211cb5334f2dc99856fd4d Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:47:14 +0300 Subject: [PATCH 61/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 982e9cf..7a21a53 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -143,3 +143,4 @@ EditAction 1475243199587 RomanNumerals.java 1992 2 3 0 EditAction 1475243206473 RomanNumerals.java 1998 2 3 0 EditAction 1475243220769 RomanNumerals.java 2016 2 3 0 EditAction 1475243225777 RomanNumerals.java 2022 2 3 0 +EditAction 1475243234746 RomanNumerals.java 2028 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index e8d416f..7f5e2fc 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -51,7 +51,7 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "D"){ return convertSingleRoman(romanNum); }else if (romanNum == "DC"){ - return 600; + return 500 + 100; }else if (romanNum == "DCC"){ return 700; }else if (romanNum == "DCCC"){ From ca15e43a302364ab2340480c0817888b9cd53b5e Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:47:20 +0300 Subject: [PATCH 62/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 7a21a53..631ada9 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -144,3 +144,4 @@ EditAction 1475243206473 RomanNumerals.java 1998 2 3 0 EditAction 1475243220769 RomanNumerals.java 2016 2 3 0 EditAction 1475243225777 RomanNumerals.java 2022 2 3 0 EditAction 1475243234746 RomanNumerals.java 2028 2 3 0 +EditAction 1475243240770 RomanNumerals.java 2040 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 7f5e2fc..d44372e 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -53,7 +53,7 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "DC"){ return 500 + 100; }else if (romanNum == "DCC"){ - return 700; + return 500 + 100 + 100; }else if (romanNum == "DCCC"){ return 800; }else if (romanNum == "CM"){ From 0bd321f9e4732ba20109825e80d67c4ea4087c00 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:47:28 +0300 Subject: [PATCH 63/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 631ada9..a540147 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -145,3 +145,4 @@ EditAction 1475243220769 RomanNumerals.java 2016 2 3 0 EditAction 1475243225777 RomanNumerals.java 2022 2 3 0 EditAction 1475243234746 RomanNumerals.java 2028 2 3 0 EditAction 1475243240770 RomanNumerals.java 2040 2 3 0 +EditAction 1475243248736 RomanNumerals.java 2058 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index d44372e..4aa8acf 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -55,7 +55,7 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "DCC"){ return 500 + 100 + 100; }else if (romanNum == "DCCC"){ - return 800; + return 500 + 100 + 100 + 100; }else if (romanNum == "CM"){ return 900; }else if (romanNum == "M"){ From d85975121c29934935f1e6ff8065602782085cb0 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:47:34 +0300 Subject: [PATCH 64/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index a540147..f72789f 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -146,3 +146,4 @@ EditAction 1475243225777 RomanNumerals.java 2022 2 3 0 EditAction 1475243234746 RomanNumerals.java 2028 2 3 0 EditAction 1475243240770 RomanNumerals.java 2040 2 3 0 EditAction 1475243248736 RomanNumerals.java 2058 2 3 0 +EditAction 1475243254471 RomanNumerals.java 2065 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 4aa8acf..c2df9d2 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -57,7 +57,7 @@ public int convertToInteger(String romanNum) { }else if (romanNum == "DCCC"){ return 500 + 100 + 100 + 100; }else if (romanNum == "CM"){ - return 900; + return 1000 - 100; }else if (romanNum == "M"){ return convertSingleRoman(romanNum); } From 639f969eec6401bc2e1f18f5754d22b4b831ce46 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:51:33 +0300 Subject: [PATCH 65/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 18 +++++------------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index f72789f..fd7d974 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -147,3 +147,4 @@ EditAction 1475243234746 RomanNumerals.java 2028 2 3 0 EditAction 1475243240770 RomanNumerals.java 2040 2 3 0 EditAction 1475243248736 RomanNumerals.java 2058 2 3 0 EditAction 1475243254471 RomanNumerals.java 2065 2 3 0 +EditAction 1475243493127 RomanNumerals.java 1757 2 1 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index c2df9d2..f2bc20e 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -4,16 +4,18 @@ public class RomanNumerals { public int convertToInteger(String romanNum) { - if (romanNum == "I"){ + + + if (romanNum.length() == 1) return convertSingleRoman(romanNum); + else if (romanNum.length() == 2) { + if (romanNum.substring(0,1).equals(romanNum.substring(1))) }else if (romanNum == "II") { return 1 + 1; }else if (romanNum == "III"){ return 1 + 1 + 1; }else if (romanNum == "IV"){ return 5 - 1; - }else if (romanNum == "V"){ - return convertSingleRoman(romanNum); }else if (romanNum == "VI"){ return 5 + 1; }else if (romanNum == "VII"){ @@ -22,16 +24,12 @@ public int convertToInteger(String romanNum) { return 5 + 1 + 1 + 1; }else if (romanNum == "IX"){ return 10 - 1; - }else if (romanNum == "X"){ - return convertSingleRoman(romanNum); }else if (romanNum == "XX"){ return 10 + 10; }else if (romanNum == "XXX"){ return 10 + 10 + 10; }else if (romanNum == "XL"){ return 50 - 10; - }else if (romanNum == "L"){ - return convertSingleRoman(romanNum); }else if (romanNum == "LX"){ return 50 + 10; }else if (romanNum == "LXX"){ @@ -40,16 +38,12 @@ public int convertToInteger(String romanNum) { return 50 + 10 + 10 + 10; }else if (romanNum == "XC"){ return 100 - 10; - }else if (romanNum == "C"){ - return convertSingleRoman(romanNum); }else if (romanNum == "CC"){ return 100 + 100; }else if (romanNum == "CCC"){ return 100 + 100 + 100; }else if (romanNum == "CD"){ return 500 - 100; - }else if (romanNum == "D"){ - return convertSingleRoman(romanNum); }else if (romanNum == "DC"){ return 500 + 100; }else if (romanNum == "DCC"){ @@ -58,8 +52,6 @@ public int convertToInteger(String romanNum) { return 500 + 100 + 100 + 100; }else if (romanNum == "CM"){ return 1000 - 100; - }else if (romanNum == "M"){ - return convertSingleRoman(romanNum); } return 0; } From bd669e370d7cc8fc6b706b46ed657c2cd81d325f Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:52:11 +0300 Subject: [PATCH 66/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 5 +++++ src/RomanNumerals.java | 1 + 2 files changed, 6 insertions(+) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index fd7d974..9fe3f40 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -148,3 +148,8 @@ EditAction 1475243240770 RomanNumerals.java 2040 2 3 0 EditAction 1475243248736 RomanNumerals.java 2058 2 3 0 EditAction 1475243254471 RomanNumerals.java 2065 2 3 0 EditAction 1475243493127 RomanNumerals.java 1757 2 1 0 +CompilationAction 1475243493306 RomanNumerals.java +CompilationAction 1475243493307 RomanNumerals.java +CompilationAction 1475243524793 RomanNumerals.java +CompilationAction 1475243524938 RomanNumerals.java +EditAction 1475243531074 RomanNumerals.java 1800 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index f2bc20e..87ec9dc 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -10,6 +10,7 @@ public int convertToInteger(String romanNum) { return convertSingleRoman(romanNum); else if (romanNum.length() == 2) { if (romanNum.substring(0,1).equals(romanNum.substring(1))) + return 2*convertSingleRoman(romanNum); }else if (romanNum == "II") { return 1 + 1; }else if (romanNum == "III"){ From 99247409f35b3a25a918aecb0ed02f408f5d8905 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:53:27 +0300 Subject: [PATCH 67/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 9fe3f40..16e967c 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -153,3 +153,6 @@ CompilationAction 1475243493307 RomanNumerals.java CompilationAction 1475243524793 RomanNumerals.java CompilationAction 1475243524938 RomanNumerals.java EditAction 1475243531074 RomanNumerals.java 1800 2 3 0 +UnitTestCaseAction 1475243546305 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475243546305 TestRomanNumerals.java FAIL +EditAction 1475243607199 RomanNumerals.java 1800 2 3 0 From ff292bd6cab7dd56be9aaf661f49f55b3f0e1fde Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:54:17 +0300 Subject: [PATCH 68/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 1 + src/RomanNumerals.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 16e967c..9499f17 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -156,3 +156,4 @@ EditAction 1475243531074 RomanNumerals.java 1800 2 3 0 UnitTestCaseAction 1475243546305 TestRomanNumerals.java FAIL UnitTestSessionAction 1475243546305 TestRomanNumerals.java FAIL EditAction 1475243607199 RomanNumerals.java 1800 2 3 0 +EditAction 1475243657563 RomanNumerals.java 1816 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 87ec9dc..bb5ecc1 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -10,7 +10,7 @@ public int convertToInteger(String romanNum) { return convertSingleRoman(romanNum); else if (romanNum.length() == 2) { if (romanNum.substring(0,1).equals(romanNum.substring(1))) - return 2*convertSingleRoman(romanNum); + return 2*convertSingleRoman(romanNum.substring(0, 1)); }else if (romanNum == "II") { return 1 + 1; }else if (romanNum == "III"){ From 03b3d8b20d2cb344b05ef26f01ec0fa2e4795cbb Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 16:55:24 +0300 Subject: [PATCH 69/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 3 +++ src/RomanNumerals.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 9499f17..f58b6ff 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -157,3 +157,6 @@ UnitTestCaseAction 1475243546305 TestRomanNumerals.java FAIL UnitTestSessionAction 1475243546305 TestRomanNumerals.java FAIL EditAction 1475243607199 RomanNumerals.java 1800 2 3 0 EditAction 1475243657563 RomanNumerals.java 1816 2 3 0 +UnitTestCaseAction 1475243659598 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475243659598 TestRomanNumerals.java FAIL +EditAction 1475243724683 RomanNumerals.java 1821 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index bb5ecc1..99c7ba5 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -58,7 +58,7 @@ else if (romanNum.length() == 2) { } private int convertSingleRoman(String roman) { - if (roman == "I") + if (roman.equals("I")) return 1; else if (roman == "V") return 5; From 9cab2deecfe87333ae282ac80de6f08684ac3db5 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 17:00:07 +0300 Subject: [PATCH 70/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 3 +++ src/RomanNumerals.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index f58b6ff..906bfca 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -160,3 +160,6 @@ EditAction 1475243657563 RomanNumerals.java 1816 2 3 0 UnitTestCaseAction 1475243659598 TestRomanNumerals.java FAIL UnitTestSessionAction 1475243659598 TestRomanNumerals.java FAIL EditAction 1475243724683 RomanNumerals.java 1821 2 3 0 +UnitTestCaseAction 1475243728136 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475243728137 TestRomanNumerals.java FAIL +EditAction 1475244007188 RomanNumerals.java 1985 2 1 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 99c7ba5..89f66c0 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -11,6 +11,8 @@ public int convertToInteger(String romanNum) { else if (romanNum.length() == 2) { if (romanNum.substring(0,1).equals(romanNum.substring(1))) return 2*convertSingleRoman(romanNum.substring(0, 1)); + else if ((romanNum.substring(0,1)<(romanNum.substring(1)) + return convertSingleRoman(romanNum.substring(1,0)) - convertSingleRoman(romanNum.substring(0,1)); }else if (romanNum == "II") { return 1 + 1; }else if (romanNum == "III"){ From 07933c1e513fde8f901fbc05ed287f21066a89f2 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 17:01:04 +0300 Subject: [PATCH 71/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 12 ++++++++++++ src/RomanNumerals.java | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 906bfca..33035b7 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -163,3 +163,15 @@ EditAction 1475243724683 RomanNumerals.java 1821 2 3 0 UnitTestCaseAction 1475243728136 TestRomanNumerals.java FAIL UnitTestSessionAction 1475243728137 TestRomanNumerals.java FAIL EditAction 1475244007188 RomanNumerals.java 1985 2 1 0 +CompilationAction 1475244007433 RomanNumerals.java +CompilationAction 1475244007434 RomanNumerals.java +CompilationAction 1475244007434 RomanNumerals.java +CompilationAction 1475244038133 RomanNumerals.java +CompilationAction 1475244038134 RomanNumerals.java +CompilationAction 1475244038135 RomanNumerals.java +CompilationAction 1475244038291 RomanNumerals.java +CompilationAction 1475244038291 RomanNumerals.java +CompilationAction 1475244055027 RomanNumerals.java +CompilationAction 1475244055028 RomanNumerals.java +CompilationAction 1475244055184 RomanNumerals.java +EditAction 1475244064361 RomanNumerals.java 2029 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 89f66c0..76e0675 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -11,7 +11,7 @@ public int convertToInteger(String romanNum) { else if (romanNum.length() == 2) { if (romanNum.substring(0,1).equals(romanNum.substring(1))) return 2*convertSingleRoman(romanNum.substring(0, 1)); - else if ((romanNum.substring(0,1)<(romanNum.substring(1)) + else if ((convertSingleRoman(romanNum.substring(0,1))) < convertSingleRoman((romanNum.substring(1)))) return convertSingleRoman(romanNum.substring(1,0)) - convertSingleRoman(romanNum.substring(0,1)); }else if (romanNum == "II") { return 1 + 1; From 7f5b7f575351941adcd272389b99ca3a6b4594ab Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 17:01:49 +0300 Subject: [PATCH 72/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 3 +++ src/RomanNumerals.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 33035b7..2a9d3a8 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -175,3 +175,6 @@ CompilationAction 1475244055027 RomanNumerals.java CompilationAction 1475244055028 RomanNumerals.java CompilationAction 1475244055184 RomanNumerals.java EditAction 1475244064361 RomanNumerals.java 2029 2 3 0 +UnitTestCaseAction 1475244067918 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475244067919 TestRomanNumerals.java FAIL +EditAction 1475244109463 RomanNumerals.java 2041 2 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 76e0675..cef3ebf 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -62,11 +62,11 @@ else if ((convertSingleRoman(romanNum.substring(0,1))) < convertSingleRoman((rom private int convertSingleRoman(String roman) { if (roman.equals("I")) return 1; - else if (roman == "V") + else if (roman.equals("V") return 5; - else if (roman == "X") + else if (roman.equals("X") return 10; - else if (roman == "L") + else if (roman.equals("L") return 50; else if (roman == "C") return 100; From 1833b39202d2459a6af2565331c7be5a6c39005d Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 17:01:56 +0300 Subject: [PATCH 73/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 2 ++ src/RomanNumerals.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 2a9d3a8..0de0cfa 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -178,3 +178,5 @@ EditAction 1475244064361 RomanNumerals.java 2029 2 3 0 UnitTestCaseAction 1475244067918 TestRomanNumerals.java FAIL UnitTestSessionAction 1475244067919 TestRomanNumerals.java FAIL EditAction 1475244109463 RomanNumerals.java 2041 2 2 0 +CompilationAction 1475244109695 RomanNumerals.java +EditAction 1475244116766 RomanNumerals.java 2045 2 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index cef3ebf..ccacecd 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -68,7 +68,7 @@ else if (roman.equals("X") return 10; else if (roman.equals("L") return 50; - else if (roman == "C") + else if (roman.equals("C") return 100; else if (roman == "D") return 500; From 308cbf33723397a1bdc84e1d6e4366025b23378b Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 17:02:10 +0300 Subject: [PATCH 74/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 2 ++ src/RomanNumerals.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 0de0cfa..c2569ac 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -180,3 +180,5 @@ UnitTestSessionAction 1475244067919 TestRomanNumerals.java FAIL EditAction 1475244109463 RomanNumerals.java 2041 2 2 0 CompilationAction 1475244109695 RomanNumerals.java EditAction 1475244116766 RomanNumerals.java 2045 2 2 0 +CompilationAction 1475244116986 RomanNumerals.java +EditAction 1475244130482 RomanNumerals.java 2049 2 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index ccacecd..8294d35 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -70,7 +70,7 @@ else if (roman.equals("L") return 50; else if (roman.equals("C") return 100; - else if (roman == "D") + else if (roman.equals("D") return 500; else if (roman == "M") return 1000; From aca22246116a80d71f94bb25c5e33c17a1ab7b6f Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 17:02:18 +0300 Subject: [PATCH 75/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 2 ++ src/RomanNumerals.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index c2569ac..3b3fccf 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -182,3 +182,5 @@ CompilationAction 1475244109695 RomanNumerals.java EditAction 1475244116766 RomanNumerals.java 2045 2 2 0 CompilationAction 1475244116986 RomanNumerals.java EditAction 1475244130482 RomanNumerals.java 2049 2 2 0 +CompilationAction 1475244130722 RomanNumerals.java +EditAction 1475244138705 RomanNumerals.java 2053 2 2 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 8294d35..7286ec8 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -72,7 +72,7 @@ else if (roman.equals("C") return 100; else if (roman.equals("D") return 500; - else if (roman == "M") + else if (roman.equals("M") return 1000; else return 0; From ecc4e6dde2b100d323d8115707a7ba45b2942972 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 17:03:06 +0300 Subject: [PATCH 76/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 5 +++++ src/RomanNumerals.java | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 3b3fccf..f87581e 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -184,3 +184,8 @@ CompilationAction 1475244116986 RomanNumerals.java EditAction 1475244130482 RomanNumerals.java 2049 2 2 0 CompilationAction 1475244130722 RomanNumerals.java EditAction 1475244138705 RomanNumerals.java 2053 2 2 0 +CompilationAction 1475244138945 RomanNumerals.java +CompilationAction 1475244157022 RomanNumerals.java +UnitTestCaseAction 1475244161194 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475244161194 TestRomanNumerals.java FAIL +EditAction 1475244186105 RomanNumerals.java 2267 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 7286ec8..fa17387 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -13,6 +13,8 @@ else if (romanNum.length() == 2) { return 2*convertSingleRoman(romanNum.substring(0, 1)); else if ((convertSingleRoman(romanNum.substring(0,1))) < convertSingleRoman((romanNum.substring(1)))) return convertSingleRoman(romanNum.substring(1,0)) - convertSingleRoman(romanNum.substring(0,1)); + else if ((convertSingleRoman(romanNum.substring(0,1))) > convertSingleRoman((romanNum.substring(1)))) + return convertSingleRoman(romanNum.substring(1,0)) + convertSingleRoman(romanNum.substring(0,1)); }else if (romanNum == "II") { return 1 + 1; }else if (romanNum == "III"){ @@ -62,17 +64,17 @@ else if ((convertSingleRoman(romanNum.substring(0,1))) < convertSingleRoman((rom private int convertSingleRoman(String roman) { if (roman.equals("I")) return 1; - else if (roman.equals("V") + else if (roman.equals("V")) return 5; - else if (roman.equals("X") + else if (roman.equals("X")) return 10; - else if (roman.equals("L") + else if (roman.equals("L")) return 50; - else if (roman.equals("C") + else if (roman.equals("C")) return 100; - else if (roman.equals("D") + else if (roman.equals("D")) return 500; - else if (roman.equals("M") + else if (roman.equals("M")) return 1000; else return 0; From a3cebf5d087c3877de2dae39043cce4872f1b979 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 17:05:08 +0300 Subject: [PATCH 77/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 3 +++ src/RomanNumerals.java | 33 +++++++------------------- 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index f87581e..4d37571 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -189,3 +189,6 @@ CompilationAction 1475244157022 RomanNumerals.java UnitTestCaseAction 1475244161194 TestRomanNumerals.java FAIL UnitTestSessionAction 1475244161194 TestRomanNumerals.java FAIL EditAction 1475244186105 RomanNumerals.java 2267 2 3 0 +UnitTestCaseAction 1475244193036 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475244193037 TestRomanNumerals.java FAIL +EditAction 1475244308606 RomanNumerals.java 1666 2 1 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index fa17387..da73f8a 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -15,49 +15,32 @@ else if ((convertSingleRoman(romanNum.substring(0,1))) < convertSingleRoman((rom return convertSingleRoman(romanNum.substring(1,0)) - convertSingleRoman(romanNum.substring(0,1)); else if ((convertSingleRoman(romanNum.substring(0,1))) > convertSingleRoman((romanNum.substring(1)))) return convertSingleRoman(romanNum.substring(1,0)) + convertSingleRoman(romanNum.substring(0,1)); - }else if (romanNum == "II") { - return 1 + 1; + }else if (romanNum == "III"){ return 1 + 1 + 1; - }else if (romanNum == "IV"){ - return 5 - 1; - }else if (romanNum == "VI"){ - return 5 + 1; + + }else if (romanNum == "VII"){ return 5 + 1 + 1; }else if (romanNum == "VIII"){ return 5 + 1 + 1 + 1; - }else if (romanNum == "IX"){ - return 10 - 1; - }else if (romanNum == "XX"){ - return 10 + 10; + + }else if (romanNum == "XXX"){ return 10 + 10 + 10; - }else if (romanNum == "XL"){ - return 50 - 10; - }else if (romanNum == "LX"){ - return 50 + 10; + }else if (romanNum == "LXX"){ return 50 + 10 + 10; }else if (romanNum == "LXXX"){ return 50 + 10 + 10 + 10; - }else if (romanNum == "XC"){ - return 100 - 10; - }else if (romanNum == "CC"){ - return 100 + 100; + }else if (romanNum == "CCC"){ return 100 + 100 + 100; - }else if (romanNum == "CD"){ - return 500 - 100; - }else if (romanNum == "DC"){ - return 500 + 100; + }else if (romanNum == "DCC"){ return 500 + 100 + 100; }else if (romanNum == "DCCC"){ return 500 + 100 + 100 + 100; - }else if (romanNum == "CM"){ - return 1000 - 100; - } return 0; } From 4ca5437893b0717f6085cf7d75b77a015dc3ee1a Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 17:06:33 +0300 Subject: [PATCH 78/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 5 +++++ src/RomanNumerals.java | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 4d37571..583190b 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -192,3 +192,8 @@ EditAction 1475244186105 RomanNumerals.java 2267 2 3 0 UnitTestCaseAction 1475244193036 TestRomanNumerals.java FAIL UnitTestSessionAction 1475244193037 TestRomanNumerals.java FAIL EditAction 1475244308606 RomanNumerals.java 1666 2 1 0 +CompilationAction 1475244308842 RomanNumerals.java +CompilationAction 1475244324532 RomanNumerals.java +UnitTestCaseAction 1475244328861 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475244328861 TestRomanNumerals.java FAIL +EditAction 1475244393542 RomanNumerals.java 1663 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index da73f8a..aad15bd 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -12,9 +12,9 @@ else if (romanNum.length() == 2) { if (romanNum.substring(0,1).equals(romanNum.substring(1))) return 2*convertSingleRoman(romanNum.substring(0, 1)); else if ((convertSingleRoman(romanNum.substring(0,1))) < convertSingleRoman((romanNum.substring(1)))) - return convertSingleRoman(romanNum.substring(1,0)) - convertSingleRoman(romanNum.substring(0,1)); + return convertSingleRoman(romanNum.substring(1)) - convertSingleRoman(romanNum.substring(0,1)); else if ((convertSingleRoman(romanNum.substring(0,1))) > convertSingleRoman((romanNum.substring(1)))) - return convertSingleRoman(romanNum.substring(1,0)) + convertSingleRoman(romanNum.substring(0,1)); + return convertSingleRoman(romanNum.substring(1)) + convertSingleRoman(romanNum.substring(0,1)); }else if (romanNum == "III"){ return 1 + 1 + 1; @@ -40,7 +40,7 @@ else if ((convertSingleRoman(romanNum.substring(0,1))) > convertSingleRoman((rom }else if (romanNum == "DCC"){ return 500 + 100 + 100; }else if (romanNum == "DCCC"){ - return 500 + 100 + 100 + 100; + return 500 + 100 + 100 + 100;} return 0; } From 6866004d09594852cec1f11874b86b48e7828bbf Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 17:07:28 +0300 Subject: [PATCH 79/85] besouro automatic message --- .besouro/20160930152921209/actions.txt | 3 +++ .besouro/20160930152921209/besouroEpisodes.txt | 3 +++ .besouro/20160930152921209/randomHeuristicEpisodes.txt | 1 + .besouro/20160930152921209/zorroEpisodes.txt | 1 + src/RomanNumerals.java | 2 +- 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.besouro/20160930152921209/actions.txt b/.besouro/20160930152921209/actions.txt index 583190b..6693c52 100644 --- a/.besouro/20160930152921209/actions.txt +++ b/.besouro/20160930152921209/actions.txt @@ -197,3 +197,6 @@ CompilationAction 1475244324532 RomanNumerals.java UnitTestCaseAction 1475244328861 TestRomanNumerals.java FAIL UnitTestSessionAction 1475244328861 TestRomanNumerals.java FAIL EditAction 1475244393542 RomanNumerals.java 1663 2 3 0 +UnitTestCaseAction 1475244395877 TestRomanNumerals.java OK +UnitTestSessionAction 1475244395878 TestRomanNumerals.java OK +EditAction 1475244448591 RomanNumerals.java 1708 2 3 0 diff --git a/.besouro/20160930152921209/besouroEpisodes.txt b/.besouro/20160930152921209/besouroEpisodes.txt index f563761..30a17a8 100644 --- a/.besouro/20160930152921209/besouroEpisodes.txt +++ b/.besouro/20160930152921209/besouroEpisodes.txt @@ -97,3 +97,6 @@ 1475241918969 test-last 1 149 false 1475241918970 test-last 1 149 false 1475241918971 test-last 1 149 false +1475244395878 production 1 2369 false +1475244395879 refactoring 2A 2369 true +1475244395880 production 2 2369 false diff --git a/.besouro/20160930152921209/randomHeuristicEpisodes.txt b/.besouro/20160930152921209/randomHeuristicEpisodes.txt index f39e3c7..cfa1982 100644 --- a/.besouro/20160930152921209/randomHeuristicEpisodes.txt +++ b/.besouro/20160930152921209/randomHeuristicEpisodes.txt @@ -3,3 +3,4 @@ 1475241607332 test-addition 1 15 true 1475241634348 test-addition 1 16 true 1475241918966 test-last 1 149 false +1475244395878 production 1 2369 true diff --git a/.besouro/20160930152921209/zorroEpisodes.txt b/.besouro/20160930152921209/zorroEpisodes.txt index a26f575..759bae3 100644 --- a/.besouro/20160930152921209/zorroEpisodes.txt +++ b/.besouro/20160930152921209/zorroEpisodes.txt @@ -3,3 +3,4 @@ 1475241607332 test-addition 1 90 true 1475241634348 test-addition 1 27 true 1475241918966 test-last 1 284 false +1475244395878 production 1 2476 false diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index aad15bd..3657bb5 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -15,7 +15,7 @@ else if ((convertSingleRoman(romanNum.substring(0,1))) < convertSingleRoman((rom return convertSingleRoman(romanNum.substring(1)) - convertSingleRoman(romanNum.substring(0,1)); else if ((convertSingleRoman(romanNum.substring(0,1))) > convertSingleRoman((romanNum.substring(1)))) return convertSingleRoman(romanNum.substring(1)) + convertSingleRoman(romanNum.substring(0,1)); - +//TODO: implement for the three-letter groups }else if (romanNum == "III"){ return 1 + 1 + 1; From 73c216630f32fa40e9cc33389886494d5347f2b5 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 30 Sep 2016 17:08:06 +0300 Subject: [PATCH 80/85] besouro automatic message --- src/RomanNumerals.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 3657bb5..24dca4c 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -15,7 +15,7 @@ else if ((convertSingleRoman(romanNum.substring(0,1))) < convertSingleRoman((rom return convertSingleRoman(romanNum.substring(1)) - convertSingleRoman(romanNum.substring(0,1)); else if ((convertSingleRoman(romanNum.substring(0,1))) > convertSingleRoman((romanNum.substring(1)))) return convertSingleRoman(romanNum.substring(1)) + convertSingleRoman(romanNum.substring(0,1)); -//TODO: implement for the three-letter groups +//TODO: implement the conversion for the three-letter groups }else if (romanNum == "III"){ return 1 + 1 + 1; From a49d9ca2e30b2bf2b9d7139e2972c05e1d6d3ee0 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:35:55 +0300 Subject: [PATCH 81/85] besouro automatic message --- .besouro/20161007142400435/actions.txt | 4 ++++ .besouro/20161007142400435/besouroEpisodes.txt | 0 .besouro/20161007142400435/disagreements.txt | 0 .../20161007142400435/randomHeuristicEpisodes.txt | 0 .besouro/20161007142400435/userComments.txt | 0 .besouro/20161007142400435/zorroEpisodes.txt | 0 src/RomanNumerals.java | 13 ++++++++++--- 7 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 .besouro/20161007142400435/actions.txt create mode 100644 .besouro/20161007142400435/besouroEpisodes.txt create mode 100644 .besouro/20161007142400435/disagreements.txt create mode 100644 .besouro/20161007142400435/randomHeuristicEpisodes.txt create mode 100644 .besouro/20161007142400435/userComments.txt create mode 100644 .besouro/20161007142400435/zorroEpisodes.txt diff --git a/.besouro/20161007142400435/actions.txt b/.besouro/20161007142400435/actions.txt new file mode 100644 index 0000000..b7b138b --- /dev/null +++ b/.besouro/20161007142400435/actions.txt @@ -0,0 +1,4 @@ +FileOpenedAction 1475839440684 RomanNumerals.java 1723 2 3 0 +CompilationAction 1475840107071 RomanNumerals.java +FileOpenedAction 1475840112282 TestRomanNumerals.java 1817 11 34 12 +EditAction 1475840155494 RomanNumerals.java 2303 2 2 0 diff --git a/.besouro/20161007142400435/besouroEpisodes.txt b/.besouro/20161007142400435/besouroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161007142400435/disagreements.txt b/.besouro/20161007142400435/disagreements.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161007142400435/randomHeuristicEpisodes.txt b/.besouro/20161007142400435/randomHeuristicEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161007142400435/userComments.txt b/.besouro/20161007142400435/userComments.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161007142400435/zorroEpisodes.txt b/.besouro/20161007142400435/zorroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 24dca4c..0c5cf20 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -14,12 +14,19 @@ else if (romanNum.length() == 2) { else if ((convertSingleRoman(romanNum.substring(0,1))) < convertSingleRoman((romanNum.substring(1)))) return convertSingleRoman(romanNum.substring(1)) - convertSingleRoman(romanNum.substring(0,1)); else if ((convertSingleRoman(romanNum.substring(0,1))) > convertSingleRoman((romanNum.substring(1)))) - return convertSingleRoman(romanNum.substring(1)) + convertSingleRoman(romanNum.substring(0,1)); + return convertSingleRoman(romanNum.substring(1)) + convertSingleRoman(romanNum.substring(0,1)); + + else if (romanNum.length() == 3) { + if (romanNum.substring(0,2).equals(romanNum.substring(1))) + return 3*convertSingleRoman(romanNum.substring(0, 2)); + else if ((convertSingleRoman(romanNum.substring(0,2))) < convertSingleRoman((romanNum.substring(1)))) + return convertSingleRoman(romanNum.substring(1)) - convertSingleRoman(romanNum.substring(0,2)); + else if ((convertSingleRoman(romanNum.substring(0,2))) > convertSingleRoman((romanNum.substring(1)))) + return convertSingleRoman(romanNum.substring(1)) + convertSingleRoman(romanNum.substring(0,2)); //TODO: implement the conversion for the three-letter groups }else if (romanNum == "III"){ return 1 + 1 + 1; - }else if (romanNum == "VII"){ return 5 + 1 + 1; }else if (romanNum == "VIII"){ @@ -42,7 +49,7 @@ else if ((convertSingleRoman(romanNum.substring(0,1))) > convertSingleRoman((rom }else if (romanNum == "DCCC"){ return 500 + 100 + 100 + 100;} return 0; - } + }} private int convertSingleRoman(String roman) { if (roman.equals("I")) From d180e25c24dbc792d583e35e9411e703f6fea2a8 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:36:15 +0300 Subject: [PATCH 82/85] besouro automatic message --- .besouro/20161007142400435/actions.txt | 2 ++ src/RomanNumerals.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007142400435/actions.txt b/.besouro/20161007142400435/actions.txt index b7b138b..ffa5770 100644 --- a/.besouro/20161007142400435/actions.txt +++ b/.besouro/20161007142400435/actions.txt @@ -2,3 +2,5 @@ FileOpenedAction 1475839440684 RomanNumerals.java 1723 2 3 0 CompilationAction 1475840107071 RomanNumerals.java FileOpenedAction 1475840112282 TestRomanNumerals.java 1817 11 34 12 EditAction 1475840155494 RomanNumerals.java 2303 2 2 0 +CompilationAction 1475840156960 RomanNumerals.java +EditAction 1475840175509 RomanNumerals.java 2302 2 1 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index 0c5cf20..a2e653a 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -49,7 +49,7 @@ else if ((convertSingleRoman(romanNum.substring(0,2))) > convertSingleRoman((rom }else if (romanNum == "DCCC"){ return 500 + 100 + 100 + 100;} return 0; - }} + } private int convertSingleRoman(String roman) { if (roman.equals("I")) From f244f468fdd05783641ea3153d4e2720f86ed315 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:58:34 +0300 Subject: [PATCH 83/85] besouro automatic message --- .besouro/20161007142400435/actions.txt | 17 +++++++++++ .../20161007142400435/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 2 ++ .besouro/20161007142400435/zorroEpisodes.txt | 2 ++ src/RomanNumerals.java | 29 ++++++++++++------- 5 files changed, 42 insertions(+), 10 deletions(-) diff --git a/.besouro/20161007142400435/actions.txt b/.besouro/20161007142400435/actions.txt index ffa5770..6b44f81 100644 --- a/.besouro/20161007142400435/actions.txt +++ b/.besouro/20161007142400435/actions.txt @@ -4,3 +4,20 @@ FileOpenedAction 1475840112282 TestRomanNumerals.java 1817 11 34 12 EditAction 1475840155494 RomanNumerals.java 2303 2 2 0 CompilationAction 1475840156960 RomanNumerals.java EditAction 1475840175509 RomanNumerals.java 2302 2 1 0 +CompilationAction 1475840175727 RomanNumerals.java +CompilationAction 1475840222714 RomanNumerals.java +UnitTestCaseAction 1475840229958 TestRomanNumerals.java OK +UnitTestSessionAction 1475840229958 TestRomanNumerals.java OK +UnitTestCaseAction 1475840520637 TestRomanNumerals.java OK +UnitTestSessionAction 1475840520637 TestRomanNumerals.java OK +CompilationAction 1475840654111 RomanNumerals.java +CompilationAction 1475840668712 RomanNumerals.java +UnitTestCaseAction 1475840674175 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475840674175 TestRomanNumerals.java FAIL +UnitTestCaseAction 1475840798651 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475840798651 TestRomanNumerals.java FAIL +UnitTestCaseAction 1475840844066 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475840844066 TestRomanNumerals.java FAIL +UnitTestCaseAction 1475841486202 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475841486202 TestRomanNumerals.java FAIL +EditAction 1475841514392 RomanNumerals.java 3002 2 3 0 diff --git a/.besouro/20161007142400435/besouroEpisodes.txt b/.besouro/20161007142400435/besouroEpisodes.txt index e69de29..4241136 100644 --- a/.besouro/20161007142400435/besouroEpisodes.txt +++ b/.besouro/20161007142400435/besouroEpisodes.txt @@ -0,0 +1,2 @@ +1475840229958 refactoring 2A 789 true +1475840520637 regression 1 0 true diff --git a/.besouro/20161007142400435/randomHeuristicEpisodes.txt b/.besouro/20161007142400435/randomHeuristicEpisodes.txt index e69de29..d7acc31 100644 --- a/.besouro/20161007142400435/randomHeuristicEpisodes.txt +++ b/.besouro/20161007142400435/randomHeuristicEpisodes.txt @@ -0,0 +1,2 @@ +1475840229958 refactoring 2A 789 false +1475840520637 regression 1 0 true diff --git a/.besouro/20161007142400435/zorroEpisodes.txt b/.besouro/20161007142400435/zorroEpisodes.txt index e69de29..3fb006c 100644 --- a/.besouro/20161007142400435/zorroEpisodes.txt +++ b/.besouro/20161007142400435/zorroEpisodes.txt @@ -0,0 +1,2 @@ +1475840229958 refactoring 2A 789 false +1475840520637 regression 1 290 false diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index a2e653a..fa0754c 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -5,7 +5,7 @@ public class RomanNumerals { public int convertToInteger(String romanNum) { - + //two-letter groups if (romanNum.length() == 1) return convertSingleRoman(romanNum); else if (romanNum.length() == 2) { @@ -15,17 +15,26 @@ else if ((convertSingleRoman(romanNum.substring(0,1))) < convertSingleRoman((rom return convertSingleRoman(romanNum.substring(1)) - convertSingleRoman(romanNum.substring(0,1)); else if ((convertSingleRoman(romanNum.substring(0,1))) > convertSingleRoman((romanNum.substring(1)))) return convertSingleRoman(romanNum.substring(1)) + convertSingleRoman(romanNum.substring(0,1)); - + //three-letter groups else if (romanNum.length() == 3) { - if (romanNum.substring(0,2).equals(romanNum.substring(1))) - return 3*convertSingleRoman(romanNum.substring(0, 2)); - else if ((convertSingleRoman(romanNum.substring(0,2))) < convertSingleRoman((romanNum.substring(1)))) - return convertSingleRoman(romanNum.substring(1)) - convertSingleRoman(romanNum.substring(0,2)); - else if ((convertSingleRoman(romanNum.substring(0,2))) > convertSingleRoman((romanNum.substring(1)))) - return convertSingleRoman(romanNum.substring(1)) + convertSingleRoman(romanNum.substring(0,2)); + if (romanNum.substring(0,1).equals(romanNum.substring(1,2)) && (romanNum.substring(1,2).equals(romanNum.substring(2,3)))) + return 3*convertSingleRoman(romanNum.substring(1,3)); + else if ((convertSingleRoman(romanNum.substring(0,2))) < convertSingleRoman((romanNum.substring(2)))) + return convertSingleRoman(romanNum.substring(2)) - convertSingleRoman(romanNum.substring(0,2)); + else if ((convertSingleRoman(romanNum.substring(0,2))) > convertSingleRoman((romanNum.substring(2)))) + return convertSingleRoman(romanNum.substring(2)) + convertSingleRoman(romanNum.substring(0,2)); + + else if (romanNum.length() == 4) { + if (romanNum.substring(0,3).equals(romanNum.substring(3))) + return 4*convertSingleRoman(romanNum.substring(0, 3)); + else if ((convertSingleRoman(romanNum.substring(0,3))) < convertSingleRoman((romanNum.substring(3)))) + return convertSingleRoman(romanNum.substring(3)) - convertSingleRoman(romanNum.substring(0,3)); + else if ((convertSingleRoman(romanNum.substring(0,3))) > convertSingleRoman((romanNum.substring(3)))) + return convertSingleRoman(romanNum.substring(3)) + convertSingleRoman(romanNum.substring(0,3)); + } //TODO: implement the conversion for the three-letter groups - }else if (romanNum == "III"){ - return 1 + 1 + 1; + }//else if (romanNum == "III"){ + //return 1 + 1 + 1; }else if (romanNum == "VII"){ return 5 + 1 + 1; From e75b0b781c3fceca5a997912d373c38489288d21 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:03:13 +0300 Subject: [PATCH 84/85] besouro automatic message --- .besouro/20161007142400435/actions.txt | 4 ++++ src/RomanNumerals.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007142400435/actions.txt b/.besouro/20161007142400435/actions.txt index 6b44f81..1b13985 100644 --- a/.besouro/20161007142400435/actions.txt +++ b/.besouro/20161007142400435/actions.txt @@ -21,3 +21,7 @@ UnitTestSessionAction 1475840844066 TestRomanNumerals.java FAIL UnitTestCaseAction 1475841486202 TestRomanNumerals.java FAIL UnitTestSessionAction 1475841486202 TestRomanNumerals.java FAIL EditAction 1475841514392 RomanNumerals.java 3002 2 3 0 +UnitTestCaseAction 1475841516781 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475841516781 TestRomanNumerals.java FAIL +CompilationAction 1475841753170 RomanNumerals.java +EditAction 1475841793714 RomanNumerals.java 3116 2 3 0 diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index fa0754c..a42e6ee 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -17,7 +17,7 @@ else if ((convertSingleRoman(romanNum.substring(0,1))) > convertSingleRoman((rom return convertSingleRoman(romanNum.substring(1)) + convertSingleRoman(romanNum.substring(0,1)); //three-letter groups else if (romanNum.length() == 3) { - if (romanNum.substring(0,1).equals(romanNum.substring(1,2)) && (romanNum.substring(1,2).equals(romanNum.substring(2,3)))) + if (romanNum.substring(0,1).equals(romanNum.substring(1)) && (romanNum.substring(1,2).equals(romanNum.substring(3)))) return 3*convertSingleRoman(romanNum.substring(1,3)); else if ((convertSingleRoman(romanNum.substring(0,2))) < convertSingleRoman((romanNum.substring(2)))) return convertSingleRoman(romanNum.substring(2)) - convertSingleRoman(romanNum.substring(0,2)); @@ -25,7 +25,7 @@ else if ((convertSingleRoman(romanNum.substring(0,2))) > convertSingleRoman((rom return convertSingleRoman(romanNum.substring(2)) + convertSingleRoman(romanNum.substring(0,2)); else if (romanNum.length() == 4) { - if (romanNum.substring(0,3).equals(romanNum.substring(3))) + if (romanNum.substring(0,1).equals(romanNum.substring(1)) && (romanNum.substring(1,2).equals(romanNum.substring(3) && (romanNum.substring(3,4).equals(romanNum.substring(4)))))) return 4*convertSingleRoman(romanNum.substring(0, 3)); else if ((convertSingleRoman(romanNum.substring(0,3))) < convertSingleRoman((romanNum.substring(3)))) return convertSingleRoman(romanNum.substring(3)) - convertSingleRoman(romanNum.substring(0,3)); From af37149c2718676f0bb286dd595862a4ef208f9e Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:53:01 +0300 Subject: [PATCH 85/85] besouro automatic message --- .besouro/20161007142400435/actions.txt | 92 ++++++++++++++++++++++++++ src/RomanNumerals.java | 90 ++++++++++++------------- tests/TestRomanNumerals.java | 13 +++- 3 files changed, 149 insertions(+), 46 deletions(-) diff --git a/.besouro/20161007142400435/actions.txt b/.besouro/20161007142400435/actions.txt index 1b13985..6cda905 100644 --- a/.besouro/20161007142400435/actions.txt +++ b/.besouro/20161007142400435/actions.txt @@ -25,3 +25,95 @@ UnitTestCaseAction 1475841516781 TestRomanNumerals.java FAIL UnitTestSessionAction 1475841516781 TestRomanNumerals.java FAIL CompilationAction 1475841753170 RomanNumerals.java EditAction 1475841793714 RomanNumerals.java 3116 2 3 0 +CompilationAction 1475841793917 RomanNumerals.java +CompilationAction 1475841835351 RomanNumerals.java +CompilationAction 1475841864569 RomanNumerals.java +CompilationAction 1475843105152 RomanNumerals.java +CompilationAction 1475843105604 RomanNumerals.java +CompilationAction 1475843231809 RomanNumerals.java +CompilationAction 1475843426216 RomanNumerals.java +CompilationAction 1475843438337 RomanNumerals.java +UnitTestCaseAction 1475843443786 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475843443786 TestRomanNumerals.java FAIL +UnitTestCaseAction 1475843505237 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475843505237 TestRomanNumerals.java FAIL +UnitTestCaseAction 1475843536035 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475843536035 TestRomanNumerals.java FAIL +UnitTestCaseAction 1475844435475 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475844435475 TestRomanNumerals.java FAIL +UnitTestCaseAction 1475846356302 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475846356302 TestRomanNumerals.java FAIL +UnitTestCaseAction 1475846424602 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475846424602 TestRomanNumerals.java FAIL +CompilationAction 1475846479842 RomanNumerals.java +CompilationAction 1475846479842 RomanNumerals.java +CompilationAction 1475846479857 RomanNumerals.java +CompilationAction 1475846479857 RomanNumerals.java +CompilationAction 1475846479857 RomanNumerals.java +CompilationAction 1475846479857 RomanNumerals.java +CompilationAction 1475846494241 RomanNumerals.java +CompilationAction 1475846494241 RomanNumerals.java +CompilationAction 1475846494241 RomanNumerals.java +CompilationAction 1475846494241 RomanNumerals.java +CompilationAction 1475846494241 RomanNumerals.java +CompilationAction 1475846494241 RomanNumerals.java +UnitTestCaseAction 1475846565879 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475846565879 TestRomanNumerals.java FAIL +RefactoringAction 1475846601962 TestRomanNumerals.java ADD void test_III()/2 METHOD +RefactoringAction 1475846605066 TestRomanNumerals.java RENAME test_III()/2=>void test_IIII() METHOD +UnitTestCaseAction 1475846622761 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475846622761 TestRomanNumerals.java FAIL +UnitTestCaseAction 1475846682871 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475846682871 TestRomanNumerals.java FAIL +UnitTestCaseAction 1475846772778 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475846772778 TestRomanNumerals.java FAIL +UnitTestCaseAction 1475846790768 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475846790768 TestRomanNumerals.java FAIL +CompilationAction 1475847062619 RomanNumerals.java +CompilationAction 1475847062619 RomanNumerals.java +CompilationAction 1475847121493 RomanNumerals.java +CompilationAction 1475847121493 RomanNumerals.java +CompilationAction 1475847121509 RomanNumerals.java +CompilationAction 1475847121509 RomanNumerals.java +CompilationAction 1475847150213 RomanNumerals.java +CompilationAction 1475847159682 RomanNumerals.java +UnitTestCaseAction 1475847166050 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475847166050 TestRomanNumerals.java FAIL +UnitTestCaseAction 1475847181232 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475847181232 TestRomanNumerals.java FAIL +UnitTestCaseAction 1475847227457 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475847227457 TestRomanNumerals.java FAIL +UnitTestCaseAction 1475847260938 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475847260938 TestRomanNumerals.java FAIL +UnitTestCaseAction 1475847293498 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475847293498 TestRomanNumerals.java FAIL +UnitTestCaseAction 1475847359568 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475847359568 TestRomanNumerals.java FAIL +RefactoringAction 1475847408615 TestRomanNumerals.java ADD void test_X()/2 METHOD +RefactoringAction 1475847411189 TestRomanNumerals.java RENAME test_X()/2=>void test_XI() METHOD +UnitTestCaseAction 1475847422299 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475847422299 TestRomanNumerals.java FAIL +UnitTestCaseAction 1475847566868 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475847566868 TestRomanNumerals.java FAIL +UnitTestCaseAction 1475847634714 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475847634714 TestRomanNumerals.java FAIL +UnitTestCaseAction 1475847670532 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475847670532 TestRomanNumerals.java FAIL +CompilationAction 1475847799924 RomanNumerals.java +CompilationAction 1475847799924 RomanNumerals.java +CompilationAction 1475847916784 RomanNumerals.java +CompilationAction 1475847916784 RomanNumerals.java +CompilationAction 1475847916893 RomanNumerals.java +CompilationAction 1475847916893 RomanNumerals.java +CompilationAction 1475847938468 RomanNumerals.java +CompilationAction 1475847938468 RomanNumerals.java +CompilationAction 1475847938608 RomanNumerals.java +CompilationAction 1475847938608 RomanNumerals.java +UnitTestCaseAction 1475847997362 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475847997362 TestRomanNumerals.java FAIL +UnitTestCaseAction 1475848143381 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475848143381 TestRomanNumerals.java FAIL +UnitTestCaseAction 1475848184989 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475848184989 TestRomanNumerals.java FAIL +UnitTestCaseAction 1475848311306 TestRomanNumerals.java FAIL +UnitTestSessionAction 1475848311306 TestRomanNumerals.java FAIL diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java index a42e6ee..a08d555 100644 --- a/src/RomanNumerals.java +++ b/src/RomanNumerals.java @@ -5,60 +5,60 @@ public class RomanNumerals { public int convertToInteger(String romanNum) { + //two-letter groups - if (romanNum.length() == 1) - return convertSingleRoman(romanNum); - else if (romanNum.length() == 2) { - if (romanNum.substring(0,1).equals(romanNum.substring(1))) - return 2*convertSingleRoman(romanNum.substring(0, 1)); - else if ((convertSingleRoman(romanNum.substring(0,1))) < convertSingleRoman((romanNum.substring(1)))) - return convertSingleRoman(romanNum.substring(1)) - convertSingleRoman(romanNum.substring(0,1)); - else if ((convertSingleRoman(romanNum.substring(0,1))) > convertSingleRoman((romanNum.substring(1)))) - return convertSingleRoman(romanNum.substring(1)) + convertSingleRoman(romanNum.substring(0,1)); + if (romanNum.length() == 1){ + return convertSingleRoman(romanNum);} + + if (romanNum.length() == 2) { + if (romanNum.substring(0,1).equals(romanNum.substring(1))){ + return 2*convertSingleRoman(romanNum.substring(0, 1));}} + else if ((convertSingleRoman(romanNum.substring(0,1))) < convertSingleRoman((romanNum.substring(1)))){ + return convertSingleRoman(romanNum.substring(1)) - convertSingleRoman(romanNum.substring(0,1));} + else if ((convertSingleRoman(romanNum.substring(0,1))) > convertSingleRoman((romanNum.substring(1)))){ + return convertSingleRoman(romanNum.substring(1)) + convertSingleRoman(romanNum.substring(0,1)); + } //three-letter groups - else if (romanNum.length() == 3) { - if (romanNum.substring(0,1).equals(romanNum.substring(1)) && (romanNum.substring(1,2).equals(romanNum.substring(3)))) - return 3*convertSingleRoman(romanNum.substring(1,3)); - else if ((convertSingleRoman(romanNum.substring(0,2))) < convertSingleRoman((romanNum.substring(2)))) - return convertSingleRoman(romanNum.substring(2)) - convertSingleRoman(romanNum.substring(0,2)); - else if ((convertSingleRoman(romanNum.substring(0,2))) > convertSingleRoman((romanNum.substring(2)))) - return convertSingleRoman(romanNum.substring(2)) + convertSingleRoman(romanNum.substring(0,2)); - - else if (romanNum.length() == 4) { - if (romanNum.substring(0,1).equals(romanNum.substring(1)) && (romanNum.substring(1,2).equals(romanNum.substring(3) && (romanNum.substring(3,4).equals(romanNum.substring(4)))))) - return 4*convertSingleRoman(romanNum.substring(0, 3)); - else if ((convertSingleRoman(romanNum.substring(0,3))) < convertSingleRoman((romanNum.substring(3)))) - return convertSingleRoman(romanNum.substring(3)) - convertSingleRoman(romanNum.substring(0,3)); - else if ((convertSingleRoman(romanNum.substring(0,3))) > convertSingleRoman((romanNum.substring(3)))) - return convertSingleRoman(romanNum.substring(3)) + convertSingleRoman(romanNum.substring(0,3)); - } -//TODO: implement the conversion for the three-letter groups - }//else if (romanNum == "III"){ - //return 1 + 1 + 1; + if (romanNum.length() == 3) { + if (romanNum.substring(0,1).equals(romanNum.substring(1,2)) && (romanNum.substring(1,2).equals(romanNum.substring(2,3)))) + return 3*convertSingleRoman(romanNum.substring(0,1)); + } + + if (romanNum.length() == 4) { + if (romanNum.substring(0,1).equals(romanNum.substring(1,2)) && (romanNum.substring(1,2)).equals(romanNum.substring(2,3))&& (romanNum.substring(2,3)).equals(romanNum.substring(3,4))) + //if (romanNum.substring(0,1).equals(romanNum.substring(1)) && (romanNum.substring(1,2).equals(romanNum.substring(3)) && (romanNum.substring(3,4).equals(romanNum.substring(4)))))) + return 4*convertSingleRoman(romanNum.substring(0, 1)); + } + else if (romanNum == "III"){ + return 1 + 1 + 1; - }else if (romanNum == "VII"){ - return 5 + 1 + 1; - }else if (romanNum == "VIII"){ - return 5 + 1 + 1 + 1; + }else if (romanNum == "VII"){ + return 5 + 1 + 1; + }else if (romanNum == "VIII"){ + return 5 + 1 + 1 + 1; - }else if (romanNum == "XXX"){ - return 10 + 10 + 10; + }else if (romanNum == "XXX"){ + return 10 + 10 + 10; - }else if (romanNum == "LXX"){ - return 50 + 10 + 10; - }else if (romanNum == "LXXX"){ - return 50 + 10 + 10 + 10; + }else if (romanNum == "LXX"){ + return 50 + 10 + 10; + }else if (romanNum == "LXXX"){ + return 50 + 10 + 10 + 10; - }else if (romanNum == "CCC"){ - return 100 + 100 + 100; + }else if (romanNum == "CCC"){ + return 100 + 100 + 100; - }else if (romanNum == "DCC"){ - return 500 + 100 + 100; - }else if (romanNum == "DCCC"){ - return 500 + 100 + 100 + 100;} - return 0; + }else if (romanNum == "DCC"){ + return 500 + 100 + 100; + }else if (romanNum == "DCCC"){ + return 500 + 100 + 100 + 100;} + return 0; + + } + + private int convertSingleRoman(String roman) { if (roman.equals("I")) diff --git a/tests/TestRomanNumerals.java b/tests/TestRomanNumerals.java index 6b8526e..abf04fd 100644 --- a/tests/TestRomanNumerals.java +++ b/tests/TestRomanNumerals.java @@ -24,6 +24,12 @@ public void test_III() { assertEquals(3, result); } @Test + public void test_IIII() { + RomanNumerals roman = new RomanNumerals(); + int result = roman.convertToInteger("IIII"); + assertEquals(4, result); + } + @Test public void test_IV() { RomanNumerals roman = new RomanNumerals(); int result = roman.convertToInteger("IV"); @@ -65,7 +71,12 @@ public void test_X() { int result = roman.convertToInteger("X"); assertEquals(10, result); } - + @Test + public void test_XI() { + RomanNumerals roman = new RomanNumerals(); + int result = roman.convertToInteger("XI"); + assertEquals(11, result); + } @Test