From 8a94944e4faf028ae111763895b8167419edf16b Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:14:01 +0300 Subject: [PATCH 001/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 2 ++ .besouro/20161007141352402/besouroEpisodes.txt | 0 .besouro/20161007141352402/disagreements.txt | 0 .besouro/20161007141352402/randomHeuristicEpisodes.txt | 0 .besouro/20161007141352402/userComments.txt | 0 .besouro/20161007141352402/zorroEpisodes.txt | 0 bin/.gitignore | 2 ++ tests/SpreadsheetTest.java | 7 ++++--- 8 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .besouro/20161007141352402/actions.txt create mode 100644 .besouro/20161007141352402/besouroEpisodes.txt create mode 100644 .besouro/20161007141352402/disagreements.txt create mode 100644 .besouro/20161007141352402/randomHeuristicEpisodes.txt create mode 100644 .besouro/20161007141352402/userComments.txt create mode 100644 .besouro/20161007141352402/zorroEpisodes.txt create mode 100644 bin/.gitignore diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt new file mode 100644 index 0000000..f4704c1 --- /dev/null +++ b/.besouro/20161007141352402/actions.txt @@ -0,0 +1,2 @@ +FileOpenedAction 1475838832611 SpreadsheetTest.java 162 1 1 1 +EditAction 1475838841813 SpreadsheetTest.java 203 1 1 1 diff --git a/.besouro/20161007141352402/besouroEpisodes.txt b/.besouro/20161007141352402/besouroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161007141352402/disagreements.txt b/.besouro/20161007141352402/disagreements.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161007141352402/randomHeuristicEpisodes.txt b/.besouro/20161007141352402/randomHeuristicEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161007141352402/userComments.txt b/.besouro/20161007141352402/userComments.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161007141352402/zorroEpisodes.txt b/.besouro/20161007141352402/zorroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..2079672 --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1,2 @@ +/Spreadsheet.class +/SpreadsheetTest.class diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 9e0936a..af70126 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -6,10 +6,11 @@ public class SpreadsheetTest { + Spreadsheet ss = new Spreadsheet(); + @Test - public void test() { - fail("Not yet implemented"); - + public void spreadsheet_notnull() { + assertNotNull(ss); } } From c2c85747c5a94a315feb0c6e907695f655b99649 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:21:19 +0300 Subject: [PATCH 002/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 13 +++++++++++++ .besouro/20161007141352402/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/20161007141352402/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 490 -> 571 bytes src/Spreadsheet.java | 4 ++++ 6 files changed, 20 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index f4704c1..9205557 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -1,2 +1,15 @@ FileOpenedAction 1475838832611 SpreadsheetTest.java 162 1 1 1 EditAction 1475838841813 SpreadsheetTest.java 203 1 1 1 +UnitTestCaseAction 1475838842296 SpreadsheetTest.java OK +UnitTestSessionAction 1475838842297 SpreadsheetTest.java OK +RefactoringAction 1475838864280 SpreadsheetTest.java ADD void s FIELD +RefactoringAction 1475838866798 SpreadsheetTest.java RENAME s=>void spreadsheet_ FIELD +RefactoringAction 1475838869321 SpreadsheetTest.java RENAME spreadsheet_=>void spreadsheet_set_a FIELD +RefactoringAction 1475838871845 SpreadsheetTest.java RENAME spreadsheet_set_a=>void spreadsheet_set_a1_1() METHOD +RefactoringAction 1475839138870 Spreadsheet.java ADD Map my FIELD +RefactoringAction 1475839144887 Spreadsheet.java RENAME my=>Map map FIELD +RefactoringAction 1475839250031 Spreadsheet.java ADD import java.util.Map IMPORT +RefactoringAction 1475839254049 Spreadsheet.java RENAME import java.util.Map=>import java.util.* IMPORT +RefactoringAction 1475839266062 Spreadsheet.java REMOVE map FIELD +RefactoringAction 1475839268586 Spreadsheet.java ADD Map map FIELD +EditAction 1475839278957 Spreadsheet.java 347 3 2 0 diff --git a/.besouro/20161007141352402/besouroEpisodes.txt b/.besouro/20161007141352402/besouroEpisodes.txt index e69de29..9579bd6 100644 --- a/.besouro/20161007141352402/besouroEpisodes.txt +++ b/.besouro/20161007141352402/besouroEpisodes.txt @@ -0,0 +1 @@ +1475838842297 regression 1 9 true diff --git a/.besouro/20161007141352402/randomHeuristicEpisodes.txt b/.besouro/20161007141352402/randomHeuristicEpisodes.txt index e69de29..6dd41b3 100644 --- a/.besouro/20161007141352402/randomHeuristicEpisodes.txt +++ b/.besouro/20161007141352402/randomHeuristicEpisodes.txt @@ -0,0 +1 @@ +1475838842297 regression 1 9 false diff --git a/.besouro/20161007141352402/zorroEpisodes.txt b/.besouro/20161007141352402/zorroEpisodes.txt index e69de29..6dd41b3 100644 --- a/.besouro/20161007141352402/zorroEpisodes.txt +++ b/.besouro/20161007141352402/zorroEpisodes.txt @@ -0,0 +1 @@ +1475838842297 regression 1 9 false diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index e7086bd9ef1b6a8b7afcfb717afbaddbf99a7876..dbdffa78bc4d53872d2a0f1683dd61ea9a4b681c 100644 GIT binary patch literal 571 zcmZ9J%SyvQ6o&svYg5zo;{ATxX%}`QZWKWUSD}JR!Iezwpi^QZ$;9^(6h*-Y@S((i zqS)XflXK=j=R24A{CfKUu!D6MjzIJLK2h>Iy;aIwsMNS93$%vvL3TnJ-E>a-Lp3l0 zPMQkTgF^J4KxJP?+8hX!Hn(~L<>UBTc_^Xg!$s9aU7%LT@Zh614)T4Bp~B*Uj#M|h z>#O8K_CqBw8N>q__GF^1|9e?Bx0=-_iq&ne>|iP#wSN`GCd$H4VBsu_jJ{JnooZqZ zBP!D9I3lGL#K}!(n6dFr4)L&nB^Qg7M#^EDs>JwM#tO%lxz~+NH^KVC0dDGdl3H9c@sWNg2ZInJgRozIi9%&+ zi9%*>K~8FJYFliN0fTacWTs4}&;^1S11WT4H7n zBZH`hPgY`CqJB43lx1SzhpG|)s{?rjVi22<;0^|1gh^aLwG2RW VSb@5^86;uGvB8Z43IUZ!0RWT>DSQ9` diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index e4f120b..2a1ec4a 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -1,6 +1,10 @@ +import java.util.*; public class Spreadsheet { + Map map = new HashMap(); + + public String get(String cell) { // to be implemented return null; From 4bc2a914b41a667f1f83dad52a3bb84a0b9c8370 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:21:22 +0300 Subject: [PATCH 003/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 613 -> 778 bytes tests/SpreadsheetTest.java | 9 +++++++++ 3 files changed, 10 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 9205557..c853dda 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -13,3 +13,4 @@ RefactoringAction 1475839254049 Spreadsheet.java RENAME import java.util.Map=>im RefactoringAction 1475839266062 Spreadsheet.java REMOVE map FIELD RefactoringAction 1475839268586 Spreadsheet.java ADD Map map FIELD EditAction 1475839278957 Spreadsheet.java 347 3 2 0 +EditAction 1475839282715 SpreadsheetTest.java 285 2 2 1 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 92b411f05752a6cee6d06c9769e1b70d40aa0840..d8962da0fe3cc89c5a4b485d3714997a4bcc8c32 100644 GIT binary patch delta 419 zcmaiuy-or_6otH zd)B|a)uZv;= zRtk%7SaX|ki9g54umTFrDg5Rug7YZ~FDO1I>WDF*0(=fRA@edj-|k=qWp;v9tQp>< zrlLo)WBfo5qb<|bI9si$)=}YHuz^jp#pw~Bago&4BEkewwZmV8{2+|=7Ga8c+n#{Q Rt}3=RvRC|YCf=C`wRY-8)yIG)!4RW5WJ7C%N4{TAea0+^?+ihR&?aMs8S> Date: Fri, 7 Oct 2016 14:22:10 +0300 Subject: [PATCH 004/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 571 -> 751 bytes tests/SpreadsheetTest.java | 3 ++- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index c853dda..e0b6eb2 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -14,3 +14,4 @@ RefactoringAction 1475839266062 Spreadsheet.java REMOVE map FIELD RefactoringAction 1475839268586 Spreadsheet.java ADD Map map FIELD EditAction 1475839278957 Spreadsheet.java 347 3 2 0 EditAction 1475839282715 SpreadsheetTest.java 285 2 2 1 +EditAction 1475839330770 SpreadsheetTest.java 343 2 4 2 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index dbdffa78bc4d53872d2a0f1683dd61ea9a4b681c..e92df201d486738fba81f25b9924bc144f47b0a5 100644 GIT binary patch delta 211 zcmdnZ@}8CJ)W2Q(7#J8#7&JF>1u{m96c-ewCZ-f;q^6d{7XxvkVZ0#+g90N1lOvE; zVq{=6eU z0C_+c07)hW4FJ$>CU^h< delta 35 rcmaFQx|@aT)W2Q(7#J8#7!)>g1u{ Date: Fri, 7 Oct 2016 14:23:16 +0300 Subject: [PATCH 005/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 751 -> 939 bytes src/Spreadsheet.java | 10 ++++++++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index e0b6eb2..8166074 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -15,3 +15,6 @@ RefactoringAction 1475839268586 Spreadsheet.java ADD Map map FIEL EditAction 1475839278957 Spreadsheet.java 347 3 2 0 EditAction 1475839282715 SpreadsheetTest.java 285 2 2 1 EditAction 1475839330770 SpreadsheetTest.java 343 2 4 2 +UnitTestCaseAction 1475839333153 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475839333154 SpreadsheetTest.java FAIL +EditAction 1475839396017 Spreadsheet.java 383 3 2 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index e92df201d486738fba81f25b9924bc144f47b0a5..20bd4fffb4e393866ac3e16b0c11f1faa22f9ba8 100644 GIT binary patch delta 283 zcmaFQx|*Hq)W2Q(7#J8#7>qY^t!J#~V&GxW;9<~Y&|+j@PERdiWKh%a$x19s)Xz!G zOVfGfDJwO(#2U!} zsEB45BLkasQEG8%4$xL1Bn41QC+}qZm>$Ex%)kV6uZ-3f27V!VA;oPB$`Ix@26Z1H zMeQ97+8crLObmiRQiy>COmZ`bFo-gUF-S9r1H~ACEU+02!a#8bpbR^MK7#=RBM=$_ I`AiH(0FCcIX#fBK delta 93 zcmZ3@{+^ZV)W2Q(7#J8#7&JF>t!JDZ%=FRKih-Gd5h%u^wS|FSNM1;B8-wyjAfJgr j5J++XX$A%%25ts1APH0jQOh9AAOhquGN=PdCI$@vmh=qr diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 2a1ec4a..f55a0a2 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -2,16 +2,22 @@ public class Spreadsheet { + // dictionary of cells and values. Map map = new HashMap(); public String get(String cell) { - // to be implemented + + + return null; } public void set(String cell, String value) { - // to be implemented + + if(map.containsKey(cell)) + + } public String evaluate(String cell) { From 6c60166a2b0fbcb116f9a04a2897d7426cc66f17 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:25:56 +0300 Subject: [PATCH 006/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 7 +++++++ bin/Spreadsheet.class | Bin 778 -> 778 bytes src/Spreadsheet.java | 7 ++++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 8166074..2683779 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -18,3 +18,10 @@ EditAction 1475839330770 SpreadsheetTest.java 343 2 4 2 UnitTestCaseAction 1475839333153 SpreadsheetTest.java FAIL UnitTestSessionAction 1475839333154 SpreadsheetTest.java FAIL EditAction 1475839396017 Spreadsheet.java 383 3 2 0 +CompilationAction 1475839396134 Spreadsheet.java +CompilationAction 1475839401448 Spreadsheet.java +CompilationAction 1475839401803 Spreadsheet.java +CompilationAction 1475839456403 Spreadsheet.java +CompilationAction 1475839456579 Spreadsheet.java +CompilationAction 1475839521675 Spreadsheet.java +EditAction 1475839556426 Spreadsheet.java 420 3 3 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index d8962da0fe3cc89c5a4b485d3714997a4bcc8c32..0a00c9f4268997bcb85371db7708c715c7fefd0e 100644 GIT binary patch delta 37 tcmeBT>tfq*ijk3N@@Ym-Mvlp%Oty@ClY^O@7{w+}WAbH`n*4-G4FJFF3Aq3O delta 37 tcmeBT>tfq*ijk3F@@Ym-M%KxqOty?%lY^O@82KkpWAbGbp8SMK4FJBm38DZ1 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index f55a0a2..d1ea0f4 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -3,8 +3,9 @@ public class Spreadsheet { // dictionary of cells and values. - Map map = new HashMap(); - + // cell => key + // value => value + private Map map = new HashMap(); public String get(String cell) { @@ -15,7 +16,7 @@ public String get(String cell) { public void set(String cell, String value) { - if(map.containsKey(cell)) + map.put(cell, value); } From a693c48281a8380ff43b3d7d3af270d15115ae69 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:26:34 +0300 Subject: [PATCH 007/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 778 -> 888 bytes src/Spreadsheet.java | 4 +++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 2683779..2d06241 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -25,3 +25,4 @@ CompilationAction 1475839456403 Spreadsheet.java CompilationAction 1475839456579 Spreadsheet.java CompilationAction 1475839521675 Spreadsheet.java EditAction 1475839556426 Spreadsheet.java 420 3 3 0 +EditAction 1475839594547 Spreadsheet.java 455 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 0a00c9f4268997bcb85371db7708c715c7fefd0e..69e0a4a2d8efd2bf1a7948a9b6d0cbf163ddf2f4 100644 GIT binary patch delta 215 zcmeBT`@zO_>ff$?3=9k=4C))Xni%7_8RQrg*cs#*8F;f2%M$fVOEPoxeG?0K7!(H7XjS*gh-)|euim_n0#7(aygGcW@o0|T$t76w6Wot+G_ z%nachfdWhn!a$M>NHYLgJPcwCB0!b`L@|RXkPia943Z2|42)owGLXdtWUEX*z~s!X K3KU~vPy+ze94jvX delta 104 zcmeyt*2Ttk>ff$?3=9k=42m1Mniwa)V*KD@59BigG2=!c!Ned8B-t1kfutCN2#{2O lNHT~5`5?f^Aju#FmS<#;1+ticY`MvL%+BocKv^aR1pvxy41@px diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index d1ea0f4..c0d7ca8 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -9,7 +9,9 @@ public class Spreadsheet { public String get(String cell) { - + if(map.containsKey(cell)) { + + } return null; } From 66da46998bfde04566b2291a5c2ca8048e567ac2 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:27:14 +0300 Subject: [PATCH 008/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 888 -> 951 bytes src/Spreadsheet.java | 3 --- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 2d06241..93d0d8c 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -26,3 +26,4 @@ CompilationAction 1475839456579 Spreadsheet.java CompilationAction 1475839521675 Spreadsheet.java EditAction 1475839556426 Spreadsheet.java 420 3 3 0 EditAction 1475839594547 Spreadsheet.java 455 3 4 0 +EditAction 1475839634776 Spreadsheet.java 446 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 69e0a4a2d8efd2bf1a7948a9b6d0cbf163ddf2f4..7162209063ae517d6fb7efd6d29217503bbe60b7 100644 GIT binary patch delta 299 zcmeytww;~p)W2Q(7#J8#7_>KXnK3$ZGe|MWuro+AGVo?4mL=+!mSpDW`z99fFvv2< zF*0x`=jW9qX66-pr&cmDh-&zN73C!6rR)1AWu+#USZhX2c3|}5kYZ5bVNhjIo4k_o zZM`c46A&^m@M>*g5Y*nuAj!lK&bR?6z{DU7B)PznJPh0n0t_NRz8FL?gD8*%0=x|J z3KLLIwt2tt||K+B!QKWSJSl zHv$Ei7=(c&7m#KEvUnK87({?91&Cq>Q6L`#co`r@f>_Ex! Date: Fri, 7 Oct 2016 14:27:54 +0300 Subject: [PATCH 009/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 951 -> 951 bytes src/Spreadsheet.java | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 93d0d8c..4b47fd5 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -27,3 +27,4 @@ CompilationAction 1475839521675 Spreadsheet.java EditAction 1475839556426 Spreadsheet.java 420 3 3 0 EditAction 1475839594547 Spreadsheet.java 455 3 4 0 EditAction 1475839634776 Spreadsheet.java 446 3 4 0 +EditAction 1475839674377 Spreadsheet.java 465 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 7162209063ae517d6fb7efd6d29217503bbe60b7..1e9a7345da794bfc85104b7cb4a84117aed3204d 100644 GIT binary patch delta 23 ecmdnazMXx89W$#40}q4fWM^hyM#;$&nbiP9Nd+|k delta 23 ecmdnazMXx89W$#a0}q45WM^hyMw!VInbiP9hy^?V diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index d045d7f..5cdc21f 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -10,10 +10,10 @@ public class Spreadsheet { public String get(String cell) { if(map.containsKey(cell)) { - + return map.get(cell); } - return null; + return -1; } public void set(String cell, String value) { From 8ade8e1dd0ec72822bb88682fbfe0d5e2404189d Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:28:06 +0300 Subject: [PATCH 010/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 951 -> 1081 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 4b47fd5..84f7a31 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -28,3 +28,6 @@ EditAction 1475839556426 Spreadsheet.java 420 3 3 0 EditAction 1475839594547 Spreadsheet.java 455 3 4 0 EditAction 1475839634776 Spreadsheet.java 446 3 4 0 EditAction 1475839674377 Spreadsheet.java 465 3 4 0 +CompilationAction 1475839674485 Spreadsheet.java +CompilationAction 1475839682215 Spreadsheet.java +EditAction 1475839686308 Spreadsheet.java 477 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 1e9a7345da794bfc85104b7cb4a84117aed3204d..dc0fe5750974ff376e9f15af82bcd49556ca11a3 100644 GIT binary patch delta 308 zcmZ9FO-{l95QV>KQ3$lik3Ufo`~{Js^@kl-khs7L)TSY7LDLWuS017(S6%@V6H^z) zwKwn(F5Majapg=h^XBEfH_z!LlYRewc?H@WJ!WqupJRnJizU{DdL#alS~tz6P`L1J zJU8@)eYZD?&WHUBHDM-*qN_+q`9T;8rQ`pqj$rpjo`2c(u1~$QFo++dJ=?O_WiS4a z&pRJO8>-DGicZ3^!9B&lW7Xh|jd5vftO}E|&b)50u(c}`nAdA@n!tjhNmZ${jnGhR vA{B)@GQ1G6(X<%I+F7##ip;(|0Z delta 184 zcmdnVv7Mdk)W2Q(7#J8#7_>KXRWeS#&L}sTmC1-rg@-|vL2a@v)7w;61|}e6VBpo- z!XT) Date: Fri, 7 Oct 2016 14:29:23 +0300 Subject: [PATCH 011/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 7 +++++++ .../20161007141352402/besouroEpisodes.txt | 6 ++++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161007141352402/zorroEpisodes.txt | 3 ++- bin/Spreadsheet.class | Bin 1081 -> 1088 bytes tests/SpreadsheetTest.java | 13 +++++++++---- 6 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 84f7a31..5c57f07 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -31,3 +31,10 @@ EditAction 1475839674377 Spreadsheet.java 465 3 4 0 CompilationAction 1475839674485 Spreadsheet.java CompilationAction 1475839682215 Spreadsheet.java EditAction 1475839686308 Spreadsheet.java 477 3 4 0 +UnitTestCaseAction 1475839699452 SpreadsheetTest.java OK +UnitTestSessionAction 1475839699452 SpreadsheetTest.java OK +RefactoringAction 1475839713866 SpreadsheetTest.java ADD void spreadsheet_get_ FIELD +RefactoringAction 1475839717879 SpreadsheetTest.java RENAME spreadsheet_get_=>void spreadsheet_get_error FIELD +RefactoringAction 1475839721392 SpreadsheetTest.java RENAME spreadsheet_get_error=>void spreadsheet_get_error() METHOD +RefactoringAction 1475839753964 SpreadsheetTest.java REMOVE ss FIELD +EditAction 1475839763365 SpreadsheetTest.java 488 3 8 2 diff --git a/.besouro/20161007141352402/besouroEpisodes.txt b/.besouro/20161007141352402/besouroEpisodes.txt index 9579bd6..ef55ff6 100644 --- a/.besouro/20161007141352402/besouroEpisodes.txt +++ b/.besouro/20161007141352402/besouroEpisodes.txt @@ -1 +1,7 @@ 1475838842297 regression 1 9 true +1475839699452 test-first 3 835 true +1475839699453 test-first 3 835 true +1475839699454 test-first 3 835 true +1475839699455 test-first 3 835 true +1475839699456 test-first 3 835 true +1475839699457 test-first 3 835 true diff --git a/.besouro/20161007141352402/randomHeuristicEpisodes.txt b/.besouro/20161007141352402/randomHeuristicEpisodes.txt index 6dd41b3..55ab521 100644 --- a/.besouro/20161007141352402/randomHeuristicEpisodes.txt +++ b/.besouro/20161007141352402/randomHeuristicEpisodes.txt @@ -1 +1,2 @@ 1475838842297 regression 1 9 false +1475839699452 test-first 3 835 true diff --git a/.besouro/20161007141352402/zorroEpisodes.txt b/.besouro/20161007141352402/zorroEpisodes.txt index 6dd41b3..5bd496a 100644 --- a/.besouro/20161007141352402/zorroEpisodes.txt +++ b/.besouro/20161007141352402/zorroEpisodes.txt @@ -1 +1,2 @@ -1475838842297 regression 1 9 false +1475838842297 regression 1 9 true +1475839699452 test-first 3 857 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index dc0fe5750974ff376e9f15af82bcd49556ca11a3..762bdbbc94844e886f5e24c431670b22f3795ed6 100644 GIT binary patch delta 26 hcmdnVae!mPMMhqp)S{yNqTJNt;>7gS&DR-|m;j2x3L^jj delta 19 acmX@Wv6ExNMMgH()S{yNqRsahlb8TX?*}&k diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 8512bea..6104d38 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -5,22 +5,27 @@ public class SpreadsheetTest { - - Spreadsheet ss = new Spreadsheet(); @Test public void spreadsheet_notnull() { + Spreadsheet ss = new Spreadsheet(); assertNotNull(ss); } @Test public void spreadsheet_set_a1_1() { + Spreadsheet ss = new Spreadsheet(); ss.set("A1", "1"); - String result = ss.get("A1"); - assertEquals("1", result); } + @Test + public void spreadsheet_get_error() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "2"); + + } + } From d3f1f7568da87d756c3baeec823fd6ae3e89f695 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:29:33 +0300 Subject: [PATCH 012/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 939 -> 1071 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 5c57f07..4dca410 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -38,3 +38,4 @@ RefactoringAction 1475839717879 SpreadsheetTest.java RENAME spreadsheet_get_=>vo RefactoringAction 1475839721392 SpreadsheetTest.java RENAME spreadsheet_get_error=>void spreadsheet_get_error() METHOD RefactoringAction 1475839753964 SpreadsheetTest.java REMOVE ss FIELD EditAction 1475839763365 SpreadsheetTest.java 488 3 8 2 +EditAction 1475839773338 SpreadsheetTest.java 501 3 9 2 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 20bd4fffb4e393866ac3e16b0c11f1faa22f9ba8..80f993cdfecd8d63eb43ce99a817ae06d385b9d7 100644 GIT binary patch literal 1071 zcmZva+fEu$7=_nH1cX6hL?~7~^q`W!K< z=>znkny$?dm?}5>H2=T8wf3Gre}Dc4aE7xaVghU3udXz%ylW}_OX>MZ#07F=wo67f8G{ZPR}zuvD$}1mf?VE1AX;Rx~UlL7lc~%T91JknW{1u%v+Ac7}%4 zGh9>cr-yO>+VlkS?FZPVz`8eg(zhMo4lGNc{5i0F^G5be&!kMt<`=^^9h)k-w&RZK zuY#|vOw0D>^hF$nLszH?T0teRH9^6^Z=bG+aMvPR$_is<^TX^)x_==7x4Q=R)7 z4p3$1NOkTn=&U_%RjCg(9N}0%3-f*W78n*2{KpO-ILe-$sK5zVdVxi#{um&z5lv2S zed)T6n?i$;PX*FlCvb=IqpALeLgZD{Tb-y2#vYi8e9a2BI zh#}2UeFh6M9JR23bCx@SRep_OZCaI^)B&G(7UMem3;8d1SZ^QQqc9g-ozOE#QAPbY&ehmb-LdJthjsLx?QAv6fVQ1kFEZ6JwM5aX29+C`yqOH^Uk zaqL=MVFHt`DVBRAi9}kU?G|;+3Z&>U<`ovO=r&|cSI8)2VYx3-)RS0N$YaI*l(JjV zat&er0R&im{K`nIgH(Gz8W^(LFswJIavPCnL?5}+Fw7d^1?ceeKFV%VDZ1&w2u9fj zG4eFTIR~f`>>hiQvv;RkPYpyn80$d|o&#axB7H#p4> Date: Fri, 7 Oct 2016 14:30:01 +0300 Subject: [PATCH 013/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 1071 -> 1090 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 4dca410..8512043 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -39,3 +39,4 @@ RefactoringAction 1475839721392 SpreadsheetTest.java RENAME spreadsheet_get_erro RefactoringAction 1475839753964 SpreadsheetTest.java REMOVE ss FIELD EditAction 1475839763365 SpreadsheetTest.java 488 3 8 2 EditAction 1475839773338 SpreadsheetTest.java 501 3 9 2 +EditAction 1475839801077 SpreadsheetTest.java 531 3 9 3 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 80f993cdfecd8d63eb43ce99a817ae06d385b9d7..00567e0ed6b87e461e823f661738f64cb691efde 100644 GIT binary patch delta 132 zcmZ3_afpNK)W2Q(7#J8#7|b?u#WAsSFc>p3Fgb2cXDVP!j$mMBU;;`?>}C**+|D5E zqb(#WWU!4vQCrAp8-r^2MxY!M0~e4KVqgK1k_;RSQVaqN(hTAZG7Q{65iy8<1|9}p UAddqmCk2#c1VR%apNYW~07!Qc1poj5 delta 113 zcmX@av7UqL)W2Q(7#J8#7)&;D#W8IzV9IBV@MU0TU;+vX?q(2-+|D5Eqb(#WWU!4v zaU)QWiGd49@&T1FFi0|RFi0^7Fvu`)19@T)O$4rjevY624eur CEDnAE diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index cefebcc..d3ac56e 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -24,7 +24,7 @@ public void spreadsheet_set_a1_1() { public void spreadsheet_get_error() { Spreadsheet ss = new Spreadsheet(); ss.set("A1", "2"); - ss.get("A2"); + assertEquals("errormessage", ss.get("A2")); } From b1ff3e69df83b5c33fd30e52c06d5884eccaada7 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:30:13 +0300 Subject: [PATCH 014/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ .../20161007141352402/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/20161007141352402/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 1090 -> 1112 bytes src/Spreadsheet.java | 2 -- 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 8512043..ed3cc2b 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -40,3 +40,6 @@ RefactoringAction 1475839753964 SpreadsheetTest.java REMOVE ss FIELD EditAction 1475839763365 SpreadsheetTest.java 488 3 8 2 EditAction 1475839773338 SpreadsheetTest.java 501 3 9 2 EditAction 1475839801077 SpreadsheetTest.java 531 3 9 3 +UnitTestCaseAction 1475839803004 SpreadsheetTest.java OK +UnitTestSessionAction 1475839803004 SpreadsheetTest.java OK +EditAction 1475839813876 Spreadsheet.java 471 3 4 0 diff --git a/.besouro/20161007141352402/besouroEpisodes.txt b/.besouro/20161007141352402/besouroEpisodes.txt index ef55ff6..7d6c1d9 100644 --- a/.besouro/20161007141352402/besouroEpisodes.txt +++ b/.besouro/20161007141352402/besouroEpisodes.txt @@ -5,3 +5,4 @@ 1475839699455 test-first 3 835 true 1475839699456 test-first 3 835 true 1475839699457 test-first 3 835 true +1475839803004 test-addition 1 89 true diff --git a/.besouro/20161007141352402/randomHeuristicEpisodes.txt b/.besouro/20161007141352402/randomHeuristicEpisodes.txt index 55ab521..e64feaf 100644 --- a/.besouro/20161007141352402/randomHeuristicEpisodes.txt +++ b/.besouro/20161007141352402/randomHeuristicEpisodes.txt @@ -1,2 +1,3 @@ 1475838842297 regression 1 9 false 1475839699452 test-first 3 835 true +1475839803004 test-addition 1 89 false diff --git a/.besouro/20161007141352402/zorroEpisodes.txt b/.besouro/20161007141352402/zorroEpisodes.txt index 5bd496a..da8f0af 100644 --- a/.besouro/20161007141352402/zorroEpisodes.txt +++ b/.besouro/20161007141352402/zorroEpisodes.txt @@ -1,2 +1,3 @@ 1475838842297 regression 1 9 true 1475839699452 test-first 3 857 true +1475839803004 test-addition 1 103 true diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 00567e0ed6b87e461e823f661738f64cb691efde..b6d41f66089dcc01f94f115845b98aecc91018de 100644 GIT binary patch delta 124 zcmX@aaf5^F)W2Q(7#J8#7%Vn&B{K=|q!tzB7v-iF7bm8taxj=~&SolMREc3=W?%xU zlG)857`dH6*hgDPR>)u*gQAd;wvfp-2Gt!5nv?%COKD0o$S`mN6^cQWGw?9*0(l$^ TA`DUt(hQ71Xa?jnF_;4Yp}!Yr delta 124 zcmcb?afpNK)W2Q(7#J8#7|b?uB{OZVXDVV$j$mMBU;+wC>}C**+|D5Eqb(#WWU!4v zQCrAp8-r^2MxY!M0~e4KVqgK1k_;RSQVaqN(hTAZG7Q{65iy8<1|9}pAddqmCk2#c M1VR%apNYW~0R6EL#{d8T diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 1f6e7eb..b94622b 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -8,11 +8,9 @@ public class Spreadsheet { private Map map = new HashMap(); public String get(String cell) { - if(map.containsKey(cell)) { return map.get(cell); } - return "errormessage"; } From 5e497fa74365872d3c5f0598903b3d6e390aee28 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:30:50 +0300 Subject: [PATCH 015/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 4 ++++ bin/Spreadsheet.class | Bin 1088 -> 1088 bytes tests/SpreadsheetTest.java | 8 ++++++++ 3 files changed, 12 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index ed3cc2b..2f38071 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -43,3 +43,7 @@ EditAction 1475839801077 SpreadsheetTest.java 531 3 9 3 UnitTestCaseAction 1475839803004 SpreadsheetTest.java OK UnitTestSessionAction 1475839803004 SpreadsheetTest.java OK EditAction 1475839813876 Spreadsheet.java 471 3 4 0 +RefactoringAction 1475839832190 SpreadsheetTest.java ADD void spreadsheet_set_a1_1()/2 METHOD +RefactoringAction 1475839834706 SpreadsheetTest.java RENAME spreadsheet_set_a1_1()/2=>void spreadsheet_set_a1_() METHOD +RefactoringAction 1475839839222 SpreadsheetTest.java RENAME spreadsheet_set_a1_()=>void spreadsheet_set_a1_teststring() METHOD +EditAction 1475839850569 SpreadsheetTest.java 728 4 13 4 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 762bdbbc94844e886f5e24c431670b22f3795ed6..fd35167ed46c74615efee1cb3fad005bb6337956 100644 GIT binary patch delta 37 rcmX@Wae!k(Ix{CX11|#)gERx*l!lb;7N delta 37 rcmX@Wae!k(Ix{B^11}ItGYCvBU=C*$Vc=m9oqUGbmr-)E6pI=FlsyML diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index d3ac56e..9b1a102 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -20,6 +20,14 @@ public void spreadsheet_set_a1_1() { assertEquals("1", result); } + @Test + public void spreadsheet_set_a1_teststring() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "teststring"); + String result = ss.get("A1"); + assertEquals("teststring", result); + } + @Test public void spreadsheet_get_error() { Spreadsheet ss = new Spreadsheet(); From 4bc8f3afbe2e81681ec46442add17e01f32f4e43 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:31:02 +0300 Subject: [PATCH 016/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ .../20161007141352402/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161007141352402/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 1112 -> 1294 bytes tests/SpreadsheetTest.java | 3 +-- 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 2f38071..7201006 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -47,3 +47,6 @@ RefactoringAction 1475839832190 SpreadsheetTest.java ADD void spreadsheet_set_a1 RefactoringAction 1475839834706 SpreadsheetTest.java RENAME spreadsheet_set_a1_1()/2=>void spreadsheet_set_a1_() METHOD RefactoringAction 1475839839222 SpreadsheetTest.java RENAME spreadsheet_set_a1_()=>void spreadsheet_set_a1_teststring() METHOD EditAction 1475839850569 SpreadsheetTest.java 728 4 13 4 +UnitTestCaseAction 1475839852104 SpreadsheetTest.java OK +UnitTestSessionAction 1475839852104 SpreadsheetTest.java OK +EditAction 1475839862861 SpreadsheetTest.java 702 4 12 4 diff --git a/.besouro/20161007141352402/besouroEpisodes.txt b/.besouro/20161007141352402/besouroEpisodes.txt index 7d6c1d9..4721d2e 100644 --- a/.besouro/20161007141352402/besouroEpisodes.txt +++ b/.besouro/20161007141352402/besouroEpisodes.txt @@ -6,3 +6,5 @@ 1475839699456 test-first 3 835 true 1475839699457 test-first 3 835 true 1475839803004 test-addition 1 89 true +1475839852104 test-last 1 38 false +1475839852105 test-last 1 38 false diff --git a/.besouro/20161007141352402/randomHeuristicEpisodes.txt b/.besouro/20161007141352402/randomHeuristicEpisodes.txt index e64feaf..ebe264a 100644 --- a/.besouro/20161007141352402/randomHeuristicEpisodes.txt +++ b/.besouro/20161007141352402/randomHeuristicEpisodes.txt @@ -1,3 +1,4 @@ 1475838842297 regression 1 9 false 1475839699452 test-first 3 835 true 1475839803004 test-addition 1 89 false +1475839852104 test-last 1 38 false diff --git a/.besouro/20161007141352402/zorroEpisodes.txt b/.besouro/20161007141352402/zorroEpisodes.txt index da8f0af..5d8a002 100644 --- a/.besouro/20161007141352402/zorroEpisodes.txt +++ b/.besouro/20161007141352402/zorroEpisodes.txt @@ -1,3 +1,4 @@ 1475838842297 regression 1 9 true 1475839699452 test-first 3 857 true 1475839803004 test-addition 1 103 true +1475839852104 test-last 1 49 false diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index b6d41f66089dcc01f94f115845b98aecc91018de..043fbe86564fbaf219b9a0bcc0a7398d2e92be89 100644 GIT binary patch delta 260 zcmcb?(Z|Jg>ff$?3=9k=4AvXD9GQ}2iwlZU6H|&aQd3Lfi-9=NFuo+UxTLtGC^Ije zgTauIfeXQBWDrGGpAJ-?T2z!@#KB;~$iQgC!C=P7zylV^O)V}?Oi$%tu$WxSWWvb0 zc@vX8NQsRUH13{>~v delta 142 zcmeCff$?3=9k=3>F)?9GQ$niwlZU6H|&aQd3Lf(}6g(s3^aPgTauIfzgPA z!I+VO2P~4CT3no%p31>sI(aRV2_wtqM@;sNlb5rI>KJTeP!uxK7Bbn!pt^%Wb0g4j iCI&7bDa616BqbR*7^D~k7^HzvX7URbd3H0f3UdHM=ph0C diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 9b1a102..edb7c0e 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -24,8 +24,7 @@ public void spreadsheet_set_a1_1() { public void spreadsheet_set_a1_teststring() { Spreadsheet ss = new Spreadsheet(); ss.set("A1", "teststring"); - String result = ss.get("A1"); - assertEquals("teststring", result); + assertEquals("teststring", ss.get("A1")); } @Test From 8d9ebf0d0e832a195b32996675d6979a2675315f Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:34:35 +0300 Subject: [PATCH 017/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1294 -> 1278 bytes tests/SpreadsheetTest.java | 8 ++++++++ 3 files changed, 11 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 7201006..7cc2664 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -50,3 +50,6 @@ EditAction 1475839850569 SpreadsheetTest.java 728 4 13 4 UnitTestCaseAction 1475839852104 SpreadsheetTest.java OK UnitTestSessionAction 1475839852104 SpreadsheetTest.java OK EditAction 1475839862861 SpreadsheetTest.java 702 4 12 4 +RefactoringAction 1475840057331 SpreadsheetTest.java ADD void spreadsheet_evaluate FIELD +RefactoringAction 1475840065346 SpreadsheetTest.java RENAME spreadsheet_evaluate=>void spreadsheet_evaluate_negative() METHOD +EditAction 1475840075075 SpreadsheetTest.java 874 5 15 5 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 043fbe86564fbaf219b9a0bcc0a7398d2e92be89..b41dc2c5b0d6e3a5243d4fb4b10c319dd1147604 100644 GIT binary patch delta 82 zcmeC<`p3CJk!A977Ev98Z48P+2HHZh+Za@LFlcUMU|?Wk-~y6D3@kuWl7WLkia~%u d8VF@3zhIG{JdwqVR{F)9Z48RqLbBT!RDFdEbapUkZe(C!U}E3`l41<3KvI%{gF%Wx mfI*r;oI!>`mO*y%BWBIXjVxZgia;49po}t5PG#~97Bv9xMh?;d diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index edb7c0e..1d41bc2 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -34,5 +34,13 @@ public void spreadsheet_get_error() { assertEquals("errormessage", ss.get("A2")); } + @Test + public void spreadsheet_evaluate_negative() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "2"); + assertEquals("errormessage", ss.evaluate("A2")); + + } + } From 7091a84173e044367ded53ec9b807adfaa10d80c Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:34:44 +0300 Subject: [PATCH 018/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 1278 -> 1449 bytes tests/SpreadsheetTest.java | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 7cc2664..f17eda1 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -53,3 +53,4 @@ EditAction 1475839862861 SpreadsheetTest.java 702 4 12 4 RefactoringAction 1475840057331 SpreadsheetTest.java ADD void spreadsheet_evaluate FIELD RefactoringAction 1475840065346 SpreadsheetTest.java RENAME spreadsheet_evaluate=>void spreadsheet_evaluate_negative() METHOD EditAction 1475840075075 SpreadsheetTest.java 874 5 15 5 +EditAction 1475840084440 SpreadsheetTest.java 875 5 15 5 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index b41dc2c5b0d6e3a5243d4fb4b10c319dd1147604..21db1b01648d05941caf8b791f7aa99da758a2c0 100644 GIT binary patch delta 136 zcmeyzxssdf)W2Q(7#J8#80Pb|qS zOXXq^WU%I8uwl?(WZ;0wPTs_%&&am<5tBI6WL_4{$!l1+6|HtKXl?`=%f!G1B!w7Q cfTTJD2ZIKK0D~rjG=ui!8!YndwqO-@040YZl>h($ delta 36 scmZ3<{g0FD)W2Q(7#J8#7_2vPtzw$|l1Z15b+b6LI1?)a0~3Q40O+X+v;Y7A diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 1d41bc2..2e2b398 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -37,8 +37,8 @@ public void spreadsheet_get_error() { @Test public void spreadsheet_evaluate_negative() { Spreadsheet ss = new Spreadsheet(); - ss.set("A1", "2"); - assertEquals("errormessage", ss.evaluate("A2")); + ss.set("A1", "-1"); + assertEquals("errormessage", ss.evaluate("A1")); } From dcd54b8c0f0b68a78d0ac0db77f2baac2e792221 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:34:51 +0300 Subject: [PATCH 019/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 1449 -> 1457 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index f17eda1..1041a54 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -54,3 +54,4 @@ RefactoringAction 1475840057331 SpreadsheetTest.java ADD void spreadsheet_evalua RefactoringAction 1475840065346 SpreadsheetTest.java RENAME spreadsheet_evaluate=>void spreadsheet_evaluate_negative() METHOD EditAction 1475840075075 SpreadsheetTest.java 874 5 15 5 EditAction 1475840084440 SpreadsheetTest.java 875 5 15 5 +EditAction 1475840091058 SpreadsheetTest.java 865 5 15 5 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 21db1b01648d05941caf8b791f7aa99da758a2c0..515f2f7062cb3d53c331b4465ad0ba31c911b406 100644 GIT binary patch delta 66 zcmZ3j)W2Q(7#J8#80yZ G40ZsGV+{KM diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 2e2b398..e9e9bca 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -38,7 +38,7 @@ public void spreadsheet_get_error() { public void spreadsheet_evaluate_negative() { Spreadsheet ss = new Spreadsheet(); ss.set("A1", "-1"); - assertEquals("errormessage", ss.evaluate("A1")); + assertEquals("-1", ss.evaluate("A1")); } From 44d401896ca19be6f4f1f8149db8f7bcb1fec665 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:35:18 +0300 Subject: [PATCH 020/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1457 -> 1457 bytes src/Spreadsheet.java | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 1041a54..52bd4b0 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -55,3 +55,6 @@ RefactoringAction 1475840065346 SpreadsheetTest.java RENAME spreadsheet_evaluate EditAction 1475840075075 SpreadsheetTest.java 874 5 15 5 EditAction 1475840084440 SpreadsheetTest.java 875 5 15 5 EditAction 1475840091058 SpreadsheetTest.java 865 5 15 5 +UnitTestCaseAction 1475840101713 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475840101714 SpreadsheetTest.java FAIL +EditAction 1475840118574 Spreadsheet.java 460 3 4 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 515f2f7062cb3d53c331b4465ad0ba31c911b406..8479632167095f6c1b26c30ae38a6579b59a2436 100644 GIT binary patch delta 13 UcmdnUy^(uE3M-@4 Date: Fri, 7 Oct 2016 14:36:14 +0300 Subject: [PATCH 021/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1088 -> 1088 bytes src/Spreadsheet.java | 7 +++++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 52bd4b0..e6d99ef 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -58,3 +58,4 @@ EditAction 1475840091058 SpreadsheetTest.java 865 5 15 5 UnitTestCaseAction 1475840101713 SpreadsheetTest.java FAIL UnitTestSessionAction 1475840101714 SpreadsheetTest.java FAIL EditAction 1475840118574 Spreadsheet.java 460 3 4 0 +EditAction 1475840174860 Spreadsheet.java 539 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index fd35167ed46c74615efee1cb3fad005bb6337956..5e1349c191485b614509cde1ad1870320b3c3f15 100644 GIT binary patch delta 13 UcmX@Wae!lkBnzX|WGNOk039I%Pyhe` delta 13 UcmX@Wae!lkBnzYXWGNOk038woO#lD@ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 3ac3a71..e4c1a95 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -20,10 +20,13 @@ public void set(String cell, String value) { public String evaluate(String cell) { + String value = ""; + if(map.containsKey(cell)) { + value = map.get(cell); + } - - return null; + return value; } } From 6928bb74994b0cab41778de5fb5dfc5a3ed67c35 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:37:26 +0300 Subject: [PATCH 022/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 6 ++++++ .../20161007141352402/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161007141352402/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 1088 -> 1160 bytes tests/SpreadsheetTest.java | 10 +++++++++- 6 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index e6d99ef..7b3e385 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -59,3 +59,9 @@ UnitTestCaseAction 1475840101713 SpreadsheetTest.java FAIL UnitTestSessionAction 1475840101714 SpreadsheetTest.java FAIL EditAction 1475840118574 Spreadsheet.java 460 3 4 0 EditAction 1475840174860 Spreadsheet.java 539 3 6 0 +UnitTestCaseAction 1475840176154 SpreadsheetTest.java OK +UnitTestSessionAction 1475840176154 SpreadsheetTest.java OK +RefactoringAction 1475840227953 SpreadsheetTest.java ADD void spreadsheet_evaluate_negative()/2 METHOD +RefactoringAction 1475840235467 SpreadsheetTest.java RENAME spreadsheet_evaluate_negative()/2=>void spreadsheet_evaluate_wrong() METHOD +RefactoringAction 1475840244988 SpreadsheetTest.java RENAME spreadsheet_evaluate_wrong()=>void spreadsheet_evaluate_wrongFormattedInt() METHOD +EditAction 1475840246757 SpreadsheetTest.java 1035 6 18 6 diff --git a/.besouro/20161007141352402/besouroEpisodes.txt b/.besouro/20161007141352402/besouroEpisodes.txt index 4721d2e..8e29fdb 100644 --- a/.besouro/20161007141352402/besouroEpisodes.txt +++ b/.besouro/20161007141352402/besouroEpisodes.txt @@ -8,3 +8,5 @@ 1475839803004 test-addition 1 89 true 1475839852104 test-last 1 38 false 1475839852105 test-last 1 38 false +1475840176154 test-first 3 313 true +1475840176155 test-first 3 313 true diff --git a/.besouro/20161007141352402/randomHeuristicEpisodes.txt b/.besouro/20161007141352402/randomHeuristicEpisodes.txt index ebe264a..22c1b7c 100644 --- a/.besouro/20161007141352402/randomHeuristicEpisodes.txt +++ b/.besouro/20161007141352402/randomHeuristicEpisodes.txt @@ -2,3 +2,4 @@ 1475839699452 test-first 3 835 true 1475839803004 test-addition 1 89 false 1475839852104 test-last 1 38 false +1475840176154 test-first 3 313 true diff --git a/.besouro/20161007141352402/zorroEpisodes.txt b/.besouro/20161007141352402/zorroEpisodes.txt index 5d8a002..ad6c967 100644 --- a/.besouro/20161007141352402/zorroEpisodes.txt +++ b/.besouro/20161007141352402/zorroEpisodes.txt @@ -2,3 +2,4 @@ 1475839699452 test-first 3 857 true 1475839803004 test-addition 1 103 true 1475839852104 test-last 1 49 false +1475840176154 test-first 3 324 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 5e1349c191485b614509cde1ad1870320b3c3f15..da8b3b2a77f4655aacdfcfd81993fa4a890702f9 100644 GIT binary patch delta 142 zcmX@W(ZR`e>ff$?3=9k=45k~o`k2@_7>pPh7&gyfN@wJ$U|?ck2FfW28TwAPVwQ^a z)!6{#GBXGRNg)OnASn*yNiqm9NHNGU$TEn46hpKyh%$%)c_6+TgE|8vP*j#dAIM^2 Y&;W{ZFfjgMkYi_10?HTz`AiHZ043fK0RR91 delta 90 zcmeC+Jix(q>ff$?3=9k=48|L|`j|G)V@hXqG-F_7U;+vU~n48lN?4JgLIAjKd8 aB*h@I45C052rx0IF{lIO85s=0JR<<%?h1nd diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index e9e9bca..582d9b2 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -39,8 +39,16 @@ public void spreadsheet_evaluate_negative() { Spreadsheet ss = new Spreadsheet(); ss.set("A1", "-1"); assertEquals("-1", ss.evaluate("A1")); - } + @Test + public void spreadsheet_evaluate_wrongFormattedInt() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "-1"); + assertEquals("-1", ss.evaluate("A1")); + } + + + } From 57c5830cd1524eca5009f14dc374ea49b22d8748 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:37:31 +0300 Subject: [PATCH 023/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 2 ++ bin/SpreadsheetTest.class | Bin 1457 -> 1616 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 7b3e385..c628b31 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -65,3 +65,5 @@ RefactoringAction 1475840227953 SpreadsheetTest.java ADD void spreadsheet_evalua RefactoringAction 1475840235467 SpreadsheetTest.java RENAME spreadsheet_evaluate_negative()/2=>void spreadsheet_evaluate_wrong() METHOD RefactoringAction 1475840244988 SpreadsheetTest.java RENAME spreadsheet_evaluate_wrong()=>void spreadsheet_evaluate_wrongFormattedInt() METHOD EditAction 1475840246757 SpreadsheetTest.java 1035 6 18 6 +RefactoringAction 1475840250502 SpreadsheetTest.java RENAME spreadsheet_evaluate_wrongFormattedInt()=>void spreadsheet_evaluate_wronglyFormattedInt() METHOD +EditAction 1475840251366 SpreadsheetTest.java 1037 6 18 6 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 8479632167095f6c1b26c30ae38a6579b59a2436..5af0d578bbf059d6c2ee6bb0f6750452f2f8004d 100644 GIT binary patch delta 116 zcmdnUeSwGT)W2Q(7#J8#7@Rh8J!eu^D=sKXO-w1yNKGw?Pc2K#DNQU%jV~|C&r5g9 zFUn0UDM?N7%qyAvo=KmPeX~4sHWQ=Pvyq$Y)W2Q(7#J8#7#ufpJ!hIM#jMN7w%LO@n~70-vK^~DyFE~niNOH?I%Ep; diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 582d9b2..caa58da 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -42,7 +42,7 @@ public void spreadsheet_evaluate_negative() { } @Test - public void spreadsheet_evaluate_wrongFormattedInt() { + public void spreadsheet_evaluate_wronglyFormattedInt() { Spreadsheet ss = new Spreadsheet(); ss.set("A1", "-1"); assertEquals("-1", ss.evaluate("A1")); From f290c79402d548cf47c9c7d0b78ce6d67100a13a Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:37:45 +0300 Subject: [PATCH 024/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 1616 -> 1618 bytes tests/SpreadsheetTest.java | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index c628b31..0eac777 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -67,3 +67,4 @@ RefactoringAction 1475840244988 SpreadsheetTest.java RENAME spreadsheet_evaluate EditAction 1475840246757 SpreadsheetTest.java 1035 6 18 6 RefactoringAction 1475840250502 SpreadsheetTest.java RENAME spreadsheet_evaluate_wrongFormattedInt()=>void spreadsheet_evaluate_wronglyFormattedInt() METHOD EditAction 1475840251366 SpreadsheetTest.java 1037 6 18 6 +EditAction 1475840265529 SpreadsheetTest.java 1041 6 18 6 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 5af0d578bbf059d6c2ee6bb0f6750452f2f8004d..8b954874d701258fe961c1a6b0d38eecde151ec8 100644 GIT binary patch delta 42 xcmcb>bBSleM Date: Fri, 7 Oct 2016 14:37:49 +0300 Subject: [PATCH 025/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 1618 -> 1638 bytes tests/SpreadsheetTest.java | 2 ++ 3 files changed, 3 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 0eac777..b52d130 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -68,3 +68,4 @@ EditAction 1475840246757 SpreadsheetTest.java 1035 6 18 6 RefactoringAction 1475840250502 SpreadsheetTest.java RENAME spreadsheet_evaluate_wrongFormattedInt()=>void spreadsheet_evaluate_wronglyFormattedInt() METHOD EditAction 1475840251366 SpreadsheetTest.java 1037 6 18 6 EditAction 1475840265529 SpreadsheetTest.java 1041 6 18 6 +EditAction 1475840269427 SpreadsheetTest.java 1045 6 18 6 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 8b954874d701258fe961c1a6b0d38eecde151ec8..b0025263d56a3928b089759009aa80e09c6e747f 100644 GIT binary patch delta 68 zcmcb_^Nfe<)W2Q(7#J8#7~D2;2{4OrFgP+YFqt}XFgP@Gk}Obo67X8{kG delta 40 vcmaFHbBTxR)W2Q(7#J8#7@Rh82{3QgV}8aoc^<3$WMeiRb_bvY6N4iF8RH8A diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index b4ee1de..8929424 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -51,4 +51,6 @@ public void spreadsheet_evaluate_wronglyFormattedInt() { + + } From 9f161d37a7046befe0059f0aa9768154dea125a3 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:38:59 +0300 Subject: [PATCH 026/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ src/Spreadsheet.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index b52d130..0565805 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -69,3 +69,6 @@ RefactoringAction 1475840250502 SpreadsheetTest.java RENAME spreadsheet_evaluate EditAction 1475840251366 SpreadsheetTest.java 1037 6 18 6 EditAction 1475840265529 SpreadsheetTest.java 1041 6 18 6 EditAction 1475840269427 SpreadsheetTest.java 1045 6 18 6 +UnitTestCaseAction 1475840271097 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475840271097 SpreadsheetTest.java FAIL +EditAction 1475840339636 Spreadsheet.java 582 3 3 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index e4c1a95..0f63b74 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -21,11 +21,14 @@ public void set(String cell, String value) { public String evaluate(String cell) { String value = ""; + char[] c = ''; if(map.containsKey(cell)) { value = map.get(cell); } + for(int i = 0; i < ) + return value; } From b0e65a236b18c61fcc7441c31d16aa9329b33913 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:40:10 +0300 Subject: [PATCH 027/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 21 +++++++++++++++++++++ bin/Spreadsheet.class | Bin 1160 -> 1271 bytes src/Spreadsheet.java | 10 ++++++++-- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 0565805..aa99caf 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -72,3 +72,24 @@ EditAction 1475840269427 SpreadsheetTest.java 1045 6 18 6 UnitTestCaseAction 1475840271097 SpreadsheetTest.java FAIL UnitTestSessionAction 1475840271097 SpreadsheetTest.java FAIL EditAction 1475840339636 Spreadsheet.java 582 3 3 0 +CompilationAction 1475840339741 Spreadsheet.java +CompilationAction 1475840344213 Spreadsheet.java +CompilationAction 1475840344390 Spreadsheet.java +CompilationAction 1475840344391 Spreadsheet.java +CompilationAction 1475840382337 Spreadsheet.java +CompilationAction 1475840382337 Spreadsheet.java +CompilationAction 1475840382519 Spreadsheet.java +CompilationAction 1475840382520 Spreadsheet.java +CompilationAction 1475840386106 Spreadsheet.java +CompilationAction 1475840386107 Spreadsheet.java +CompilationAction 1475840386240 Spreadsheet.java +CompilationAction 1475840386241 Spreadsheet.java +CompilationAction 1475840400246 Spreadsheet.java +CompilationAction 1475840400247 Spreadsheet.java +CompilationAction 1475840400416 Spreadsheet.java +CompilationAction 1475840400416 Spreadsheet.java +CompilationAction 1475840403043 Spreadsheet.java +CompilationAction 1475840403043 Spreadsheet.java +CompilationAction 1475840403222 Spreadsheet.java +CompilationAction 1475840403223 Spreadsheet.java +EditAction 1475840410470 Spreadsheet.java 673 3 9 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index da8b3b2a77f4655aacdfcfd81993fa4a890702f9..451d01952511a2a6ecd07f99176604a75173b47d 100644 GIT binary patch delta 275 zcmYL^Jxjzu5Qg84pk_G`)UzH^DG0}D{K^Sdc6O(NFb>w7Ip;)1{M|O7`T1Mk19p ztmEN~y_u5z-9wUb2yZM?a+qw=fb6ufxwm7j(Z_BFG4>R?>nHyQ4!tY67;KzBKSqT* qN->8h{G;E{zgXUW!Olmp2rGf}P=N_n13Q1SMi*o1kGqyvJaL0v`%SK$_HR+HUbkal4Zvm3IAI1S62^StlL z^KuWa_x#-MK*svw9i{HDG*E2p*6eo(R<~iW$fqU#>`Ew{@c%Fn9whnvtUs2PW Date: Fri, 7 Oct 2016 14:43:47 +0300 Subject: [PATCH 028/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1271 -> 1307 bytes src/Spreadsheet.java | 10 ++++------ 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index aa99caf..1daee61 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -93,3 +93,4 @@ CompilationAction 1475840403043 Spreadsheet.java CompilationAction 1475840403222 Spreadsheet.java CompilationAction 1475840403223 Spreadsheet.java EditAction 1475840410470 Spreadsheet.java 673 3 9 0 +EditAction 1475840627336 Spreadsheet.java 679 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 451d01952511a2a6ecd07f99176604a75173b47d..c00daf0ee07efe90035b26836607513d52e55fec 100644 GIT binary patch delta 311 zcmXYrJxjx26osGnO*Azs*w`w5+aTI%MATSo{iY}gZJ~>cQ&3Ss41{)Ya&dMSCnwj6 zBIr;$`-epE>!L1~``mL5=f1Vw*!Jt!O9SxPxVNu#CB~eB7{0>U4Nhx^<*>RP*3J&L zq9}}PT(TW3l2f!-!@_Y8ZAMXWt}xS?y@EpREA;PjBCunTf2bHo>Y|CJMQWCv+0x`A z@u_F}G}k2lVMNo!E#1-T%-6jq7RpA}6uLB3(wuJGe!qKli5qmwbmc$j73!yp0freQ z#SmkRk`Z-@aT4P2|0+pR>=Bf95hhR)%rPUI7P}+%yj(mwMPI=rEzUUR2Pq3ze_~s# LDlM@!5j5*R3`sHp delta 275 zcmYL^O-jT-5QSeyP}2+u>bNelQV@pG_?Hn}xpOxvxa`TaF`86`o+iwI;0?Thrw|u{ zg6_SECvYdWZrps-$9qs!5Be+CAKx!;08(U+`aZf_z?Q<&wP{VSGF$;Dvf{OL0) r)KQ8#MByL(ivGp&_A_?ggGE>goQDcbuo~F;n>D&v3#PCi7~$Xt!B$A) diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index d4f6dcd..f1e93fc 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -21,18 +21,16 @@ public void set(String cell, String value) { public String evaluate(String cell) { String value = ""; - char[] c; if(map.containsKey(cell)) { value = map.get(cell); } else { return "ValueNotFoundError"; } - - c = value.toCharArray(); - - for(int i = 0; i < c.length; i++) { - + for(char c : value.toCharArray()) + if(Character.isLetter(c)) { + return "#Error"; + } } return value; From 9d6e515134506ca5e8330a91444facff3f1bdef5 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:45:42 +0300 Subject: [PATCH 029/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1307 -> 1403 bytes src/Spreadsheet.java | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 1daee61..4f3fd9b 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -94,3 +94,6 @@ CompilationAction 1475840403222 Spreadsheet.java CompilationAction 1475840403223 Spreadsheet.java EditAction 1475840410470 Spreadsheet.java 673 3 9 0 EditAction 1475840627336 Spreadsheet.java 679 3 6 0 +CompilationAction 1475840627446 Spreadsheet.java +CompilationAction 1475840713823 Spreadsheet.java +EditAction 1475840742675 Spreadsheet.java 767 3 7 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index c00daf0ee07efe90035b26836607513d52e55fec..ac144f274a2f3d5d6be8d0980a7a450dbfa93fc9 100644 GIT binary patch delta 311 zcmW-bPcH*O7{-4yo$l5~Qc+u}|3$P!vX`cbMX7DMAa$&sHceARNLJ(O;u|=Llap)3 zMI8D8_!v(83`D&oGtd0qC(ko856+k4y#KuQfC78Z&WAp7@Y%3gSESCu>(Dz7FWO#k z5=LRO(~5@Kq@+lkUhTI!GAm3zSUyg$t*{oVQFJMmYRV35Dhk~QUi!MNhCb2Q@=Wcn zZt^#E-|7|Pv7&h*ov~a~C{4ezc8@i>)x9;!HE#TI&|mFJAx27c1xIvTrVJxYFvBES zrdSm6nWfAe72!j1#{Tn0w1!Js&Ocfrhm!sQ9;KZ8#+NJ0?1+_@K$iG7S(|x1Ac<|G Rgk_-w0!V6US0$*~{RL_GF#Z4l delta 215 zcmXAh%}PR16otQY?$MhE0`n(9O;kd!U^EfQf5B0cUcg}k=_#7{27;4Dj+`dV99$gR z6GfISXs{Q1t@Z8w?ccmV{_bO-!*u6AZO&kx4R$`$@}hYR>3=kWg-IQ-Bt#BYYZtvf z1zoo#xpXG)?&8h)tNpGnAS Date: Fri, 7 Oct 2016 14:46:19 +0300 Subject: [PATCH 030/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1403 -> 1403 bytes src/Spreadsheet.java | 1 + 3 files changed, 2 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 4f3fd9b..ac0a799 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -97,3 +97,4 @@ EditAction 1475840627336 Spreadsheet.java 679 3 6 0 CompilationAction 1475840627446 Spreadsheet.java CompilationAction 1475840713823 Spreadsheet.java EditAction 1475840742675 Spreadsheet.java 767 3 7 0 +EditAction 1475840779144 Spreadsheet.java 770 3 7 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index ac144f274a2f3d5d6be8d0980a7a450dbfa93fc9..62b99a6b1de59b7e1d58f00b828a0ecbc7dd7535 100644 GIT binary patch delta 45 ycmey(^_y$MPZmWf1_1_X1~~>921N#01{EM_#h}FC$e_&N0%ZF!s85z+O#}ed3nng{^X%?EV= diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index ca4d5d8..61df13c 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -22,6 +22,7 @@ public String evaluate(String cell) { String value = ""; + // get the value of the cell. if(map.containsKey(cell)) { value = map.get(cell); From b4aa420e651a90668356ffd7d314f24fe84b9ccb Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:47:22 +0300 Subject: [PATCH 031/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1403 -> 1403 bytes src/Spreadsheet.java | 3 ++- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index ac0a799..e6ed0ce 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -98,3 +98,4 @@ CompilationAction 1475840627446 Spreadsheet.java CompilationAction 1475840713823 Spreadsheet.java EditAction 1475840742675 Spreadsheet.java 767 3 7 0 EditAction 1475840779144 Spreadsheet.java 770 3 7 0 +EditAction 1475840842052 Spreadsheet.java 816 3 8 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 62b99a6b1de59b7e1d58f00b828a0ecbc7dd7535..c48dabbb6c57285ad1e38eb5755c6844bd85c95d 100644 GIT binary patch delta 45 wcmey(^_y$MPZmXK1_1^c1~~><21OvL!l1-p#h}dK2xPec*?tTflciV_0oBO|kpKVy delta 45 ycmey(^_y$MPZmWf1_1_X1~~>921N#01{EM_#h}FC$e_&N0%ZF!s85z+O#}ed3 Date: Fri, 7 Oct 2016 14:47:54 +0300 Subject: [PATCH 032/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1403 -> 1440 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index e6ed0ce..4dd5c20 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -99,3 +99,4 @@ CompilationAction 1475840713823 Spreadsheet.java EditAction 1475840742675 Spreadsheet.java 767 3 7 0 EditAction 1475840779144 Spreadsheet.java 770 3 7 0 EditAction 1475840842052 Spreadsheet.java 816 3 8 0 +EditAction 1475840874313 Spreadsheet.java 815 3 8 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index c48dabbb6c57285ad1e38eb5755c6844bd85c95d..29934384fee4ff6f40f262e971239544a18f75e2 100644 GIT binary patch delta 276 zcmWlUyGjE=6o$Xq-Pws75N~U|aE_BOtOAlPYT8xce- z@&LYw@1SD*g*pFx=kWh$nD6MJ7=8S{_kfiAIU4j!uG2idJUhQKm|WFSH5>;oiGN`R zzVIl>+`hdFD%ZX3>MI*3TdtRderBJTm~^pCvmg%M*t{nk+3DU`6Wcg^?0;6f3i^yn zYZRp=byEy6%^Wi%%(BQlYb;O~UyBT9sw0u%h(?hN7?HuUT_$(j=m<^hha~94(0SX`UBqECZ_-Z delta 239 zcmW-b!Ab&A6o$V$b7wA2pi+(zX)q=_MBqk*W}%o?E5ohpw!K4}-k?=G1);6cCS3Rc zzDBE_A!+&(4*&Vix&MDT^Mju#+WxLLK$pAssOT5WgTag(Xq+5NrQ}Y zhN7|fo|MYoZ>3XWs_OsLqK#30LWh1^*JS!~$hB6f3<<%G#L@6_N;roRt1yBQlsu(x IWc0ZG132Ix!2kdN diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 697d87e..4c9776d 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -33,7 +33,7 @@ public String evaluate(String cell) { // loop through the value and check for letters. for(char c : value.toCharArray()) { - if(Character.isLetter(c)) { + if(Character.isDigit(c)) { return "#Error"; } } From 0c85bb98e9b2063e8f98ee676191f5519e0f5df2 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:48:02 +0300 Subject: [PATCH 033/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1440 -> 1439 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 4dd5c20..b9de030 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -100,3 +100,4 @@ EditAction 1475840742675 Spreadsheet.java 767 3 7 0 EditAction 1475840779144 Spreadsheet.java 770 3 7 0 EditAction 1475840842052 Spreadsheet.java 816 3 8 0 EditAction 1475840874313 Spreadsheet.java 815 3 8 0 +EditAction 1475840882346 Spreadsheet.java 799 3 8 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 29934384fee4ff6f40f262e971239544a18f75e2..08396ad087abd607ab0c60030bdfbd3e6ff59aec 100644 GIT binary patch delta 21 ccmZ3$J)e8SFD4H5%wm_!^vsgY%*=C{093LEHUIzs delta 22 dcmbQwy?}eeFD6co%wnI^l9JS-%}mU5nE+kq2etqJ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 4c9776d..4ee8a5c 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -34,7 +34,7 @@ public String evaluate(String cell) { // loop through the value and check for letters. for(char c : value.toCharArray()) { if(Character.isDigit(c)) { - return "#Error"; + } } From 007a79f951a5018df80e0d38cbb90068c86f791e Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:48:36 +0300 Subject: [PATCH 034/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1439 -> 1417 bytes src/Spreadsheet.java | 7 ++++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index b9de030..60c6280 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -101,3 +101,4 @@ EditAction 1475840779144 Spreadsheet.java 770 3 7 0 EditAction 1475840842052 Spreadsheet.java 816 3 8 0 EditAction 1475840874313 Spreadsheet.java 815 3 8 0 EditAction 1475840882346 Spreadsheet.java 799 3 8 0 +EditAction 1475840916276 Spreadsheet.java 876 3 10 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 08396ad087abd607ab0c60030bdfbd3e6ff59aec..41f023d7c9df121a6b5a614edbb065d415a94770 100644 GIT binary patch delta 222 zcmbQw-O0^$>ff$?3=9k=4DK7b{xeB3GO#E6q~@h(lrSx1JWRt8iP6mBTz>GgFcYO1k|O;V9($H6meu=17arz u76uKVN<{{iKMacO3`$J@fx0=^85n_VAOgA($Z}?2;0GGx3RK9%;06Gd@*j8r delta 222 zcmeC=p3lv7>ff$?3=9k=44xag{xhj^FgP$WuqnG173CK(GO#E6q~@h(lrSp`*#-ix!$)L*M!=TI%#-Pa{0(Jl^$Sej?1~DKFVyQ8xGcW>m zg)-;^SxgLCK)sF(PCyYy25tst1{Vev1`VJ}B?i{X39Qomt_%! Date: Fri, 7 Oct 2016 14:49:13 +0300 Subject: [PATCH 035/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1417 -> 1458 bytes src/Spreadsheet.java | 1 + 3 files changed, 2 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 60c6280..77f07ed 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -102,3 +102,4 @@ EditAction 1475840842052 Spreadsheet.java 816 3 8 0 EditAction 1475840874313 Spreadsheet.java 815 3 8 0 EditAction 1475840882346 Spreadsheet.java 799 3 8 0 EditAction 1475840916276 Spreadsheet.java 876 3 10 0 +EditAction 1475840953177 Spreadsheet.java 903 3 10 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 41f023d7c9df121a6b5a614edbb065d415a94770..027bed95f2c3e22ffef5f72a78ae5bc95441f34c 100644 GIT binary patch delta 292 zcmW-cyGjE=7)HS1 z#3B#ii}(^^{19e7&OiL;gSm}fqwwqZvj@~TcnJsGYjw<)G>ahO@FN7ws delta 228 zcmdnQ-O0^$>ff$?3=9k=4DK7b_?bBwlNlKpo!J>&HtREIGjcI}U|?e40LlkXUc#bf zs@PGbl3zGH5c0fNf+2nad!`AO@sCEHwso21cO100w;^iwUS#lfj Date: Fri, 7 Oct 2016 14:49:44 +0300 Subject: [PATCH 036/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1458 -> 1458 bytes src/Spreadsheet.java | 5 ++--- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 77f07ed..13aeaff 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -103,3 +103,4 @@ EditAction 1475840874313 Spreadsheet.java 815 3 8 0 EditAction 1475840882346 Spreadsheet.java 799 3 8 0 EditAction 1475840916276 Spreadsheet.java 876 3 10 0 EditAction 1475840953177 Spreadsheet.java 903 3 10 0 +EditAction 1475840984572 Spreadsheet.java 892 3 10 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 027bed95f2c3e22ffef5f72a78ae5bc95441f34c..f6abc4520c08977e494f4c188ccf76f69d45c3b4 100644 GIT binary patch delta 13 UcmdnQy@`8+6)U6uWNX%P03JaD Date: Fri, 7 Oct 2016 14:50:04 +0300 Subject: [PATCH 037/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1458 -> 1505 bytes src/Spreadsheet.java | 1 + 3 files changed, 2 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 13aeaff..3ddec3d 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -104,3 +104,4 @@ EditAction 1475840882346 Spreadsheet.java 799 3 8 0 EditAction 1475840916276 Spreadsheet.java 876 3 10 0 EditAction 1475840953177 Spreadsheet.java 903 3 10 0 EditAction 1475840984572 Spreadsheet.java 892 3 10 0 +EditAction 1475841003961 Spreadsheet.java 944 3 10 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f6abc4520c08977e494f4c188ccf76f69d45c3b4..ae13e8ab187962481a782be96c743df2be17ebcd 100644 GIT binary patch delta 233 zcmXwyOHKko6h%)}f3RtTQAC(95F-*qdV(QgprU+)9WXK)h9oAv0T$5 zyI>zgyge|fS9Nl4oxJaG7iNEcH(Q{^_$zy`$45LF{HuN(f5u7RT$|xKa%Luoumt)y zO_uJYSa8b={IkbZW2MX?ue(Do3B71u=Z#xFXmYOf0Y9}UaG^J)DmNH8??fU?U1pbO xC3m!W5xMjTHGMp4a_;f>TxO`)10{kCMyz8DMmT^|H79s!lmD;KmRH%9(H|`G9=QMj delta 184 zcmWlRNeaSH3_#!iZ7shof@sC10}hB<6nBDS9gd)Q1rOjodXcI-7aqV{cn`6r5R#YV zB_IFpd+*=#1xz{Iyi6yd)mGcb%(^HOpfR#KC#iiZ4pKpjvg8RtQg@VF{&Bf-#h|yxfVZ G+5Z6)zZY8o diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index b551034..da92ea8 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -39,6 +39,7 @@ public String evaluate(String cell) { } } + // if there is some other characters than digits. if(digitCount != cLenght) { return "#Error"; } From e28e29abbf715050ec5fa102911971613efb11ff Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:50:08 +0300 Subject: [PATCH 038/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1505 -> 1505 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 3ddec3d..0ffeb49 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -105,3 +105,4 @@ EditAction 1475840916276 Spreadsheet.java 876 3 10 0 EditAction 1475840953177 Spreadsheet.java 903 3 10 0 EditAction 1475840984572 Spreadsheet.java 892 3 10 0 EditAction 1475841003961 Spreadsheet.java 944 3 10 0 +EditAction 1475841008479 Spreadsheet.java 945 3 10 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index ae13e8ab187962481a782be96c743df2be17ebcd..f22d5153fef0a55edc85a4d79f50b73057d55d11 100644 GIT binary patch delta 21 ccmaFJ{g8WuKP#s;Lp*~HLlT4j Date: Fri, 7 Oct 2016 14:51:28 +0300 Subject: [PATCH 039/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ src/Spreadsheet.java | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 0ffeb49..dd4a65b 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -106,3 +106,6 @@ EditAction 1475840953177 Spreadsheet.java 903 3 10 0 EditAction 1475840984572 Spreadsheet.java 892 3 10 0 EditAction 1475841003961 Spreadsheet.java 944 3 10 0 EditAction 1475841008479 Spreadsheet.java 945 3 10 0 +UnitTestCaseAction 1475841014549 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475841014549 SpreadsheetTest.java FAIL +EditAction 1475841088793 Spreadsheet.java 1006 3 3 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 686ab1e..cf8df4f 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -34,9 +34,14 @@ public String evaluate(String cell) { // loop through the value and check for letters. for(char c : value.toCharArray()) { + + // if the first char is negative (-). + if() + if(Character.isDigit(c)) { digitCount ++; } + } // if there are some other characters than digits. From 81e5a341f725589d9ebd938ca00dfa2341b77d92 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:53:38 +0300 Subject: [PATCH 040/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 19 +++++++++++++++++++ bin/Spreadsheet.class | Bin 1505 -> 1245 bytes src/Spreadsheet.java | 16 ++++++++++------ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index dd4a65b..5e1205e 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -109,3 +109,22 @@ EditAction 1475841008479 Spreadsheet.java 945 3 10 0 UnitTestCaseAction 1475841014549 SpreadsheetTest.java FAIL UnitTestSessionAction 1475841014549 SpreadsheetTest.java FAIL EditAction 1475841088793 Spreadsheet.java 1006 3 3 0 +CompilationAction 1475841088885 Spreadsheet.java +CompilationAction 1475841126880 Spreadsheet.java +CompilationAction 1475841127062 Spreadsheet.java +CompilationAction 1475841127062 Spreadsheet.java +CompilationAction 1475841157825 Spreadsheet.java +CompilationAction 1475841157826 Spreadsheet.java +CompilationAction 1475841158004 Spreadsheet.java +CompilationAction 1475841158005 Spreadsheet.java +CompilationAction 1475841169869 Spreadsheet.java +CompilationAction 1475841169869 Spreadsheet.java +CompilationAction 1475841170050 Spreadsheet.java +CompilationAction 1475841170050 Spreadsheet.java +CompilationAction 1475841170050 Spreadsheet.java +CompilationAction 1475841177746 Spreadsheet.java +CompilationAction 1475841177924 Spreadsheet.java +CompilationAction 1475841177924 Spreadsheet.java +CompilationAction 1475841181698 Spreadsheet.java +CompilationAction 1475841181840 Spreadsheet.java +EditAction 1475841218236 Spreadsheet.java 1084 3 11 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f22d5153fef0a55edc85a4d79f50b73057d55d11..27ff43d1ed0db01cd646834ff328d54a523f7b8b 100644 GIT binary patch delta 250 zcmaFJeV3E#)W2Q(7#J8#7_2sO^)c16GZ-;4@Mk5KCFjnM(r@smUM$BzeGW TE(TEsF(8kT!2(D!F<1fsxwAis delta 512 zcmYk2K~ED=5XXPByWQPxiArG=R8*=0EhUXw7Ohf+1r!5%GeHh!ZEL9^ZL$^SE!Q{=n-+MFvnfK;<`bWn5_WR2KD0Bav_uA;WTorIB z3)x4}?q1_Tr@PkKYu8ufxD$Ki2!>eTx{&F1!ks8yisR^&V9n&WLyro#9Bv9D&!d-7 zX*X&&OG#2x>o(#c7O4tO>%~f|+3F^mF#p))j$mK>TVBXJwT(u*xua287rc6s8EXIJ zqNWx)+!c)N@cn}MOnOqnAg%AOXRmA)J}^A{nQ?;yM*kho8+;|Vd5E38)-Qf!eo!?7 zD}k+wI|v*zun!pQ%oaTKGKY7 z{Zv7lEU~ONb2{%($ Date: Fri, 7 Oct 2016 14:53:43 +0300 Subject: [PATCH 041/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1245 -> 1475 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 5e1205e..777f3aa 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -128,3 +128,4 @@ CompilationAction 1475841177924 Spreadsheet.java CompilationAction 1475841181698 Spreadsheet.java CompilationAction 1475841181840 Spreadsheet.java EditAction 1475841218236 Spreadsheet.java 1084 3 11 0 +EditAction 1475841223094 Spreadsheet.java 1089 3 11 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 27ff43d1ed0db01cd646834ff328d54a523f7b8b..4a2f754f044435fda9c55ff07f81157e7c0cf5bd 100644 GIT binary patch delta 482 zcmXYtO-~bH6osGr&R3n*q!vbEPzjYNg^rC_3Zft|1!PgeiUq7DEnp3y$yiKWb;H^{ zZq!w`H5#KX8WVT^1>+wv2EA1m@5%i*=iK|=9~Zu+{cq==`#_n^xBd&$NiidkqAcWg z;-i!OtyX)zb#mNTOOjUNlc$nlj(H*7ZbgsdWF<-B=Yl<1*o%A?c;Ing7V|4b*?e4 zIH6e3;}p5cj7G~$5fM`3Hrra;)dR=O(qNupwOIPMJ^`0C(~l_U7NWj&N*WpUSY$;9 rTI#u=UR7-EOtVI{fWxGUM(}r@smUM$BzeGW TE(TEsF(8kT!2(D!F<1fsnYBM* diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 62381ad..a8aa6be 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -37,7 +37,7 @@ public String evaluate(String cell) { //for(char c : value.toCharArray()) { for(int i = 0; i < c.length; i++) { - // if the first char is negative (-). + // if the first character is negative (-). if(c[i] == '-' && i == 0) { continue; } From 3deeabbf6756ea79f8f81bee6001421cfdde6d86 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:54:12 +0300 Subject: [PATCH 042/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + src/Spreadsheet.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 777f3aa..8b22d21 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -129,3 +129,4 @@ CompilationAction 1475841181698 Spreadsheet.java CompilationAction 1475841181840 Spreadsheet.java EditAction 1475841218236 Spreadsheet.java 1084 3 11 0 EditAction 1475841223094 Spreadsheet.java 1089 3 11 0 +EditAction 1475841252441 Spreadsheet.java 1093 3 11 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index a8aa6be..e9307a8 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -49,7 +49,7 @@ public String evaluate(String cell) { } // if there are some other characters than digits. - if(digitCount != c.length) { + if(digitCount != c.length - 1) { return "#Error"; } From 871ce17e5459c5332bc93750ffdb1a93214aa5e4 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:54:19 +0300 Subject: [PATCH 043/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1475 -> 1477 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 8b22d21..e4f2b83 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -130,3 +130,4 @@ CompilationAction 1475841181840 Spreadsheet.java EditAction 1475841218236 Spreadsheet.java 1084 3 11 0 EditAction 1475841223094 Spreadsheet.java 1089 3 11 0 EditAction 1475841252441 Spreadsheet.java 1093 3 11 0 +EditAction 1475841259958 Spreadsheet.java 1089 3 11 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 4a2f754f044435fda9c55ff07f81157e7c0cf5bd..ab893a88a0aa9ad6bbc42bb4d17da32a8caec98f 100644 GIT binary patch delta 104 zcmX@ieUy8{Toz7Q24)5}1_p+V$;(*cm{?LKv#|PFCo`Bbq%l}9hyW$*Akqw?3}QeY vP$7dFgE|8vP+Ka4K9I%4pvhp*;K<+v6wzU@ncTyw!z~1qcL%CvV(7?GNdqAFo*y}?I3atq6}g{9#9p7 t8iP6mBLg!-GJ`&l#l)b=V9Vgh-~<%WVX&Iq$Ew3E0F-wJs%2vE001ua4Iuyk diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index e9307a8..a8aa6be 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -49,7 +49,7 @@ public String evaluate(String cell) { } // if there are some other characters than digits. - if(digitCount != c.length - 1) { + if(digitCount != c.length) { return "#Error"; } From c69fd4a55797850303de8e5beb0f9ed2d2b3008d Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:55:00 +0300 Subject: [PATCH 044/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1477 -> 1475 bytes src/Spreadsheet.java | 1 + 3 files changed, 2 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index e4f2b83..b249b4e 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -131,3 +131,4 @@ EditAction 1475841218236 Spreadsheet.java 1084 3 11 0 EditAction 1475841223094 Spreadsheet.java 1089 3 11 0 EditAction 1475841252441 Spreadsheet.java 1093 3 11 0 EditAction 1475841259958 Spreadsheet.java 1089 3 11 0 +EditAction 1475841300326 Spreadsheet.java 1119 3 12 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index ab893a88a0aa9ad6bbc42bb4d17da32a8caec98f..4a2f754f044435fda9c55ff07f81157e7c0cf5bd 100644 GIT binary patch delta 101 zcmX@geVBX0Toz7g1||kJ1_p+-$;(*cCbO~nS|>7?GNdqAFo*y}?I3atq6}g{9#9p7 t8iP6mBLg!-GJ`&l#l)b=V9Vgh-~<%WVX&Iq$Ew3E0F-wJs%2vE001ua4Iuyk delta 104 zcmX@ieUy8{Toz7Q24)5}1_p+V$;(*cm{?LKv#|PFCo`Bbq%l}9hyW$*Akqw?3}QeY vP$7dFgE|8vP+Ka4K9I%4pvhp*;K<+v6wzU@ncTyw!z~1qcL%CvV( Date: Fri, 7 Oct 2016 14:55:10 +0300 Subject: [PATCH 045/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1475 -> 1535 bytes src/Spreadsheet.java | 1 + 3 files changed, 2 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index b249b4e..f275caf 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -132,3 +132,4 @@ EditAction 1475841223094 Spreadsheet.java 1089 3 11 0 EditAction 1475841252441 Spreadsheet.java 1093 3 11 0 EditAction 1475841259958 Spreadsheet.java 1089 3 11 0 EditAction 1475841300326 Spreadsheet.java 1119 3 12 0 +EditAction 1475841309953 Spreadsheet.java 1142 3 12 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 4a2f754f044435fda9c55ff07f81157e7c0cf5bd..0c414d1b395bb2f031cdac65e180d816d12b5089 100644 GIT binary patch delta 344 zcmXAjO-n*i5Qd*~ulHQgKFqpFU`8e>rG;UFK}26>MG>?MT11(+F50^BAGE4XwTgB| zn`q&tU4Nl}(jt2`I1Dq-nR#YDBi%^&>-VDr6xn|b$K9dE)nToEcHOwC8O+IB(rudI z3J$({8nMEGTMFI2gtAS~E!k(%`M?&V`9~swy+Y z8(VAV+A_I}DpnX#jH{Z!k`S9@nj~qa$dDq(42#N^nPZcA^)GNFa!jVlsqh6Q>XaFi zruu&(0pqH4EVCLll3(^Ej&!T6vms(RmvD=aepc9)*kefxc9dDNnl9jXb%*C;d{TNc b;dB|q@1sPI`BaS&j}ACLMAfmYNr$~ZDRVGw delta 285 zcmXAjy-EX76okLKyLT6|5tf*Bi>QzgG-_5ctfGSd|3$#sPL#ZWtzeTkNTrQhrH$B# z;5K%?f^Q;{IASx*nRD-VW)yyeh0ozz4rH7@7ZUfS<=&WL1qWYYr?lMey?c#Y&t0{B z>S=7VD19W1?LB^<=r4F>{SLqDnXWalP4lPGSL~(v1Ab|H&>RTkGA`XCk|vrea+6Fm zMO9jt&QYVu3@y1G=GiBu%_3*Y&dIL1V1+BzC=0Rm-;J0FO=_t}vlxLdS(0-E*<@D- oT|qYlJHXRsfkQb Date: Fri, 7 Oct 2016 14:55:44 +0300 Subject: [PATCH 046/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1535 -> 1542 bytes src/Spreadsheet.java | 3 +++ 3 files changed, 4 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index f275caf..f77b5f4 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -133,3 +133,4 @@ EditAction 1475841252441 Spreadsheet.java 1093 3 11 0 EditAction 1475841259958 Spreadsheet.java 1089 3 11 0 EditAction 1475841300326 Spreadsheet.java 1119 3 12 0 EditAction 1475841309953 Spreadsheet.java 1142 3 12 0 +EditAction 1475841344840 Spreadsheet.java 1169 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 0c414d1b395bb2f031cdac65e180d816d12b5089..b45794487efaf1b51c17292f4f334fdf6533d467 100644 GIT binary patch delta 213 zcmXAj&1%9>5QV>__g;}oxx`){q1hz0ln|*P^|w@^t3uc9ref)11YaO4yQ!|alkA#R zp2KHxqa$tx=FBQEXNH1)m!5o&T$39LCNhHePe(%nx;ysz2;WD|uL9GVNu? zb0)4fhn>@L^@|A}i>MI51x=YVf;`ggkBBL4Ub*9qkatq%boipnwYZ+ol{i|mNjW#- r@`SOFR46Y+^cgS|#qi09F-k5yCOo0J=Qb~O$2J@O9xK7AKzwFLUq>NM delta 186 zcmXAiI|{;35JitMc_IlIKM~T4DNGEA9~4CV1+@~aQz?oYaRcdWbOn;mP8Z@%1knMT zftfk?+>`Y+)0>`;(8vMDWoT0y6e6iBY0d;rBUjqLS`w;j3_3d z5ynl{glzDL>9C{Afj$)>7Jn}eRoSG0x=Ic;h8*=~v diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 5419125..f116bd9 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -51,6 +51,9 @@ public String evaluate(String cell) { } // if there are some other characters than digits. + if(isNegative) { + + } if(digitCount != c.length) { return "#Error"; } From c114b1fa25bd03b92093c7fa935e787f4ec2b41a Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:56:03 +0300 Subject: [PATCH 047/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1542 -> 1542 bytes src/Spreadsheet.java | 3 ++- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index f77b5f4..3fa55a7 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -134,3 +134,4 @@ EditAction 1475841259958 Spreadsheet.java 1089 3 11 0 EditAction 1475841300326 Spreadsheet.java 1119 3 12 0 EditAction 1475841309953 Spreadsheet.java 1142 3 12 0 EditAction 1475841344840 Spreadsheet.java 1169 3 13 0 +EditAction 1475841363108 Spreadsheet.java 1185 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index b45794487efaf1b51c17292f4f334fdf6533d467..2715d0bf20403fa87d577b61f2f7d743c9fd76ea 100644 GIT binary patch delta 21 ccmZqUY2(?D$I5BRkj`Mmki}p-xtz5h06XIaZ~y=R delta 21 ccmZqUY2(?D$I5BOkj`Mvki}p%xtz5h06UTeX8-^I diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index f116bd9..2cc29f1 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -52,8 +52,9 @@ public String evaluate(String cell) { // if there are some other characters than digits. if(isNegative) { - + return value; } + if(digitCount != c.length) { return "#Error"; } From 21ec7649a8d6a525e463e7d5f8d492761f1216e1 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:56:19 +0300 Subject: [PATCH 048/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1542 -> 1558 bytes src/Spreadsheet.java | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 3fa55a7..28ee9ed 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -135,3 +135,4 @@ EditAction 1475841300326 Spreadsheet.java 1119 3 12 0 EditAction 1475841309953 Spreadsheet.java 1142 3 12 0 EditAction 1475841344840 Spreadsheet.java 1169 3 13 0 EditAction 1475841363108 Spreadsheet.java 1185 3 13 0 +EditAction 1475841379831 Spreadsheet.java 1189 3 12 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 2715d0bf20403fa87d577b61f2f7d743c9fd76ea..1a12a842e8164c7adffce0700012bf902972c0a3 100644 GIT binary patch delta 177 zcmXAhy$-=(6ow!5eWgh)v_>O_YLgBmBpOuxjCO-TIuYU?+&~kF$sNeI+1!D9a*{45 z?|GlR&)t2v=B=DP7B%2jeAJ<%p6I~%dhmT=Hxm;WK~-9EcX&mllYGdL5jkVdOt><| z6S^)X__XB{9bI}(n0oQkq1$jov5~@J F`v)Da7$yJ! delta 161 zcmXAhI|{;36hx2DyaX|Y#NQ6oB1W_j6hh)(1Fk`A6vcJ8fq<<$kaTvg#KkyZbD25A zxex#D7cZx>$KV0C{Ouguw*PtJ21yYXVrA;O89_d_$zj5oDOX||qT9bkla`u%I&>+? rxiC;Ngrv-vi@2Ovu*A_4vto^9M8rnPr6+rcmw#A4jA diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 2cc29f1..8bfa879 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -55,9 +55,9 @@ public String evaluate(String cell) { return value; } - if(digitCount != c.length) { + /*if(digitCount != c.length) { return "#Error"; - } + }*/ return value; } From ff93f615356f0a203f37f6be64f56d7712c3951c Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:56:31 +0300 Subject: [PATCH 049/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1558 -> 1527 bytes src/Spreadsheet.java | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 28ee9ed..8cc3281 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -136,3 +136,4 @@ EditAction 1475841309953 Spreadsheet.java 1142 3 12 0 EditAction 1475841344840 Spreadsheet.java 1169 3 13 0 EditAction 1475841363108 Spreadsheet.java 1185 3 13 0 EditAction 1475841379831 Spreadsheet.java 1189 3 12 0 +EditAction 1475841391929 Spreadsheet.java 1185 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 1a12a842e8164c7adffce0700012bf902972c0a3..3c770574f51ca13b6017c509200019cb770dcc62 100644 GIT binary patch delta 178 zcmXAhO%B0O6h_Z`Z8fS4RJ#EQ1`Vl*fduv2>IN)8qOqPP)Qr$rkj-90@aO~{xjv2050m@&r`Gh)FKi#}aeLM1wK9bp$ws~N17QsBAzO;w&H HqBQ9b4fGjk delta 210 zcmXAhJ8r^I5Jk^>#tsJ41QRHcECGd+C@58s_yrpS9X+C?0upB_PoiZ3G@x`8UO+Y! zDMer;n$gTXbM9|(=M{eb&l&K_>{PgDFHc|L1W}r9Q{!4MYWUr;R?1zVxs$&ybI7e~ z75g#Uk~pk+ nXGBiOh=>@QHc!H1VJ)%S Date: Fri, 7 Oct 2016 14:57:40 +0300 Subject: [PATCH 050/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1527 -> 1558 bytes src/Spreadsheet.java | 10 ++++++---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 8cc3281..e4bd67a 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -137,3 +137,4 @@ EditAction 1475841344840 Spreadsheet.java 1169 3 13 0 EditAction 1475841363108 Spreadsheet.java 1185 3 13 0 EditAction 1475841379831 Spreadsheet.java 1189 3 12 0 EditAction 1475841391929 Spreadsheet.java 1185 3 13 0 +EditAction 1475841460489 Spreadsheet.java 1195 3 12 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3c770574f51ca13b6017c509200019cb770dcc62..1a12a842e8164c7adffce0700012bf902972c0a3 100644 GIT binary patch delta 210 zcmXAhJ8r^I5Jk^>#tsJ41QRHcECGd+C@58s_yrpS9X+C?0upB_PoiZ3G@x`8UO+Y! zDMer;n$gTXbM9|(=M{eb&l&K_>{PgDFHc|L1W}r9Q{!4MYWUr;R?1zVxs$&ybI7e~ z75g#Uk~pk+ nXGBiOh=>@QHc!H1VJ)%SIN)8qOqPP)Qr$rkj-90@aO~{xjv2050m@&r`Gh)FKi#}aeLM1wK9bp$ws~N17QsBAzO;w&H HqBQ9b4fGjk diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 2cc29f1..a2506bc 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -52,12 +52,14 @@ public String evaluate(String cell) { // if there are some other characters than digits. if(isNegative) { - return value; + if(digitCount != (c.length - 1)) { + return "#Error"; + } + } else { + } - if(digitCount != c.length) { - return "#Error"; - } + return value; } From 49e5008588ffecc453d7d3b6098a2447dfb4174a Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:58:04 +0300 Subject: [PATCH 051/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1558 -> 1553 bytes src/Spreadsheet.java | 4 +++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index e4bd67a..e9d085d 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -138,3 +138,4 @@ EditAction 1475841363108 Spreadsheet.java 1185 3 13 0 EditAction 1475841379831 Spreadsheet.java 1189 3 12 0 EditAction 1475841391929 Spreadsheet.java 1185 3 13 0 EditAction 1475841460489 Spreadsheet.java 1195 3 12 0 +EditAction 1475841484584 Spreadsheet.java 1249 3 12 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 1a12a842e8164c7adffce0700012bf902972c0a3..622712671c9f7dfc74ab1e2abf196963c9b780f4 100644 GIT binary patch delta 79 zcmbQnGm&S*Iu_;#2Ik2dS+b=0MOk(Cv82prU=y<6ptFI2fq|Jp7)bgt2v0U+b!E?E huwW=;aG2c28q93Sz&`m7s~)#F10#bcPz@7<7XZ|$54ivU delta 84 zcmbQpGmU4%Iu_h7D*z$RqBL1zO40|PUIFpvyl5SeVo>dKwY mV8xKfV9ij-U^lsmHJI6mfn)LwRy`hGP6kE>PoP331}^|Wvk=Sx diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index a2506bc..d86a36e 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -56,7 +56,9 @@ public String evaluate(String cell) { return "#Error"; } } else { - + if(digitCount != c.length) { + return "#Error"; + } } From 78f9a1df0d9d2d8094133be2d21a06fea064f550 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 14:58:06 +0300 Subject: [PATCH 052/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1553 -> 1572 bytes src/Spreadsheet.java | 2 -- 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index e9d085d..79c8353 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -139,3 +139,4 @@ EditAction 1475841379831 Spreadsheet.java 1189 3 12 0 EditAction 1475841391929 Spreadsheet.java 1185 3 13 0 EditAction 1475841460489 Spreadsheet.java 1195 3 12 0 EditAction 1475841484584 Spreadsheet.java 1249 3 12 0 +EditAction 1475841486766 Spreadsheet.java 1243 3 12 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 622712671c9f7dfc74ab1e2abf196963c9b780f4..9af1a44ed6c665614a4aae86859b191d84f52c60 100644 GIT binary patch delta 150 zcmbQpvxH~EIu_1s24)6!1_p-O$=g|SWdwxmH;A(8?wilR24v}M07@`32m{G52GPl8 ztlsX{3>6GE4Al%y3?e{L4~SLL38iP6mBT!EjgFcYO#Gu0v$lwT6&CI~Y lP|o1Y;KINHl<}K+v delta 147 zcmXAhOAdlS5Cuz^fk;?^dIWVrBzgf+5q}9=yab7fCn0kM*JgI!$y4|eH=VAo_xhC% zsehaCosbxKx{v9zDBJqN3qx|vmfThL)>TYI=YNnXGm$FHSuj%eL8&dE;KYu-E)hKk dYK% Date: Fri, 7 Oct 2016 15:00:07 +0300 Subject: [PATCH 053/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 + .../20161007141352402/besouroEpisodes.txt | 82 ++++++++++++++++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161007141352402/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 1572 -> 1572 bytes src/Spreadsheet.java | 2 + 6 files changed, 89 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 79c8353..b3503ac 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -140,3 +140,6 @@ EditAction 1475841391929 Spreadsheet.java 1185 3 13 0 EditAction 1475841460489 Spreadsheet.java 1195 3 12 0 EditAction 1475841484584 Spreadsheet.java 1249 3 12 0 EditAction 1475841486766 Spreadsheet.java 1243 3 12 0 +UnitTestCaseAction 1475841488228 SpreadsheetTest.java OK +UnitTestSessionAction 1475841488228 SpreadsheetTest.java OK +EditAction 1475841607682 Spreadsheet.java 1352 3 12 0 diff --git a/.besouro/20161007141352402/besouroEpisodes.txt b/.besouro/20161007141352402/besouroEpisodes.txt index 8e29fdb..8936d83 100644 --- a/.besouro/20161007141352402/besouroEpisodes.txt +++ b/.besouro/20161007141352402/besouroEpisodes.txt @@ -10,3 +10,85 @@ 1475839852105 test-last 1 38 false 1475840176154 test-first 3 313 true 1475840176155 test-first 3 313 true +1475841488228 test-first 3 1260 true +1475841488229 test-first 3 1260 true +1475841488230 test-first 3 1260 true +1475841488231 test-first 3 1260 true +1475841488232 test-first 3 1260 true +1475841488233 test-first 3 1260 true +1475841488234 test-first 3 1260 true +1475841488235 test-first 3 1260 true +1475841488236 test-first 3 1260 true +1475841488237 test-first 3 1260 true +1475841488238 test-first 3 1260 true +1475841488239 test-first 3 1260 true +1475841488240 test-first 3 1260 true +1475841488241 test-first 3 1260 true +1475841488242 test-first 3 1260 true +1475841488243 test-first 3 1260 true +1475841488244 test-first 3 1260 true +1475841488245 test-first 3 1260 true +1475841488246 test-first 3 1260 true +1475841488247 test-first 3 1260 true +1475841488248 test-first 3 1260 true +1475841488249 test-first 3 1260 true +1475841488250 test-first 3 1260 true +1475841488251 test-first 3 1260 true +1475841488252 test-first 3 1260 true +1475841488253 test-first 3 1260 true +1475841488254 test-first 3 1260 true +1475841488255 test-first 3 1260 true +1475841488256 test-first 3 1260 true +1475841488257 test-first 3 1260 true +1475841488258 test-first 3 1260 true +1475841488259 test-first 3 1260 true +1475841488260 test-first 3 1260 true +1475841488261 test-first 3 1260 true +1475841488262 test-first 3 1260 true +1475841488263 test-first 3 1260 true +1475841488264 test-first 3 1260 true +1475841488265 test-first 3 1260 true +1475841488266 test-first 3 1260 true +1475841488267 test-first 3 1260 true +1475841488268 test-first 3 1260 true +1475841488269 test-first 3 1260 true +1475841488270 test-first 3 1260 true +1475841488271 test-first 3 1260 true +1475841488272 test-first 3 1260 true +1475841488273 test-first 3 1260 true +1475841488274 test-first 3 1260 true +1475841488275 test-first 3 1260 true +1475841488276 test-first 3 1260 true +1475841488277 test-first 3 1260 true +1475841488278 test-first 3 1260 true +1475841488279 test-first 3 1260 true +1475841488280 test-first 3 1260 true +1475841488281 test-first 3 1260 true +1475841488282 test-first 3 1260 true +1475841488283 test-first 3 1260 true +1475841488284 test-first 3 1260 true +1475841488285 test-first 3 1260 true +1475841488286 test-first 3 1260 true +1475841488287 test-first 3 1260 true +1475841488288 test-first 3 1260 true +1475841488289 test-first 3 1260 true +1475841488290 test-first 3 1260 true +1475841488291 test-first 3 1260 true +1475841488292 test-first 3 1260 true +1475841488293 test-first 3 1260 true +1475841488294 test-first 3 1260 true +1475841488295 test-first 3 1260 true +1475841488296 test-first 3 1260 true +1475841488297 test-first 3 1260 true +1475841488298 test-first 3 1260 true +1475841488299 test-first 3 1260 true +1475841488300 test-first 3 1260 true +1475841488301 test-first 3 1260 true +1475841488302 test-first 3 1260 true +1475841488303 test-first 3 1260 true +1475841488304 test-first 3 1260 true +1475841488305 test-first 3 1260 true +1475841488306 test-first 3 1260 true +1475841488307 test-first 3 1260 true +1475841488308 test-first 3 1260 true +1475841488309 test-first 3 1260 true diff --git a/.besouro/20161007141352402/randomHeuristicEpisodes.txt b/.besouro/20161007141352402/randomHeuristicEpisodes.txt index 22c1b7c..b43d5bd 100644 --- a/.besouro/20161007141352402/randomHeuristicEpisodes.txt +++ b/.besouro/20161007141352402/randomHeuristicEpisodes.txt @@ -3,3 +3,4 @@ 1475839803004 test-addition 1 89 false 1475839852104 test-last 1 38 false 1475840176154 test-first 3 313 true +1475841488228 test-first 3 1260 true diff --git a/.besouro/20161007141352402/zorroEpisodes.txt b/.besouro/20161007141352402/zorroEpisodes.txt index ad6c967..9fe1c0e 100644 --- a/.besouro/20161007141352402/zorroEpisodes.txt +++ b/.besouro/20161007141352402/zorroEpisodes.txt @@ -3,3 +3,4 @@ 1475839803004 test-addition 1 103 true 1475839852104 test-last 1 49 false 1475840176154 test-first 3 324 true +1475841488228 test-first 3 1312 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 9af1a44ed6c665614a4aae86859b191d84f52c60..3663917c72de837ebb1050654757e6d45f333559 100644 GIT binary patch delta 13 VcmZ3&vxH~EWL8Fp$x~P-001FK1f~E0 delta 13 VcmZ3&vxH~EWL8F}$x~P-001FU1gHQ2 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index bc5749e..bbc93d5 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -51,6 +51,8 @@ public String evaluate(String cell) { } // if there are some other characters than digits. + // 1. Check if the number is negative + // 2. if the string contains other characters than digits and '-'. if(isNegative) { if(digitCount != (c.length - 1)) { return "#Error"; From a948c6b993cf75c8b3789c7a18bcd1eee79e00a0 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:01:14 +0300 Subject: [PATCH 054/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ .../20161007141352402/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/20161007141352402/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 1572 -> 1572 bytes tests/SpreadsheetTest.java | 2 +- 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index b3503ac..715a902 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -143,3 +143,6 @@ EditAction 1475841486766 Spreadsheet.java 1243 3 12 0 UnitTestCaseAction 1475841488228 SpreadsheetTest.java OK UnitTestSessionAction 1475841488228 SpreadsheetTest.java OK EditAction 1475841607682 Spreadsheet.java 1352 3 12 0 +UnitTestCaseAction 1475841615011 SpreadsheetTest.java OK +UnitTestSessionAction 1475841615012 SpreadsheetTest.java OK +EditAction 1475841674538 SpreadsheetTest.java 1047 6 18 6 diff --git a/.besouro/20161007141352402/besouroEpisodes.txt b/.besouro/20161007141352402/besouroEpisodes.txt index 8936d83..19ccc56 100644 --- a/.besouro/20161007141352402/besouroEpisodes.txt +++ b/.besouro/20161007141352402/besouroEpisodes.txt @@ -92,3 +92,4 @@ 1475841488307 test-first 3 1260 true 1475841488308 test-first 3 1260 true 1475841488309 test-first 3 1260 true +1475841615012 refactoring 2A 7 true diff --git a/.besouro/20161007141352402/randomHeuristicEpisodes.txt b/.besouro/20161007141352402/randomHeuristicEpisodes.txt index b43d5bd..98d8bbf 100644 --- a/.besouro/20161007141352402/randomHeuristicEpisodes.txt +++ b/.besouro/20161007141352402/randomHeuristicEpisodes.txt @@ -4,3 +4,4 @@ 1475839852104 test-last 1 38 false 1475840176154 test-first 3 313 true 1475841488228 test-first 3 1260 true +1475841615012 refactoring 2A 7 true diff --git a/.besouro/20161007141352402/zorroEpisodes.txt b/.besouro/20161007141352402/zorroEpisodes.txt index 9fe1c0e..4bcaab3 100644 --- a/.besouro/20161007141352402/zorroEpisodes.txt +++ b/.besouro/20161007141352402/zorroEpisodes.txt @@ -4,3 +4,4 @@ 1475839852104 test-last 1 49 false 1475840176154 test-first 3 324 true 1475841488228 test-first 3 1312 true +1475841615012 refactoring 2A 126 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3663917c72de837ebb1050654757e6d45f333559..6c85cc0611345df28ea640d7910270ab69ff9bde 100644 GIT binary patch delta 33 ocmZ3&vxH|uJ*%h%Ln?zMLmq<_Lm`7LLj{8!Lp6ib`2YX_ diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 8929424..2b68e02 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -24,7 +24,7 @@ public void spreadsheet_set_a1_1() { public void spreadsheet_set_a1_teststring() { Spreadsheet ss = new Spreadsheet(); ss.set("A1", "teststring"); - assertEquals("teststring", ss.get("A1")); + assertEquals("'teststring'", ss.get("A1")); } @Test From 19ff470d0dada32c25bfa68dec68abd562b308b5 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:02:14 +0300 Subject: [PATCH 055/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 1638 -> 1656 bytes src/Spreadsheet.java | 5 +++++ 3 files changed, 6 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 715a902..db3d786 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -146,3 +146,4 @@ EditAction 1475841607682 Spreadsheet.java 1352 3 12 0 UnitTestCaseAction 1475841615011 SpreadsheetTest.java OK UnitTestSessionAction 1475841615012 SpreadsheetTest.java OK EditAction 1475841674538 SpreadsheetTest.java 1047 6 18 6 +EditAction 1475841734156 Spreadsheet.java 1443 3 12 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index b0025263d56a3928b089759009aa80e09c6e747f..59ec298a9d0513602f09dbf9ce597d73bb8ab08d 100644 GIT binary patch delta 227 zcmaFH^Mi-$)W2Q(7#J8#7(6y|p3@Tixh7MB#46lLb6t1~i)78ewyCZ-f; zq^6d{rvq_nQBi&o2ZI?S1EUcKg9T6nSR^;KxHvIAm4m@*@>(W!K3hfxCS5}=20;dU z9tMZWkC?1DoqmAdv-UVpO_fj0j0q?_y7O^ delta 180 zcmeyt^Nfe<)W2Q(7#J8#7~D2; Date: Fri, 7 Oct 2016 15:02:18 +0300 Subject: [PATCH 056/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1572 -> 1592 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index db3d786..c45b339 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -147,3 +147,4 @@ UnitTestCaseAction 1475841615011 SpreadsheetTest.java OK UnitTestSessionAction 1475841615012 SpreadsheetTest.java OK EditAction 1475841674538 SpreadsheetTest.java 1047 6 18 6 EditAction 1475841734156 Spreadsheet.java 1443 3 12 0 +EditAction 1475841738627 Spreadsheet.java 1449 3 12 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 6c85cc0611345df28ea640d7910270ab69ff9bde..defa4d917cd305009398bd67b0ed33f4adf2c1bc 100644 GIT binary patch delta 214 zcmXAiyH3Jj7(h?kzcnR|X$0FhXsxkPp|EjLiUmd!A~7*BMrIaP0~18U_P>AwvvHHj z-B&R_0h3?C_FZz$*?3#;^Fz6FEDnIR{!*FWNUh9|-zlZ(w|dU*^q)F4espL@);)pl z*vUNSoLep!amkpBC+bXynbKrNix=7~xMoF{Hwr2u@9z^F6UZhpA|VV(zltr!Ds^j!ex)40kYN5RwIoVw}c;q^xbMl(Hg{i}-HAT6SEDYa!(=yZ89} zKi#W)znRVkg9LC^53{ZX>SGqPm+~#&SmLRf6<#8W3@H&)VL_E80V^7;X|koojy4B6 zoam7eY5e!_$Vw+NzI Date: Fri, 7 Oct 2016 15:02:26 +0300 Subject: [PATCH 057/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1592 -> 1604 bytes src/Spreadsheet.java | 1 + 3 files changed, 2 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index c45b339..81f1970 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -148,3 +148,4 @@ UnitTestSessionAction 1475841615012 SpreadsheetTest.java OK EditAction 1475841674538 SpreadsheetTest.java 1047 6 18 6 EditAction 1475841734156 Spreadsheet.java 1443 3 12 0 EditAction 1475841738627 Spreadsheet.java 1449 3 12 0 +EditAction 1475841746580 Spreadsheet.java 1477 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index defa4d917cd305009398bd67b0ed33f4adf2c1bc..cae222969ec7fb510868c7bd16f7aa71a42b5b74 100644 GIT binary patch delta 226 zcmXAjy-osA6ofza-d(d~izSG>!7eC^XfEYyKwW+;s7Z`8B!-0A#=?e#!bl+Z1?=ny zom3RYr_z{kqTQJ@`DSJtdqJQ%)0Q!uX9slI-;O@ATfO+aG1BT>>zBt%YD zEF~?*p~eF(p%fmkLSCcA8FNF1%em+dSzgSF;D)^Yb*sfvF>t=|LSLeK@^|R(0q-s& A_y7O^ delta 214 zcmXAiy-vbV7(h?k+d@fW8o}}gttB*yT-em0#VVtTLQG7E(V2zSz=VOY-52l)j2li) zF1!*GU*h)tY=gShP5@B8#_-#=Fv@O zIVaq6$^$J%XkO^>M#6-1rd;sOC3CL$;F=W$HId)`CpaRKO=84CSdw0fEy1SAn4VA$ p9t$CJlzg7)bA!v7xC@y)jy=KK_@?ZohX>Wb-ck3(bSGz Date: Fri, 7 Oct 2016 15:02:33 +0300 Subject: [PATCH 058/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1604 -> 1634 bytes src/Spreadsheet.java | 1 + 3 files changed, 2 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 81f1970..d5333a8 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -149,3 +149,4 @@ EditAction 1475841674538 SpreadsheetTest.java 1047 6 18 6 EditAction 1475841734156 Spreadsheet.java 1443 3 12 0 EditAction 1475841738627 Spreadsheet.java 1449 3 12 0 EditAction 1475841746580 Spreadsheet.java 1477 3 13 0 +EditAction 1475841753157 Spreadsheet.java 1498 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index cae222969ec7fb510868c7bd16f7aa71a42b5b74..481ee8d9771e153b5a03ddbc35a9cc47d45009e7 100644 GIT binary patch delta 405 zcmX|+yGlbr5Qe{#v)N5T)DS&h@q&sG^$?ZhppEgKcr9Wp2tg1*6x7DXGyy>nl!y=u zFO{ugBZ4W!%Ez$t6)cP+g2OWW^UutFyKmu-aOnN}xeO#&d*D;AFMoZ{|whG2_ zj9b2~ygI5xjicSNTE8X|P2K$o~BbN3Q>k3wi`# z3AiYL7(U4xOfV^q=2W()QSzJdgw9YK)tTdBiWJqHKiJ(Ij+1Cck&?yJY0$+tH Y0{@<2&XNG9HthRCM}mT$mu(*lKU5^Z-E=fe=CCCJ|1A22m7_Y@&^v z8cm{sgJ@K5(PK2owg$n^X05gVwf5d$q4!YmsRu=!^IYXSUW0yDJrFQ6W)r8Yy|7$ERV=NdG*@}; z$IhE;)(E>+*Ivho>LD?yF=4|fMu?UfWr8uL7$-rT6qC#gT4II* zvlNBxv%mpqj^vtC>6}UboGcftQX$6`>)f)zJ$VKtzVLS>EL${*7`1 K@@Gf9I=jE6syosE diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 4e5abb8..d346047 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -41,6 +41,7 @@ public String evaluate(String cell) { // if value is a string. if(c[0] == '\'' && c[c.length - 1] == '\'') { + isString = true; break; } From 668a85bb75a5a75998d52d0777d03d5bef174f4c Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:03:09 +0300 Subject: [PATCH 059/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1634 -> 1641 bytes src/Spreadsheet.java | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index d5333a8..17cf1d3 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -150,3 +150,4 @@ EditAction 1475841734156 Spreadsheet.java 1443 3 12 0 EditAction 1475841738627 Spreadsheet.java 1449 3 12 0 EditAction 1475841746580 Spreadsheet.java 1477 3 13 0 EditAction 1475841753157 Spreadsheet.java 1498 3 13 0 +EditAction 1475841789588 Spreadsheet.java 1533 3 3 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 481ee8d9771e153b5a03ddbc35a9cc47d45009e7..7bc7ed040d60f62578e6af02ec16a8f60d4f417b 100644 GIT binary patch delta 220 zcmXAjyJ|vF5Ji{wo^$cS6$FisA5fcv_=plLd@G4n@&kfs0ycuRAZZ05a6%-VjlHdn zf}djNFIYJw&9G-+uQiw88tf0s-{BGle(hORlMUmRquDKSV~%S47kyRHHlj`FWNSL( zzLU0NU0NDmDKMnSh!PVj%&0Oa$AUVaG+5DOO^0u~Y+>9yqIVQEWW;qxVo4q9v<^yuR$9_ibJ_Y_OT0_TPo^#$`HNQc24?Dit< delta 212 zcmXAiJ!`^X6h@E9n->EaQWA?xS9J-k)hG`2tEq}^oeKpCWGOhi*s&l8%3C@Xe?nIm zhx`<`{spIA>T-GRbGhgIdMEGapxke4iolo2RXco$?51Dca}`BLmHtO Date: Fri, 7 Oct 2016 15:04:01 +0300 Subject: [PATCH 060/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 8 ++++++++ bin/Spreadsheet.class | Bin 1641 -> 1284 bytes src/Spreadsheet.java | 8 ++++++++ 3 files changed, 16 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 17cf1d3..2939b03 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -151,3 +151,11 @@ EditAction 1475841738627 Spreadsheet.java 1449 3 12 0 EditAction 1475841746580 Spreadsheet.java 1477 3 13 0 EditAction 1475841753157 Spreadsheet.java 1498 3 13 0 EditAction 1475841789588 Spreadsheet.java 1533 3 3 0 +CompilationAction 1475841789693 Spreadsheet.java +CompilationAction 1475841789693 Spreadsheet.java +RefactoringAction 1475841808220 Spreadsheet.java ADD String delete FIELD +RefactoringAction 1475841810737 Spreadsheet.java REMOVE delete FIELD +RefactoringAction 1475841812766 Spreadsheet.java ADD String Cut FIELD +RefactoringAction 1475841822282 Spreadsheet.java RENAME Cut=>String RemoveQuotes() METHOD +RefactoringAction 1475841828313 Spreadsheet.java RENAME RemoveQuotes()=>String RemoveQuotes(String) METHOD +EditAction 1475841841646 Spreadsheet.java 1602 4 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 7bc7ed040d60f62578e6af02ec16a8f60d4f417b..fad9db16ff295bb041e4e9ccf14244794b2e6925 100644 GIT binary patch delta 289 zcmYL^y-EW?6ov0>K;2>fg(1y;Fd`#}7(lxV*%q}U{-Ls1O%XZ6aYjDm@>ukc^ z0wB+5qcSCfO!Tf;Bt#$?u+_>QA&7JQ#@maSIqK;JSoB4{&y{;1rd!pX9c1J{#qaz42i4an-<09B{}h1($Wj5F+-c+ z%FJ<1_QoV$m#GDb;GLG(ZH>}oyS4lgC4b0hagf-)7-^ckk^#p%;>K_6M7yAGh}~fR EFZZ!>i2wiq diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index c66f6a4..a49a237 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -77,4 +77,12 @@ public String evaluate(String cell) { return value; } + private String RemoveQuotes(String s) { + + + + return s; + } + + } From 2c1425d1dc74dd13534dc87122807e08c44c603f Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:04:14 +0300 Subject: [PATCH 061/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1284 -> 1371 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 2939b03..fce6d1b 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -159,3 +159,6 @@ RefactoringAction 1475841812766 Spreadsheet.java ADD String Cut FIELD RefactoringAction 1475841822282 Spreadsheet.java RENAME Cut=>String RemoveQuotes() METHOD RefactoringAction 1475841828313 Spreadsheet.java RENAME RemoveQuotes()=>String RemoveQuotes(String) METHOD EditAction 1475841841646 Spreadsheet.java 1602 4 4 0 +CompilationAction 1475841841753 Spreadsheet.java +CompilationAction 1475841841754 Spreadsheet.java +EditAction 1475841854407 Spreadsheet.java 1622 4 15 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index fad9db16ff295bb041e4e9ccf14244794b2e6925..66d311e132974d107faf6aeb59f7ef10474fdcf4 100644 GIT binary patch delta 126 zcmZqSy3NIP>ff$?3=9k=3^p6N!k7hlf>Lwy%TfbN^Gi~T85tOhC&w{cGqP@;#hl3K z%fw*8Ai==Mzzx)32BevQG?VrQ5Xm46B-wys3=AO*B0y3MBFi8OWPtz^gC&DHP@a*& I3e2+x0FVz74*&oF delta 40 vcmcc3)xyPf>ff$?3=9k=3|1St!k8x)Gg~sUY+lQp$jHgaU;&h1Vz2}N0k#Rr diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index a49a237..c0528e2 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -58,7 +58,7 @@ public String evaluate(String cell) { } if(isString) { - return + return RemoveQuotes(value); } // if there are some other characters than digits. From 87fa5e89a88345ac7b588d2e39030321845e5f1d Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:04:29 +0300 Subject: [PATCH 062/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1371 -> 1758 bytes src/Spreadsheet.java | 1 + 3 files changed, 2 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index fce6d1b..c348ae1 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -162,3 +162,4 @@ EditAction 1475841841646 Spreadsheet.java 1602 4 4 0 CompilationAction 1475841841753 Spreadsheet.java CompilationAction 1475841841754 Spreadsheet.java EditAction 1475841854407 Spreadsheet.java 1622 4 15 0 +EditAction 1475841869771 Spreadsheet.java 1673 4 15 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 66d311e132974d107faf6aeb59f7ef10474fdcf4..41f0fe9483a0be7a2a0780c2201a5a86ac61d53c 100644 GIT binary patch delta 708 zcmX|<%}*0i6vcn9)6TR*ky5CF#*cuJuT}z-ih>H1f{3kx#sw_Q2$MPl+GN_2n3yys zByNlwV`4QCFeKg9XjELFYySlk{}31AEgE0u-Q0WLyXTzu-uy6sHk#jmf7u7(+lEuf$(}_M#dwej+7!WsJN9~h!=5kY zi*~_JQlWPq3Mi7wN%1T6YF4IWkb1wa zt*WxxLz9ESZg?QACA?a~*ZYCyzCGGKRA~KIoc8dIj&v10JXDK*WH_TGbS+_28INi4 zP}erCvDm(M~c=Tl$h8Nu`WCkOVXPXMCT3D%-|JkuZ3p@pUAqxc3swnrJj>)(hzCH zLc@Xd>jui8Lq3%JZ=M4h@&CsRZYUYh))MsmLN`MJQJi?*>>F)LANo*oL}}yZAA+KP AssI20 delta 318 zcmYL^F-rqM5QS$Gh-Qfd)L0K`R1iWmYP{1%u(Q!)9JZXQ|! zZqJP)Z}pV=*t6**(TWpmaN_Kxrqo9$%bl5Fb&d2}+Q7tka*Xx3j%@ReCMG=8wm0su zVoJ%dm*ulz;xQ#2+I|<)%riRT%o$Wc_)Ig}E9BXPu){7f11X^iI~6Fyu7KLw@&C7f zdA!~gP&uX4PU$4GO#W$H9Em85EJ7iSm9NmeSloJs?e}mMU@5Q!BJco~11q_fP=l2` SZ{I(Z;_4o(246swd+`tElvQ^C diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index c0528e2..bbe2f44 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -57,6 +57,7 @@ public String evaluate(String cell) { } + // remove quatation marks and return the string. if(isString) { return RemoveQuotes(value); } From 608d38e0377f1eb311e47be6f629ef33cfb9e253 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:04:36 +0300 Subject: [PATCH 063/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1758 -> 1758 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index c348ae1..1ef6461 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -163,3 +163,4 @@ CompilationAction 1475841841753 Spreadsheet.java CompilationAction 1475841841754 Spreadsheet.java EditAction 1475841854407 Spreadsheet.java 1622 4 15 0 EditAction 1475841869771 Spreadsheet.java 1673 4 15 0 +EditAction 1475841876198 Spreadsheet.java 1673 4 15 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 41f0fe9483a0be7a2a0780c2201a5a86ac61d53c..f664528fd399aa5c0c5e35655db48facdc1ddc33 100644 GIT binary patch delta 47 zcmcb|dyjX+Jyuy;hDHWEhIR%Qh8_l2hN%p03^N!!8Rj#1F)U*6oBW$~4`b-$9c*d< DOnwc} delta 47 zcmcb|dyjX+Jyuy8hDHWkhIR&Lh8_kNhN%p$3^N!!80Is0GAv^7o&1}14`ayW9c*d< DOR){d diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index bbe2f44..6453381 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -57,7 +57,7 @@ public String evaluate(String cell) { } - // remove quatation marks and return the string. + // remove quotation marks and return the string. if(isString) { return RemoveQuotes(value); } From e03564add7656cc3012bbbb2fe1436333e70c6b2 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:04:49 +0300 Subject: [PATCH 064/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ src/Spreadsheet.java | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 1ef6461..e2d1c3a 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -164,3 +164,6 @@ CompilationAction 1475841841754 Spreadsheet.java EditAction 1475841854407 Spreadsheet.java 1622 4 15 0 EditAction 1475841869771 Spreadsheet.java 1673 4 15 0 EditAction 1475841876198 Spreadsheet.java 1673 4 15 0 +UnitTestCaseAction 1475841880701 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475841880702 SpreadsheetTest.java FAIL +EditAction 1475841889778 Spreadsheet.java 1670 4 15 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 6453381..812ba96 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -74,7 +74,6 @@ public String evaluate(String cell) { return "#Error"; } } - return value; } From cc6b4b313634ba725635dc01400a89db13a46fb9 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:05:56 +0300 Subject: [PATCH 065/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1758 -> 1758 bytes src/Spreadsheet.java | 5 +---- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index e2d1c3a..4984be2 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -167,3 +167,4 @@ EditAction 1475841876198 Spreadsheet.java 1673 4 15 0 UnitTestCaseAction 1475841880701 SpreadsheetTest.java FAIL UnitTestSessionAction 1475841880702 SpreadsheetTest.java FAIL EditAction 1475841889778 Spreadsheet.java 1670 4 15 0 +EditAction 1475841956857 Spreadsheet.java 1690 4 15 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f664528fd399aa5c0c5e35655db48facdc1ddc33..c0d58d841d9dc7e79b0ed630cb5aaa1b33b66507 100644 GIT binary patch delta 19 bcmcb|dyjX+FIGn1$-i0mFosOt!KMZPR>}wO delta 19 bcmcb|dyjX+FIGms$-i0mFosUv!KMZPR@w*g diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 812ba96..c375c39 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -78,10 +78,7 @@ public String evaluate(String cell) { } private String RemoveQuotes(String s) { - - - - return s; + return s.substring(1, s.length() - 1); } From d54cbcfbf5ae3c4d6f7b1cdafae3f45700d07978 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:06:23 +0300 Subject: [PATCH 066/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1758 -> 1840 bytes tests/SpreadsheetTest.java | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 4984be2..61cd9c7 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -168,3 +168,6 @@ UnitTestCaseAction 1475841880701 SpreadsheetTest.java FAIL UnitTestSessionAction 1475841880702 SpreadsheetTest.java FAIL EditAction 1475841889778 Spreadsheet.java 1670 4 15 0 EditAction 1475841956857 Spreadsheet.java 1690 4 15 0 +UnitTestCaseAction 1475841968683 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475841968683 SpreadsheetTest.java FAIL +EditAction 1475841983011 SpreadsheetTest.java 1047 6 18 6 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index c0d58d841d9dc7e79b0ed630cb5aaa1b33b66507..aa66db1a449b9d619b733d795ccfedf26613371e 100644 GIT binary patch delta 173 zcmcb|yMd4E)W2Q(7#J8#7$P=uB{F+(F(@(k@i6!^1TZqN<)r4Nmt-(9Fl%Uff+T`? z7=jr>7#TQ=OOuLAiZb)k85zVhJUumivJ%S@^>Y&Q()EME;?|q9nT?pe9T->`n1H79 zXtQW9wV DS@IuY delta 90 zcmdnMcaN9r)W2Q(7#J8#7y>qOB{FZ`%xuK$XvV Date: Fri, 7 Oct 2016 15:08:43 +0300 Subject: [PATCH 067/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1656 -> 1656 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 61cd9c7..5f43f40 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -171,3 +171,6 @@ EditAction 1475841956857 Spreadsheet.java 1690 4 15 0 UnitTestCaseAction 1475841968683 SpreadsheetTest.java FAIL UnitTestSessionAction 1475841968683 SpreadsheetTest.java FAIL EditAction 1475841983011 SpreadsheetTest.java 1047 6 18 6 +UnitTestCaseAction 1475841992732 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475841992732 SpreadsheetTest.java FAIL +EditAction 1475842123890 Spreadsheet.java 1701 4 15 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 59ec298a9d0513602f09dbf9ce597d73bb8ab08d..5310ebdc6c9f59ad2ab361293143913ebf14b86c 100644 GIT binary patch delta 42 pcmeyt^MhwY9+NDOdP!<=NpVS0W?s5F2ZJ#q0~bPIb2rmlW&k~}4#WTe delta 42 pcmeyt^MhwY9+NCrNosLPaY<2TUOESZF(U(yIzm8wb2rmlW&lCy4#WTe diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index c375c39..2d581f8 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -59,7 +59,7 @@ public String evaluate(String cell) { // remove quotation marks and return the string. if(isString) { - return RemoveQuotes(value); + return "taalla";//RemoveQuotes(value); } // if there are some other characters than digits. From 216527cb7c4ef30fae372011e95174f229472f08 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:11:39 +0300 Subject: [PATCH 068/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 7 +++++++ bin/Spreadsheet.class | Bin 1840 -> 1839 bytes src/Spreadsheet.java | 1 + 3 files changed, 8 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 5f43f40..870766e 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -174,3 +174,10 @@ EditAction 1475841983011 SpreadsheetTest.java 1047 6 18 6 UnitTestCaseAction 1475841992732 SpreadsheetTest.java FAIL UnitTestSessionAction 1475841992732 SpreadsheetTest.java FAIL EditAction 1475842123890 Spreadsheet.java 1701 4 15 0 +UnitTestCaseAction 1475842125529 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475842125530 SpreadsheetTest.java FAIL +RefactoringAction 1475842255389 Spreadsheet.java REMOVE RemoveQuotes(String) METHOD +RefactoringAction 1475842257908 Spreadsheet.java ADD String RemoveQuotes(String) METHOD +UnitTestCaseAction 1475842279697 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475842279697 SpreadsheetTest.java FAIL +EditAction 1475842299847 Spreadsheet.java 1704 4 15 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index aa66db1a449b9d619b733d795ccfedf26613371e..db0737ed73d69a503e0752885d0fd24c70e4f14d 100644 GIT binary patch delta 262 zcmXBNu}i~H5XbTF>q}k|Ep3QK9K_Amr3ivJ)@oa|ieUbOKr>khXm!=W#nneaQ4G!w z1`3YO{t^BqE_&h($L|jAb7k$VRtCE6v!yWOG#!mnpKZIMdtp~mO|sMcGCRJ=$JzPx zL{C-lj>ZRGY}377Hc`8bod@c%X?-}uf-vfof4RU!9sB7HuWsmaOOHGHOxWj%0R>0Q z3zGa(#4N}pC=Hq@dGXAeq>A)2c0|w^9!2Tn5OB|~B$st^_QW)7$YvnPV^y3@W`E?| fcqsd7mf`~?1&edl%C~I8K;%RFWm+n+GhX8t0PQbI delta 263 zcmXAjy-EX75Ju0<-MyO|ml$GJwn$?We=rDwSZWg2pQuIh4B0XS)YxigV|Ni0!9}r3 zlZ6ywW9visCN?_a6vO#un8QrVc{#VbUP7@O(jr!b{d73GOnc+eMS5PO<6@ntWH!_@ zW#7>hfmgTcUoY9U^*46%$a`QuGR+TfkWs0&^FPio)wcWe2Uj=jaZAD-``mLxMwb^( zsfnlmZzEz+l6YybEWc=;*$^s7AIp6r6T_1j4)Cx%awz1p$(b0tvfGk;EEKRJo^9rS hNy)UegPdQE?@uv diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 2d581f8..5b3c269 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -74,6 +74,7 @@ public String evaluate(String cell) { return "#Error"; } } + return value; } From c455ac4ab12c3cf74b006eacbc9ec1ac321e074f Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:13:49 +0300 Subject: [PATCH 069/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 4 ++++ bin/Spreadsheet.class | Bin 1839 -> 1824 bytes src/Spreadsheet.java | 8 ++------ tests/SpreadsheetTest.java | 7 +++++++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 870766e..f16e173 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -181,3 +181,7 @@ RefactoringAction 1475842257908 Spreadsheet.java ADD String RemoveQuotes(String) UnitTestCaseAction 1475842279697 SpreadsheetTest.java FAIL UnitTestSessionAction 1475842279697 SpreadsheetTest.java FAIL EditAction 1475842299847 Spreadsheet.java 1704 4 15 0 +UnitTestCaseAction 1475842331823 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475842331824 SpreadsheetTest.java FAIL +RefactoringAction 1475842418298 SpreadsheetTest.java ADD void spreadsheet_get_ValueNotFoundError() METHOD +EditAction 1475842428986 SpreadsheetTest.java 1222 7 21 7 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index db0737ed73d69a503e0752885d0fd24c70e4f14d..24bb55ea8d0106d8801e0db932ec79da0c61174d 100644 GIT binary patch delta 276 zcmXAjyGjF55Qe{#vwPMJOA>OCXd@!T3kiatRUpQ=-cigmxHb|OHkwYvR|RP zf(t3^d<+}k#70M)V)$m5|2yX`_nb@fdS)(6k~qnt*a+xQRRrCr7Z0N2%lIPd+gaUI z;kc*A%6~yK0X*47_p0tZkgu4=hjTKbP;8}tJi-Vq)!%8Sa;PauKV`~(x<}V7Zdm7* zHg{}tPsorx%5u^D*HU3pCV7Aw^YSCjBg;Y=>F1IOWn(0@#WoJUICg|wRyboY!6otQEllKON%?&+_TFw9a0V$m!$t+fyabwQbv^;N;oeph|7t_Yze_Y^CXluCN__3 xi?diFVn>*oWw~_3<(U=E3S&Pc4|>|$Q!+4FDdtA#ykiS Date: Fri, 7 Oct 2016 15:13:56 +0300 Subject: [PATCH 070/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 1656 -> 1835 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index f16e173..5e46e8b 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -185,3 +185,4 @@ UnitTestCaseAction 1475842331823 SpreadsheetTest.java FAIL UnitTestSessionAction 1475842331824 SpreadsheetTest.java FAIL RefactoringAction 1475842418298 SpreadsheetTest.java ADD void spreadsheet_get_ValueNotFoundError() METHOD EditAction 1475842428986 SpreadsheetTest.java 1222 7 21 7 +EditAction 1475842436134 SpreadsheetTest.java 1227 7 21 7 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 5310ebdc6c9f59ad2ab361293143913ebf14b86c..0aa2a362747d4394ae78e0b9004ee3324afc411e 100644 GIT binary patch delta 232 zcmeytvzm|V)W2Q(7#J8#7`!)f?P0Q3DlRBWO-w1yNKGw?PY2?##GKMpzx)!n{L;J> z*P^2QA`S*yMg}2F@ySP+l=vJN8JKhpxflc)oOl?VCx2nG;&cNFnL2VXcuY2DwqWGg zT)^zW#AdpUK~czNvIDE+B0AZRO_aw8B;^8?%4f4@ LcLUnN#NZA9Ft{0Z diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 8b744fb..c07a55e 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -38,7 +38,7 @@ public void spreadsheet_get_error() { public void spreadsheet_get_ValueNotFoundError() { Spreadsheet ss = new Spreadsheet(); ss.set("A1", "2"); - assertEquals("ValueNotFoundError", ss.get("A2")); + assertEquals("ValueNotFoundError", ss.evaluate("A2")); } @Test From 9c0b08e6f4132ec331aacc180c7c90cd274a7392 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:14:13 +0300 Subject: [PATCH 071/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 5 +++++ bin/SpreadsheetTest.class | Bin 1835 -> 1835 bytes tests/SpreadsheetTest.java | 14 ++++++-------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 5e46e8b..1be4245 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -186,3 +186,8 @@ UnitTestSessionAction 1475842331824 SpreadsheetTest.java FAIL RefactoringAction 1475842418298 SpreadsheetTest.java ADD void spreadsheet_get_ValueNotFoundError() METHOD EditAction 1475842428986 SpreadsheetTest.java 1222 7 21 7 EditAction 1475842436134 SpreadsheetTest.java 1227 7 21 7 +UnitTestCaseAction 1475842437411 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475842437412 SpreadsheetTest.java FAIL +RefactoringAction 1475842449344 SpreadsheetTest.java REMOVE spreadsheet_set_a1_teststring() METHOD +RefactoringAction 1475842452363 SpreadsheetTest.java ADD void spreadsheet_set_a1_teststring() METHOD +EditAction 1475842453391 SpreadsheetTest.java 1223 7 21 7 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 0aa2a362747d4394ae78e0b9004ee3324afc411e..5c31e6ce012f17bf25b7c801b459e612700c1fc8 100644 GIT binary patch delta 84 zcmZ3@x0-JQBeN(MgCK)F4}$}P1|tJUYFT1VX<|w0WJYEsHfKf#CSAkLcFen&80{wi nWVL5>oE*p^I@ym+l*efsgQAd=wvg;L2D{1mY^6X2Pubi66s{Bw delta 93 zcmV-j0HXh^4yz8Z0Rsa803DM-0~M1l0}2~J0RRFmF$w??0747^LjWiN00?DvVQh6_ zbY-(X1G)l}f&~H06~*)26X{JljR0RggX@= diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index c07a55e..4d733ae 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -19,14 +19,6 @@ public void spreadsheet_set_a1_1() { String result = ss.get("A1"); assertEquals("1", result); } - - @Test - public void spreadsheet_set_a1_teststring() { - Spreadsheet ss = new Spreadsheet(); - ss.set("A1", "'teststring'"); - assertEquals("teststring", ss.get("A1")); - } - @Test public void spreadsheet_get_error() { Spreadsheet ss = new Spreadsheet(); @@ -55,6 +47,12 @@ public void spreadsheet_evaluate_wronglyFormattedInt() { assertEquals("#Error", ss.evaluate("A1")); } + @Test + public void spreadsheet_set_a1_teststring() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "'teststring'"); + assertEquals("teststring", ss.get("A1")); + } From 33c747f4adde5047e31befc16ba692266a7832a9 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:14:39 +0300 Subject: [PATCH 072/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 1835 -> 1835 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 1be4245..df85407 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -191,3 +191,4 @@ UnitTestSessionAction 1475842437412 SpreadsheetTest.java FAIL RefactoringAction 1475842449344 SpreadsheetTest.java REMOVE spreadsheet_set_a1_teststring() METHOD RefactoringAction 1475842452363 SpreadsheetTest.java ADD void spreadsheet_set_a1_teststring() METHOD EditAction 1475842453391 SpreadsheetTest.java 1223 7 21 7 +EditAction 1475842479481 Spreadsheet.java 1608 4 14 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 5c31e6ce012f17bf25b7c801b459e612700c1fc8..b7d088076e8042edf517a4a5cb43468ad0055fbd 100644 GIT binary patch delta 355 zcmZ3@x0-K*H`C-^CJ8A+Mg~SB4hCaJ2AQ(|hL_r%#(q-R3aB&`^ z8$}4dfzRPnxOI|+B81`0V)(zAGtQ2)uNR7JrE*slhKv;mKkx(Ze&ARfTMXLYfWh#e zJYo0!J0XHwho0~}*W;)&uqsEB7Q~ZB;rq5DICkYoDJ``a^c(wOD0*(tb%%rgNyIcv z<1m9G`KgrIvHVu5dY3_|wK+~1)O;LzAElm|{8DEoXTdRtDa=zX$QN~)ZOhBFA$zJ( zs)aE1Mp54hvHF3+8vq3wbscHyIie=f6{7i=?)|6xF+E727ST1L1)}RQZU53vbhT5| j7ege`4WebDn?x%_ug#=XjZ$?=H7M1L4osZIzd!#0FDy~F diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 13b3808..5060b99 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -71,7 +71,7 @@ public String evaluate(String cell) { } // it is a string? - return RemoveQuotes(value); + return value; } private String RemoveQuotes(String s) { From 5ffaef0bf492e26018b82286450059e887ceaa3a Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:14:50 +0300 Subject: [PATCH 073/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 2 ++ bin/Spreadsheet.class | Bin 1824 -> 1641 bytes src/Spreadsheet.java | 6 ------ 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index df85407..f567be5 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -192,3 +192,5 @@ RefactoringAction 1475842449344 SpreadsheetTest.java REMOVE spreadsheet_set_a1_t RefactoringAction 1475842452363 SpreadsheetTest.java ADD void spreadsheet_set_a1_teststring() METHOD EditAction 1475842453391 SpreadsheetTest.java 1223 7 21 7 EditAction 1475842479481 Spreadsheet.java 1608 4 14 0 +RefactoringAction 1475842486790 Spreadsheet.java REMOVE RemoveQuotes(String) METHOD +EditAction 1475842490393 Spreadsheet.java 1517 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 24bb55ea8d0106d8801e0db932ec79da0c61174d..f6608181817ed4688106462d5514883e3b057511 100644 GIT binary patch delta 163 zcmZ3$_mYR})W2Q(7#J8#7<@KzaWhZWW42**n!KIanvrGmXJ&0i&ZP{@3>-iOGbgLF zPG{7ae3-SydnSV@gBVZ@D9WJ5pw7SuR5Oi1AIM??l35In3{F51HipRz&I~RLEDW3s z6Bt~9ELH|1hI9ru26v#GDUkGFaG%`8rYGge2m}la62d%8zZlpAIDrOw0S#wj@CE?! CWE-*o delta 347 zcmX|6Jxjw-6g@XD2_}7rP#fx~gSJ)-h)#9zt7`hCZT-TnVo24Rf=N618(bn3go3M^ zB2;j2aP*(}7aYWE1mAGpz2_XxJMUB8kD4FfuWtYrar9&+#DodLn#4NN1X*`4J3Y77 z?SyU+rNnZjU}6eYi5=_`^tS7JVT&L#S?5=%OEj=YFoNz$5MG`69>K~uPPTmB>^1Fn z)A#H~%;yOdM0JrT?fFLJ$asLj2-g@y?`mJ0oqNG*bgW&M21vnTo)t`EhRX@u!RAR} z^s#{gGdlX%#1>Q-xWzV48WwN?2SwJFcrT$CP3rTlGVuY@NvV86A2T?Hzsj)*eqx0K o6uxCn%?(jePlu>I@~$AssIv>GVw} Date: Fri, 7 Oct 2016 15:15:05 +0300 Subject: [PATCH 074/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ src/Spreadsheet.java | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index f567be5..0ebb6aa 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -194,3 +194,6 @@ EditAction 1475842453391 SpreadsheetTest.java 1223 7 21 7 EditAction 1475842479481 Spreadsheet.java 1608 4 14 0 RefactoringAction 1475842486790 Spreadsheet.java REMOVE RemoveQuotes(String) METHOD EditAction 1475842490393 Spreadsheet.java 1517 3 13 0 +UnitTestCaseAction 1475842500361 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475842500361 SpreadsheetTest.java FAIL +EditAction 1475842505118 Spreadsheet.java 1496 3 13 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 3cea898..f475a01 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -70,7 +70,6 @@ public String evaluate(String cell) { } } - // it is a string? return value; } } From 5fc8bde6f842ebbb6c0ae2509550df83bc1b85d4 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:16:01 +0300 Subject: [PATCH 075/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1641 -> 1641 bytes src/Spreadsheet.java | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 0ebb6aa..6380485 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -197,3 +197,4 @@ EditAction 1475842490393 Spreadsheet.java 1517 3 13 0 UnitTestCaseAction 1475842500361 SpreadsheetTest.java FAIL UnitTestSessionAction 1475842500361 SpreadsheetTest.java FAIL EditAction 1475842505118 Spreadsheet.java 1496 3 13 0 +EditAction 1475842561037 Spreadsheet.java 1556 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f6608181817ed4688106462d5514883e3b057511..7bc7ed040d60f62578e6af02ec16a8f60d4f417b 100644 GIT binary patch delta 13 VcmaFK^O9%7DON_$$){Q80RSpk1+@SG delta 13 VcmaFK^O9%7DON_W$){Q80RSpp1-1YH diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index f475a01..fa7ff73 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -63,10 +63,14 @@ public String evaluate(String cell) { if(isNegative) { if(digitCount != (c.length - 1)) { return "#Error"; + } else { + return value; } } else { if(digitCount != c.length) { return "#Error"; + } else { + return value; } } From adbfac2b472c2b1cf5128ce84402b76427419ab2 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:16:44 +0300 Subject: [PATCH 076/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 5 +++++ bin/Spreadsheet.class | Bin 1641 -> 1648 bytes src/Spreadsheet.java | 6 ++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 6380485..4aa29ef 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -198,3 +198,8 @@ UnitTestCaseAction 1475842500361 SpreadsheetTest.java FAIL UnitTestSessionAction 1475842500361 SpreadsheetTest.java FAIL EditAction 1475842505118 Spreadsheet.java 1496 3 13 0 EditAction 1475842561037 Spreadsheet.java 1556 3 13 0 +CompilationAction 1475842561517 Spreadsheet.java +CompilationAction 1475842573826 Spreadsheet.java +UnitTestCaseAction 1475842576083 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475842576084 SpreadsheetTest.java FAIL +EditAction 1475842604895 Spreadsheet.java 1611 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 7bc7ed040d60f62578e6af02ec16a8f60d4f417b..3a02806b89c54b7816502b08940fc6f0b8b7c1b0 100644 GIT binary patch delta 193 zcmaFK^MPl>P8QBJ49pB13=9mjCm&*I;1d*O)7{6CGM|A>$bN&)WIt9h<}3!O$?2@o z_0A0a3~mh57~C0VGI%nG0JQ``G%|=Xhyi&(BN)^e)EO9o2F_s62eO!eWDbKPgA-7M zjbSQ-GlL5Q3j-&^BnDR?i!!RVq!RIJOj7y6hV Date: Fri, 7 Oct 2016 15:17:25 +0300 Subject: [PATCH 077/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1648 -> 1746 bytes src/Spreadsheet.java | 1 - 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 4aa29ef..8832c3c 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -203,3 +203,6 @@ CompilationAction 1475842573826 Spreadsheet.java UnitTestCaseAction 1475842576083 SpreadsheetTest.java FAIL UnitTestSessionAction 1475842576084 SpreadsheetTest.java FAIL EditAction 1475842604895 Spreadsheet.java 1611 3 13 0 +UnitTestCaseAction 1475842606539 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475842606540 SpreadsheetTest.java FAIL +EditAction 1475842645312 Spreadsheet.java 1571 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3a02806b89c54b7816502b08940fc6f0b8b7c1b0..b1b1d348f0ecd84a9d6356be770ff4bab45103ac 100644 GIT binary patch delta 348 zcmXw!Jxf9X6o#Ms;ms>IvP@}kiYNs`ih{tR4>h}LS=t{k3^T+*ts#);2ejlQK?Olk zG#G(HgF{0@W51-ip*j|w;qac1_kGX#u-^M!Z(q+{V215S*SDH-G0Kv~GAjy3dACxm z?_cGd1$`qjfkVgKu8aDSkwz0qHV97ab2;jQ1Xm=vCB;4K49j-*&k-*^sl=OcCXjEqBP>Xj+`tx=hQW<6({iQB wweZt8nC6HLGBTSL^-V#21Vm>}#cEC&WBx5g0!BQR`ibFoE2gMtWkV(R1I#i)Q2+n{ delta 255 zcmXwy%}PR16otQY&%H Date: Fri, 7 Oct 2016 15:17:46 +0300 Subject: [PATCH 078/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1746 -> 1746 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 8832c3c..1f81e9a 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -206,3 +206,4 @@ EditAction 1475842604895 Spreadsheet.java 1611 3 13 0 UnitTestCaseAction 1475842606539 SpreadsheetTest.java FAIL UnitTestSessionAction 1475842606540 SpreadsheetTest.java FAIL EditAction 1475842645312 Spreadsheet.java 1571 3 13 0 +EditAction 1475842666132 Spreadsheet.java 1576 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index b1b1d348f0ecd84a9d6356be770ff4bab45103ac..44e7e4b3be097976798885f55bcc91ee8873c3c1 100644 GIT binary patch delta 85 zcmcb_dx>|$OIA;H1`7r)25$y!20sQJhCl`bhIj@;h9m|fhExVqhI|Gyh9U-ah8hNI phDHV(hF%6IhDi+046_+r80Im!F)U#4WLVDN#juLOXR;C70s!yh5wZXP delta 85 zcmcb_dx>|$OIA+}1`7sl25$x(20sQ}hCl{GhIj@eh9m}KhExVKhI|Hdh9U+Hh8hMN ohDHWkhF%6|hDi)A46_+r8Rjv#Gb~{6VptB;y^6tivJu+?0P^k;#Q*>R diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 322479c..168751d 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -39,7 +39,7 @@ public String evaluate(String cell) { for(int i = 0; i < c.length; i++) { // if value is a string. - if(c[0] == '\'' && c[c.length - 1] == '\'') { + if(c[0] == '\'') { //&& c[c.length - 1] == '\'') { isString = true; break; } From 08456deb5278dc6b7f80a7e53b2c2e7232816738 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:18:38 +0300 Subject: [PATCH 079/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 9 +++++++++ bin/Spreadsheet.class | Bin 1746 -> 1735 bytes 2 files changed, 9 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 1f81e9a..71c491d 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -207,3 +207,12 @@ UnitTestCaseAction 1475842606539 SpreadsheetTest.java FAIL UnitTestSessionAction 1475842606540 SpreadsheetTest.java FAIL EditAction 1475842645312 Spreadsheet.java 1571 3 13 0 EditAction 1475842666132 Spreadsheet.java 1576 3 13 0 +UnitTestCaseAction 1475842680806 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475842680806 SpreadsheetTest.java FAIL +RefactoringAction 1475842696192 Spreadsheet.java ADD boolean is FIELD +RefactoringAction 1475842697707 Spreadsheet.java REMOVE is FIELD +RefactoringAction 1475842698720 Spreadsheet.java ADD boolean is FIELD +RefactoringAction 1475842702736 Spreadsheet.java RENAME is=>boolean get FIELD +RefactoringAction 1475842708251 Spreadsheet.java RENAME get=>boolean getIsString() METHOD +RefactoringAction 1475842717764 Spreadsheet.java REMOVE getIsString() METHOD +EditAction 1475842718870 Spreadsheet.java 1576 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 44e7e4b3be097976798885f55bcc91ee8873c3c1..3a4416397f31098b6832bd8b8f1bd7ae4cb7bc95 100644 GIT binary patch delta 212 zcmXAi!Ab&Q6otQ;@gJOUU_fUcp%xXHFh)2F$q2Mmus~=nNUP9=TS26@!A~G4iEq%} z2M}ELIIcS2=5p@6=R4;w+=ai63AW_O0~>o{ZoKr;vt3hl_V&ZPP3xS~;DQIryl_pQ z3a_LLs50b?5j7@c%(&xI&M)q3)RTtV^&OMiNe)lK6Pj8iWzp+UI8*`w`hnHdE!V6+DVYstLrmjos%RKA* zX~YS)oN`B=0R@JfGp5J`B_0WQp~@RIW?V7nngw;1G>B>OL7O! Date: Fri, 7 Oct 2016 15:19:37 +0300 Subject: [PATCH 080/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + src/Spreadsheet.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 71c491d..93d1a16 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -216,3 +216,4 @@ RefactoringAction 1475842702736 Spreadsheet.java RENAME is=>boolean get FIELD RefactoringAction 1475842708251 Spreadsheet.java RENAME get=>boolean getIsString() METHOD RefactoringAction 1475842717764 Spreadsheet.java REMOVE getIsString() METHOD EditAction 1475842718870 Spreadsheet.java 1576 3 13 0 +EditAction 1475842777733 Spreadsheet.java 1599 3 13 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 168751d..9f4a0d7 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -41,7 +41,8 @@ public String evaluate(String cell) { // if value is a string. if(c[0] == '\'') { //&& c[c.length - 1] == '\'') { isString = true; - break; + return "taalla"; + //break; } // if the first character is negative (-). From 8878aefbcb6c2dc5a399c6a1a4e30949c2c6b6dd Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:19:56 +0300 Subject: [PATCH 081/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1735 -> 1746 bytes src/Spreadsheet.java | 3 +-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 93d1a16..d688782 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -217,3 +217,6 @@ RefactoringAction 1475842708251 Spreadsheet.java RENAME get=>boolean getIsString RefactoringAction 1475842717764 Spreadsheet.java REMOVE getIsString() METHOD EditAction 1475842718870 Spreadsheet.java 1576 3 13 0 EditAction 1475842777733 Spreadsheet.java 1599 3 13 0 +UnitTestCaseAction 1475842779275 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475842779275 SpreadsheetTest.java FAIL +EditAction 1475842796249 Spreadsheet.java 1576 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3a4416397f31098b6832bd8b8f1bd7ae4cb7bc95..2707470e2810e30aa97dfdba7aba6029e70b2536 100644 GIT binary patch delta 325 zcmW-dNlSuZ6osGnn@m$EOA6anppq>bOss5jD5tWr0(XM(B}oxUKcJ1<;3a4Rw=IpJ zg$uVq?b`Q8T12ni)wvw*xew>v^W|}U{C2v)Jclo?Pi?r5MS<0*ROsJ5`YnRd9{+y1qDHq)^gO3ZS^ z9Ay@$62&IKh2p#-&b1fUpf1JpB`J%uK#XGWoTA6Z~CMJ;kI|p8IS73xXQh!0hVTPm{HrmCU z+A?Ou{NtVB3Gu3Gtp($rZnbGOPmGk2B`Hd_2-;oM+n@KKRi-X%hM$=NJ_JT Date: Fri, 7 Oct 2016 15:20:06 +0300 Subject: [PATCH 082/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1746 -> 1735 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index d688782..6cbbc54 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -220,3 +220,4 @@ EditAction 1475842777733 Spreadsheet.java 1599 3 13 0 UnitTestCaseAction 1475842779275 SpreadsheetTest.java FAIL UnitTestSessionAction 1475842779275 SpreadsheetTest.java FAIL EditAction 1475842796249 Spreadsheet.java 1576 3 13 0 +EditAction 1475842806316 Spreadsheet.java 1574 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 2707470e2810e30aa97dfdba7aba6029e70b2536..3a4416397f31098b6832bd8b8f1bd7ae4cb7bc95 100644 GIT binary patch delta 354 zcmW-dIZFdk0EEAn-F=H;<4GE^62XY^HsTSlBu3+X1Omar#mE{F#Tfhn60j8>fUpf1JpB`J%uK#XGWoTA6Z~CMJ;kI|p8IS73xXQh!0hVTPm{HrmCU z+A?Ou{NtVB3Gu3Gtp($rZnbGOPmGk2B`Hd_2-;oM+n@KKRi-X%hM$=NJ_JTbOss5jD5tWr0(XM(B}oxUKcJ1<;3a4Rw=IpJ zg$uVq?b`Q8T12ni)wvw*xew>v^W|}U{C2v)Jclo?Pi?r5MS<0*ROsJ5`YnRd9{+y1qDHq)^gO3ZS^ z9Ay@$62&IKh2p#-&b1 Date: Fri, 7 Oct 2016 15:20:15 +0300 Subject: [PATCH 083/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ src/Spreadsheet.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 6cbbc54..73f5c15 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -221,3 +221,6 @@ UnitTestCaseAction 1475842779275 SpreadsheetTest.java FAIL UnitTestSessionAction 1475842779275 SpreadsheetTest.java FAIL EditAction 1475842796249 Spreadsheet.java 1576 3 13 0 EditAction 1475842806316 Spreadsheet.java 1574 3 13 0 +UnitTestCaseAction 1475842807918 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475842807918 SpreadsheetTest.java FAIL +EditAction 1475842815460 Spreadsheet.java 1576 3 13 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index ca6762a..168751d 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -39,7 +39,7 @@ public String evaluate(String cell) { for(int i = 0; i < c.length; i++) { // if value is a string. - if(c[0] == 39) { //&& c[c.length - 1] == '\'') { + if(c[0] == '\'') { //&& c[c.length - 1] == '\'') { isString = true; break; } From ef4c83e9c9d927d4e4b661706c30d97f6f0e0196 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:20:54 +0300 Subject: [PATCH 084/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + src/Spreadsheet.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 73f5c15..590d76a 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -224,3 +224,4 @@ EditAction 1475842806316 Spreadsheet.java 1574 3 13 0 UnitTestCaseAction 1475842807918 SpreadsheetTest.java FAIL UnitTestSessionAction 1475842807918 SpreadsheetTest.java FAIL EditAction 1475842815460 Spreadsheet.java 1576 3 13 0 +EditAction 1475842854673 Spreadsheet.java 1587 3 13 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 168751d..cc3e85a 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -73,7 +73,7 @@ public String evaluate(String cell) { if(digitCount != c.length) { return "#Error"; } else { - return value; + return "taalla";//value; } } } From 0bc1494765f1245ffb11286b3375710f736ccc22 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:21:16 +0300 Subject: [PATCH 085/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1735 -> 1748 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 590d76a..d85bae4 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -225,3 +225,6 @@ UnitTestCaseAction 1475842807918 SpreadsheetTest.java FAIL UnitTestSessionAction 1475842807918 SpreadsheetTest.java FAIL EditAction 1475842815460 Spreadsheet.java 1576 3 13 0 EditAction 1475842854673 Spreadsheet.java 1587 3 13 0 +UnitTestCaseAction 1475842856221 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475842856222 SpreadsheetTest.java FAIL +EditAction 1475842876875 Spreadsheet.java 1576 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3a4416397f31098b6832bd8b8f1bd7ae4cb7bc95..edaf26b3173548df6098d71a066dbcf5b71370c7 100644 GIT binary patch delta 173 zcmWNJFAKtO6h+T(b7LDD3`LV!n}TTD7tr}{PHl!I%YvZQZeLP_!JcqNhF;JMhBuUdGTj_xs-cI^j*$+xsvMVyj$hC4myBLSC zph``kU>Y=0=;XAeX>zxO4277S88H@t&5?;TgAN;}MDptqFeA$LW~&}633wG(`(paO LvPC%;y~g4Xrehvi delta 159 zcmcb@dz_c+)W2Q(7#J8#7(zC31v5|1WVT`S+PsW8osn}l0}BHOP-@|1G1mEvI+M4v zc6cvj5M>YpiUCC#)ELwm7#Wxu<}v64Sxi8(h{2P=3n;?IFq^@f!3U_HlVJvfFObE` zV8oEm;K$$(lrv?pVF+OGpWMZ!ClkmB1Plzk!aPjB7}x{^7&(DP1_6y{Vh9ERqRks@ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index cc3e85a..168751d 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -73,7 +73,7 @@ public String evaluate(String cell) { if(digitCount != c.length) { return "#Error"; } else { - return "taalla";//value; + return value; } } } From caab6ed30a033b309304e2ab18faf2644269b087 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:21:38 +0300 Subject: [PATCH 086/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1748 -> 1735 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index d85bae4..3153707 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -228,3 +228,4 @@ EditAction 1475842854673 Spreadsheet.java 1587 3 13 0 UnitTestCaseAction 1475842856221 SpreadsheetTest.java FAIL UnitTestSessionAction 1475842856222 SpreadsheetTest.java FAIL EditAction 1475842876875 Spreadsheet.java 1576 3 13 0 +EditAction 1475842898461 Spreadsheet.java 1588 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index edaf26b3173548df6098d71a066dbcf5b71370c7..3a4416397f31098b6832bd8b8f1bd7ae4cb7bc95 100644 GIT binary patch delta 159 zcmcb@dz_c+)W2Q(7#J8#7(zC31v5|1WVT`S+PsW8osn}l0}BHOP-@|1G1mEvI+M4v zc6cvj5M>YpiUCC#)ELwm7#Wxu<}v64Sxi8(h{2P=3n;?IFq^@f!3U_HlVJvfFObE` zV8oEm;K$$(lrv?pVF+OGpWMZ!ClkmB1Plzk!aPjB7}x{^7&(DP1_6y{Vh9ERqRks@ delta 173 zcmWNJFAKtO6h+T(b7LDD3`LV!n}TTD7tr}{PHl!I%YvZQZeLP_!JcqNhF;JMhBuUdGTj_xs-cI^j*$+xsvMVyj$hC4myBLSC zph``kU>Y=0=;XAeX>zxO4277S88H@t&5?;TgAN;}MDptqFeA$LW~&}633wG(`(paO LvPC%;y~g4Xrehvi diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 168751d..e084198 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -67,7 +67,7 @@ public String evaluate(String cell) { if(digitCount != (c.length - 1)) { return "#Error"; } else { - return value; + return "taalla"; //value; } } else { if(digitCount != c.length) { From 3132993c03da66365e40f02077c58c51f3e01450 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:21:48 +0300 Subject: [PATCH 087/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1735 -> 1748 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 3153707..a3c8227 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -229,3 +229,6 @@ UnitTestCaseAction 1475842856221 SpreadsheetTest.java FAIL UnitTestSessionAction 1475842856222 SpreadsheetTest.java FAIL EditAction 1475842876875 Spreadsheet.java 1576 3 13 0 EditAction 1475842898461 Spreadsheet.java 1588 3 13 0 +UnitTestCaseAction 1475842899636 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475842899636 SpreadsheetTest.java FAIL +EditAction 1475842908022 Spreadsheet.java 1576 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3a4416397f31098b6832bd8b8f1bd7ae4cb7bc95..2a76e429e70764481f617abe284bf6c800e7c275 100644 GIT binary patch delta 208 zcmX@kdxe+l)W2Q(7#J8#7{WGk1vB$-FnBRCu$3ex=Hw(!j%BuC^w~U%Ih~Pn4+9GW z2T Date: Fri, 7 Oct 2016 15:23:05 +0300 Subject: [PATCH 088/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1748 -> 1735 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index a3c8227..d8489be 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -232,3 +232,6 @@ EditAction 1475842898461 Spreadsheet.java 1588 3 13 0 UnitTestCaseAction 1475842899636 SpreadsheetTest.java FAIL UnitTestSessionAction 1475842899636 SpreadsheetTest.java FAIL EditAction 1475842908022 Spreadsheet.java 1576 3 13 0 +UnitTestCaseAction 1475842961853 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475842961853 SpreadsheetTest.java FAIL +EditAction 1475842985743 SpreadsheetTest.java 1228 7 21 7 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 2a76e429e70764481f617abe284bf6c800e7c275..3a4416397f31098b6832bd8b8f1bd7ae4cb7bc95 100644 GIT binary patch delta 194 zcmcb@dz_c+)W2Q(7#J8#7(zC31v5|1WVT`S+PsW8osn}l0}BHOP-@|1G1fLdK~Xl{ zeJm;S8Q6r}H|R`W&03c@mBEu?4ucoNd Date: Fri, 7 Oct 2016 15:24:05 +0300 Subject: [PATCH 089/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 + .../20161007141352402/besouroEpisodes.txt | 240 ++++++++++++++++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161007141352402/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 1835 -> 1835 bytes src/Spreadsheet.java | 2 +- 6 files changed, 246 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index d8489be..f4d964a 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -235,3 +235,6 @@ EditAction 1475842908022 Spreadsheet.java 1576 3 13 0 UnitTestCaseAction 1475842961853 SpreadsheetTest.java FAIL UnitTestSessionAction 1475842961853 SpreadsheetTest.java FAIL EditAction 1475842985743 SpreadsheetTest.java 1228 7 21 7 +UnitTestCaseAction 1475842997833 SpreadsheetTest.java OK +UnitTestSessionAction 1475842997834 SpreadsheetTest.java OK +EditAction 1475843044970 Spreadsheet.java 1571 3 13 0 diff --git a/.besouro/20161007141352402/besouroEpisodes.txt b/.besouro/20161007141352402/besouroEpisodes.txt index 19ccc56..86aea5f 100644 --- a/.besouro/20161007141352402/besouroEpisodes.txt +++ b/.besouro/20161007141352402/besouroEpisodes.txt @@ -93,3 +93,243 @@ 1475841488308 test-first 3 1260 true 1475841488309 test-first 3 1260 true 1475841615012 refactoring 2A 7 true +1475842997834 test-first 3 1323 true +1475842997835 test-last 1 1323 false +1475842997836 test-last 1 1323 false +1475842997837 test-last 1 1323 false +1475842997838 test-last 1 1323 false +1475842997839 test-last 1 1323 false +1475842997840 test-last 1 1323 false +1475842997841 test-last 1 1323 false +1475842997842 test-last 1 1323 false +1475842997843 test-last 1 1323 false +1475842997844 test-last 1 1323 false +1475842997845 test-last 1 1323 false +1475842997846 test-last 1 1323 false +1475842997847 test-first 3 1323 true +1475842997848 test-first 3 1323 true +1475842997849 test-first 3 1323 true +1475842997850 test-first 3 1323 true +1475842997851 test-first 3 1323 true +1475842997852 test-first 3 1323 true +1475842997853 test-first 3 1323 true +1475842997854 test-first 3 1323 true +1475842997855 test-first 3 1323 true +1475842997856 test-first 3 1323 true +1475842997857 test-first 3 1323 true +1475842997858 test-first 3 1323 true +1475842997859 test-first 3 1323 true +1475842997860 test-first 3 1323 true +1475842997861 test-first 3 1323 true +1475842997862 test-first 3 1323 true +1475842997863 test-first 3 1323 true +1475842997864 test-first 3 1323 true +1475842997865 test-first 3 1323 true +1475842997866 test-first 3 1323 true +1475842997867 test-first 3 1323 true +1475842997868 test-first 3 1323 true +1475842997869 test-first 3 1323 true +1475842997870 test-first 3 1323 true +1475842997871 test-first 3 1323 true +1475842997872 test-first 3 1323 true +1475842997873 test-first 3 1323 true +1475842997874 test-first 3 1323 true +1475842997875 test-first 3 1323 true +1475842997876 test-first 3 1323 true +1475842997877 test-first 3 1323 true +1475842997878 test-first 3 1323 true +1475842997879 test-first 3 1323 true +1475842997880 test-first 3 1323 true +1475842997881 test-first 3 1323 true +1475842997882 test-first 3 1323 true +1475842997883 test-first 3 1323 true +1475842997884 test-first 3 1323 true +1475842997885 test-first 3 1323 true +1475842997886 test-first 3 1323 true +1475842997887 test-first 3 1323 true +1475842997888 test-first 3 1323 true +1475842997889 test-first 3 1323 true +1475842997890 test-first 3 1323 true +1475842997891 test-first 3 1323 true +1475842997892 test-first 3 1323 true +1475842997893 test-first 3 1323 true +1475842997894 test-first 3 1323 true +1475842997895 test-first 3 1323 true +1475842997896 test-first 3 1323 true +1475842997897 test-first 3 1323 true +1475842997898 test-first 3 1323 true +1475842997899 test-first 3 1323 true +1475842997900 test-first 3 1323 true +1475842997901 test-first 3 1323 true +1475842997902 test-first 3 1323 true +1475842997903 test-first 3 1323 true +1475842997904 test-first 3 1323 true +1475842997905 test-first 3 1323 true +1475842997906 test-first 3 1323 true +1475842997907 test-first 3 1323 true +1475842997908 test-first 3 1323 true +1475842997909 test-first 3 1323 true +1475842997910 test-first 3 1323 true +1475842997911 test-first 3 1323 true +1475842997912 test-first 3 1323 true +1475842997913 test-first 3 1323 true +1475842997914 test-first 3 1323 true +1475842997915 test-first 3 1323 true +1475842997916 test-first 3 1323 true +1475842997917 test-first 3 1323 true +1475842997918 test-first 3 1323 true +1475842997919 test-first 3 1323 true +1475842997920 test-first 3 1323 true +1475842997921 test-first 3 1323 true +1475842997922 test-first 3 1323 true +1475842997923 test-first 3 1323 true +1475842997924 test-first 3 1323 true +1475842997925 test-first 3 1323 true +1475842997926 test-first 3 1323 true +1475842997927 test-first 3 1323 true +1475842997928 test-first 3 1323 true +1475842997929 test-first 3 1323 true +1475842997930 test-first 3 1323 true +1475842997931 test-first 3 1323 true +1475842997932 test-last 1 1323 false +1475842997933 test-first 3 1323 true +1475842997934 test-last 1 1323 false +1475842997935 test-first 3 1323 true +1475842997936 test-last 1 1323 false +1475842997937 test-first 3 1323 true +1475842997938 test-last 1 1323 false +1475842997939 test-first 3 1323 true +1475842997940 test-last 1 1323 false +1475842997941 test-first 3 1323 true +1475842997942 test-last 1 1323 false +1475842997943 test-first 3 1323 true +1475842997944 test-last 1 1323 false +1475842997945 test-first 3 1323 true +1475842997946 test-last 1 1323 false +1475842997947 test-first 3 1323 true +1475842997948 test-first 3 1323 true +1475842997949 test-last 1 1323 false +1475842997950 test-first 3 1323 true +1475842997951 test-last 1 1323 false +1475842997952 test-first 3 1323 true +1475842997953 test-last 1 1323 false +1475842997954 test-first 3 1323 true +1475842997955 test-last 1 1323 false +1475842997956 test-first 3 1323 true +1475842997957 test-first 3 1323 true +1475842997958 test-first 3 1323 true +1475842997959 test-first 3 1323 true +1475842997960 test-first 3 1323 true +1475842997961 test-first 3 1323 true +1475842997962 test-first 3 1323 true +1475842997963 test-first 3 1323 true +1475842997964 test-first 3 1323 true +1475842997965 test-first 3 1323 true +1475842997966 test-first 3 1323 true +1475842997967 test-first 3 1323 true +1475842997968 test-first 3 1323 true +1475842997969 test-first 3 1323 true +1475842997970 test-first 3 1323 true +1475842997971 test-first 3 1323 true +1475842997972 test-first 3 1323 true +1475842997973 test-first 3 1323 true +1475842997974 test-first 3 1323 true +1475842997975 test-first 3 1323 true +1475842997976 test-first 3 1323 true +1475842997977 test-first 3 1323 true +1475842997978 test-first 3 1323 true +1475842997979 test-first 3 1323 true +1475842997980 test-first 3 1323 true +1475842997981 test-first 3 1323 true +1475842997982 test-first 3 1323 true +1475842997983 test-first 3 1323 true +1475842997984 test-first 3 1323 true +1475842997985 test-first 3 1323 true +1475842997986 test-first 3 1323 true +1475842997987 test-first 3 1323 true +1475842997988 test-first 3 1323 true +1475842997989 test-first 3 1323 true +1475842997990 test-last 1 1323 false +1475842997991 test-last 1 1323 false +1475842997992 test-last 1 1323 false +1475842997993 test-last 1 1323 false +1475842997994 test-last 1 1323 false +1475842997995 test-last 1 1323 false +1475842997996 test-last 1 1323 false +1475842997997 test-last 1 1323 false +1475842997998 test-last 1 1323 false +1475842997999 test-last 1 1323 false +1475842998000 test-last 1 1323 false +1475842998001 test-last 1 1323 false +1475842998002 test-first 3 1323 true +1475842998003 test-first 3 1323 true +1475842998004 test-first 3 1323 true +1475842998005 test-first 3 1323 true +1475842998006 test-first 3 1323 true +1475842998007 test-first 3 1323 true +1475842998008 test-first 3 1323 true +1475842998009 test-first 3 1323 true +1475842998010 test-first 3 1323 true +1475842998011 test-first 3 1323 true +1475842998012 test-first 3 1323 true +1475842998013 test-first 3 1323 true +1475842998014 test-first 3 1323 true +1475842998015 test-first 3 1323 true +1475842998016 test-first 3 1323 true +1475842998017 test-first 3 1323 true +1475842998018 test-first 3 1323 true +1475842998019 test-first 3 1323 true +1475842998020 test-first 3 1323 true +1475842998021 test-first 3 1323 true +1475842998022 test-first 3 1323 true +1475842998023 test-first 3 1323 true +1475842998024 test-first 3 1323 true +1475842998025 test-first 3 1323 true +1475842998026 test-first 3 1323 true +1475842998027 test-first 3 1323 true +1475842998028 test-first 3 1323 true +1475842998029 test-first 3 1323 true +1475842998030 test-first 3 1323 true +1475842998031 test-first 3 1323 true +1475842998032 test-first 3 1323 true +1475842998033 test-first 3 1323 true +1475842998034 test-first 3 1323 true +1475842998035 test-first 3 1323 true +1475842998036 test-first 3 1323 true +1475842998037 test-first 3 1323 true +1475842998038 test-first 3 1323 true +1475842998039 test-first 3 1323 true +1475842998040 test-first 3 1323 true +1475842998041 test-first 3 1323 true +1475842998042 test-first 3 1323 true +1475842998043 test-first 3 1323 true +1475842998044 test-first 3 1323 true +1475842998045 test-first 3 1323 true +1475842998046 test-first 3 1323 true +1475842998047 test-first 3 1323 true +1475842998048 test-first 3 1323 true +1475842998049 test-first 3 1323 true +1475842998050 test-first 3 1323 true +1475842998051 test-first 3 1323 true +1475842998052 test-first 3 1323 true +1475842998053 test-first 3 1323 true +1475842998054 test-first 3 1323 true +1475842998055 test-first 3 1323 true +1475842998056 test-first 3 1323 true +1475842998057 test-first 3 1323 true +1475842998058 test-first 3 1323 true +1475842998059 test-first 3 1323 true +1475842998060 test-first 3 1323 true +1475842998061 test-first 3 1323 true +1475842998062 test-first 3 1323 true +1475842998063 test-first 3 1323 true +1475842998064 test-first 3 1323 true +1475842998065 test-first 3 1323 true +1475842998066 test-first 3 1323 true +1475842998067 test-first 3 1323 true +1475842998068 test-first 3 1323 true +1475842998069 test-first 3 1323 true +1475842998070 test-first 3 1323 true +1475842998071 test-first 3 1323 true +1475842998072 test-first 3 1323 true +1475842998073 test-first 3 1323 true diff --git a/.besouro/20161007141352402/randomHeuristicEpisodes.txt b/.besouro/20161007141352402/randomHeuristicEpisodes.txt index 98d8bbf..0ec24f4 100644 --- a/.besouro/20161007141352402/randomHeuristicEpisodes.txt +++ b/.besouro/20161007141352402/randomHeuristicEpisodes.txt @@ -5,3 +5,4 @@ 1475840176154 test-first 3 313 true 1475841488228 test-first 3 1260 true 1475841615012 refactoring 2A 7 true +1475842997834 test-first 3 1323 true diff --git a/.besouro/20161007141352402/zorroEpisodes.txt b/.besouro/20161007141352402/zorroEpisodes.txt index 4bcaab3..a9ca424 100644 --- a/.besouro/20161007141352402/zorroEpisodes.txt +++ b/.besouro/20161007141352402/zorroEpisodes.txt @@ -5,3 +5,4 @@ 1475840176154 test-first 3 324 true 1475841488228 test-first 3 1312 true 1475841615012 refactoring 2A 126 true +1475842997834 test-first 3 1382 true diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index b7d088076e8042edf517a4a5cb43468ad0055fbd..dd29355d367da0e97a283561556fe3e0031ffaf8 100644 GIT binary patch delta 15 XcmZ3@x0-Lm6Sm1stRj Date: Fri, 7 Oct 2016 15:25:06 +0300 Subject: [PATCH 090/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 15 +++++++++++++++ .../20161007141352402/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/20161007141352402/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 1735 -> 1746 bytes tests/SpreadsheetTest.java | 10 +++++++++- 6 files changed, 27 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index f4d964a..6093d45 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -238,3 +238,18 @@ EditAction 1475842985743 SpreadsheetTest.java 1228 7 21 7 UnitTestCaseAction 1475842997833 SpreadsheetTest.java OK UnitTestSessionAction 1475842997834 SpreadsheetTest.java OK EditAction 1475843044970 Spreadsheet.java 1571 3 13 0 +UnitTestCaseAction 1475843052884 SpreadsheetTest.java OK +UnitTestSessionAction 1475843052884 SpreadsheetTest.java OK +RefactoringAction 1475843064460 SpreadsheetTest.java ADD void spreadsheet_set_ FIELD +RefactoringAction 1475843065971 SpreadsheetTest.java RENAME spreadsheet_set_=>void spreadsheet_set_a1_ FIELD +RefactoringAction 1475843067983 SpreadsheetTest.java RENAME spreadsheet_set_a1_=>void spreadsheet_set_a1_test FIELD +RefactoringAction 1475843069494 SpreadsheetTest.java RENAME spreadsheet_set_a1_test=>void spreadsheet_set_a1_teststring_ FIELD +RefactoringAction 1475843074507 SpreadsheetTest.java RENAME spreadsheet_set_a1_teststring_=>void spreadsheet_evaluate FIELD +RefactoringAction 1475843078520 SpreadsheetTest.java RENAME spreadsheet_set_a1_teststring()=>void spreadsheet_evaluate_a1_teststring() METHOD +RefactoringAction 1475843081031 SpreadsheetTest.java RENAME spreadsheet_evaluate=>void spreadsheet_evaluate_ FIELD +RefactoringAction 1475843083543 SpreadsheetTest.java RENAME spreadsheet_evaluate_=>void spreadsheet_evaluate_wrong FIELD +RefactoringAction 1475843086054 SpreadsheetTest.java RENAME spreadsheet_evaluate_wrong=>void spreadsheet_evaluate_ FIELD +RefactoringAction 1475843087565 SpreadsheetTest.java RENAME spreadsheet_evaluate_=>void spreadsheet_evaluate_in FIELD +RefactoringAction 1475843089076 SpreadsheetTest.java RENAME spreadsheet_evaluate_in=>void spreadsheet_evaluate_incorrect FIELD +RefactoringAction 1475843092087 SpreadsheetTest.java RENAME spreadsheet_evaluate_incorrect=>void spreadsheet_evaluate_incorrect_string() METHOD +EditAction 1475843105957 SpreadsheetTest.java 1417 8 24 8 diff --git a/.besouro/20161007141352402/besouroEpisodes.txt b/.besouro/20161007141352402/besouroEpisodes.txt index 86aea5f..b272964 100644 --- a/.besouro/20161007141352402/besouroEpisodes.txt +++ b/.besouro/20161007141352402/besouroEpisodes.txt @@ -333,3 +333,4 @@ 1475842998071 test-first 3 1323 true 1475842998072 test-first 3 1323 true 1475842998073 test-first 3 1323 true +1475843052884 refactoring 2A 7 true diff --git a/.besouro/20161007141352402/randomHeuristicEpisodes.txt b/.besouro/20161007141352402/randomHeuristicEpisodes.txt index 0ec24f4..e165d73 100644 --- a/.besouro/20161007141352402/randomHeuristicEpisodes.txt +++ b/.besouro/20161007141352402/randomHeuristicEpisodes.txt @@ -6,3 +6,4 @@ 1475841488228 test-first 3 1260 true 1475841615012 refactoring 2A 7 true 1475842997834 test-first 3 1323 true +1475843052884 refactoring 2A 7 false diff --git a/.besouro/20161007141352402/zorroEpisodes.txt b/.besouro/20161007141352402/zorroEpisodes.txt index a9ca424..136530f 100644 --- a/.besouro/20161007141352402/zorroEpisodes.txt +++ b/.besouro/20161007141352402/zorroEpisodes.txt @@ -6,3 +6,4 @@ 1475841488228 test-first 3 1312 true 1475841615012 refactoring 2A 126 true 1475842997834 test-first 3 1382 true +1475843052884 refactoring 2A 55 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3a4416397f31098b6832bd8b8f1bd7ae4cb7bc95..44e7e4b3be097976798885f55bcc91ee8873c3c1 100644 GIT binary patch delta 223 zcmXAj&q@Me6vcnvIN#ue#z2nv1kIv`G*S^=M2Vu4N%{bS=%Q87&i)`hfE&N1AOnGs zxbO*VS9>3)RTtV^&OMiNe)lK6Pj8iWzp+UI8*`w`hnHdE!V6+DVYstLrmjos%RKA* zX~YS)oN`B=0R@JfGp5J`B_0WQp~@RIW?V7nngw;1G>B>OL7O!o{ZoKr;vt3hl_V&ZPP3xS~;DQIryl_pQ z3a_LLs50b?5j7@c%(&xI&M)q Date: Fri, 7 Oct 2016 15:27:34 +0300 Subject: [PATCH 091/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ .../20161007141352402/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/20161007141352402/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 1835 -> 2015 bytes src/Spreadsheet.java | 2 +- 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 6093d45..d80e569 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -253,3 +253,6 @@ RefactoringAction 1475843087565 SpreadsheetTest.java RENAME spreadsheet_evaluate RefactoringAction 1475843089076 SpreadsheetTest.java RENAME spreadsheet_evaluate_in=>void spreadsheet_evaluate_incorrect FIELD RefactoringAction 1475843092087 SpreadsheetTest.java RENAME spreadsheet_evaluate_incorrect=>void spreadsheet_evaluate_incorrect_string() METHOD EditAction 1475843105957 SpreadsheetTest.java 1417 8 24 8 +UnitTestCaseAction 1475843108135 SpreadsheetTest.java OK +UnitTestSessionAction 1475843108136 SpreadsheetTest.java OK +EditAction 1475843254069 Spreadsheet.java 1577 3 13 0 diff --git a/.besouro/20161007141352402/besouroEpisodes.txt b/.besouro/20161007141352402/besouroEpisodes.txt index b272964..c79f4fa 100644 --- a/.besouro/20161007141352402/besouroEpisodes.txt +++ b/.besouro/20161007141352402/besouroEpisodes.txt @@ -334,3 +334,4 @@ 1475842998072 test-first 3 1323 true 1475842998073 test-first 3 1323 true 1475843052884 refactoring 2A 7 true +1475843108136 test-addition 1 43 true diff --git a/.besouro/20161007141352402/randomHeuristicEpisodes.txt b/.besouro/20161007141352402/randomHeuristicEpisodes.txt index e165d73..ff31a20 100644 --- a/.besouro/20161007141352402/randomHeuristicEpisodes.txt +++ b/.besouro/20161007141352402/randomHeuristicEpisodes.txt @@ -7,3 +7,4 @@ 1475841615012 refactoring 2A 7 true 1475842997834 test-first 3 1323 true 1475843052884 refactoring 2A 7 false +1475843108136 test-addition 1 43 true diff --git a/.besouro/20161007141352402/zorroEpisodes.txt b/.besouro/20161007141352402/zorroEpisodes.txt index 136530f..586f0ed 100644 --- a/.besouro/20161007141352402/zorroEpisodes.txt +++ b/.besouro/20161007141352402/zorroEpisodes.txt @@ -7,3 +7,4 @@ 1475841615012 refactoring 2A 126 true 1475842997834 test-first 3 1382 true 1475843052884 refactoring 2A 55 true +1475843108136 test-addition 1 55 true diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index dd29355d367da0e97a283561556fe3e0031ffaf8..02bc408db07b8087271f2f53923da150ab2ff3e1 100644 GIT binary patch delta 115 zcmZ3@cb}i@)W2Q(7#J8#82mPJ88b5~P5#d$I@yoekWm%H63@&_&MzuTO)iNqE-A{) zOXpzlW@O-2pIppr$;i2REpsLF Date: Fri, 7 Oct 2016 15:29:58 +0300 Subject: [PATCH 092/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + src/Spreadsheet.java | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index d80e569..37b9089 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -256,3 +256,4 @@ EditAction 1475843105957 SpreadsheetTest.java 1417 8 24 8 UnitTestCaseAction 1475843108135 SpreadsheetTest.java OK UnitTestSessionAction 1475843108136 SpreadsheetTest.java OK EditAction 1475843254069 Spreadsheet.java 1577 3 13 0 +EditAction 1475843398818 Spreadsheet.java 1706 3 13 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 407758d..ebf605e 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -44,12 +44,19 @@ public String evaluate(String cell) { break; } + // if there is a '=' character + // the subsequent char is either '-', '\'' or digit. + if(c[i] == '=') { + + } + // if the first character is negative (-). if(c[i] == '-' && i == 0) { isNegative = true; continue; } + if(Character.isDigit(c[i])) { digitCount ++; } From b89486a46bbccf7d0a9e11959e6c8c858322ed42 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:31:21 +0300 Subject: [PATCH 093/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1746 -> 1755 bytes src/Spreadsheet.java | 4 +++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 37b9089..9608feb 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -257,3 +257,4 @@ UnitTestCaseAction 1475843108135 SpreadsheetTest.java OK UnitTestSessionAction 1475843108136 SpreadsheetTest.java OK EditAction 1475843254069 Spreadsheet.java 1577 3 13 0 EditAction 1475843398818 Spreadsheet.java 1706 3 13 0 +EditAction 1475843481458 Spreadsheet.java 1784 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 44e7e4b3be097976798885f55bcc91ee8873c3c1..c6383563fbb56b94b4b63ff096734104be28308a 100644 GIT binary patch delta 241 zcmXAjJxfAy6vlt|<$v==!X2*BB5n!6B`Wi(=#n_7H(x=ARv~DP8l@0Ffd9c&kT6Ir z*Mw%=+sBm~jk1PX1Zpm>+k$Xx!lIDpk#*~>*WlD`1b>>|2LW?DB z-s$2?a_2vv1c$Oo6OQHEz+%OzC{yOMFlypBya^?e&MvRQiaZqO3~A7m<0X+EIR*dd Q!2HGWJi`@EN0=tvKUcCTbN~PV delta 232 zcmXAjO-lk{6osGpc!x$51{_;NYlUDkMIE#jp^^Aipg+KnTnjFvh}Pn!cPWSxvi*7E@J(qLN-Nm-CrJ>vnHYdQZj;QeLHn4JDYK9*KEBpC?u3bG{inkBE4pOpk)=-e+ HH0k^Ueqkp* diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index ebf605e..800faf2 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -47,7 +47,9 @@ public String evaluate(String cell) { // if there is a '=' character // the subsequent char is either '-', '\'' or digit. if(c[i] == '=') { - + if(c[i+1] == '-' || c[i+1] == '\'' || Character.isDigit(c[i+1])) { + + } } // if the first character is negative (-). From 570632916b09eef9949b03c867abc54494916add Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:31:40 +0300 Subject: [PATCH 094/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1755 -> 1796 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 9608feb..9d7ffc7 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -258,3 +258,4 @@ UnitTestSessionAction 1475843108136 SpreadsheetTest.java OK EditAction 1475843254069 Spreadsheet.java 1577 3 13 0 EditAction 1475843398818 Spreadsheet.java 1706 3 13 0 EditAction 1475843481458 Spreadsheet.java 1784 3 13 0 +EditAction 1475843500026 Spreadsheet.java 1786 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index c6383563fbb56b94b4b63ff096734104be28308a..ebde9a64ffbdcd6de7607961fdd1206124c9ed8d 100644 GIT binary patch delta 293 zcmXYs%_~G<6o;St@!oOe>Me6+C8gXcZc5k3t59Nr8FVKp8x}Tp*0Zs(P*XNou}XVijI449Tk4#(*=CmZZ*Alkb0R;S`^dt(ck~W z(4SJ*Y^QM{({n9`1^m5Cr%eX_F=-NY@E&7#)u?l3>&kdF25noJqa7xwF~bRlIPGY=mC5LN4|lZoNU%!oBgdd3T*vLLpgs~oC3evtMbu1*UX;9Cxl#gZFT>pW98J0 zD>v-P>Nk}%R(hd|W{*p~Q^i4t99{A}QQ(;pFWk^4&X8N)DKqAt4=PNk^2q~Jn*7jW z!6PAwZ6Cu46Om175R-2MlR0ToCo*4!Q4z=HTPQUt?C>S58tQ@!1L`#7cr8X#l!t_X O3i$NKP8sKVZwC*f2PzZ* diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 800faf2..12bc49a 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -45,7 +45,7 @@ public String evaluate(String cell) { } // if there is a '=' character - // the subsequent char is either '-', '\'' or digit. + // the subsequent char can only be '-', '\'' or digit. if(c[i] == '=') { if(c[i+1] == '-' || c[i+1] == '\'' || Character.isDigit(c[i+1])) { From f99968a615ae0b6571944726d47a103d874f32d9 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:31:46 +0300 Subject: [PATCH 095/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + src/Spreadsheet.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 9d7ffc7..b70543b 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -259,3 +259,4 @@ EditAction 1475843254069 Spreadsheet.java 1577 3 13 0 EditAction 1475843398818 Spreadsheet.java 1706 3 13 0 EditAction 1475843481458 Spreadsheet.java 1784 3 13 0 EditAction 1475843500026 Spreadsheet.java 1786 3 13 0 +EditAction 1475843506894 Spreadsheet.java 1791 3 13 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 12bc49a..3a75a2e 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -44,7 +44,7 @@ public String evaluate(String cell) { break; } - // if there is a '=' character + // if there is a '=' character then // the subsequent char can only be '-', '\'' or digit. if(c[i] == '=') { if(c[i+1] == '-' || c[i+1] == '\'' || Character.isDigit(c[i+1])) { From 400b0dc1542763ee9db15f9ee817639c54c06a7a Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:33:35 +0300 Subject: [PATCH 096/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 7 +++++++ tests/SpreadsheetTest.java | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index b70543b..9d0abfa 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -260,3 +260,10 @@ EditAction 1475843398818 Spreadsheet.java 1706 3 13 0 EditAction 1475843481458 Spreadsheet.java 1784 3 13 0 EditAction 1475843500026 Spreadsheet.java 1786 3 13 0 EditAction 1475843506894 Spreadsheet.java 1791 3 13 0 +RefactoringAction 1475843593700 SpreadsheetTest.java ADD void spreadsheet FIELD +RefactoringAction 1475843595210 SpreadsheetTest.java RENAME spreadsheet=>void spreadsheet_eva FIELD +RefactoringAction 1475843596721 SpreadsheetTest.java RENAME spreadsheet_eva=>void spreadsheet_evaluate FIELD +RefactoringAction 1475843598734 SpreadsheetTest.java RENAME spreadsheet_evaluate=>void spreadsheet_evaluate_ FIELD +RefactoringAction 1475843608747 SpreadsheetTest.java RENAME spreadsheet_evaluate_=>void spreadsheet_evaluate_simple_formula() METHOD +RefactoringAction 1475843614759 SpreadsheetTest.java RENAME spreadsheet_evaluate_simple_formula()=>void spreadsheet_evaluate_simple_equals_formula() METHOD +EditAction 1475843615871 SpreadsheetTest.java 1485 9 24 8 diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 4806fcc..cabdabe 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -59,10 +59,12 @@ public void spreadsheet_evaluate_incorrect_string() { Spreadsheet ss = new Spreadsheet(); ss.set("A1", "'teststring"); assertEquals("#Error", ss.evaluate("A1")); - } - + @Test + public void spreadsheet_evaluate_simple_equals_formula() { + + } From 4c3615d2344a79f4e3995d262bd01c45331b1fd6 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:34:11 +0300 Subject: [PATCH 097/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 2015 -> 2129 bytes tests/SpreadsheetTest.java | 4 +++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 9d0abfa..1702a41 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -267,3 +267,4 @@ RefactoringAction 1475843598734 SpreadsheetTest.java RENAME spreadsheet_evaluate RefactoringAction 1475843608747 SpreadsheetTest.java RENAME spreadsheet_evaluate_=>void spreadsheet_evaluate_simple_formula() METHOD RefactoringAction 1475843614759 SpreadsheetTest.java RENAME spreadsheet_evaluate_simple_formula()=>void spreadsheet_evaluate_simple_equals_formula() METHOD EditAction 1475843615871 SpreadsheetTest.java 1485 9 24 8 +EditAction 1475843651613 SpreadsheetTest.java 1602 9 27 9 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 02bc408db07b8087271f2f53923da150ab2ff3e1..f2db34cfcb69ad5f729f9dcbfddb7d76783f3ff7 100644 GIT binary patch delta 125 zcmcc5e^G$z)W2Q(7#J8#82mSKZDwZFn*5(hRJ1rVw;(4qKDDqkF{d~_Ex#zYG$(QL zZf1Q(uFbER&oVRGO@7EK&*(FmkxkT08>pQTgf{{SCI&7b$p#j1X5a?0c_5NNnir&q J!56H`4*)4*8p!|v delta 44 zcmca8aG#&+)W2Q(7#J8#82mPJZDyYQidmPDbF&1?S!PE2$p!54>^?wACI(*sS<(z{ diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index cabdabe..0323c56 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -63,7 +63,9 @@ public void spreadsheet_evaluate_incorrect_string() { @Test public void spreadsheet_evaluate_simple_equals_formula() { - + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "='teststring'"); + assertEquals("teststring", ss.evaluate("A1")); } From 4b512532d9896b4e3dd7567821dcf135242399d5 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:38:12 +0300 Subject: [PATCH 098/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 2129 -> 2197 bytes src/Spreadsheet.java | 1 + 3 files changed, 4 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 1702a41..999398e 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -268,3 +268,6 @@ RefactoringAction 1475843608747 SpreadsheetTest.java RENAME spreadsheet_evaluate RefactoringAction 1475843614759 SpreadsheetTest.java RENAME spreadsheet_evaluate_simple_formula()=>void spreadsheet_evaluate_simple_equals_formula() METHOD EditAction 1475843615871 SpreadsheetTest.java 1485 9 24 8 EditAction 1475843651613 SpreadsheetTest.java 1602 9 27 9 +UnitTestCaseAction 1475843654879 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475843654880 SpreadsheetTest.java FAIL +EditAction 1475843892913 Spreadsheet.java 1822 3 13 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index f2db34cfcb69ad5f729f9dcbfddb7d76783f3ff7..cae63be8c2a6810de7c56275441badd48d61027e 100644 GIT binary patch delta 85 zcmca8FjbK2)W2Q(7#J8#7y>tP-D4K!VDMvP;I&mRNi8lZE-A{)OIP3gg4vj5vOc>g po9{LTMIrae2iPTfoftS6oEZcdTo|MoTqhT>%d`6fO<`gP001+56%+sf delta 79 zcmbO#cu|1s)W2Q(7#J8#82mSK-DBSTo7tGfOdBY`2*MkI1QP=nkYoc3I5Thq**p+Q OAk7O>#NZ27 Date: Fri, 7 Oct 2016 15:42:55 +0300 Subject: [PATCH 099/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1796 -> 1796 bytes src/Spreadsheet.java | 1 + 3 files changed, 2 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 999398e..1a14f26 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -271,3 +271,4 @@ EditAction 1475843651613 SpreadsheetTest.java 1602 9 27 9 UnitTestCaseAction 1475843654879 SpreadsheetTest.java FAIL UnitTestSessionAction 1475843654880 SpreadsheetTest.java FAIL EditAction 1475843892913 Spreadsheet.java 1822 3 13 0 +EditAction 1475844175915 Spreadsheet.java 1869 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index ebde9a64ffbdcd6de7607961fdd1206124c9ed8d..67f8578716935a911509a4d6ea959aa4c45ef344 100644 GIT binary patch delta 45 zcmZqSYvJ4A#HQ%Vu!_NrVH<-F!)^v&h9eAq496J)7)~+-GhAQ@VYti?HaVGXApjOn B46FbE delta 45 zcmZqSYvJ4A#HQ%Nu!_NzVH<-t!)^v2h9eBV496M#8BQ_;FX1L4{IysqbApjMU B45I)5 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 9a4ca4b..933c8a1 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -66,6 +66,7 @@ public String evaluate(String cell) { } // if the value is a string. + // return a substring without single quotes. if(isString) { return value.substring(1, value.length() - 1); } From f6e2b7f2f0dca02885d5fec1cfff6f3c1dfab128 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:43:30 +0300 Subject: [PATCH 100/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1796 -> 1796 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 1a14f26..3037225 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -272,3 +272,6 @@ UnitTestCaseAction 1475843654879 SpreadsheetTest.java FAIL UnitTestSessionAction 1475843654880 SpreadsheetTest.java FAIL EditAction 1475843892913 Spreadsheet.java 1822 3 13 0 EditAction 1475844175915 Spreadsheet.java 1869 3 13 0 +UnitTestCaseAction 1475844185929 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475844185930 SpreadsheetTest.java FAIL +EditAction 1475844210431 Spreadsheet.java 1878 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 67f8578716935a911509a4d6ea959aa4c45ef344..9713d20ba23d7aef273503bf2e53f7d8e9293cee 100644 GIT binary patch delta 45 zcmZqSYvJ4A#HQ%Ru!_N*VH<-l!)^vYh9eCA496J)8BQ{UFkD~=Ww^``J~^3fApjQ) B47C6N delta 45 zcmZqSYvJ4A#HQ%Vu!_NrVH<-F!)^v&h9eAq496J)7)~+-GhAQ@VYti?HaVGXApjOn B46FbE diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 933c8a1..8e362e5 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -48,7 +48,7 @@ public String evaluate(String cell) { // the subsequent char can only be '-', '\'' or digit. if(c[i] == '=') { if(c[i+1] == '-' || c[i+1] == '\'' || Character.isDigit(c[i+1])) { - + continue; } } From 339255dc8c80353de19f04ab785762a432bff3dd Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:43:51 +0300 Subject: [PATCH 101/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1796 -> 1805 bytes src/Spreadsheet.java | 2 ++ 3 files changed, 3 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 3037225..fec054d 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -275,3 +275,4 @@ EditAction 1475844175915 Spreadsheet.java 1869 3 13 0 UnitTestCaseAction 1475844185929 SpreadsheetTest.java FAIL UnitTestSessionAction 1475844185930 SpreadsheetTest.java FAIL EditAction 1475844210431 Spreadsheet.java 1878 3 13 0 +EditAction 1475844231253 Spreadsheet.java 1913 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 9713d20ba23d7aef273503bf2e53f7d8e9293cee..4fbf15ba23754fea16552928d1ba1dcfdf60c918 100644 GIT binary patch delta 269 zcmXYsJ4*vm5Jt~t_ijvzu*k;NM%*A=0?GQ=Kw{@J44b&D0`OzfYIE;G+o2c4_*##g^FK^E z8>-K#&L%^z9Fr4p&O%T3sQhElqd3QBqC4C^E2g8?tXnfwk$ugwnW}R8iXv^c=n`>5 z2}6Z@wuuRNWQQTUyintnI&U->)8w6FJ~`o=7QRRx%~i>=B%MgJD%%z|U*v@nQU~mF iAc@O_L#py#iVtdwf{FqUa=szMbuP`5Te7tIb^RIqD>X0x delta 276 zcmXYs%_~G<6o;St@m}u4?JaXK<2P7Mo17$$@6*22cldNwu|BsOnJSZG7-Oxxf7!_c2p z*W@PdN_DkhNWkApwP`W%k4cN(4&IaH_E3#Fr}kE5UXwxlrK)>Pra2(vhzcjnaK zBwRAj4GY|{!UL;3Qs;>^p4s4yO+LseOSVQQAu;{ZNmhpC+QH+UF(Fs#6^ks%B;b{0 nYVuXci+F3Oh;c4NUzg Date: Fri, 7 Oct 2016 15:45:53 +0300 Subject: [PATCH 102/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1805 -> 1813 bytes src/Spreadsheet.java | 6 ++++++ 3 files changed, 7 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index fec054d..17a4809 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -276,3 +276,4 @@ UnitTestCaseAction 1475844185929 SpreadsheetTest.java FAIL UnitTestSessionAction 1475844185930 SpreadsheetTest.java FAIL EditAction 1475844210431 Spreadsheet.java 1878 3 13 0 EditAction 1475844231253 Spreadsheet.java 1913 3 13 0 +EditAction 1475844353013 Spreadsheet.java 2047 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 4fbf15ba23754fea16552928d1ba1dcfdf60c918..61aa30be299d2b22d11d9a917f038186450d72ee 100644 GIT binary patch delta 409 zcmXw#%`1Ze9LGP~^TM;%Jj~-L5%aRAl{WISY#3%+^g2{$BQdN4}z=gvyDz&>Irj>_*l@J^fw=7?jZ3^7_iw zstcvLC0R-gc^PKJ2`Y`(3(Bd>Fij_*YK}@vFUjZ8 zr7l=3dH*b%DEP(hQs;bX13M9+ZVu_ep_gM~6o_*|fD1;rBFP<-+%v@k(>yZ66SKTB z$2;>>i&FacJ}hd)lS^rmZutmrgoNB;FGXimB04Xm7?YnEJTuN%EgJ2dGa*BCB5cc` eNy=yzp>BN6gKk@Hzt{bRZkjGbWYdyyGxH512~CRt delta 385 zcmXw#-7AA}6o8-C`!QR?u-AnfW!PwMieXdRFyH1gaznWwE<`PE`3J1%&BZRXU8so* zE47r8TO}n#{tf?tGvns;oZmU;>37a)b-KFXRDCX*8E`Ymkb<$jv9r0irJx4dCrX83 zHzSPNVYSs=$+$H5MpCKW)Xl1Tt~eDmDuFNCrT2~RSZc`Q&*8PKdu{y}om#J+XT>rd zAx|_%KtNjyd8{n4KlEqmF5@kc3`U+7`$+GIo|t-unxGae64%y?BnqaMq1H4??kq;# zSRq&_W&bSSP^p)AK$HEgCl14;iEvCmHZjhKlf%y?qg*q_9n(B8!y~giG0!uLytBk7 z%Xr1IP+km^2FYYa+GJYp!Uvr~6%wzQU{YQT-k2gO$8ho@-XuC*ja-O+R*F6BGbiLA PAfgCW_N!spio^Q@`;JNz diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 64f8144..9dea8e4 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -48,6 +48,12 @@ public String evaluate(String cell) { // the subsequent char can only be '-', '\'' or digit. if(c[i] == '=') { if(c[i+1] == '-' || c[i+1] == '\'' || Character.isDigit(c[i+1])) { + + // loop through the remaining characters for closing quote. + for(int j = i+1; j < c.length; j++) { + + } + continue; } else { return "#Error"; From 435939f6ed19f325109b542073d3db9f89e62020 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:46:39 +0300 Subject: [PATCH 103/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1813 -> 1858 bytes src/Spreadsheet.java | 8 ++++---- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 17a4809..7122b78 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -277,3 +277,4 @@ UnitTestSessionAction 1475844185930 SpreadsheetTest.java FAIL EditAction 1475844210431 Spreadsheet.java 1878 3 13 0 EditAction 1475844231253 Spreadsheet.java 1913 3 13 0 EditAction 1475844353013 Spreadsheet.java 2047 3 13 0 +EditAction 1475844399051 Spreadsheet.java 2074 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 61aa30be299d2b22d11d9a917f038186450d72ee..e6d9143b32c1d434520755a191b681ac2906beac 100644 GIT binary patch delta 370 zcmXYsODIHP6o9{f?!DvQiE(8{*eMyQ8|ltylIMav$NNzu7FL$F7E04>B;_{A3MsOb zLKYLs#!kvsNhu;_MZ)noi*vs7J|`1A3kEJekF$Ww@Lpg^(-mrFe^r}NRxLV~WL~_0 zQ8$)yG}n%75OSQXKK+Z99y4~Bb;3EW-LOHUfIj8g&N`+47+EL(508kiQSws|Gk5T( zOcger?B>^-mo{qDoOfu%wKQektI;$cWtliD)RUo^En3*7m0jA{r=0^LoY2cT2`(At znh|ao<(6^oNb<-8&rA}M)02M>5T-~xd4&q;R%kp?E#wn@N(Y@1@$*0z-RL#abWe|< zK`mKXm5^kVMf!wtSRjvnA(KiO*-C+Tw2E_^pssWNs?81A|9(<#2%FQwYwrG4tsKQbKBZGsb7?&eagW> z6fSaj4%{SCipc*V2brunOrM!%zVn@1Z_jh@e{NzRWa+})Hm(kh4b5>dX_Drr@~q*> z&AxHF6)@LBKd6)c$8?=c1Fy**V5=jmU)xcSR@SJ| zp1@2hnfg(?od1je6R`_6*qDat7%ba}Y@Y2b=pv3^EEXWaC%xuY_0ttFVD2J!M?5_5r WCIM}M-qNgpWBb15h<-^%bjrVMZ9OLd diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 9dea8e4..77919b9 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -47,14 +47,14 @@ public String evaluate(String cell) { // if there is a '=' character then // the subsequent char can only be '-', '\'' or digit. if(c[i] == '=') { - if(c[i+1] == '-' || c[i+1] == '\'' || Character.isDigit(c[i+1])) { - + if(c[i+1] == '-' || Character.isDigit(c[i+1])) { + isNegative = true; + continue; + } else if (c[i+1] == '\'') { // loop through the remaining characters for closing quote. for(int j = i+1; j < c.length; j++) { } - - continue; } else { return "#Error"; } From 52865109a89cccae266f0e0069f07de9d475fdf4 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:47:03 +0300 Subject: [PATCH 104/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1858 -> 1877 bytes src/Spreadsheet.java | 12 +++++++----- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 7122b78..abef236 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -278,3 +278,4 @@ EditAction 1475844210431 Spreadsheet.java 1878 3 13 0 EditAction 1475844231253 Spreadsheet.java 1913 3 13 0 EditAction 1475844353013 Spreadsheet.java 2047 3 13 0 EditAction 1475844399051 Spreadsheet.java 2074 3 13 0 +EditAction 1475844423879 Spreadsheet.java 2085 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index e6d9143b32c1d434520755a191b681ac2906beac..3a0c1d0d28a7828ec619b9bf251bb3e1623a8489 100644 GIT binary patch delta 364 zcmXYt%_~G<6o;QXbMKvd#kiRnWi=Za3pd4lG&J)4&5*Cu2<0D8#7@aVcH9(M7^_Js zmXu~8u~2rhu~kxvNJw$a*u3XC=lsq&{oXV0jrT~?%r;a^;N9_RvFSD29kxPg{I;D{ zXL4w&Q7yxw9q@#$M4DCsbt-JxyAbIwou}H=vBd>_Ki<*ePOzMg%WhjQcO8DBpMgPzxS(1 AKmY&$ delta 305 zcmXYsK`R7t6u^ID=D)L}j8VJP-dv1iQrj#|+lp0$WjP?V;@}gwu2PbVqWp7k+AXzm zQ%X)7$_G%mDk(+e12}jYm)GyT*L&~x9^G5_Tq!4ug#&zRR}GEr1ZL>@by7jlwATO7 zu?E#C8$sF*y+WN~0c$Pvf*P5B^lP-octv!q_f?nS>xK%9s(w(Bxl6b95{0czavTtG zNS-4`IAN3qMa~%Kf(b71xn`C-%G|TS6N@~v#0$&3QsILYzE~wCww2hKG@X)(Jv}mQ zVDia;P>aMHCYh2-f_J7V#gD!*LkUHerkpBEGshltLN?p9F)x&)S5_A3(5-gA)%QbE H=k3fd)JHrc diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 77919b9..0a8d3d2 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -44,6 +44,12 @@ public String evaluate(String cell) { break; } + // if the first character is negative (-). + if(c[i] == '-' && i == 0) { + isNegative = true; + continue; + } + // if there is a '=' character then // the subsequent char can only be '-', '\'' or digit. if(c[i] == '=') { @@ -60,11 +66,7 @@ public String evaluate(String cell) { } } - // if the first character is negative (-). - if(c[i] == '-' && i == 0) { - isNegative = true; - continue; - } + if(Character.isDigit(c[i])) { From e82bf6865e8d5839e33d59d72bc47d8ea4aafdd8 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:47:35 +0300 Subject: [PATCH 105/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1877 -> 1877 bytes src/Spreadsheet.java | 6 +++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index abef236..810500f 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -279,3 +279,4 @@ EditAction 1475844231253 Spreadsheet.java 1913 3 13 0 EditAction 1475844353013 Spreadsheet.java 2047 3 13 0 EditAction 1475844399051 Spreadsheet.java 2074 3 13 0 EditAction 1475844423879 Spreadsheet.java 2085 3 13 0 +EditAction 1475844455800 Spreadsheet.java 2131 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3a0c1d0d28a7828ec619b9bf251bb3e1623a8489..0da432df92479ee5833bae81579e7875d317999f 100644 GIT binary patch delta 169 zcmWN}KMMh20KnnjdwEY+I!b1fSQL`~ij9pZj&c#JZ$ZlVmO%!alwwsDi^VL9RmrAI zGO#@3b1^UGt}or;C8p0g$8aPZD_Y8y0TEXt8B#|%wj$U>=@DZmbxVt>Z9lUUcda}71{?wbN$sl L9$_G;0UGrm+_)%4 delta 170 zcmWN?t!n~d0Knnjd)#~DK#mv0d^Rlxzd;Sopi3^y4^9+||9~*iyfmyYg1T}|gn?GU z)s^MLVim+Dn8e_o@&r!cYz9(~WmLTAxr{57@Nptf3v4rIE>ZeNPP`-?QVdD+PKFU# zKFBkrz>Fealv(l2Hx<@Y*-~Rij9=>f@yebi2U;9ybHd|HmkT|v^tEq!;#1$OlIzMl UVPV{`jd18cODSO^cmoU?4+^6wT>t<8 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 0a8d3d2..43d115f 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -57,10 +57,14 @@ public String evaluate(String cell) { isNegative = true; continue; } else if (c[i+1] == '\'') { + // loop through the remaining characters for closing quote. for(int j = i+1; j < c.length; j++) { - + if(c[j] == '\'') { + + } } + } else { return "#Error"; } From 09a339d309f799d99f856cd29c9048d221261ddc Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:50:18 +0300 Subject: [PATCH 106/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1877 -> 1890 bytes src/Spreadsheet.java | 4 +++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 810500f..704254b 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -280,3 +280,4 @@ EditAction 1475844353013 Spreadsheet.java 2047 3 13 0 EditAction 1475844399051 Spreadsheet.java 2074 3 13 0 EditAction 1475844423879 Spreadsheet.java 2085 3 13 0 EditAction 1475844455800 Spreadsheet.java 2131 3 13 0 +EditAction 1475844618132 Spreadsheet.java 2151 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 0da432df92479ee5833bae81579e7875d317999f..a0b71c8a02388b05f68523e0b3f3559ae24f6467 100644 GIT binary patch delta 328 zcmXAlyGz4R7{z}vxw#2KD5cRwI=0hAklND0mVyq|`aqNpRw_Pr{{Y3MyF);*2u2XH zNd*U|f}`l*pqq=1f(W9bDCkXHKF))~;e2=Aqt_9_oyWojz5`Db3cJe8C9)wYrMlL7 z54u)fL~JWx<`OEz^JN>YSrN^iHWpG1w!~1SsHwHm%cNtJcOv?g@8s$&$M7B1J^Fo% zu#@FZoI9tukKMA3mNa}Bo14L{D4K0DLBg)@lsKf!F(pnI=adP~sL^Gb3$k3XzzvJs zv%~`po>=CYCNHe=!5Uv|kkYFf|J(2x&`hr+qtgZ^pA2i%r|&gYCbeSo&Xn$m|M8mE dMKuH?Tr$I~Hb>cGP9w7JX7&0iy!9VZ~M}+_Y delta 311 zcmXAkxl03a5QV=zetUo}TV#Vmz(!292(l(v1Pmy6M^T6u9^k(qSO{sX>~uS^SgS=4 zv=u@s(ZX6puo46j1Vs_F(Q$2tZ{9F7?>%@o-kDPFFeWbW8GEW+-VKe&FDB%|uw`y! z=$a*!vK0n)_iwnX;H^m4u;qTNSz@Y0b54r}K|WPKveTXn_;9j()!4rYdNg z@tqnl_UVoTtKO(^%pfOJIc0=%Mrl&yl4-7);g&l0%=5?sPb~4w3U93P!8$o{y!`K* zfV^~)fF9Y_FnFg|NSAsgH^)S=cx9Z4Eb9xCLW;gT7fex;VLyBFw1&+g?XhcDJM?c{ Ry-lj+`& diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 43d115f..98e9fb4 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -53,7 +53,7 @@ public String evaluate(String cell) { // if there is a '=' character then // the subsequent char can only be '-', '\'' or digit. if(c[i] == '=') { - if(c[i+1] == '-' || Character.isDigit(c[i+1])) { + if(c[i+1] == '-') { isNegative = true; continue; } else if (c[i+1] == '\'') { @@ -65,6 +65,8 @@ public String evaluate(String cell) { } } + } else if (Character.isDigit(c[i+1])){ + } else { return "#Error"; } From a317441109feab98f346cb8d460a2cbbed521bd9 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:50:29 +0300 Subject: [PATCH 107/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1890 -> 1889 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 704254b..16014a0 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -281,3 +281,4 @@ EditAction 1475844399051 Spreadsheet.java 2074 3 13 0 EditAction 1475844423879 Spreadsheet.java 2085 3 13 0 EditAction 1475844455800 Spreadsheet.java 2131 3 13 0 EditAction 1475844618132 Spreadsheet.java 2151 3 13 0 +EditAction 1475844628950 Spreadsheet.java 2157 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index a0b71c8a02388b05f68523e0b3f3559ae24f6467..2a2b68d98563d23a0aa45920d1e2d5e92356b264 100644 GIT binary patch delta 179 zcmaFF_mFP`D=TB*WH#11&IJsdEM_dr8C)mNWL4!B(iLTANif;LU^#2@Ue<;Fl?;{) zH4Ih^^$gYwT?}>%lNsz8W&r6$3@!{C8QdARF!(X-WAJA<$e_+}njwtg0z){%9fnwj zhYWEHuNdMP-ZCUIyk|&Z_{NaR@RK2Z@>;e?!3hjP41qvB91I!^3=B>Tf|JGBb!8?0 fFbFfU|6<_e<6-*6z$PHT$jQLS5DZko#1H}i?OG{k delta 180 zcmWN{y=uZx0D#diAvZBl;veE>C$Wp02vN{M-IQR}p;&2Ad<{225T^?TL5PFkRH@Lx zDbU%)2XKj_P}~X)4mzFX_}0n#5<+>Fx)>!~!r6qOz2|n=b4)F-t+C}yq@^d8&KR2s z1*R1FpoB}A)!hwMw$%8hjz@zZGVEz{pu>?aKChhV@yi<*`us8ApP~HJU!n_QG;s*= f1XPI0q>)WMiYsx&2r$(LH9(I<6cdHky{NQrC$TA( diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 98e9fb4..1e43417 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -61,7 +61,7 @@ public String evaluate(String cell) { // loop through the remaining characters for closing quote. for(int j = i+1; j < c.length; j++) { if(c[j] == '\'') { - + break; } } From 8875208f0e5eb6215e0dea76990558d6fa27f2d1 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:50:31 +0300 Subject: [PATCH 108/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1889 -> 1901 bytes src/Spreadsheet.java | 2 ++ 3 files changed, 3 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 16014a0..002523c 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -282,3 +282,4 @@ EditAction 1475844423879 Spreadsheet.java 2085 3 13 0 EditAction 1475844455800 Spreadsheet.java 2131 3 13 0 EditAction 1475844618132 Spreadsheet.java 2151 3 13 0 EditAction 1475844628950 Spreadsheet.java 2157 3 13 0 +EditAction 1475844630957 Spreadsheet.java 2169 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 2a2b68d98563d23a0aa45920d1e2d5e92356b264..1cbe79926279c28b1912212310627b40a5223426 100644 GIT binary patch delta 368 zcmXYtyGjFL5Jt~#_KLDBA*%!nD~$+?5Mm^SA}EL&O+?Ygc!8++6lwAR!h%Kc6060| zG9acCEJX{k6dRiqf(VKdCmWmL{NG__nE%CTIaj)Fm(Z|5Q3FSxs2uyTjGL;H@cpJ% zj?mV!dPvpx%#7>TaXhnzWLn66lugzt3TQi#?wb66Ad`kVDr<$reb0&p8X<#KOYtnf zdC_h~qSM_VR|{_R0p&1w)^o8lQh{fbDkn^H&J>r-(qN8jmbsE<2Zz?>B9vO`pn@n;ziLtJVy%MW>K~9U?g{~sPSquA z1qY{sqtwA4;9ysw2%@5O&|~UydG7n358l&p+D^kT>>@fg@a;RsWc5TvGj6I*LaC;{ z7ox3ajesNNnHg8raXhnzXnH^;)TZj>1@xWJ?m6@Sf=n9uv$9q|pYp6s>DbadOEoWk z-U8yisvB}OV)2=V^8A*O&<_14BNwfa^oL{R>N(R~GRGAQT(e4(0=J}SvB?7^9x2mi zn`bI?*yV*iKG^4r0}_&JtCtRsLHS8elG3da<&$xth`jgYSrjG4J4-Bw7kOnx$Vigr tPSzI0oZyT#A(K<$6oo9tWaKOZ{-~KAGP~GLf22#ybv0Xdtcw|8;}>ufNb3Lq diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 1e43417..a9e311a 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -65,6 +65,8 @@ public String evaluate(String cell) { } } + + } else if (Character.isDigit(c[i+1])){ } else { From 6e4bc8ab632183b0ae9c2436d9231345001aefd5 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:50:35 +0300 Subject: [PATCH 109/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1901 -> 1901 bytes src/Spreadsheet.java | 2 ++ 3 files changed, 3 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 002523c..9b0dbd6 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -283,3 +283,4 @@ EditAction 1475844455800 Spreadsheet.java 2131 3 13 0 EditAction 1475844618132 Spreadsheet.java 2151 3 13 0 EditAction 1475844628950 Spreadsheet.java 2157 3 13 0 EditAction 1475844630957 Spreadsheet.java 2169 3 13 0 +EditAction 1475844635428 Spreadsheet.java 2181 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 1cbe79926279c28b1912212310627b40a5223426..453685210999e00ffa222d65cb8957b5a38d7328 100644 GIT binary patch delta 65 zcmV-H0KWh24($%Gg9bH50Js220J{KC0L1`N0LTC*0MY Date: Fri, 7 Oct 2016 15:52:17 +0300 Subject: [PATCH 110/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1901 -> 1901 bytes src/Spreadsheet.java | 3 +++ 3 files changed, 6 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 9b0dbd6..dacb3d8 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -284,3 +284,6 @@ EditAction 1475844618132 Spreadsheet.java 2151 3 13 0 EditAction 1475844628950 Spreadsheet.java 2157 3 13 0 EditAction 1475844630957 Spreadsheet.java 2169 3 13 0 EditAction 1475844635428 Spreadsheet.java 2181 3 13 0 +UnitTestCaseAction 1475844664901 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475844664901 SpreadsheetTest.java FAIL +EditAction 1475844737942 Spreadsheet.java 2256 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 453685210999e00ffa222d65cb8957b5a38d7328..01da370cc7a330183dd5629ddb1122e70994941c 100644 GIT binary patch delta 93 zcmaFM_m*!%I$NL>Lk)v9Lp_5nLl=Vs!(;|WhB*vQ4D*5Pl?)yXI~cqfb~6Mq9AyY* xIKiOKaET#`;W|S!!()a-h8GM;3?CVi8NM*2GJIpmVED_B$;iNvJ$VP)Rsfs68bkm9 delta 93 zcmaFM_m*!%I$NM6Lk)u!Lp_5vLl=V`!(;|~hB*ul4D*5Pl?-kSI~Y6}b~6Mp9AyY( xIKiOKaET#;;W|Sk!()bch8GM83?CU18NM(iGkjx6WBALE&d9)!Ie7=$RsfY$8Xf=u diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 3f1269e..9a3ac82 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -60,9 +60,12 @@ public String evaluate(String cell) { } else if (c[i+1] == '\'') { + boolean hasClosingQuote = false; + // loop through the remaining characters for closing quote. for(int j = i+1; j < c.length; j++) { if(c[j] == '\'') { + hasClosingQuote = true; break; } } From 5980186e8e7610acb36e264a6b72086fedc45401 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:52:26 +0300 Subject: [PATCH 111/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1901 -> 1944 bytes src/Spreadsheet.java | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index dacb3d8..288fca9 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -287,3 +287,4 @@ EditAction 1475844635428 Spreadsheet.java 2181 3 13 0 UnitTestCaseAction 1475844664901 SpreadsheetTest.java FAIL UnitTestSessionAction 1475844664901 SpreadsheetTest.java FAIL EditAction 1475844737942 Spreadsheet.java 2256 3 13 0 +EditAction 1475844746448 Spreadsheet.java 2303 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 01da370cc7a330183dd5629ddb1122e70994941c..c4cd9b7709a9c7685ed4fa43549a2b04867ec714 100644 GIT binary patch delta 439 zcmXw#JxCl;6otPxf4gr9Uo8rMoOMAsFUweY94NhO37 z14cy1M$sun>{1NaCSVzoB9JzMwjmOKuB*P{aqcVxT3 z)yyPs)Qpbs17F{JCLSr69bO4a$R{5&ENYUFdPaoPG>dyr*pO&!9#wLnwyN%e8l_z0AKHCjoa1<& M(vtmJo*Il@1B$s-U;qFB delta 376 zcmXYsIZFdk6otQ+nMr0;;$RX{8*NO|jDn1ch2VnVz9fp^0`4f<_zP^(D-4K*ORR!e ziH#_v6U0W*!XIE`lR^+tiN@>lipzKJdFNivPH8S!bp3Un1zg5XiZ->=V{J`Y)96^B zd|r*wT(#|Jt{qDgcATuf@Qaq-WMoKr>qe++$%zD9yEVmT1}!=s&DIyj(>Bf2@Gj|&o9 zlH`gQcTDiWB#+GU#2nAe^THypEc3~Vf>pwjZR#%!5z3{LSVYCG&?rzZYETQB Date: Fri, 7 Oct 2016 15:53:12 +0300 Subject: [PATCH 112/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 1944 -> 1944 bytes src/Spreadsheet.java | 3 ++- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 288fca9..b5c416c 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -288,3 +288,4 @@ UnitTestCaseAction 1475844664901 SpreadsheetTest.java FAIL UnitTestSessionAction 1475844664901 SpreadsheetTest.java FAIL EditAction 1475844737942 Spreadsheet.java 2256 3 13 0 EditAction 1475844746448 Spreadsheet.java 2303 3 13 0 +EditAction 1475844792888 Spreadsheet.java 2360 3 3 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index c4cd9b7709a9c7685ed4fa43549a2b04867ec714..37f4bd273dd56d7847af90e29aff76af405ae74b 100644 GIT binary patch delta 65 zcmV-H0KWg2510?IqXsok0KNcH0KouR0LuVc0L}m>0N4Ow0Nns$0O-N0RsSV0R{kalh_8pkYy9# delta 65 zcmV-H0KWg2510?IqXsog0KNcD0KouN0LuVY0L}m>0N4Os0Nnsy0O-J0RsSR0R{kWlh_8pia`^s diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 47893e8..99fff22 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -70,8 +70,9 @@ public String evaluate(String cell) { } } + // return the string after equals character. if(hasClosingQuote) { - + return } From 27d33ccaa8e4169b60ab64e3941d05d29c4e70a0 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:53:24 +0300 Subject: [PATCH 113/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1944 -> 1284 bytes src/Spreadsheet.java | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index b5c416c..ec8fbce 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -289,3 +289,6 @@ UnitTestSessionAction 1475844664901 SpreadsheetTest.java FAIL EditAction 1475844737942 Spreadsheet.java 2256 3 13 0 EditAction 1475844746448 Spreadsheet.java 2303 3 13 0 EditAction 1475844792888 Spreadsheet.java 2360 3 3 0 +CompilationAction 1475844792977 Spreadsheet.java +CompilationAction 1475844792977 Spreadsheet.java +EditAction 1475844804448 Spreadsheet.java 2385 3 3 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 37f4bd273dd56d7847af90e29aff76af405ae74b..be9c72f58ac6a0bb2cbd151ac084671b98264129 100644 GIT binary patch delta 289 zcmYL^Jxc>Y7=&jppxzP)sIh)Yr67c8{7M=T#6r7M!E#MD$?4v1*nKaU%ErdV+Ml6V z2nyQ!qr^29HV-ol12d1cJ1M`u-#!4e(Rr2+$?ZHg1Zr1mqMAn8Ve`;?=NHfxxIeRA z2WKX_Pd!(RbE7zSmd4&)8eN1A$uyf_kFB z@+K=J*i=FURU&}EOM+S<=pv%qBC$kt(LVqdY!QeO&Lp9|x^s2Tch33lcQohDL~k`m z|N8vL0+3)}Ayx>3( zcvlogSL$po%1(A$>{7H$dedHS$txFo!z6F4RtRG3VXwmSt9^dauZ1&6Rez~Y<>&oX-1OH!katRj!YD}S> z%_*XOb*NDEYW{RV&{2i$SC_LSHXaJeNqeG3<>g!BE1D;~YOYkN$_2-#Dz&g|(&ET( z=k!aeu1#YQ1!X6;4C+}!&qg-=&Z_Qbv}?@Ly5e+bJSREWz)bu&-}8iRLweTKvsQy& z(|RV}IY(bnTlD$;Fw)oH5mmrCcja9CIVH zH1`;y`hYS1g#LNgm}Qk~hI;FFmMVMZL-(sKLf6>qC}+r>LdH$(JroXwnP3l}9)km)K*^oq>VRd!LAskz2Ju5*x^)N|aSk9+j< zK!8UKv%m@doo_SUTOteU6D`iOQsOGawJ>7rqx^ z!;;@6?0qB_h10Z97D?GCd1l%o-(vrVS)5d|V0BCTzqBdUq Date: Fri, 7 Oct 2016 15:53:45 +0300 Subject: [PATCH 114/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ src/Spreadsheet.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index ec8fbce..4ffbc22 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -292,3 +292,6 @@ EditAction 1475844792888 Spreadsheet.java 2360 3 3 0 CompilationAction 1475844792977 Spreadsheet.java CompilationAction 1475844792977 Spreadsheet.java EditAction 1475844804448 Spreadsheet.java 2385 3 3 0 +CompilationAction 1475844804580 Spreadsheet.java +CompilationAction 1475844804580 Spreadsheet.java +EditAction 1475844825083 Spreadsheet.java 2413 3 3 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 742a91b..54b76fb 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -78,7 +78,8 @@ public String evaluate(String cell) { } } else if (Character.isDigit(c[i+1])){ - + digitCount++; + continue; } else { return "#Error"; } From f87cebaf3337f9f78cf79469b1e9d14e5cc2f093 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:55:09 +0300 Subject: [PATCH 115/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 15 +++++++++++++++ bin/Spreadsheet.class | Bin 1284 -> 1284 bytes src/Spreadsheet.java | 4 +++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 4ffbc22..4e5fdfd 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -295,3 +295,18 @@ EditAction 1475844804448 Spreadsheet.java 2385 3 3 0 CompilationAction 1475844804580 Spreadsheet.java CompilationAction 1475844804580 Spreadsheet.java EditAction 1475844825083 Spreadsheet.java 2413 3 3 0 +CompilationAction 1475844825186 Spreadsheet.java +CompilationAction 1475844825186 Spreadsheet.java +CompilationAction 1475844858378 Spreadsheet.java +CompilationAction 1475844858379 Spreadsheet.java +CompilationAction 1475844858520 Spreadsheet.java +CompilationAction 1475844858520 Spreadsheet.java +CompilationAction 1475844873151 Spreadsheet.java +CompilationAction 1475844873152 Spreadsheet.java +CompilationAction 1475844873326 Spreadsheet.java +CompilationAction 1475844873326 Spreadsheet.java +CompilationAction 1475844878865 Spreadsheet.java +CompilationAction 1475844878866 Spreadsheet.java +CompilationAction 1475844879013 Spreadsheet.java +CompilationAction 1475844879013 Spreadsheet.java +EditAction 1475844909666 Spreadsheet.java 2471 3 3 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index be9c72f58ac6a0bb2cbd151ac084671b98264129..4053bb9c75d651317887afaab126fefc19d08528 100644 GIT binary patch delta 13 UcmZqSYT?@OoQ2VM@(UIj03mz?p#T5? delta 13 UcmZqSYT?@OoQ2VQ@(UIj03mV&p8x;= diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 54b76fb..269e2c9 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -61,9 +61,11 @@ public String evaluate(String cell) { } else if (c[i+1] == '\'') { boolean hasClosingQuote = false; + int StringStartPos = i+1; + int StringEndPos = 0; // loop through the remaining characters for closing quote. - for(int j = i+1; j < c.length; j++) { + for(int j = i+2; j < c.length; j++) { if(c[j] == '\'') { hasClosingQuote = true; break; From 080c942ddac39fb95f9093dbb42adea32e5c3d6f Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:55:39 +0300 Subject: [PATCH 116/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 7 +++++++ bin/Spreadsheet.class | Bin 1284 -> 1284 bytes src/Spreadsheet.java | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 4e5fdfd..4221dca 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -310,3 +310,10 @@ CompilationAction 1475844878866 Spreadsheet.java CompilationAction 1475844879013 Spreadsheet.java CompilationAction 1475844879013 Spreadsheet.java EditAction 1475844909666 Spreadsheet.java 2471 3 3 0 +CompilationAction 1475844909766 Spreadsheet.java +CompilationAction 1475844909767 Spreadsheet.java +CompilationAction 1475844920115 Spreadsheet.java +CompilationAction 1475844920116 Spreadsheet.java +CompilationAction 1475844920258 Spreadsheet.java +CompilationAction 1475844920258 Spreadsheet.java +EditAction 1475844939647 Spreadsheet.java 2542 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 4053bb9c75d651317887afaab126fefc19d08528..f34bdacc8092ab6599778417a5402d1eb9344e0a 100644 GIT binary patch delta 13 UcmZqSYT?@OoQ2VE@(UIj03m?{q5uE@ delta 13 UcmZqSYT?@OoQ2VM@(UIj03mz?p#T5? diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 269e2c9..e433606 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -68,13 +68,14 @@ public String evaluate(String cell) { for(int j = i+2; j < c.length; j++) { if(c[j] == '\'') { hasClosingQuote = true; + StringEndPos = j; break; } } // return the string after equals character. if(hasClosingQuote) { - return + return value.substring(StringStartPos, StringEndPos); } else { return "#Error"; } From 6b3cf67b2bca7998c75e5cafbeb56493d4895ac3 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:55:50 +0300 Subject: [PATCH 117/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1284 -> 2088 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 4221dca..7ce5723 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -317,3 +317,6 @@ CompilationAction 1475844920116 Spreadsheet.java CompilationAction 1475844920258 Spreadsheet.java CompilationAction 1475844920258 Spreadsheet.java EditAction 1475844939647 Spreadsheet.java 2542 3 13 0 +UnitTestCaseAction 1475844940955 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475844940956 SpreadsheetTest.java FAIL +EditAction 1475844950860 Spreadsheet.java 2542 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f34bdacc8092ab6599778417a5402d1eb9344e0a..6eaa3e3b8e1e97bc0d23e2137fb4192a8af3f814 100644 GIT binary patch delta 1099 zcmZ9L-D?zQ6vlt=%lW1%{OyfsUP)B#&tfaei zch+Dj>`kr;_NGwSQZT(*!3(z^h%Iesq4YxNA0P;YUU(&V+13lwGrMUE9fp^4o@dT; z&hv6+)xHzAAHMi*9mw$Rm-fe6JS*esOHUqdZ4su8l z^~>2MuQFb#csCWsaPmSnphsgI=1oPUTDwy9E5%Ylv2}QQIyrOQyWx#2d!@q2VjDjk z<}HOexT$=UV;1#sMelzf1`WKce!dbT%Y?!zRws&uq963jCeH``reYlDgy<~iO9g*P zp${jg73!)&yO34b#p+zX;Q7THc|p%B!o_N*zi_!gEGzazQ3X|_MMd|LSIsV$t1|jR zt?WzLmQKN&2*9HT*xV+M|Hi{-Iasug7a#Ik=ny>kA-J~>~KtRIt?iLjlmyviL#wDq}QWq*O`&knDCZl{P%UEZOk2u0Dj`9iPe98p3ndA;r z+?D0I#|gd??0aVUN#q`KieFje5vO^~8Ghp&zjKkN(&Cvk{)=n8prCBtQ{9x*Hp=Q1 z-dEf4RecvVHN*;i;^TwPBH)Mzc~p|!QZ5^+c8iN4G&!F$%}McVszGrxBg+#}J7tg= zLSp3)8E0N@;s8I(Q1e)A6AQwI#mXq}2o@1T2W8xOY(8I+OFAuKlws+331>t4m=?-n zKwgym+}Z|Rg#X1X&M0|cTW|k{+;i;zOovTq&oR6HMC;LFK^Tv#hY7=&jppxzQt)L6fyQV>EkekF|vVk0)Eg5{cQlGDB2u=`#xm5q&!zr$86 z1O@G_{6*p#3!8@-hJl&Kg*z!fzhB=0w9tN%56SH;HU#Fc)L1o)vV+E<_s-9uC2)Uc zy$;Tdb&tBP80AKB?ktVGyEM88ZIWp=v8--L|CZJ%w?TWRdZ$k8rX8bM(}8i_>x>oa zLR$_pJsswO3e7{;JEEctOkQ*8EvYC%X_#D}crwzIvCr*5N;I)uMT#AP+UoKD+P}QB xcK-ZT>5KjNs)8iGlW%BVEN;GF>m#}ZOOZ1WktbM=tWLE=4J*+J>_#To`vLj#PC@_x diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index e433606..8df693c 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -65,7 +65,7 @@ public String evaluate(String cell) { int StringEndPos = 0; // loop through the remaining characters for closing quote. - for(int j = i+2; j < c.length; j++) { + for(int j = i+1; j < c.length; j++) { if(c[j] == '\'') { hasClosingQuote = true; StringEndPos = j; From 173e7b2adb3a547b2e04ebbb2ae3601bbf856abb Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:55:55 +0300 Subject: [PATCH 118/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2088 -> 2088 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 7ce5723..1705bf6 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -320,3 +320,6 @@ EditAction 1475844939647 Spreadsheet.java 2542 3 13 0 UnitTestCaseAction 1475844940955 SpreadsheetTest.java FAIL UnitTestSessionAction 1475844940956 SpreadsheetTest.java FAIL EditAction 1475844950860 Spreadsheet.java 2542 3 13 0 +UnitTestCaseAction 1475844951973 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475844951974 SpreadsheetTest.java FAIL +EditAction 1475844955935 Spreadsheet.java 2542 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 6eaa3e3b8e1e97bc0d23e2137fb4192a8af3f814..a697d472ca6e979d0e05e1383ed34ffc1ff6b5f1 100644 GIT binary patch delta 14 VcmZ1>utH$N4OT{$%{N*7nE)v71myq# delta 14 VcmZ1>utH$N4OT|h%{N*7nE)vD1m*w$ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 8df693c..e433606 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -65,7 +65,7 @@ public String evaluate(String cell) { int StringEndPos = 0; // loop through the remaining characters for closing quote. - for(int j = i+1; j < c.length; j++) { + for(int j = i+2; j < c.length; j++) { if(c[j] == '\'') { hasClosingQuote = true; StringEndPos = j; From a6a4b81ca1b30c2ecb9e158e1f8f6ba9b00b8af4 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:56:12 +0300 Subject: [PATCH 119/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2088 -> 2088 bytes 2 files changed, 3 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 1705bf6..d7ede9f 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -323,3 +323,6 @@ EditAction 1475844950860 Spreadsheet.java 2542 3 13 0 UnitTestCaseAction 1475844951973 SpreadsheetTest.java FAIL UnitTestSessionAction 1475844951974 SpreadsheetTest.java FAIL EditAction 1475844955935 Spreadsheet.java 2542 3 13 0 +UnitTestCaseAction 1475844958325 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475844958325 SpreadsheetTest.java FAIL +EditAction 1475844972803 SpreadsheetTest.java 1602 9 27 9 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index a697d472ca6e979d0e05e1383ed34ffc1ff6b5f1..6eaa3e3b8e1e97bc0d23e2137fb4192a8af3f814 100644 GIT binary patch delta 14 VcmZ1>utH$N4OT|h%{N*7nE)vD1m*w$ delta 14 VcmZ1>utH$N4OT{$%{N*7nE)v71myq# From 89a75925aaf1e987a624705d5ef533467bfe55a6 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:56:43 +0300 Subject: [PATCH 120/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + src/Spreadsheet.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index d7ede9f..f096101 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -326,3 +326,4 @@ EditAction 1475844955935 Spreadsheet.java 2542 3 13 0 UnitTestCaseAction 1475844958325 SpreadsheetTest.java FAIL UnitTestSessionAction 1475844958325 SpreadsheetTest.java FAIL EditAction 1475844972803 SpreadsheetTest.java 1602 9 27 9 +EditAction 1475845003937 Spreadsheet.java 2542 3 13 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index e433606..9e0cdfe 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -61,7 +61,7 @@ public String evaluate(String cell) { } else if (c[i+1] == '\'') { boolean hasClosingQuote = false; - int StringStartPos = i+1; + int StringStartPos = i+2; int StringEndPos = 0; // loop through the remaining characters for closing quote. From d96c4f90de0e32dd1e4270cf284fc73b96d9ea56 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:57:26 +0300 Subject: [PATCH 121/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 7 +++ .../20161007141352402/besouroEpisodes.txt | 48 ++++++++++++++++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161007141352402/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 2088 -> 2088 bytes tests/SpreadsheetTest.java | 7 ++- 6 files changed, 63 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index f096101..d35ef7e 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -327,3 +327,10 @@ UnitTestCaseAction 1475844958325 SpreadsheetTest.java FAIL UnitTestSessionAction 1475844958325 SpreadsheetTest.java FAIL EditAction 1475844972803 SpreadsheetTest.java 1602 9 27 9 EditAction 1475845003937 Spreadsheet.java 2542 3 13 0 +UnitTestCaseAction 1475845005501 SpreadsheetTest.java OK +UnitTestSessionAction 1475845005501 SpreadsheetTest.java OK +RefactoringAction 1475845027920 SpreadsheetTest.java ADD void spreadsheet FIELD +RefactoringAction 1475845029932 SpreadsheetTest.java RENAME spreadsheet=>void spreadsheet_evaluate_ FIELD +RefactoringAction 1475845033444 SpreadsheetTest.java RENAME spreadsheet_evaluate_=>void spreadsheet_evaluate_simple_equals_forum FIELD +RefactoringAction 1475845037453 SpreadsheetTest.java RENAME spreadsheet_evaluate_simple_equals_forum=>void spreadsheet_evaluate_simple_equals_formula_error() METHOD +EditAction 1475845046742 SpreadsheetTest.java 1795 10 30 10 diff --git a/.besouro/20161007141352402/besouroEpisodes.txt b/.besouro/20161007141352402/besouroEpisodes.txt index c79f4fa..926c66f 100644 --- a/.besouro/20161007141352402/besouroEpisodes.txt +++ b/.besouro/20161007141352402/besouroEpisodes.txt @@ -335,3 +335,51 @@ 1475842998073 test-first 3 1323 true 1475843052884 refactoring 2A 7 true 1475843108136 test-addition 1 43 true +1475845005501 test-first 3 1751 true +1475845005502 test-first 3 1751 true +1475845005503 test-first 3 1751 true +1475845005504 test-first 3 1751 true +1475845005505 test-first 3 1751 true +1475845005506 test-first 3 1751 true +1475845005507 test-first 3 1751 true +1475845005508 test-first 3 1751 true +1475845005509 test-first 3 1751 true +1475845005510 test-first 3 1751 true +1475845005511 test-first 3 1751 true +1475845005512 test-first 3 1751 true +1475845005513 test-first 3 1751 true +1475845005514 test-first 3 1751 true +1475845005515 test-first 3 1751 true +1475845005516 test-first 3 1751 true +1475845005517 test-first 3 1751 true +1475845005518 test-first 3 1751 true +1475845005519 test-first 3 1751 true +1475845005520 test-first 3 1751 true +1475845005521 test-first 3 1751 true +1475845005522 test-first 3 1751 true +1475845005523 test-first 3 1751 true +1475845005524 test-first 3 1751 true +1475845005525 test-first 3 1751 true +1475845005526 test-first 3 1751 true +1475845005527 test-first 3 1751 true +1475845005528 test-first 3 1751 true +1475845005529 test-first 3 1751 true +1475845005530 test-first 3 1751 true +1475845005531 test-first 3 1751 true +1475845005532 test-first 3 1751 true +1475845005533 test-first 3 1751 true +1475845005534 test-first 3 1751 true +1475845005535 test-first 3 1751 true +1475845005536 test-first 3 1751 true +1475845005537 test-first 3 1751 true +1475845005538 test-first 3 1751 true +1475845005539 test-first 3 1751 true +1475845005540 test-first 3 1751 true +1475845005541 test-first 3 1751 true +1475845005542 test-first 3 1751 true +1475845005543 test-first 3 1751 true +1475845005544 test-last 1 1751 false +1475845005545 test-last 1 1751 false +1475845005546 test-last 1 1751 false +1475845005547 test-last 1 1751 false +1475845005548 test-last 1 1751 false diff --git a/.besouro/20161007141352402/randomHeuristicEpisodes.txt b/.besouro/20161007141352402/randomHeuristicEpisodes.txt index ff31a20..5f436e9 100644 --- a/.besouro/20161007141352402/randomHeuristicEpisodes.txt +++ b/.besouro/20161007141352402/randomHeuristicEpisodes.txt @@ -8,3 +8,4 @@ 1475842997834 test-first 3 1323 true 1475843052884 refactoring 2A 7 false 1475843108136 test-addition 1 43 true +1475845005501 test-first 3 1751 true diff --git a/.besouro/20161007141352402/zorroEpisodes.txt b/.besouro/20161007141352402/zorroEpisodes.txt index 586f0ed..c037c1f 100644 --- a/.besouro/20161007141352402/zorroEpisodes.txt +++ b/.besouro/20161007141352402/zorroEpisodes.txt @@ -8,3 +8,4 @@ 1475842997834 test-first 3 1382 true 1475843052884 refactoring 2A 55 true 1475843108136 test-addition 1 55 true +1475845005501 test-first 3 1897 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 6eaa3e3b8e1e97bc0d23e2137fb4192a8af3f814..006dfddf774d54d83c442086f804d8d53c22ef38 100644 GIT binary patch delta 14 VcmZ1>utH$Nc~(Z&%@utH$Nc~(Z2%@ Date: Fri, 7 Oct 2016 15:59:00 +0300 Subject: [PATCH 123/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 9 +++++++++ .../20161007141352402/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/20161007141352402/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 2384 -> 2384 bytes tests/SpreadsheetTest.java | 7 +++++-- 6 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 90d3c5f..ea404c0 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -335,3 +335,12 @@ RefactoringAction 1475845033444 SpreadsheetTest.java RENAME spreadsheet_evaluate RefactoringAction 1475845037453 SpreadsheetTest.java RENAME spreadsheet_evaluate_simple_equals_forum=>void spreadsheet_evaluate_simple_equals_formula_error() METHOD EditAction 1475845046742 SpreadsheetTest.java 1795 10 30 10 EditAction 1475845049730 SpreadsheetTest.java 1791 10 30 10 +UnitTestCaseAction 1475845051003 SpreadsheetTest.java OK +UnitTestSessionAction 1475845051003 SpreadsheetTest.java OK +RefactoringAction 1475845060493 SpreadsheetTest.java ADD void spreadsheed FIELD +RefactoringAction 1475845062506 SpreadsheetTest.java RENAME spreadsheed=>void spreadsheet_ FIELD +RefactoringAction 1475845118521 SpreadsheetTest.java RENAME spreadsheet_=>void spreadsheet_evaluate_ FIELD +RefactoringAction 1475845123034 SpreadsheetTest.java RENAME spreadsheet_evaluate_simple_equals_formula_error()=>void spreadsheet_evaluate_simple_equals_formula_string_error() METHOD +RefactoringAction 1475845128547 SpreadsheetTest.java RENAME spreadsheet_evaluate_simple_equals_formula()=>void spreadsheet_evaluate_simple_equals_formula_string() METHOD +RefactoringAction 1475845136558 SpreadsheetTest.java RENAME spreadsheet_evaluate_=>void spreadsheet_evaluate_simple_equals_formula_ FIELD +EditAction 1475845140078 SpreadsheetTest.java 1871 10 30 10 diff --git a/.besouro/20161007141352402/besouroEpisodes.txt b/.besouro/20161007141352402/besouroEpisodes.txt index 926c66f..497104b 100644 --- a/.besouro/20161007141352402/besouroEpisodes.txt +++ b/.besouro/20161007141352402/besouroEpisodes.txt @@ -383,3 +383,4 @@ 1475845005546 test-last 1 1751 false 1475845005547 test-last 1 1751 false 1475845005548 test-last 1 1751 false +1475845051003 test-addition 1 23 true diff --git a/.besouro/20161007141352402/randomHeuristicEpisodes.txt b/.besouro/20161007141352402/randomHeuristicEpisodes.txt index 5f436e9..4d815b3 100644 --- a/.besouro/20161007141352402/randomHeuristicEpisodes.txt +++ b/.besouro/20161007141352402/randomHeuristicEpisodes.txt @@ -9,3 +9,4 @@ 1475843052884 refactoring 2A 7 false 1475843108136 test-addition 1 43 true 1475845005501 test-first 3 1751 true +1475845051003 test-addition 1 23 false diff --git a/.besouro/20161007141352402/zorroEpisodes.txt b/.besouro/20161007141352402/zorroEpisodes.txt index c037c1f..3dd17c6 100644 --- a/.besouro/20161007141352402/zorroEpisodes.txt +++ b/.besouro/20161007141352402/zorroEpisodes.txt @@ -9,3 +9,4 @@ 1475843052884 refactoring 2A 55 true 1475843108136 test-addition 1 55 true 1475845005501 test-first 3 1897 true +1475845051003 test-addition 1 45 true diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index c0037d147a7fa664a5fffa421ebf86de00629d31..1e42a4575ca5205bc2b029bec167011673861333 100644 GIT binary patch delta 17 Ycmca0bU|nXGbf|d{63uIgJ4=H3Y%{ diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 00b22fb..5277e9d 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -62,17 +62,20 @@ public void spreadsheet_evaluate_incorrect_string() { } @Test - public void spreadsheet_evaluate_simple_equals_formula() { + public void spreadsheet_evaluate_simple_equals_formula_string() { Spreadsheet ss = new Spreadsheet(); ss.set("A1", "='teststring'"); assertEquals("teststring", ss.evaluate("A1")); } @Test - public void spreadsheet_evaluate_simple_equals_formula_error() { + public void spreadsheet_evaluate_simple_equals_formula_string_error() { Spreadsheet ss = new Spreadsheet(); ss.set("A1", "='teststring"); assertEquals("#Error", ss.evaluate("A1")); } + @Test + public void spreadsheet_evaluate_simple_equals_formula_ + } From 888ead9e30a2dd4974494360bd54342c6026119a Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 15:59:32 +0300 Subject: [PATCH 124/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 5 +++++ bin/SpreadsheetTest.class | Bin 2384 -> 1789 bytes tests/SpreadsheetTest.java | 6 +++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index ea404c0..8b8d6db 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -344,3 +344,8 @@ RefactoringAction 1475845123034 SpreadsheetTest.java RENAME spreadsheet_evaluate RefactoringAction 1475845128547 SpreadsheetTest.java RENAME spreadsheet_evaluate_simple_equals_formula()=>void spreadsheet_evaluate_simple_equals_formula_string() METHOD RefactoringAction 1475845136558 SpreadsheetTest.java RENAME spreadsheet_evaluate_=>void spreadsheet_evaluate_simple_equals_formula_ FIELD EditAction 1475845140078 SpreadsheetTest.java 1871 10 30 10 +CompilationAction 1475845140178 SpreadsheetTest.java +CompilationAction 1475845140179 SpreadsheetTest.java +CompilationAction 1475845140179 SpreadsheetTest.java +RefactoringAction 1475845162080 SpreadsheetTest.java RENAME spreadsheet_evaluate_simple_equals_formula_=>void spreadsheet_evaluate_simple_equals_formula_negative_int() METHOD +EditAction 1475845172451 SpreadsheetTest.java 1992 11 33 11 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 1e42a4575ca5205bc2b029bec167011673861333..b6b59e76e458d6ac1662b2f09ff498b7dc6da004 100644 GIT binary patch literal 1789 zcmbW0ZEF)j5XWcJhoskP)7o0Awr(SZ3dK+qghs@o28B?;v;kio+uWFL+3d#Mz0`g( zK|$a9J^UKtT$(nqE`s-F?{;?PH?#kl{qgI|Hvo7H_lrOoBz2A;8G@m9@r}V3xtpLv7I+)yIUl zO}8hN@X~1Bv*t))*X{CX=HM8)(AxO(qvu(6E*(##6H1v=3jJU#_s3*YrakbAW}0W( zi%%T0RNGu?ht~5-t-`$-WK!sn*CndtCAO8Y!?3=QNd_01V){bS&Y$&gm;rfTSShG9 z?nZLNNRFxS7(3bRDU9)BDwK<S5NR9hx z_XzDlmVm)xgD#_5!-PZQWOhvk3ymx7s4=)PUJ}WrQ>7TJzDu>2U2I7w3A=YGBvHx@ zV>{K8lp0peRIQa@g~7(ZdqOQ?ur!{_p^wE*yhE28H+RT9ke@;2s=Y;m;lA;8lj>wJ z4h+`Doh~KS*rC?+Nsq1I`KdL!qt5E2weTL3H=2grxY06ouD`NZJq-ngF687nLL+1Q<|f0?tGPMI&B9rOGO+QVkqqQ=M+@3sXLp zf7F_(ng^JNnwoVwA!#9!_@^(s_uk)H`<&DN{`c2E09LUVM@-;K>4PhcL+`zm{+{&w zIC=yIj*Md?XBl=i_hSD@9{2*i>!xk`4+Jh`vSopuP3KT1Z~>Q+xQJf%DVnz24Ql(+ z-81$rDWDgf1H&pCuBqM|!5;s;=?M%LPhs-{LtaZs#ddrh)7wC($PGAt15*Ws493w1fuN1%;JwyY{=lSm`O%BrfIZBv;&TdG{oB{7dX0?E3+t&f3W(ZP4@`T|GUjfgVb z>q;-M2-VL51csx|sjVVi*Ksv0)AEXjUkDB(HR*XqRccsMGg%RsIbB#btUz-7+fHB~ zZq>WoC-rPx&EvNu@@gKMJZ7EYbF)oEJD!9qwybim9FxqA8(W~ROxwIaUB|9kpSB&h zX8685+_8NP1(vK8G;DGVH$zRQgf}rBzKq|-C*=13=jxweI#S^HqgiVT;x@{TS7%h0gPy}A)8PYWz{Uw^WgujnS)g;q*V z;2y|rQ=RfusdZ}A8C+Bc2h-qg!K?ZVCiL-| ztS9i^&o_a~{2IfRM%F->2kbBw<8%Mt7<}^;L&f=TNVOVX4(WZ+*hV!{jYsMQjm8>P zUBh((1jgGUEcQ?yZZr}4gg*HN)ARbo7uPRLjUCq)wAL(}B9)J#|BQ-3Vvijyg+fn$!%b*$&j-yQlu4s1JWg zT_AOl)Eucx9jK4Gr*0|g;~!F2NnIoLE~)oAPkg?;Nqt6Yu> Date: Fri, 7 Oct 2016 15:59:44 +0300 Subject: [PATCH 125/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1789 -> 2591 bytes src/Spreadsheet.java | 3 --- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 8b8d6db..2e3d4ed 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -349,3 +349,6 @@ CompilationAction 1475845140179 SpreadsheetTest.java CompilationAction 1475845140179 SpreadsheetTest.java RefactoringAction 1475845162080 SpreadsheetTest.java RENAME spreadsheet_evaluate_simple_equals_formula_=>void spreadsheet_evaluate_simple_equals_formula_negative_int() METHOD EditAction 1475845172451 SpreadsheetTest.java 1992 11 33 11 +UnitTestCaseAction 1475845174438 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475845174438 SpreadsheetTest.java FAIL +EditAction 1475845184280 Spreadsheet.java 2530 3 13 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index b6b59e76e458d6ac1662b2f09ff498b7dc6da004..ca64ae7470e36d5410be8daa2b3cef3d05734aae 100644 GIT binary patch literal 2591 zcmb7^ZBr9h9L3L#NY)S(mH<*g9#oQuA%=pq4QL}mMI$PqX`SgzW`Wzd%x2f_1D$@X zzEP*0=?CbC>h#KDg32^xjM9?@7;( zqEBGx$T&8#mSI=3ulJASfiKX%X4$nu;NK~#gm1B~*aU&V}N_8CfyX)9h>yItR ztr@;A54UY!LxCkL1q~aVhC6jnr;N8STyUS;&#SMZhArk!wmXs}`~$%?EmZ{=5}2rQ!|vcoOA9#TmPtX^8?WNF_rTUhLJ zS|{sKG1Ua`aYwIbRy3%SmEqoqm7KsmkXxp@J`$z&b)XLSqB@b71&ern0dcpQ?ZZ*bcH4xX!;3+~B(!HN;j4ZL=@JcJOZuzx#xd z;=*Sn+Je{X^Z{s;Q9??1tWnSu)`<8Dwwb)}#_Bg|2ut;ZubJHp4FRWBSC&Mlt(uKaX zpfA(M7anxS~?(Z3pT!sWYU`k~!Cfy4E{&U1eRb z&v_^6JgG@iQ>3Q5P@nWp{a#U@o=eS;x=3o4)Q4TD&w8hBD(VmCQkO|xA@vcdt6iwu zy;EOYoHbAC8ma4~KJG#-_D+3uan`4#Zjkzn)Xgr`*S%BUT%2{A)EA__B(>Ouy4yRo aq^LihyRL6YeM{;tsiiK|pLo6_`1yaSwczjo literal 1789 zcmbW0ZEF)j5XWcJhoskP)7o0Awr(SZ3dK+qghs@o28B?;v;kio+uWFL+3d#Mz0`g( zK|$a9J^UKtT$(nqE`s-F?{;?PH?#kl{qgI|Hvo7H_lrOoBz2A;8G@m9@r}V3xtpLv7I+)yIUl zO}8hN@X~1Bv*t))*X{CX=HM8)(AxO(qvu(6E*(##6H1v=3jJU#_s3*YrakbAW}0W( zi%%T0RNGu?ht~5-t-`$-WK!sn*CndtCAO8Y!?3=QNd_01V){bS&Y$&gm;rfTSShG9 z?nZLNNRFxS7(3bRDU9)BDwK<S5NR9hx z_XzDlmVm)xgD#_5!-PZQWOhvk3ymx7s4=)PUJ}WrQ>7TJzDu>2U2I7w3A=YGBvHx@ zV>{K8lp0peRIQa@g~7(ZdqOQ?ur!{_p^wE*yhE28H+RT9ke@;2s=Y;m;lA;8lj>wJ z4h+`Doh~KS*rC?+Nsq1I`KdL!qt5E2weTL3H=2g Date: Fri, 7 Oct 2016 15:59:48 +0300 Subject: [PATCH 126/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 2088 -> 2088 bytes src/Spreadsheet.java | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 2e3d4ed..83dc911 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -352,3 +352,4 @@ EditAction 1475845172451 SpreadsheetTest.java 1992 11 33 11 UnitTestCaseAction 1475845174438 SpreadsheetTest.java FAIL UnitTestSessionAction 1475845174438 SpreadsheetTest.java FAIL EditAction 1475845184280 Spreadsheet.java 2530 3 13 0 +EditAction 1475845188155 Spreadsheet.java 2526 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 006dfddf774d54d83c442086f804d8d53c22ef38..d8d1bde5080d14266ca3452dc9002dba6c746600 100644 GIT binary patch delta 57 zcmZ1>utH!154&zO!yASehW8BW3_lr?8U8V(Fmf?uG4eBHGfFVzFiJDzG0HL&GO92X NF{(3^Otxfy4*;V`4O;*J delta 57 zcmZ1>utH!154&z0!yATphW8BW3_lst82&M&GjcKHGV(LzF-kDxGfFcQGRiWPFsd+= NGO9C_Pqt)#4*;f_4SWCq diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 02367df..b119570 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -91,7 +91,6 @@ public String evaluate(String cell) { if(Character.isDigit(c[i])) { digitCount ++; } - } // if the value is a string. From a0d3374a60a367b7b712275082e458243f81689a Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:01:32 +0300 Subject: [PATCH 127/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 2088 -> 2088 bytes src/Spreadsheet.java | 4 +++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 83dc911..9c66135 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -353,3 +353,4 @@ UnitTestCaseAction 1475845174438 SpreadsheetTest.java FAIL UnitTestSessionAction 1475845174438 SpreadsheetTest.java FAIL EditAction 1475845184280 Spreadsheet.java 2530 3 13 0 EditAction 1475845188155 Spreadsheet.java 2526 3 13 0 +EditAction 1475845292337 Spreadsheet.java 2553 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index d8d1bde5080d14266ca3452dc9002dba6c746600..f9beb47271e75f2de81c84cbe6b6258fcc4373cc 100644 GIT binary patch delta 45 zcmZ1>utH#i1iNAq!#{>(MlOa-Mt+7YMhS*&MrnpzMp=deMiquaMs delta 45 zcmZ1>utH#i1iNA~!#{=;MlOadMt+8DMhS)-MrnpTMp=eJMiqu4Ms@~ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index b119570..054a3c7 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -51,8 +51,10 @@ public String evaluate(String cell) { } // if there is a '=' character then - // the subsequent char can only be '-', '\'' or digit. + // the subsequent char can only be '-', '\'' or a digit. if(c[i] == '=') { + + // negative sign if(c[i+1] == '-') { isNegative = true; From 7541c3ad47c52568d04f465c4ecf2529502a9501 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:01:51 +0300 Subject: [PATCH 128/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 2088 -> 2088 bytes src/Spreadsheet.java | 3 ++- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 9c66135..e776971 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -354,3 +354,4 @@ UnitTestSessionAction 1475845174438 SpreadsheetTest.java FAIL EditAction 1475845184280 Spreadsheet.java 2530 3 13 0 EditAction 1475845188155 Spreadsheet.java 2526 3 13 0 EditAction 1475845292337 Spreadsheet.java 2553 3 13 0 +EditAction 1475845311069 Spreadsheet.java 2581 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f9beb47271e75f2de81c84cbe6b6258fcc4373cc..63e12fa159ab6513e1bdedabfdb141d956fb3434 100644 GIT binary patch delta 139 zcmWN_F-rnr007YUEeb8&;2=nwaQ{J*Fu}6L2s9dUvZ*8}8Uo?=py|NX^`OCMzNJ<0 z2LyrOtTeZXzVT&I7JcT0q~_JJv4+HnH%;$OrCKK1rp{!}edw6E@U_2O*SAY^R~CAH r^!>WFbYtb#+Q6UKzoD(WaNs^1dI)8sQ1KX!JcX*~5PMNd>&49um) z0IL8;0IvW@0I~o?0K5QA0KouG0LlPR0L=hX0NDUk0Nemo0N(&t0O9~!0PFx<0Pg@N t0Qmr70R8}D0SW+V0S^Fb0T=*l0UH2q0UZEv0VDu%0Ve=+02Gru2knO)A%Xw^ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 054a3c7..6ad5b35 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -59,7 +59,8 @@ public String evaluate(String cell) { isNegative = true; continue; - + + // opening single quote. } else if (c[i+1] == '\'') { boolean hasClosingQuote = false; From a3bb643564693a6036ce888d12711aad5d75b68c Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:02:47 +0300 Subject: [PATCH 129/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 2088 -> 2088 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index e776971..2e8ce45 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -355,3 +355,4 @@ EditAction 1475845184280 Spreadsheet.java 2530 3 13 0 EditAction 1475845188155 Spreadsheet.java 2526 3 13 0 EditAction 1475845292337 Spreadsheet.java 2553 3 13 0 EditAction 1475845311069 Spreadsheet.java 2581 3 13 0 +EditAction 1475845367411 Spreadsheet.java 2583 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 63e12fa159ab6513e1bdedabfdb141d956fb3434..7f5e1e11b9d6685a86462a94759eba544de1063e 100644 GIT binary patch delta 139 zcmWN_u}Xpg7y!Wg76lP>Pzb^;klrFRuxv?$5(k@VQV|jdmv+HPaCQBmp>S?#lfVZM zgveQFb_u)jl6;bXU!`6yOjJx&&0LzRS-6t8_Nwm9jphG+xb>;wOViq&jeA=y-`aLM o_8$ByJ9zZxDKff|(~A@RI5mip=QuNrvXKJDvc$RKtd{;c0^TGbh5!Hn delta 139 zcmWN_y-Gp>7y!`oEeaCopddtBAU#EB;7>~;lsMQ_lZueIxVQ&Rf~)I=hQhg}O#&Z4 z5F%%x*(L0ZC&?wb_f=|o=~>x}ikT~ORSPwVx>pTvt}XxX!;Mc(Us~2~ZQR*v`_{43 owRi7V$-#p^kCD-ftbP;?;?ywCJjJY5)KL diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 6ad5b35..a16202c 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -76,7 +76,7 @@ public String evaluate(String cell) { } } - // return the string after equals character. + // return value if the closing quote is found. if(hasClosingQuote) { return value.substring(StringStartPos, StringEndPos); } else { From e5e7957be3d23a251caebf4f7b6405e178b5e68c Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:03:02 +0300 Subject: [PATCH 130/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + src/Spreadsheet.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 2e8ce45..7242b40 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -356,3 +356,4 @@ EditAction 1475845188155 Spreadsheet.java 2526 3 13 0 EditAction 1475845292337 Spreadsheet.java 2553 3 13 0 EditAction 1475845311069 Spreadsheet.java 2581 3 13 0 EditAction 1475845367411 Spreadsheet.java 2583 3 13 0 +EditAction 1475845382682 Spreadsheet.java 2616 3 13 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index a16202c..d3f8bb9 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -82,7 +82,8 @@ public String evaluate(String cell) { } else { return "#Error"; } - + + // next character is a digit. } else if (Character.isDigit(c[i+1])){ digitCount++; continue; From fbacf4a14ba66c526af72c1b8a466edded59ce0d Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:03:18 +0300 Subject: [PATCH 131/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 2088 -> 2088 bytes src/Spreadsheet.java | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 7242b40..e4dd80e 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -357,3 +357,4 @@ EditAction 1475845292337 Spreadsheet.java 2553 3 13 0 EditAction 1475845311069 Spreadsheet.java 2581 3 13 0 EditAction 1475845367411 Spreadsheet.java 2583 3 13 0 EditAction 1475845382682 Spreadsheet.java 2616 3 13 0 +EditAction 1475845398698 Spreadsheet.java 2652 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 7f5e1e11b9d6685a86462a94759eba544de1063e..4c7fb42d46b6130825dc87aad24ecabdda116640 100644 GIT binary patch delta 73 zcmZ1>utH$NA2!=?hMNo#40jkJ8SXPgGdyC5XL!Sq!0?_yo#7`#8pA(^bVe?QTtutH$NA2!=ChMNrG40jkJ816GfF+5_3V|c?5&+wi>o#7`#D#Jg9G)69l97cYI dTt*3oJVt4T0!CSeVn!8)5=M1~vdNb0?*S!z6Gs35 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index d3f8bb9..88c870a 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -54,13 +54,13 @@ public String evaluate(String cell) { // the subsequent char can only be '-', '\'' or a digit. if(c[i] == '=') { - // negative sign + // next character is negative sign if(c[i+1] == '-') { isNegative = true; continue; - // opening single quote. + // next character is opening single quote. } else if (c[i+1] == '\'') { boolean hasClosingQuote = false; From 1e644766b073015a7f4bcaf3b3954143d23ec2b7 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:03:56 +0300 Subject: [PATCH 132/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + src/Spreadsheet.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index e4dd80e..611b2ba 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -358,3 +358,4 @@ EditAction 1475845311069 Spreadsheet.java 2581 3 13 0 EditAction 1475845367411 Spreadsheet.java 2583 3 13 0 EditAction 1475845382682 Spreadsheet.java 2616 3 13 0 EditAction 1475845398698 Spreadsheet.java 2652 3 13 0 +EditAction 1475845436271 Spreadsheet.java 2658 3 13 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 88c870a..a426c27 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -97,7 +97,7 @@ public String evaluate(String cell) { } } - // if the value is a string. + // if the whole value is a string. // return a substring without single quotes. if(isString) { return value.substring(1, value.length() - 1); From c41fc8a1c8925beb576726b7acc26666c37be1ac Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:03:59 +0300 Subject: [PATCH 133/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + src/Spreadsheet.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 611b2ba..3b3cac3 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -359,3 +359,4 @@ EditAction 1475845367411 Spreadsheet.java 2583 3 13 0 EditAction 1475845382682 Spreadsheet.java 2616 3 13 0 EditAction 1475845398698 Spreadsheet.java 2652 3 13 0 EditAction 1475845436271 Spreadsheet.java 2658 3 13 0 +EditAction 1475845439151 Spreadsheet.java 2658 3 13 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index a426c27..684c4b2 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -97,7 +97,7 @@ public String evaluate(String cell) { } } - // if the whole value is a string. + // if the WHOLE value is a string. // return a substring without single quotes. if(isString) { return value.substring(1, value.length() - 1); From 072aaaed603d64a19a216381fd1f30556a334355 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:04:50 +0300 Subject: [PATCH 134/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + src/Spreadsheet.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 3b3cac3..aab0bd2 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -360,3 +360,4 @@ EditAction 1475845382682 Spreadsheet.java 2616 3 13 0 EditAction 1475845398698 Spreadsheet.java 2652 3 13 0 EditAction 1475845436271 Spreadsheet.java 2658 3 13 0 EditAction 1475845439151 Spreadsheet.java 2658 3 13 0 +EditAction 1475845490267 Spreadsheet.java 2678 3 13 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 684c4b2..8bfacba 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -35,6 +35,9 @@ public String evaluate(String cell) { c = value.toCharArray(); int digitCount = 0; + // TODO: + // + // loop through the value and check for letters. for(int i = 0; i < c.length; i++) { From cd821cd4ad787ba1be44edda05d0fd63c41a2984 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:05:17 +0300 Subject: [PATCH 135/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 2088 -> 2088 bytes src/Spreadsheet.java | 3 ++- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index aab0bd2..220073b 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -361,3 +361,4 @@ EditAction 1475845398698 Spreadsheet.java 2652 3 13 0 EditAction 1475845436271 Spreadsheet.java 2658 3 13 0 EditAction 1475845439151 Spreadsheet.java 2658 3 13 0 EditAction 1475845490267 Spreadsheet.java 2678 3 13 0 +EditAction 1475845517800 Spreadsheet.java 2736 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 4c7fb42d46b6130825dc87aad24ecabdda116640..00ce30e052fab4fc6adcc8da417f3a0d63494fc3 100644 GIT binary patch delta 170 zcmWN}y$bO5%hq{)jGZz+H1Vxsb;&(F<3*cb^rW8q*ToJ@s_neZ?d KUY2^)YW@LRWhQk1 delta 170 zcmWN}KMMh20KnnjyHFN4Dlw@m3|Rb$5{jcl24o0@rcYTJ(QY_`Pa~LWKf>a1mB}|*;B$o z<3O3CT+Y%i)VRv&MuR&|9<+GU=0%6M+&}cNQTa0D=Vv5bjD;Irc$f$;Q{iJK0?dWV I!c02tKQtXB{Qv*} diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 8bfacba..70965d3 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -36,7 +36,8 @@ public String evaluate(String cell) { int digitCount = 0; // TODO: - // + // refactor for loop. + // atm. there are too much going on. // loop through the value and check for letters. for(int i = 0; i < c.length; i++) { From 6215f9e4160c42d5260ff2692eb63f96f0b87fe3 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:05:23 +0300 Subject: [PATCH 136/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 2088 -> 2088 bytes 2 files changed, 1 insertion(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 220073b..c6061e5 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -362,3 +362,4 @@ EditAction 1475845436271 Spreadsheet.java 2658 3 13 0 EditAction 1475845439151 Spreadsheet.java 2658 3 13 0 EditAction 1475845490267 Spreadsheet.java 2678 3 13 0 EditAction 1475845517800 Spreadsheet.java 2736 3 13 0 +EditAction 1475845523761 Spreadsheet.java 2736 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 00ce30e052fab4fc6adcc8da417f3a0d63494fc3..64bb738233d454c32e693685cac380410741a296 100644 GIT binary patch delta 170 zcmWN}y$bUL$iGAZkofy@@G@&_oT z%<5)~yz5iH$5c$^w6p0dF#;3_QYJ)|FdZUvi83I;m?Ro0R;1C%uqMlf90qx|Qtc^X zQsN->kqT$oF4VYE=SG7&O&+v((&i=4Z+d*_W1;e8$j{42IG6}0Q{iGJ+{}fCh47&X JKT9KSxBh5-CY=BP delta 170 zcmWN}y$bO5%hq{)jGZz+H1Vxsb;&(F<3*cb^rW8q*ToJ@s_neZ?d KUY2^)YW@LRWhQk1 From c5bce51d2a8325d2962cfe249d21e02e94b04756 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:10:37 +0300 Subject: [PATCH 137/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 2088 -> 2088 bytes src/Spreadsheet.java | 6 +++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index c6061e5..dc2a273 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -363,3 +363,4 @@ EditAction 1475845439151 Spreadsheet.java 2658 3 13 0 EditAction 1475845490267 Spreadsheet.java 2678 3 13 0 EditAction 1475845517800 Spreadsheet.java 2736 3 13 0 EditAction 1475845523761 Spreadsheet.java 2736 3 13 0 +EditAction 1475845837423 Spreadsheet.java 2899 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 64bb738233d454c32e693685cac380410741a296..e69eb8a8a648859734ad4b6b7547165402b44506 100644 GIT binary patch delta 178 zcmWNKzY76z9EP9oLRlDz0~RGpD8CjmAcctuk<0DMbh28n3}m)gl|Mi!WmY#^ zj!^*pcbvwf$n%hZUV6C+HLC?#2C;?zjc5z-??pEP4KEXZPz!z9m|0vn20V(i4& zQ^BUnLChm{&cZG Date: Fri, 7 Oct 2016 16:12:23 +0300 Subject: [PATCH 138/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 2088 -> 2088 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index dc2a273..faf7b33 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -364,3 +364,4 @@ EditAction 1475845490267 Spreadsheet.java 2678 3 13 0 EditAction 1475845517800 Spreadsheet.java 2736 3 13 0 EditAction 1475845523761 Spreadsheet.java 2736 3 13 0 EditAction 1475845837423 Spreadsheet.java 2899 3 13 0 +EditAction 1475845942991 Spreadsheet.java 2900 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index e69eb8a8a648859734ad4b6b7547165402b44506..52bf3868ae3232cf68e1f18356eb6e5e4df93c84 100644 GIT binary patch delta 170 zcmWNJy$b}6LS7d#cuP!7=<0O4GF_RJ^~ykIi&gmplu~AO zvqgU6^Xd6KPQVGAb{Y_6s&4>(BvKZtr$zxGqO_7bVZOUw^vZscl zUI!W+X>wNEg%(%Z+~{yuwFf<(^m#Gl&6p1pTr|F_{);dZA9L}ukRVG5VMrKLqO2r_ IW$Rw|51id6Jpcdz delta 170 zcmWN}y$bSEehIvR)a;Y_TeTfKtk= zZnns8ed_Z#0Vi Date: Fri, 7 Oct 2016 16:14:42 +0300 Subject: [PATCH 139/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + src/Spreadsheet.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index faf7b33..661582c 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -365,3 +365,4 @@ EditAction 1475845517800 Spreadsheet.java 2736 3 13 0 EditAction 1475845523761 Spreadsheet.java 2736 3 13 0 EditAction 1475845837423 Spreadsheet.java 2899 3 13 0 EditAction 1475845942991 Spreadsheet.java 2900 3 13 0 +EditAction 1475846082550 Spreadsheet.java 2983 3 13 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 0376c41..77839fa 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -84,6 +84,9 @@ public String evaluate(String cell) { } } + // TODO: + // characters after the closing quote are being discarded + // return value if the closing quote is found. if(hasClosingQuote) { return value.substring(StringStartPos, StringEndPos); From 75c965f0f1b313216000fa8ca51035a71fd48c74 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:14:44 +0300 Subject: [PATCH 140/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 2088 -> 2088 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 661582c..45ea5a5 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -366,3 +366,4 @@ EditAction 1475845523761 Spreadsheet.java 2736 3 13 0 EditAction 1475845837423 Spreadsheet.java 2899 3 13 0 EditAction 1475845942991 Spreadsheet.java 2900 3 13 0 EditAction 1475846082550 Spreadsheet.java 2983 3 13 0 +EditAction 1475846084568 Spreadsheet.java 2984 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 52bf3868ae3232cf68e1f18356eb6e5e4df93c84..9265d88ad04bb35a283b3979b0f4563e37b788da 100644 GIT binary patch delta 85 zcmV-b0IL6}5U3Ea@CHd+0KouU0LlPf0L=hm0NDUz0Nem%0N(&+0O9~@0PFy30Pg@V r0QmrM0R8}S0SW+k0S^Fq0T=*!0UH2(0UZE;0VDu`0Ve>0lQ{?PT(}o- delta 85 zcmV-b0IL6}5U3Ea@CHd(0KouR0LlPc0L=hj0NDUw0Nem!0N(&(0O9~=0PFy00Pg@V r0QmrJ0R8}P0SW+h0S^Fn0T=*x0UH2$0UZE*0VDu@0Ve=|lQ{?PR1z0D diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 77839fa..b2e1f42 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -85,7 +85,7 @@ public String evaluate(String cell) { } // TODO: - // characters after the closing quote are being discarded + // characters after the closing quote are being discarded. // return value if the closing quote is found. if(hasClosingQuote) { From 4bb65df0551bb13daaf47aaa866a0125f414e115 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:15:28 +0300 Subject: [PATCH 141/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + src/Spreadsheet.java | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 45ea5a5..5fccc79 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -367,3 +367,4 @@ EditAction 1475845837423 Spreadsheet.java 2899 3 13 0 EditAction 1475845942991 Spreadsheet.java 2900 3 13 0 EditAction 1475846082550 Spreadsheet.java 2983 3 13 0 EditAction 1475846084568 Spreadsheet.java 2984 3 13 0 +EditAction 1475846128925 Spreadsheet.java 2873 3 13 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index b2e1f42..7ce54ac 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -94,10 +94,6 @@ public String evaluate(String cell) { return "#Error"; } - // next character is a digit. - } else if (Character.isDigit(c[i+1])){ - digitCount++; - continue; } else { return "#Error"; } From 472ea151eef60cb016e40e10542d738450760db5 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:17:32 +0300 Subject: [PATCH 142/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2088 -> 2057 bytes src/Spreadsheet.java | 5 +++++ 3 files changed, 8 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 5fccc79..5f32ecf 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -368,3 +368,6 @@ EditAction 1475845942991 Spreadsheet.java 2900 3 13 0 EditAction 1475846082550 Spreadsheet.java 2983 3 13 0 EditAction 1475846084568 Spreadsheet.java 2984 3 13 0 EditAction 1475846128925 Spreadsheet.java 2873 3 13 0 +UnitTestCaseAction 1475846131608 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475846131608 SpreadsheetTest.java FAIL +EditAction 1475846252893 Spreadsheet.java 2967 3 12 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 9265d88ad04bb35a283b3979b0f4563e37b788da..ea3827c55a614ad462ba0957d501227ecc2fd58f 100644 GIT binary patch delta 266 zcmXAkzbi#y9L7K2^PcxTo!s=|9Kv98rbBVK-9cIXx=Lab<;TS2O74yMX3{&^&UTeW zMgy6wW@QwEKR`-(V|n^Kee3x?&y{W4o2rhV2&sS!xLI8ty3SQ$vyvpw@5AjsjKgW& z;nH2`zTsw`MunXz+3^r=7B(;O_prm3d(d?^Vg_Z^)l5y@G3FYkefG>QFYNKkIPdK9 z$pK#+@^S7Ve6K}q6MG6Jt3%rTF`NDm7v`Vp~o nv*bxL!5ej!F-!&Ay7OpKZIHOfXe9|M!8gWQ|5sS^;Q{Nv&xA0I delta 298 zcmXAkzbnLX7{_1F_s8e@>hR(2D_ly^eKUL$j>{mj`E|;`NZn;10|s2`B+Cs3eJ0zL z;grQ_!6N^IQp#XbM!7*gx#j8gyq|jYeyaLf-{$?`1CJ!gkeTuGz4x)3(@~9d96xxa ze+;|{zs`-h@Kc%dI85a9RE+}*-bPNxHSFE1vu_^#LT59*WBQWdOi7)TX;nQkYa%u2 zJ~Lv9s#E=mSiVA1{ Date: Fri, 7 Oct 2016 16:18:09 +0300 Subject: [PATCH 143/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 31 +++++++++++++++++++++++++ bin/Spreadsheet.class | Bin 2057 -> 2073 bytes src/Spreadsheet.java | 6 ++--- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 5f32ecf..86dad66 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -371,3 +371,34 @@ EditAction 1475846128925 Spreadsheet.java 2873 3 13 0 UnitTestCaseAction 1475846131608 SpreadsheetTest.java FAIL UnitTestSessionAction 1475846131608 SpreadsheetTest.java FAIL EditAction 1475846252893 Spreadsheet.java 2967 3 12 0 +CompilationAction 1475846252998 Spreadsheet.java +CompilationAction 1475846252998 Spreadsheet.java +CompilationAction 1475846252998 Spreadsheet.java +CompilationAction 1475846252998 Spreadsheet.java +CompilationAction 1475846252999 Spreadsheet.java +CompilationAction 1475846252999 Spreadsheet.java +CompilationAction 1475846252999 Spreadsheet.java +CompilationAction 1475846258432 Spreadsheet.java +CompilationAction 1475846258433 Spreadsheet.java +CompilationAction 1475846258434 Spreadsheet.java +CompilationAction 1475846258435 Spreadsheet.java +CompilationAction 1475846258435 Spreadsheet.java +CompilationAction 1475846258436 Spreadsheet.java +CompilationAction 1475846258437 Spreadsheet.java +CompilationAction 1475846258606 Spreadsheet.java +CompilationAction 1475846258607 Spreadsheet.java +CompilationAction 1475846258607 Spreadsheet.java +CompilationAction 1475846258607 Spreadsheet.java +CompilationAction 1475846258608 Spreadsheet.java +CompilationAction 1475846258608 Spreadsheet.java +CompilationAction 1475846258608 Spreadsheet.java +CompilationAction 1475846280061 Spreadsheet.java +CompilationAction 1475846280062 Spreadsheet.java +CompilationAction 1475846280063 Spreadsheet.java +CompilationAction 1475846280063 Spreadsheet.java +CompilationAction 1475846280064 Spreadsheet.java +CompilationAction 1475846280065 Spreadsheet.java +CompilationAction 1475846280065 Spreadsheet.java +UnitTestCaseAction 1475846284649 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475846284649 SpreadsheetTest.java FAIL +EditAction 1475846289507 Spreadsheet.java 2991 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index ea3827c55a614ad462ba0957d501227ecc2fd58f..798af8b484ad3207561cc018a3fb887da8fc9a98 100644 GIT binary patch delta 275 zcmXAkzb^z)6otP#Gw*FC8S=smu|kN%RFh3)*eHb3&(+aNNEB>=%8DQgwv<;^Ge0+JL7Zh}u=9^$Frzx$ z+Z)wCe3d1Y+{_gmI0&|KlNGpo(4lFcRU_(dpP0Wx+a5h6i#FA>eo4)4>-O0zyS%Z- zJNtZ4l)28rEONOoMH}OCg$-xwvH1tG(J`w4 delta 279 zcmXAky)Oh&6vcmcX5O1jY~)!pB&#>okT7f%8(Lqh5n2)-6&ggWk7f&7%2d;hY75Oq zC5lyQ)e@yp_ya^DJTy1IlY4W{xw&bXPE`dDc$7c}vl&&bTqka7;({;(Lqp1(NW>W-aQxqrhykl?UxtYhTnVj9 xjAQ2;v&`Y5rH^?Q>}P@WvS>*$#tU_p&`dboWT*Z`=#-pKv@teMSh1!Kt3Lq6G_L>v diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index abcdd5e..8ac9d8d 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -96,11 +96,11 @@ public String evaluate(String cell) { // next character is a digit. } else if(Character.isDigit(c[i+1])) { - - } + + // dont do anything. } else { - return "#Error"; + return "#Errorasf"; } } From dcc63d5362475ec56ad7035ddf0dbc871c77241a Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:18:13 +0300 Subject: [PATCH 144/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2073 -> 2088 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 86dad66..59f0966 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -402,3 +402,6 @@ CompilationAction 1475846280065 Spreadsheet.java UnitTestCaseAction 1475846284649 SpreadsheetTest.java FAIL UnitTestSessionAction 1475846284649 SpreadsheetTest.java FAIL EditAction 1475846289507 Spreadsheet.java 2991 3 13 0 +UnitTestCaseAction 1475846290875 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475846290875 SpreadsheetTest.java FAIL +EditAction 1475846293625 Spreadsheet.java 2988 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 798af8b484ad3207561cc018a3fb887da8fc9a98..eca860c63d84b9e8539f46ebbccf77de26aa53d2 100644 GIT binary patch delta 224 zcmXAkziPr@97WGBv0qF`CFr6SQR3b~6v07?ptjcfx7F6o#Z`z;-~%`X3WYvE9gABB zAE1-3(yeq*KkelXhkK^`=6!h1_x@`O6q$TF6*Cp3A=vqP5X^(=V&>p;>vBgc?3hbw zZ+2$Oka~Efd}(f~Dk;Nz+L$QG@IZ$MwxsE5x}d-hJ^Cn0Y#C^>SaHKp+bAIw9`$DP zN|`534)5d`(GSH7#hs2^Egl^w4^yvWWmJTR5`a48%U=zUkW4? RqVWG+8i^Ox%HE8y{sE`N9)kb? diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 8ac9d8d..b4057f6 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -100,7 +100,7 @@ public String evaluate(String cell) { // dont do anything. } else { - return "#Errorasf"; + return "#Error"; } } From 193bf7a67a9d544598097be860d9118299b158e7 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:18:59 +0300 Subject: [PATCH 145/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 2088 -> 2073 bytes src/Spreadsheet.java | 3 ++- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 59f0966..a84a1e6 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -405,3 +405,4 @@ EditAction 1475846289507 Spreadsheet.java 2991 3 13 0 UnitTestCaseAction 1475846290875 SpreadsheetTest.java FAIL UnitTestSessionAction 1475846290875 SpreadsheetTest.java FAIL EditAction 1475846293625 Spreadsheet.java 2988 3 13 0 +EditAction 1475846339686 Spreadsheet.java 2996 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index eca860c63d84b9e8539f46ebbccf77de26aa53d2..798af8b484ad3207561cc018a3fb887da8fc9a98 100644 GIT binary patch delta 182 zcmW-bI}QO+7=^#zFxT8DBpQzhnNpz;B9TZmUgK@N8jG<2)lDQ43($&26c%6;)?fp; zadL_;-)YV{c}(i(=l%eyY%aRtXpK)NL6@G{Iy(ujFDHmd)0A9a+SiermatENgDZIk z42j}NmXW0x72b@Q;8Nqk)RJOPiH7#hs2^Egl^w4^yvWWmJTR5`a48%U=zUkW4? RqVWG+8i^Ox%HE8y{sE`N9)kb? delta 224 zcmXAkziPr@97WGBv0qF`CFr6SQR3b~6v07?ptjcfx7F6o#Z`z;-~%`X3WYvE9gABB zAE1-3(yeq*KkelXhkK^`=6!h1_x@`O6q$TF6*Cp3A=vqP5X^(=V&>p;>vBgc?3hbw zZ+2$Oka~Efd}(f~Dk;Nz+L$QG@IZ$MwxsE5x}d-hJ^Cn0Y#C^>SaHKp+bAIw9`$DP zN|`534)5d`(GS Date: Fri, 7 Oct 2016 16:19:07 +0300 Subject: [PATCH 146/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2073 -> 2088 bytes src/Spreadsheet.java | 2 -- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index a84a1e6..802b3e2 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -406,3 +406,6 @@ UnitTestCaseAction 1475846290875 SpreadsheetTest.java FAIL UnitTestSessionAction 1475846290875 SpreadsheetTest.java FAIL EditAction 1475846293625 Spreadsheet.java 2988 3 13 0 EditAction 1475846339686 Spreadsheet.java 2996 3 13 0 +UnitTestCaseAction 1475846342912 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475846342913 SpreadsheetTest.java FAIL +EditAction 1475846347028 Spreadsheet.java 2971 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 798af8b484ad3207561cc018a3fb887da8fc9a98..64110fded294dd5d82156da0214e9eeb102650fe 100644 GIT binary patch delta 307 zcmXAkIZFdk6h_aT3PG^25-i0O>QkG`xeJH;)q<;_S#bSV91Kku4?6MM88x;iN8{vwvTaxk(G+EGyO4A4Y0A z=x}GRgPwt_ED3WnQ?TzqZRRE`aCg;V&priB{}yeBb-&EnhHm&JHG8DnXWP88!yCK2 zQ{$5ZzBv@du|%|_n-fVml|Ig8hzl9zk{D?H*CL_UIaiQzQUqT{TuO@P^ow~G@X<2J tB1>*cBvqCj1x)b43ae+u8Q}AHpcxI)?K(q^B30GF**PM diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index ffa6f76..a6b2406 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -96,8 +96,6 @@ public String evaluate(String cell) { // next character is a digit. } else if(Character.isDigit(c[i+1])) { - - digitCount++; continue; } else { From 916949c67f4eb98cd5ca602672d7c0bd05a343a8 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:19:38 +0300 Subject: [PATCH 147/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2088 -> 2081 bytes src/Spreadsheet.java | 1 + 3 files changed, 4 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 802b3e2..d9739d8 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -409,3 +409,6 @@ EditAction 1475846339686 Spreadsheet.java 2996 3 13 0 UnitTestCaseAction 1475846342912 SpreadsheetTest.java FAIL UnitTestSessionAction 1475846342913 SpreadsheetTest.java FAIL EditAction 1475846347028 Spreadsheet.java 2971 3 13 0 +UnitTestCaseAction 1475846348252 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475846348253 SpreadsheetTest.java FAIL +EditAction 1475846378272 Spreadsheet.java 2990 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 64110fded294dd5d82156da0214e9eeb102650fe..57209d572585918d19c4423e85185f71226bb4f5 100644 GIT binary patch delta 267 zcmXAkJxc>Y6h+V5-I;Y^kpZ(oVgyCWR*NF5A%$RL;diIl35ta_Dhe8eh?STs%pX{* zq_nnB^mhoU1xr!T#zC9Qc|17W+cS6OzOJG^0WnC;E~t9tA@g&S7L>B=G1&XVD40`S zdbXp6MsBkt%*}kkse@oAH(7!E2VIWrliC(-tGX(SwxJvT3)A*Yw_CfsvQM7_-ZGNJ5;@VPvwCd(0y(EJZ2$lO delta 274 zcmXAkPb)-G7>A$t-gD1%HRZ@$VJJm&v$%<_nJkp-{NItC#V89lMyVMQ-G!2c&KI~= zqilQuY~)iYWnrZ(WfpQ`^Xqwg>*@EqHaF(37KHC8iXh{5E~pLOCw^+;oKliJsQMp< zsv5MpwO2uJ`7((LshQ0=bfC6UljOL+YSXZf!KMl`Ep|W;$-J%V8UL9{yRR=!>b$Vc zD?7Zg%LjXWGQl?uemIaWn$k^6`ZRjBzG086}|k-;ansce$oih!K3LI7^J@ wvcm$4_-GkriDkDblo3`O1xywBVwE*C(>&R%a31w|MX!T4MnWfAcUF&$Uq|LLsQ>@~ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index a6b2406..c1e7549 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -96,6 +96,7 @@ public String evaluate(String cell) { // next character is a digit. } else if(Character.isDigit(c[i+1])) { + digitCount++; continue; } else { From 887b4be57af9fd048206341188c5657cc5c1f770 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:20:59 +0300 Subject: [PATCH 148/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2081 -> 2088 bytes src/Spreadsheet.java | 1 - 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index d9739d8..1c371b3 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -412,3 +412,6 @@ EditAction 1475846347028 Spreadsheet.java 2971 3 13 0 UnitTestCaseAction 1475846348252 SpreadsheetTest.java FAIL UnitTestSessionAction 1475846348253 SpreadsheetTest.java FAIL EditAction 1475846378272 Spreadsheet.java 2990 3 13 0 +UnitTestCaseAction 1475846379546 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475846379546 SpreadsheetTest.java FAIL +EditAction 1475846459005 Spreadsheet.java 2984 3 13 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 57209d572585918d19c4423e85185f71226bb4f5..21f64de033f258ece19122532c99ec36df884b66 100644 GIT binary patch delta 270 zcmXAkPb)-G7>A$t-gC~lnsQ{WFqERXS=>a|OcqLZ{_n`nV#vh@8~GZ_!b(}nEab%I*Yoz))9-gK{g` ztUKJfYduiBOygW;7upARlxw)=K0>TizP5{RY6h+V5otb4}kpZ(JF@mCGt3{F3kV3Gr@Vis&EW|<^6$K4Kf|Y0?GJjyL zlG55j(La(}uoMMt9JINd$AiPYJ$r8-8anQyNI>dtK{u+8d05!2q>|@PYWELgHK)7u z+?^gAxz5w5u=6D+9@I`@^Ai78T@Kx|-WKC(rY4K7X`10H)9%#Vw)g0>&l?B4GsP!I z{BSH0XOeI(DJ>c1LaMZ7oQ_O#Nd;*Amm+1zU%no7GK5ejyd@*>`Na~;gcuoPg;hT! kmQmI`X=eCfoehj)mKS#uU8Ms-5`1H Date: Fri, 7 Oct 2016 16:21:30 +0300 Subject: [PATCH 149/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 2 ++ bin/Spreadsheet.class | Bin 2088 -> 2088 bytes tests/SpreadsheetTest.java | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 1c371b3..58c9075 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -415,3 +415,5 @@ EditAction 1475846378272 Spreadsheet.java 2990 3 13 0 UnitTestCaseAction 1475846379546 SpreadsheetTest.java FAIL UnitTestSessionAction 1475846379546 SpreadsheetTest.java FAIL EditAction 1475846459005 Spreadsheet.java 2984 3 13 0 +RefactoringAction 1475846479228 SpreadsheetTest.java ADD void spreadsheet_evaluate_simple_equals_formula_int() METHOD +EditAction 1475846489983 SpreadsheetTest.java 2168 12 36 12 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 21f64de033f258ece19122532c99ec36df884b66..9265d88ad04bb35a283b3979b0f4563e37b788da 100644 GIT binary patch delta 61 zcmZ1>utH!12fJY!!y|?)hBpk^4DT8A8GbSpGW=sGV&r0|VB}}0WRzg2Vw7g6VU%U4 RXH;QmU{q&lnrzAb9smFr4@Uq1 delta 61 zcmZ1>utH!12fJZ9!y|@lhBpj34DT8A8GbSpG5ljFX5?b1WaMY4Vw7O0W|U^AWt3%T RU{qmfWK?Hpo@~kf9smJn4^sdD diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index a8edbad..a8165c9 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -82,4 +82,11 @@ public void spreadsheet_evaluate_simple_equals_formula_negative_int() { assertEquals("-5", ss.evaluate("A1")); } + @Test + public void spreadsheet_evaluate_simple_equals_formula_int() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "=5"); + assertEquals("5", ss.evaluate("A1")); + } + } From e39820cd55810cfc9679575e4a0f4c53b7804eb7 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:28:09 +0300 Subject: [PATCH 150/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 5 +++++ bin/Spreadsheet.class | Bin 2088 -> 2063 bytes bin/SpreadsheetTest.class | Bin 2591 -> 2773 bytes src/Spreadsheet.java | 16 +++++++++------- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 58c9075..5e779d2 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -417,3 +417,8 @@ UnitTestSessionAction 1475846379546 SpreadsheetTest.java FAIL EditAction 1475846459005 Spreadsheet.java 2984 3 13 0 RefactoringAction 1475846479228 SpreadsheetTest.java ADD void spreadsheet_evaluate_simple_equals_formula_int() METHOD EditAction 1475846489983 SpreadsheetTest.java 2168 12 36 12 +UnitTestCaseAction 1475846491744 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475846491745 SpreadsheetTest.java FAIL +UnitTestCaseAction 1475846766881 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475846766882 SpreadsheetTest.java FAIL +EditAction 1475846889442 Spreadsheet.java 3031 3 15 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 9265d88ad04bb35a283b3979b0f4563e37b788da..8f6d3f86c8caa99014e30b992c9b1db96e07c976 100644 GIT binary patch delta 610 zcmXYuPiPZS5XOJgO*Yx2(U@knMbV;=w9-{5?P}1dSc-odO`{f1N(-&FSQ9bnrHa84 zFJ2TD5AkC3l7b*XQN%-w;6*|3DhPt0S3v}!SajU_cnsg0dGmeqy|);@6K~x!dcx(( z#MR1ZsVtaN#YrE?jIe%sqC7NPD$f)z7UoKosb_DEqF5gZ&<@h)9SROs4L5AKR+Cqb zF%VBTNIK3^VA6+HzzsH8bZl!N?lf3uTldjipvi4Nmu*l{5E%E%Yn3bi6UsDXxDne5 zj=Ld0Mw@gwcGPE%1+)}(!%eouYEiMH&eFp_-|R@8_C7mghhLCsC9*B$^5SMv^%#87les9i9S9dYUZuZj80YwE|&aj8G>|=`kOq1mjhp8}3l_M;0 zlv|8&mlJrLq^=#0IK^X5^F%wJGRAYwEpv`Hoaa5`d|;AK%J!KHd{M@)%<`Sf{7}u` zRmvh%B*wfXxF(yqE?c=F-Q1Kk3$l|MNnn2M;j!7MC;b9aq!A41)$!A`XHy k#9Iz^raFj(kPzGbJtqEw&W^5CwumI!Rxo2L-iGj|zZ{%)_y7O^ delta 689 zcmZ9J%WD&16vclxlgwoDXk*)v77>d|qu@{?HhY8S?9A};(GKF&RNzH`sv-j6IqmL3=} znGl+*8Urc7yRimGEqEP@JH<^0c<<_~!}jaBL^=lEhL=-%>;F z75($rv!+yOZIH1#WhymmiDUhFJW$?gCX9FNDo>ixQaAh9%`x_Hf*8YEjga6Xy^PaO zmI0e6iKst_bXz=YnBgCI)_Fn- Qo6Sf>Yz=cp=Xf~#8@e)r8~^|S diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index ca64ae7470e36d5410be8daa2b3cef3d05734aae..9a98dd7604c077ffd42700baaf8f964b1e4ae8a5 100644 GIT binary patch delta 95 zcmbO)a#fV;)W2Q(7#J8#7~(c^O=Mxzn;giZEtr{C!od*9$iQT4%E1uL$iO&x28#hB z@8**%fvl6AI5gQJwlOFQMNKZ`kmL<#;9!Vg5MYR8kY Date: Fri, 7 Oct 2016 16:29:54 +0300 Subject: [PATCH 151/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 2063 -> 2106 bytes src/Spreadsheet.java | 5 ++++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 5e779d2..b2ec8d2 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -422,3 +422,4 @@ UnitTestSessionAction 1475846491745 SpreadsheetTest.java FAIL UnitTestCaseAction 1475846766881 SpreadsheetTest.java FAIL UnitTestSessionAction 1475846766882 SpreadsheetTest.java FAIL EditAction 1475846889442 Spreadsheet.java 3031 3 15 0 +EditAction 1475846994120 Spreadsheet.java 3114 3 16 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 8f6d3f86c8caa99014e30b992c9b1db96e07c976..e74b21d8ee0181acbf1e4db829df74d2b7020acd 100644 GIT binary patch delta 735 zcmX|<-Afcv7{-5RXLe?1cC^Lyq?S}hsfB~4+o{McN`yZA>cfw^QVdE8HLL`omSUwK zq6;Cg8|@;t=te0*jJ&EFFAMquf+DE9h$1L^cddru@Vw8Q_c`zLoVlA=O!&*c7ngt( zr{?_$YfbUs$nd3sq2aOCiA}iJ9iJws(=qKmXU|+odTv!~ zf&J5XSy$yqu9B$&EW5QFVM#e;a=0vG6TG2kawKry-0pwh)*K>nGwD*$`6`U zge%HrTqU`x%DJYh$fzw`SJh-y$fRoECZ%F2E7zQndq%TX$~>wTM+!^Ti;o&2G%7eO zBU(7BPR4ALf5TJTXcrVE5XlZfj`;pXr;P84*PmjcixK=oLxQb&=6G%ZpNSc4S4aApW0p=@B~rKzXuq>Wf?H_DXkzzCXAw BgWv!F delta 735 zcmX|>$Q`GOmsVofD>{ zVpT8Vlc>d%j=4(@SHJ3Lop?^$I z>#WV0xdjSlxmmBxI&Io&x|zk2!rXlG>mQaCRSnYeTBc9pdJHmHY{X#;>*!zyTglQ% zkDy*bee9xN&|X0Y1&!h{&K@S&&v_1TkpV7om?;WWIm$H0xXlpv7-5DJ)TQDPr+C5` zPo?sCl?h%7`I@u5Pjdrn8Y5i-o*pQ=gbcuY0p>_sFLK0UPqW rtFrFsf6k_NLInplq%$jQRw@;0U?m!a+CuRrOeU2h!cR-j5R-oZ6rh6P diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 4a88191..a711e40 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -24,6 +24,7 @@ public String evaluate(String cell) { char[] c; boolean isNegative = false; boolean isString = false; + boolean containsEquals = false; // get the value of the cell. if(map.containsKey(cell)) { @@ -65,6 +66,8 @@ public String evaluate(String cell) { // the subsequent char can only be '-', '\'' or a digit. if(c[i] == '=') { + containsEquals = true; + // next character is negative sign. if(c[i+1] == '-') { @@ -119,7 +122,7 @@ public String evaluate(String cell) { // if there are some other characters than digits. // 1. Check if the number is negative // 2. if the string contains other characters than digits and '-'. - if(isNegative) { + if(isNegative || containsEqual) { if(digitCount != (c.length - 1)) { return "#Error"; } else { From e5ce34b1669abca634a73ca3449e63d79f59ba21 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:31:11 +0300 Subject: [PATCH 152/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 5 +++++ bin/Spreadsheet.class | Bin 2106 -> 2112 bytes src/Spreadsheet.java | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index b2ec8d2..adef5d2 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -423,3 +423,8 @@ UnitTestCaseAction 1475846766881 SpreadsheetTest.java FAIL UnitTestSessionAction 1475846766882 SpreadsheetTest.java FAIL EditAction 1475846889442 Spreadsheet.java 3031 3 15 0 EditAction 1475846994120 Spreadsheet.java 3114 3 16 0 +CompilationAction 1475846994216 Spreadsheet.java +CompilationAction 1475847000913 Spreadsheet.java +UnitTestCaseAction 1475847002243 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475847002243 SpreadsheetTest.java FAIL +EditAction 1475847071219 Spreadsheet.java 3097 3 16 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index e74b21d8ee0181acbf1e4db829df74d2b7020acd..36cad4376283ea98d1b007b7728affccef306281 100644 GIT binary patch delta 187 zcmXAi%?bfw7)H-KT2`MAk z(xR?p(GZs7!naF zm52qV%rLN|!<>a4IMOCjGO4O@sbtaT%ZfEN13qk&DhzqE%?mp;68!vWPh3wNweR$* G#Qq1)YZ^BI diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index a711e40..bebda67 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -122,7 +122,7 @@ public String evaluate(String cell) { // if there are some other characters than digits. // 1. Check if the number is negative // 2. if the string contains other characters than digits and '-'. - if(isNegative || containsEqual) { + if(isNegative) { if(digitCount != (c.length - 1)) { return "#Error"; } else { From a933645886aeedcd83432d789ed87fb138327eba Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:31:29 +0300 Subject: [PATCH 153/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 2112 -> 2106 bytes src/Spreadsheet.java | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index adef5d2..bba5db4 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -428,3 +428,4 @@ CompilationAction 1475847000913 Spreadsheet.java UnitTestCaseAction 1475847002243 SpreadsheetTest.java FAIL UnitTestSessionAction 1475847002243 SpreadsheetTest.java FAIL EditAction 1475847071219 Spreadsheet.java 3097 3 16 0 +EditAction 1475847089038 Spreadsheet.java 3078 3 16 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 36cad4376283ea98d1b007b7728affccef306281..e74b21d8ee0181acbf1e4db829df74d2b7020acd 100644 GIT binary patch delta 180 zcmXAiy$XT=7)8&QsR;=V8LdGmL173%P;1bi{VlciCP`rQ0KQ1j*5tD^wl)Mo&Zs7!naF zm52qV%rLN|!<>a4IMOCjGO4O@sbtaT%ZfEN13qk&DhzqE%?mp;68!vWPh3wNweR$* G#Qq1)YZ^BI delta 187 zcmXAi%?bfw7)H-KT2`MAk z(xR?p(G Date: Fri, 7 Oct 2016 16:32:13 +0300 Subject: [PATCH 154/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2106 -> 2099 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index bba5db4..ad22ab0 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -429,3 +429,6 @@ UnitTestCaseAction 1475847002243 SpreadsheetTest.java FAIL UnitTestSessionAction 1475847002243 SpreadsheetTest.java FAIL EditAction 1475847071219 Spreadsheet.java 3097 3 16 0 EditAction 1475847089038 Spreadsheet.java 3078 3 16 0 +UnitTestCaseAction 1475847103238 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475847103239 SpreadsheetTest.java FAIL +EditAction 1475847133603 Spreadsheet.java 3096 3 16 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index e74b21d8ee0181acbf1e4db829df74d2b7020acd..e1344058e8a6e84f256bfc970ba710117c144788 100644 GIT binary patch delta 310 zcmXAkJ4*vm5QV?ly?f(^7;cfZ5xq3TvE2a>W3&SV1m!Pkz zUW@xMNLNf4lMT|hSWUIKNwk@mV^!6b)lRa}H4maUZ&P$s)csP6=JlleN;zuiyUTsv zIpmWgzA5v^i6~CRa3%rgGQfolawWqwq)1ajuE_z-Zc76C>}30rr-0zfC?!h{WBjtf zA}(4+sIz20^Ci!+C6A1~xME2UF;0h7)<`kI59^kCnBt2KOFpwaM=z<}AnRnD4%!&; LZOoRkhQMTCKRA25no#GsQ-l;n!ZbSEq|b+9zC zh|tLg5T8O~6d_H7zjpgQ=bStz=gxcZ>Jz5(fk7uoHkvc1i%)@`^U_rkLC`RETj&^h zv&L=UyE!kY(&f8XD9xyG(b5W4%0}K&Y;3m@ZL<`;m>Wqaw53M8r%?aT-ZOQHrKHdm z-whf!zcbOSHKxCki%zWT${ug*^UeXEl=x;?G!Dh4EOCyck7G$vk$z4kMJNGhGQ>Fv zAZ%~Ir&nES4JpzHx@5>G(#Q(Tvw)5zgA`d*yB!%|Ns&oReOyi{v>4%s6;`nsrOBG2 g4#xRnU6I2i&(Wj3<9BN@t%>D%;;5QU)v2-d2X|^c#Q*>R diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 3176f2b..f7dcfe6 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -121,7 +121,7 @@ public String evaluate(String cell) { // if there are some other characters than digits. // 1. Check if the number is negative // 2. if the string contains other characters than digits and '-'. - if(isNegative) { + if(isNegative || containsEquals) { if(digitCount != (c.length - 1)) { return "#Error"; } else { From 279867daf216699bee8b82c6329b98821b53fae9 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:33:17 +0300 Subject: [PATCH 155/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2099 -> 2105 bytes src/Spreadsheet.java | 9 +++++++++ 3 files changed, 12 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index ad22ab0..88c4052 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -432,3 +432,6 @@ EditAction 1475847089038 Spreadsheet.java 3078 3 16 0 UnitTestCaseAction 1475847103238 SpreadsheetTest.java FAIL UnitTestSessionAction 1475847103239 SpreadsheetTest.java FAIL EditAction 1475847133603 Spreadsheet.java 3096 3 16 0 +UnitTestCaseAction 1475847135054 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475847135054 SpreadsheetTest.java FAIL +EditAction 1475847197778 Spreadsheet.java 3244 3 16 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index e1344058e8a6e84f256bfc970ba710117c144788..e702209212ae8533d589056ff2f9eaed1dc9b8af 100644 GIT binary patch delta 187 zcmXAiISRr66b0ueX2S&$lfqUof?!Y-1Z@TPt%;X$0fQGv=P3kjyo`si69oNWH?Mdz zx8kFC9a!Fr40({wZD^Imy5RbD8r#o9g`HH{OO2z{IY~q!ZO)W|A JeXK2m?GJUy8s-21 delta 180 zcmXAi%?1Ji7)8%F)66t9j5IAHF{6}-h}uSf)8D2Ry-GhcdVzV7Xf-d>rftiJh(6k# z%f07j{>{G*EcZzc52Sq?T182B_Wc;JmkI}|a*`TnX^=>Z3nd`=mkB6q(itHUf+v{4n5wil=Ad>u}(85GGl`D;fy?AT(xiX H%3%8g`Boax diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index f7dcfe6..d4568ed 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -122,6 +122,15 @@ public String evaluate(String cell) { // 1. Check if the number is negative // 2. if the string contains other characters than digits and '-'. if(isNegative || containsEquals) { + + if(isNegative && containsEquals) { + if(digitCount != c.length - 2) { + return "#Error"; + } else { + return value; + } + } + if(digitCount != (c.length - 1)) { return "#Error"; } else { From 3b8ec80b0e17f32d4e4ab7c1d28e2bc6777d42ce Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:33:26 +0300 Subject: [PATCH 156/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 2105 -> 2147 bytes src/Spreadsheet.java | 3 +++ 3 files changed, 4 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 88c4052..9ec56c0 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -435,3 +435,4 @@ EditAction 1475847133603 Spreadsheet.java 3096 3 16 0 UnitTestCaseAction 1475847135054 SpreadsheetTest.java FAIL UnitTestSessionAction 1475847135054 SpreadsheetTest.java FAIL EditAction 1475847197778 Spreadsheet.java 3244 3 16 0 +EditAction 1475847206136 Spreadsheet.java 3256 3 16 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index e702209212ae8533d589056ff2f9eaed1dc9b8af..2dfe9d32b6c6d2834871690d8a86d236dc3f9963 100644 GIT binary patch delta 230 zcmXAj&q@MO97fOQb?&4YX?RVeT~P>0Aw@*3?8dLT zU-q&mKONs`ov}LHYljDQc~-)U4tdoPZ|d=`J|EP9$A3A2hAqpm!6w2fW!tDgS1Y9S zad@3FU}%R*I_AtMqGHB#BhRjuxnM-henoXI4d+Ny%cgPLjc8`GI9&{ySIP8O)+%uQ E2O?P_tpET3 delta 191 zcmXAi%L)Mj7)H-OV=it*F=Z`7DRL`iZ80um*zhJ+E=68o*4{x`$V+$$Z(yesf7zXH z@tyO`-E)_Ll`>u=$bxjQL#rf`kJonDe9(!{_HDP3GF$Q4OO1mxIZB%o1>pEUQN+`w zcYLY{rnG1(8MMV9V1$V+4aQ6~l$1JCC5wz2LnWIYUuHx&^!YGXavAVuK@>loiW%a? PX*bBGC8_?U#tc?Jv|$`g diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index d4568ed..d6a9826 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -136,12 +136,15 @@ public String evaluate(String cell) { } else { return value; } + } else { + if(digitCount != c.length) { return "#Error"; } else { return value; } + } } } From 4e7a8b951202dd3ced2b3c11c7a4bfaaf4afc976 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:33:44 +0300 Subject: [PATCH 157/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 2147 -> 2147 bytes src/Spreadsheet.java | 1 + 3 files changed, 2 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 9ec56c0..177788c 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -436,3 +436,4 @@ UnitTestCaseAction 1475847135054 SpreadsheetTest.java FAIL UnitTestSessionAction 1475847135054 SpreadsheetTest.java FAIL EditAction 1475847197778 Spreadsheet.java 3244 3 16 0 EditAction 1475847206136 Spreadsheet.java 3256 3 16 0 +EditAction 1475847224592 Spreadsheet.java 3301 3 16 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 2dfe9d32b6c6d2834871690d8a86d236dc3f9963..4ece286230c225dd28b7a85947370fd6daa7c1ff 100644 GIT binary patch delta 21 ccmaDX@K|6&0Xt_OqdP-CqZh-($(8J{08(rRRR910 delta 21 ccmaDX@K|6&0Xt_8qdP+{qZdQ} Date: Fri, 7 Oct 2016 16:33:59 +0300 Subject: [PATCH 158/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 2147 -> 2147 bytes src/Spreadsheet.java | 3 +++ 3 files changed, 4 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 177788c..a761577 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -437,3 +437,4 @@ UnitTestSessionAction 1475847135054 SpreadsheetTest.java FAIL EditAction 1475847197778 Spreadsheet.java 3244 3 16 0 EditAction 1475847206136 Spreadsheet.java 3256 3 16 0 EditAction 1475847224592 Spreadsheet.java 3301 3 16 0 +EditAction 1475847239822 Spreadsheet.java 3349 3 16 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 4ece286230c225dd28b7a85947370fd6daa7c1ff..cd3321a30e03f4bd98bf2c47644aa3563edc9550 100644 GIT binary patch delta 49 zcmaDX@K|6&2)k-MqY6UqY6Vkqb@@OqX9z`qY*t<8 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index d1ea64b..662e449 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -124,6 +124,9 @@ public String evaluate(String cell) { if(isNegative || containsEquals) { // "remove" two from lenght of the value. + // 1. negative sign + // 2. equals sign + if(isNegative && containsEquals) { if(digitCount != c.length - 2) { return "#Error"; From 43644996f4c0c6165168b9997e9f2fdc1cf271a7 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:34:27 +0300 Subject: [PATCH 159/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 2147 -> 2147 bytes src/Spreadsheet.java | 5 ++++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index a761577..c7998e4 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -438,3 +438,4 @@ EditAction 1475847197778 Spreadsheet.java 3244 3 16 0 EditAction 1475847206136 Spreadsheet.java 3256 3 16 0 EditAction 1475847224592 Spreadsheet.java 3301 3 16 0 EditAction 1475847239822 Spreadsheet.java 3349 3 16 0 +EditAction 1475847267678 Spreadsheet.java 3404 3 16 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index cd3321a30e03f4bd98bf2c47644aa3563edc9550..08b1bfa132a3276308f4db2782ced605716d61f4 100644 GIT binary patch delta 49 zcmaDX@K|6&2)k+%qY6Vaqb@@WqX9!3qY* Date: Fri, 7 Oct 2016 16:34:44 +0300 Subject: [PATCH 160/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 2147 -> 2147 bytes src/Spreadsheet.java | 2 -- 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index c7998e4..b402bfe 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -439,3 +439,4 @@ EditAction 1475847206136 Spreadsheet.java 3256 3 16 0 EditAction 1475847224592 Spreadsheet.java 3301 3 16 0 EditAction 1475847239822 Spreadsheet.java 3349 3 16 0 EditAction 1475847267678 Spreadsheet.java 3404 3 16 0 +EditAction 1475847284755 Spreadsheet.java 3396 3 16 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 08b1bfa132a3276308f4db2782ced605716d61f4..33b7eda9739cae6847835ef3edd9e4a3f88d4866 100644 GIT binary patch delta 33 pcmaDX@K|6&3cF}8qcuYxqaDKpMhAwejP4B67`+%~Os-^q1pui73DE!m delta 33 pcmaDX@K|6&3cF|*qcuY}qa8ypqXWYvMt6qEj9v^=Cs(q+0syD=3BLdU diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 96f7960..7437d4a 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -126,7 +126,6 @@ public String evaluate(String cell) { // "remove" two from value length // 1. negative sign // 2. equals sign - if(isNegative && containsEquals) { if(digitCount != c.length - 2) { return "#Error"; @@ -137,7 +136,6 @@ public String evaluate(String cell) { //"remove" one from value length // 1. negative sign - if(digitCount != (c.length - 1)) { return "#Error"; } else { From cca413ec44881edde18ca48484e27d840a3eb3e3 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:35:07 +0300 Subject: [PATCH 161/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2147 -> 2147 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index b402bfe..64dc40e 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -440,3 +440,6 @@ EditAction 1475847224592 Spreadsheet.java 3301 3 16 0 EditAction 1475847239822 Spreadsheet.java 3349 3 16 0 EditAction 1475847267678 Spreadsheet.java 3404 3 16 0 EditAction 1475847284755 Spreadsheet.java 3396 3 16 0 +UnitTestCaseAction 1475847290395 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475847290395 SpreadsheetTest.java FAIL +EditAction 1475847307208 Spreadsheet.java 3424 3 16 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 33b7eda9739cae6847835ef3edd9e4a3f88d4866..fff36bdfdb5fa1a536a07e6d208b0bcddebfee8a 100644 GIT binary patch delta 49 zcmaDX@K|6&2)k+{qY6V4qb@@;qX9!JqY* Date: Fri, 7 Oct 2016 16:35:29 +0300 Subject: [PATCH 162/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 2147 -> 2154 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 64dc40e..80ec177 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -443,3 +443,4 @@ EditAction 1475847284755 Spreadsheet.java 3396 3 16 0 UnitTestCaseAction 1475847290395 SpreadsheetTest.java FAIL UnitTestSessionAction 1475847290395 SpreadsheetTest.java FAIL EditAction 1475847307208 Spreadsheet.java 3424 3 16 0 +EditAction 1475847329550 Spreadsheet.java 3430 3 16 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index fff36bdfdb5fa1a536a07e6d208b0bcddebfee8a..885f58fd62a988c6d9f4dafd922ac6da174f9cd8 100644 GIT binary patch delta 205 zcmXBO&q@Me6o&EV=zQPI&>uwn!jO^(a#JXRpjew=2uH_eYLOSvC4^fy?TR)Nf~#&p z5L|XI;x4=h548K8&GVjZ>94fBHQ^;5MO<-7%F&Mv4r|K``c{$R^@%WD_7 za7{0t+TEf#!Ef)-kDPkpI$VeXu pB_>fB4z)N|SvqpgBPl*zsgbDy`cma7-}rCG!GVODebJ2qlRYC39sB?Q delta 198 zcmXBN%}N4s7=`iY%sBsP&}57mKf<*UB!LhJeh@^7ACo<4C$gZwOear@T} zZ|bqukat~@X~aeoK1hJoe}$B)E$h+Z1mSDUxyhrWW5!JIak^p3%$_4%acc@FS@F)~ gxKNFI=7e;WurM9aQ-x*r6F!$!RAku)`|x=D1L|EIKL7v# diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index eff5ed9..ab2da17 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -130,7 +130,7 @@ public String evaluate(String cell) { if(digitCount != c.length - 2) { return "#Error"; } else { - return value.substring(startPos, endPos); + return value.substring(startPos, c.length - 1); } } From eb2850d158ba40f4f08bf8ec65ab6315e3b75546 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:37:04 +0300 Subject: [PATCH 163/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 9 +++++++++ bin/Spreadsheet.class | Bin 2154 -> 2166 bytes src/Spreadsheet.java | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 80ec177..4b64c3c 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -444,3 +444,12 @@ UnitTestCaseAction 1475847290395 SpreadsheetTest.java FAIL UnitTestSessionAction 1475847290395 SpreadsheetTest.java FAIL EditAction 1475847307208 Spreadsheet.java 3424 3 16 0 EditAction 1475847329550 Spreadsheet.java 3430 3 16 0 +UnitTestCaseAction 1475847358792 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475847358792 SpreadsheetTest.java FAIL +UnitTestCaseAction 1475847374274 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475847374274 SpreadsheetTest.java FAIL +UnitTestCaseAction 1475847378299 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475847378300 SpreadsheetTest.java FAIL +UnitTestCaseAction 1475847416436 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475847416437 SpreadsheetTest.java FAIL +EditAction 1475847424609 Spreadsheet.java 3445 3 16 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 885f58fd62a988c6d9f4dafd922ac6da174f9cd8..73d4d10c8d999c75234bd800a11707df98befc12 100644 GIT binary patch delta 481 zcmXAlO-NKx7>1wk&bilnuYVWuxQL)Aa8TwVs0~U@<-&#kX8w%0Q5;ZQ*s352M5~n{ z#f@Mja2AD&KxSpoVyIP6o3=r#R*~Q`LJ9h2+&$;zaL)6-zoS1<`Gy;GVQ2(dNCw^8 zBOl{bZ*9)A*vD(hl{40_ew}Q1>C{j9k~iMM z<`6p!v&#rC80R&U>~n{=OmoN#@0sNTb5zLlNwcpk@{J|Fv&;`x_{A#6tZ~9Rf4RpQ zJ>qg-LLNvPkK{62(#f{;@K~}ul>v5Sm}fG^u1t`~>?SW|o>#O2PtM1}(xxY!jds!q zDaq5NW-|Goe-L=##5jXA+<5Dl?@NaFfs6 uRSLCgkkeM9)blQJ{DJh9e_Rx4aZd3XPjQ-@hAKvZ4eKRPl{xit$o~hnW?HuZ delta 429 zcmXAlK}b^p7{`B~d++VNt;R$4WXu^z(Jnp|Tbksgf)Pz!Gqnx6C=QGcbtyp*#AP5( zygUikWxK?7@UWmm6bw3e@e~9dI|M;=4C-nh^Y;7xe0=}!|NrOyc01Fia~Xq+Ad5lH zyp{Xthca%uN!<6lMx}?2F=4i7`(7mD`b}b9 z-tmz4l=wiIPpX};!YQkKWsPsF^Ml9yU6_sA2%l6if3PWy8t z&%Bb!1wC0%vbZjnxUW&d+>k+yQ^e+`BzU0YFvDjSl_DB7tD(#}qPz`a_H9W8MLQ9* NqvEJ Date: Fri, 7 Oct 2016 16:38:08 +0300 Subject: [PATCH 164/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 13 +++++++++++++ src/Spreadsheet.java | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 4b64c3c..f6104f9 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -453,3 +453,16 @@ UnitTestSessionAction 1475847378300 SpreadsheetTest.java FAIL UnitTestCaseAction 1475847416436 SpreadsheetTest.java FAIL UnitTestSessionAction 1475847416437 SpreadsheetTest.java FAIL EditAction 1475847424609 Spreadsheet.java 3445 3 16 0 +UnitTestCaseAction 1475847425699 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475847425699 SpreadsheetTest.java FAIL +UnitTestCaseAction 1475847431673 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475847431674 SpreadsheetTest.java FAIL +UnitTestCaseAction 1475847437996 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475847437996 SpreadsheetTest.java FAIL +UnitTestCaseAction 1475847456952 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475847456953 SpreadsheetTest.java FAIL +UnitTestCaseAction 1475847464957 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475847464957 SpreadsheetTest.java FAIL +UnitTestCaseAction 1475847477443 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475847477443 SpreadsheetTest.java FAIL +EditAction 1475847488657 Spreadsheet.java 3441 3 16 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index a1a6533..15ffb6e 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -70,7 +70,7 @@ public String evaluate(String cell) { // next character is negative sign. if(c[i+1] == '-') { - startPos = i+2; + startPos = i+1; isNegative = true; continue; @@ -130,7 +130,7 @@ public String evaluate(String cell) { if(digitCount != c.length - 2) { return "#Error"; } else { - return value.substring(startPos, c.length - 1); + return value.substring(startPos, c.length); } } From 3ad564c554d0b1949fc590e6e4aaa9452dd759e4 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:38:33 +0300 Subject: [PATCH 165/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2166 -> 2164 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index f6104f9..ae9dbfe 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -466,3 +466,6 @@ UnitTestSessionAction 1475847464957 SpreadsheetTest.java FAIL UnitTestCaseAction 1475847477443 SpreadsheetTest.java FAIL UnitTestSessionAction 1475847477443 SpreadsheetTest.java FAIL EditAction 1475847488657 Spreadsheet.java 3441 3 16 0 +UnitTestCaseAction 1475847489966 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475847489967 SpreadsheetTest.java FAIL +EditAction 1475847513324 Spreadsheet.java 3461 3 16 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 73d4d10c8d999c75234bd800a11707df98befc12..94b2f37779354d37b407e85f7c8f4755dc814214 100644 GIT binary patch delta 202 zcmXBNK}*7L9LDkQ&$<6L${684JY*3>yEv2}5L7w^>e95L*}a$GU5IW*mr3BMw=n3w zH|6N;54wGx%lG*U%P{Y|K}?kz$m{Q&doHIPTiw#MW=q3*apAuGV2%fQ%ldJVy_?mHB* delta 204 zcmXBNu}Z^W7=_{YYm+~TRSCtvgM%#y5uu?F5QNsDgF~aSTBt@`dkOA!a8q1T3Y~fj zf$q5|E1mm++jExp{Dr%)9JoObha-@;&8^#(v&1?p+SaT%wO(Agvo)r9Q+BN%SI(^X zFx&Z%FG=~9j2{_O$TJIhWyuNf`QO6Q(xp`*E)eRH(^J(*88GF(Z-m`6OW<(wy#PhUDrieK;j_@E(yW?%H9M!pBCaUUW8 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 15ffb6e..d066c7b 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -139,7 +139,7 @@ public String evaluate(String cell) { if(digitCount != (c.length - 1)) { return "#Error"; } else { - return value; + return value.substring(startPos); } } else { From 305677b1237b372dc518ebcb2f1619c0acbae188 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:38:39 +0300 Subject: [PATCH 166/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 2164 -> 2203 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index ae9dbfe..c925331 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -469,3 +469,4 @@ EditAction 1475847488657 Spreadsheet.java 3441 3 16 0 UnitTestCaseAction 1475847489966 SpreadsheetTest.java FAIL UnitTestSessionAction 1475847489967 SpreadsheetTest.java FAIL EditAction 1475847513324 Spreadsheet.java 3461 3 16 0 +EditAction 1475847519747 Spreadsheet.java 3451 3 16 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 94b2f37779354d37b407e85f7c8f4755dc814214..9b8cbee10e09e2f8d6bec91efa0e4a3df0ed8a17 100644 GIT binary patch delta 252 zcmXBOu}Z^G6vpxY$u-v`MyZmxRurN_p-?OcMF+t_YpW(!TU*`4M{soU1gR( zNrfX?7_4+@bF2lSbU0D@#FBHWveadhoPt@lCF4vL(2zAcs*qjYIj2a7cxHzSjm$A- Xg)W6#3aZj`dqEc4P`fYn5s&^KOLQo7 delta 227 zcmXAj%}N4c7=@qXm($FsP+%=fA#{@%QBXwfGpEMJpS%L`3S7Dgx_~d-wCDm_iJNHQ zR_J0{3GSj7+C2x}=bZO#cfAvT|9&ljGlugxbAIY3YArTyq^Q9bCD3p&${$K6{v|l} zpTW;G!K=%w2Fxg%`}}{#9{ZL|phg|x)Te2b<5YESY2gTzaYx&#Bc&upd5TK7Hwrk{ z5f7wnbD=67qmU~d@Msiq!-|ZwOw2pibWJJnL4_WvzYLq|`*Bz+Dzfc?J(A<;4|G2y A!vFvP diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index d066c7b..359bd29 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -130,7 +130,7 @@ public String evaluate(String cell) { if(digitCount != c.length - 2) { return "#Error"; } else { - return value.substring(startPos, c.length); + return value.substring(startPos); } } From 547588f40fd406393a1d1fa237dcfa82a3a79323 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:39:16 +0300 Subject: [PATCH 167/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2203 -> 2201 bytes src/Spreadsheet.java | 1 + 3 files changed, 4 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index c925331..dd04cd8 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -470,3 +470,6 @@ UnitTestCaseAction 1475847489966 SpreadsheetTest.java FAIL UnitTestSessionAction 1475847489967 SpreadsheetTest.java FAIL EditAction 1475847513324 Spreadsheet.java 3461 3 16 0 EditAction 1475847519747 Spreadsheet.java 3451 3 16 0 +UnitTestCaseAction 1475847521806 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475847521806 SpreadsheetTest.java FAIL +EditAction 1475847555965 Spreadsheet.java 3472 3 16 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 9b8cbee10e09e2f8d6bec91efa0e4a3df0ed8a17..56da7f0db50e12f484357627eb05d933ba00fc7f 100644 GIT binary patch delta 203 zcmXBNO-lk{7=_{cah!K%@B>DC2O=VZP!K~ggg|B+4D>On6=}E<`~&UVv{Twl1cQrK z?gxUF{;T#q(C#{$`)tEJEEaCir%Vmx`FrIa%h9o zncvr#wOq21gm+2FKe%y_ReSb^frHsT^M0*62tP(<7cW~C-n6SE3>f%a|OC2mH7p+yT{ zKnPm;R_;CE?sqod|K#PL@-{VLn*ygG>EF9)NF#QIoVv3)7p@rX%-b)v(%-gR5bgfy zW*fWz9PlMWmNH@`Q!;sGEw6l21s2B`j&r>!3 nL1j46;zVVM<(eroigcvOqbi^$m&~(T@NpKDY^d26-S9{b#|R$V diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 359bd29..503f1d1 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -101,6 +101,7 @@ public String evaluate(String cell) { // next character is a digit. } else if(Character.isDigit(c[i+1])) { + startPos = i+1; continue; } else { return "#Error"; From 08e7f7ca1976a76d4cad4e0bcab4e82be25d9bee Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:44:56 +0300 Subject: [PATCH 168/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 5 ++ .../20161007141352402/besouroEpisodes.txt | 44 ++++++++++++++++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161007141352402/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 2201 -> 2211 bytes src/Spreadsheet.java | 7 ++- tests/SpreadsheetTest.java | 8 ++++ 7 files changed, 65 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index dd04cd8..ab09478 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -473,3 +473,8 @@ EditAction 1475847519747 Spreadsheet.java 3451 3 16 0 UnitTestCaseAction 1475847521806 SpreadsheetTest.java FAIL UnitTestSessionAction 1475847521806 SpreadsheetTest.java FAIL EditAction 1475847555965 Spreadsheet.java 3472 3 16 0 +UnitTestCaseAction 1475847557261 SpreadsheetTest.java OK +UnitTestSessionAction 1475847557261 SpreadsheetTest.java OK +RefactoringAction 1475847849393 SpreadsheetTest.java ADD void spreadsheet_evaluate_ FIELD +RefactoringAction 1475847854404 SpreadsheetTest.java RENAME spreadsheet_evaluate_=>void spreadsheet_evaluate_cell_reference() METHOD +EditAction 1475847896200 SpreadsheetTest.java 2355 13 40 13 diff --git a/.besouro/20161007141352402/besouroEpisodes.txt b/.besouro/20161007141352402/besouroEpisodes.txt index 497104b..35520ec 100644 --- a/.besouro/20161007141352402/besouroEpisodes.txt +++ b/.besouro/20161007141352402/besouroEpisodes.txt @@ -384,3 +384,47 @@ 1475845005547 test-last 1 1751 false 1475845005548 test-last 1 1751 false 1475845051003 test-addition 1 23 true +1475847557261 test-last 1 2496 false +1475847557262 test-last 1 2496 false +1475847557263 test-last 1 2496 false +1475847557264 test-last 1 2496 false +1475847557265 test-last 1 2496 false +1475847557266 test-last 1 2496 false +1475847557267 test-last 1 2496 false +1475847557268 test-last 1 2496 false +1475847557269 test-last 1 2496 false +1475847557270 test-last 1 2496 false +1475847557271 test-last 1 2496 false +1475847557272 test-last 1 2496 false +1475847557273 test-last 1 2496 false +1475847557274 test-last 1 2496 false +1475847557275 test-last 1 2496 false +1475847557276 test-last 1 2496 false +1475847557277 test-last 1 2496 false +1475847557278 test-last 1 2496 false +1475847557279 test-last 1 2496 false +1475847557280 test-last 1 2496 false +1475847557281 test-last 1 2496 false +1475847557282 test-last 1 2496 false +1475847557283 test-last 1 2496 false +1475847557284 test-last 1 2496 false +1475847557285 test-last 1 2496 false +1475847557286 test-last 1 2496 false +1475847557287 test-last 1 2496 false +1475847557288 test-last 1 2496 false +1475847557289 test-last 1 2496 false +1475847557290 test-last 1 2496 false +1475847557291 test-last 1 2496 false +1475847557292 test-last 1 2496 false +1475847557293 test-last 1 2496 false +1475847557294 test-last 1 2496 false +1475847557295 test-last 1 2496 false +1475847557296 test-last 1 2496 false +1475847557297 test-last 1 2496 false +1475847557298 test-last 1 2496 false +1475847557299 test-last 1 2496 false +1475847557300 test-last 1 2496 false +1475847557301 test-last 1 2496 false +1475847557302 test-last 1 2496 false +1475847557303 test-last 1 2496 false +1475847557304 test-last 1 2496 false diff --git a/.besouro/20161007141352402/randomHeuristicEpisodes.txt b/.besouro/20161007141352402/randomHeuristicEpisodes.txt index 4d815b3..b51dd17 100644 --- a/.besouro/20161007141352402/randomHeuristicEpisodes.txt +++ b/.besouro/20161007141352402/randomHeuristicEpisodes.txt @@ -10,3 +10,4 @@ 1475843108136 test-addition 1 43 true 1475845005501 test-first 3 1751 true 1475845051003 test-addition 1 23 false +1475847557261 test-last 1 2496 false diff --git a/.besouro/20161007141352402/zorroEpisodes.txt b/.besouro/20161007141352402/zorroEpisodes.txt index 3dd17c6..89caefd 100644 --- a/.besouro/20161007141352402/zorroEpisodes.txt +++ b/.besouro/20161007141352402/zorroEpisodes.txt @@ -10,3 +10,4 @@ 1475843108136 test-addition 1 55 true 1475845005501 test-first 3 1897 true 1475845051003 test-addition 1 45 true +1475847557261 test-last 1 2506 false diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 56da7f0db50e12f484357627eb05d933ba00fc7f..59197af49a8170719f96fb6acb02ea5f29afd000 100644 GIT binary patch delta 428 zcmXAlPe_w-7{@=)`)_-<1rzs1h0x7GGsf9Rk6F;H67MU4!Tto&upmbci1E^6-5gc)tJIU2nSHO}hRm91ej@o9piB zV;@30pU!s3gyD`e^B?+7(cR#^*>$@U>tT?{rw2RSH{ac(vSfa{^;jxMIL%_*L|%`S zP0MTAKPa2eUT!5%i2@a!XLMd+fNKmgrrQn9GS4tKImaE&bC(ewae-ALo^g>iYP{kq zuc`BvQ8x8!i*dGTu)_qqdi%&MUzp>ovVEh)9t-?b#(fs~#V!7>a9f0uB)KPPmZgUW z(#vBx$rCB_R0dd;Vb-L|bBTB%b=oq)OKGZf26%W-3;~CA(~9UNi(tzXeTpplm8+`O zZ9HkH{YcC7WmE%1xa3kwc}by1K|(HTrkL6}p-t3?Q<1DDtl=}nCv!YLeI#S0tUq{Z PKk$;CuS#PoYcc*0;$2Z8 delta 441 zcmXAlPe_w-7{@=)w)dy+o5f5wszWG5BjrVDwgz)rh>=>UO{dO?`3H|Z%o$zo4EJW)Xz5%r;!9v?h~Vry9{V2Lo+W(@`@IwXk&(U zW_idW9pvexKo?6qVU->})62SUZqm;-X}&3;#2`D`+at>lM%ZVJ119*R)W5vspHdHb z&Hs6#V)0fSrX|dr)bLK~Sdb|1CB~v8$;$&iNCyS!!IJ@&CBrAGf!ujYga~V;d2y2n zf?tMcQ03#cvL5jmKSt7Ow_B67C8egjv8YgDq*tZkjzoA$iZbGILw% Date: Fri, 7 Oct 2016 16:45:38 +0300 Subject: [PATCH 169/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ .../20161007141352402/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/20161007141352402/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 2773 -> 2958 bytes tests/SpreadsheetTest.java | 4 ++-- 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index ab09478..98b52c7 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -478,3 +478,6 @@ UnitTestSessionAction 1475847557261 SpreadsheetTest.java OK RefactoringAction 1475847849393 SpreadsheetTest.java ADD void spreadsheet_evaluate_ FIELD RefactoringAction 1475847854404 SpreadsheetTest.java RENAME spreadsheet_evaluate_=>void spreadsheet_evaluate_cell_reference() METHOD EditAction 1475847896200 SpreadsheetTest.java 2355 13 40 13 +UnitTestCaseAction 1475847918102 SpreadsheetTest.java OK +UnitTestSessionAction 1475847918102 SpreadsheetTest.java OK +EditAction 1475847938325 SpreadsheetTest.java 2357 13 40 13 diff --git a/.besouro/20161007141352402/besouroEpisodes.txt b/.besouro/20161007141352402/besouroEpisodes.txt index 35520ec..31b8128 100644 --- a/.besouro/20161007141352402/besouroEpisodes.txt +++ b/.besouro/20161007141352402/besouroEpisodes.txt @@ -428,3 +428,4 @@ 1475847557302 test-last 1 2496 false 1475847557303 test-last 1 2496 false 1475847557304 test-last 1 2496 false +1475847918102 test-addition 1 68 true diff --git a/.besouro/20161007141352402/randomHeuristicEpisodes.txt b/.besouro/20161007141352402/randomHeuristicEpisodes.txt index b51dd17..ae86fe8 100644 --- a/.besouro/20161007141352402/randomHeuristicEpisodes.txt +++ b/.besouro/20161007141352402/randomHeuristicEpisodes.txt @@ -11,3 +11,4 @@ 1475845005501 test-first 3 1751 true 1475845051003 test-addition 1 23 false 1475847557261 test-last 1 2496 false +1475847918102 test-addition 1 68 true diff --git a/.besouro/20161007141352402/zorroEpisodes.txt b/.besouro/20161007141352402/zorroEpisodes.txt index 89caefd..39fb8fd 100644 --- a/.besouro/20161007141352402/zorroEpisodes.txt +++ b/.besouro/20161007141352402/zorroEpisodes.txt @@ -11,3 +11,4 @@ 1475845005501 test-first 3 1897 true 1475845051003 test-addition 1 45 true 1475847557261 test-last 1 2506 false +1475847918102 test-addition 1 360 false diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 9a98dd7604c077ffd42700baaf8f964b1e4ae8a5..fc6538e1fe30e25a243599d0a4c0f8108b02e14e 100644 GIT binary patch delta 187 zcmcaA+9%F+>ff$?3=9k=49Oe0F0wExPYz@el}k>|$%!vYO-n6G%}Y+@V2ER6U~)9& zU`SwOV77Ife1pY+k#936>v7h}O&lV{84Sz}Oh7YKb~6Y@Zf6ko(H4poirU7Ys4XNb z6c40@qJSdX7%X=%Xl?|mV`AU}l41<3Kr)VjgCU+lfFXfFf+3MXnIVaR8!QJlkAa7Q X7s%sakYSKwkY->6!bBjSi6IF9W$PkB delta 36 scmeAZzbeXg>ff$?3=9k=3~?K|F0xD(V%25j-R!`6oRyV<{9 diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index ec3f6e7..987a88a 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -92,9 +92,9 @@ public void spreadsheet_evaluate_simple_equals_formula_int() { @Test public void spreadsheet_evaluate_cell_reference() { Spreadsheet ss = new Spreadsheet(); - ss.set("A5", "5"); + ss.set("A5", "-5"); ss.set("A1", "=A5"); - assertEquals("5", ss.evaluate("A5")); + assertEquals("-5", ss.evaluate("A5")); } } From d260ec1df58d314b26cdff16eb92593e7165b7d1 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:45:44 +0300 Subject: [PATCH 170/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ .../20161007141352402/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/20161007141352402/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 2958 -> 2958 bytes tests/SpreadsheetTest.java | 4 ++-- 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 98b52c7..5533960 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -481,3 +481,6 @@ EditAction 1475847896200 SpreadsheetTest.java 2355 13 40 13 UnitTestCaseAction 1475847918102 SpreadsheetTest.java OK UnitTestSessionAction 1475847918102 SpreadsheetTest.java OK EditAction 1475847938325 SpreadsheetTest.java 2357 13 40 13 +UnitTestCaseAction 1475847939754 SpreadsheetTest.java OK +UnitTestSessionAction 1475847939754 SpreadsheetTest.java OK +EditAction 1475847944780 SpreadsheetTest.java 2355 13 40 13 diff --git a/.besouro/20161007141352402/besouroEpisodes.txt b/.besouro/20161007141352402/besouroEpisodes.txt index 31b8128..155adbc 100644 --- a/.besouro/20161007141352402/besouroEpisodes.txt +++ b/.besouro/20161007141352402/besouroEpisodes.txt @@ -429,3 +429,4 @@ 1475847557303 test-last 1 2496 false 1475847557304 test-last 1 2496 false 1475847918102 test-addition 1 68 true +1475847939754 regression 1 1 true diff --git a/.besouro/20161007141352402/randomHeuristicEpisodes.txt b/.besouro/20161007141352402/randomHeuristicEpisodes.txt index ae86fe8..b7e93fa 100644 --- a/.besouro/20161007141352402/randomHeuristicEpisodes.txt +++ b/.besouro/20161007141352402/randomHeuristicEpisodes.txt @@ -12,3 +12,4 @@ 1475845051003 test-addition 1 23 false 1475847557261 test-last 1 2496 false 1475847918102 test-addition 1 68 true +1475847939754 regression 1 1 true diff --git a/.besouro/20161007141352402/zorroEpisodes.txt b/.besouro/20161007141352402/zorroEpisodes.txt index 39fb8fd..2afef35 100644 --- a/.besouro/20161007141352402/zorroEpisodes.txt +++ b/.besouro/20161007141352402/zorroEpisodes.txt @@ -12,3 +12,4 @@ 1475845051003 test-addition 1 45 true 1475847557261 test-last 1 2506 false 1475847918102 test-addition 1 360 false +1475847939754 regression 1 21 false diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index fc6538e1fe30e25a243599d0a4c0f8108b02e14e..e2c40e4fe6a36449dea3d408a1703010b475ac96 100644 GIT binary patch delta 26 gcmeAZ?-So(z|9xBjX_acNLDBwNDGBdw&M-}0AB?Lr2qf` delta 26 gcmeAZ?-So(z|9x6jX_acNLDBwNDD Date: Fri, 7 Oct 2016 16:45:54 +0300 Subject: [PATCH 171/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 2958 -> 2958 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 5533960..15d29fa 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -484,3 +484,4 @@ EditAction 1475847938325 SpreadsheetTest.java 2357 13 40 13 UnitTestCaseAction 1475847939754 SpreadsheetTest.java OK UnitTestSessionAction 1475847939754 SpreadsheetTest.java OK EditAction 1475847944780 SpreadsheetTest.java 2355 13 40 13 +EditAction 1475847954359 SpreadsheetTest.java 2355 13 40 13 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index e2c40e4fe6a36449dea3d408a1703010b475ac96..fc6538e1fe30e25a243599d0a4c0f8108b02e14e 100644 GIT binary patch delta 26 gcmeAZ?-So(z|9x6jX_acNLDBwNDD Date: Fri, 7 Oct 2016 16:47:03 +0300 Subject: [PATCH 172/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 2958 -> 2958 bytes src/Spreadsheet.java | 2 ++ 3 files changed, 5 insertions(+) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 15d29fa..834d813 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -485,3 +485,6 @@ UnitTestCaseAction 1475847939754 SpreadsheetTest.java OK UnitTestSessionAction 1475847939754 SpreadsheetTest.java OK EditAction 1475847944780 SpreadsheetTest.java 2355 13 40 13 EditAction 1475847954359 SpreadsheetTest.java 2355 13 40 13 +UnitTestCaseAction 1475847957910 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475847957910 SpreadsheetTest.java FAIL +EditAction 1475848023365 Spreadsheet.java 3693 3 16 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index fc6538e1fe30e25a243599d0a4c0f8108b02e14e..8bd29b77f1bac6feaf6e3f0e91bfbc6e76cbee58 100644 GIT binary patch delta 13 UcmeAZ?-SqPz|AN-*^%2902|!{kN^Mx delta 13 UcmeAZ?-SqPz|9yt*^%290396z&;S4c diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 9980eb5..b8fa673 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -108,6 +108,8 @@ public String evaluate(String cell) { } else if(Character.isDigit(c[i+1])) { startPos = i+1; continue; + } else if(Character.isLetter(c[i+1])) { + } else { return "#Error"; } From f2b23718c69c5150b08db3ea7d4ca709ec5d6d81 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:47:28 +0300 Subject: [PATCH 173/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 2211 -> 2248 bytes src/Spreadsheet.java | 7 ++++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 834d813..3e1bc99 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -488,3 +488,4 @@ EditAction 1475847954359 SpreadsheetTest.java 2355 13 40 13 UnitTestCaseAction 1475847957910 SpreadsheetTest.java FAIL UnitTestSessionAction 1475847957910 SpreadsheetTest.java FAIL EditAction 1475848023365 Spreadsheet.java 3693 3 16 0 +EditAction 1475848047958 Spreadsheet.java 3758 3 16 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 59197af49a8170719f96fb6acb02ea5f29afd000..f46c579c44db6ea4e33d296b189f90615ad3b66c 100644 GIT binary patch delta 505 zcmXYt%}Z2K7{-6^+>g2UI@XwTlRltmkrT~Dm?kN8${^r0#E_~&g6$T9vp z=(0MxIg;QghXrr)=0KrTD$E4zpf5o`#{_q(FkLK72v&MmU;W^Cf=&j7Fm1laQl@Op z%J7>XR#E(ZY#KqPP0{Jz{3)_>$<{?uQB-aE~~izp0o$^0Vs%~xlW zl+90PJiARr`*LoDp2xTw^40pC6%NkhR^n0#Bn+b3^S@E(%(FgYXO`(TbMEeFpc=;O zk1VVXWkPS6HR-=l)w&kVx_+a>e0G=0*ZIwiz%2=wl}7eS3v;rS+mfatS?)*|ccq7W z(#r!G!pJBOWsFC1g(ot}Q<>r!DRr!@RVHMk?zB8RX+^(FuF<9xBdcCR3~K^cCOE-K z>_L1fa7xi3p_ZqWT=vR-&M-n;D$)i*DFskHpfG?a=3Rob|d7WtB726qO#2oV4 cQ4<4HY4+_b&?JAG5i9 zkKZh@%L5SxB*8;TQIakmNtVZQkS9{$sSNW>PVhp;c_~x8k{K#;ja6CT4ei>k+)Rv5 zhrTpBS-R0J$vk~Z7KgOgI1~E2kvS%r(k(eMJH}bXD4w=Fr(`%H0q2<}rsMQ-K`G9V zbaPS3;V3_uQF2+M$R({v@SeR~W;(nT?>jsz%>$k3%nn^5ZPqp>xsBCsd38)VzDXEI Lhr6PaT3r1HF>YHe diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index b8fa673..ad3ee17 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -108,8 +108,13 @@ public String evaluate(String cell) { } else if(Character.isDigit(c[i+1])) { startPos = i+1; continue; + + // next character is a letter. + // -> } else if(Character.isLetter(c[i+1])) { - + + + } else { return "#Error"; } From 04f140d348064c7017f268ce95dd959e719a6b59 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:47:35 +0300 Subject: [PATCH 174/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + bin/Spreadsheet.class | Bin 2248 -> 2248 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 3e1bc99..fbe53d3 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -489,3 +489,4 @@ UnitTestCaseAction 1475847957910 SpreadsheetTest.java FAIL UnitTestSessionAction 1475847957910 SpreadsheetTest.java FAIL EditAction 1475848023365 Spreadsheet.java 3693 3 16 0 EditAction 1475848047958 Spreadsheet.java 3758 3 16 0 +EditAction 1475848055794 Spreadsheet.java 3772 3 16 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f46c579c44db6ea4e33d296b189f90615ad3b66c..a942192f9c58b886b593b8c630e1db2a197cfe7d 100644 GIT binary patch delta 81 zcmV-X0IvVY5y%m+nFmF30Q~@W0RRAd0SW+o0Sy2+0T%#*0UQ8>0Vn{80WtuN0XzVY n0Yw0i0Z0In0Z#y!0ayT;0b2l@0b&540cilC0c-%HlimmF2?rDM delta 81 zcmX>hctUW)Om^3NhQAC&j0_BAj9d)mjJymMjN%Nnj4}*$j2a9rj7AKdj5Z8ijIIpb lj2;ZVjQ$Lh86y~`Fh(;>V@zV0&6vqBhcSm?-sF4iuK@h<6Q2M8 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index ad3ee17..c20efea 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -110,7 +110,7 @@ public String evaluate(String cell) { continue; // next character is a letter. - // -> + // -> cell reference } else if(Character.isLetter(c[i+1])) { From 8e867c50005dd54abdcd118f04a299ca95160510 Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:47:48 +0300 Subject: [PATCH 175/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 1 + src/Spreadsheet.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index fbe53d3..2a552f2 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -490,3 +490,4 @@ UnitTestSessionAction 1475847957910 SpreadsheetTest.java FAIL EditAction 1475848023365 Spreadsheet.java 3693 3 16 0 EditAction 1475848047958 Spreadsheet.java 3758 3 16 0 EditAction 1475848055794 Spreadsheet.java 3772 3 16 0 +EditAction 1475848068828 Spreadsheet.java 3789 3 16 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index c20efea..3501880 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -113,7 +113,7 @@ public String evaluate(String cell) { // -> cell reference } else if(Character.isLetter(c[i+1])) { - + return "asfdsaf"; } else { return "#Error"; From 9b5f4bc5659d40a1839bbd427ff19d597c84840b Mon Sep 17 00:00:00 2001 From: somename Date: Fri, 7 Oct 2016 16:49:08 +0300 Subject: [PATCH 176/177] besouro automatic message --- .besouro/20161007141352402/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2248 -> 2269 bytes src/Spreadsheet.java | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.besouro/20161007141352402/actions.txt b/.besouro/20161007141352402/actions.txt index 2a552f2..06fda41 100644 --- a/.besouro/20161007141352402/actions.txt +++ b/.besouro/20161007141352402/actions.txt @@ -491,3 +491,6 @@ EditAction 1475848023365 Spreadsheet.java 3693 3 16 0 EditAction 1475848047958 Spreadsheet.java 3758 3 16 0 EditAction 1475848055794 Spreadsheet.java 3772 3 16 0 EditAction 1475848068828 Spreadsheet.java 3789 3 16 0 +UnitTestCaseAction 1475848070166 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475848070167 SpreadsheetTest.java FAIL +EditAction 1475848148445 Spreadsheet.java 3830 3 16 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index a942192f9c58b886b593b8c630e1db2a197cfe7d..9ea70c5eda30aa11c1552d1fe0409b943f765480 100644 GIT binary patch delta 542 zcmXYtO>0w85Qd*gZccJqcm;S{uKr)wY3tfu$-fxG*5p zY}^>}Zj6FW5$VEBL?}ft8#mIuJN*kTT@?J7B%a0LnRn)$GiSbb|LAsh{(NcxX^J15 zvEYdaBSN^iGC#XgoOeht>T-dLf?1kdURYfeg8fHFnu#%&9GCr4up)(zuC*X`0gEWe z1HTkHE8qOjp}xT{DbGpAQZ+g~=M}b1ho$U@=cF1Ne~)>gDqTq{xy5<^jTuN?s(ay7!G#cP?PCQEF{J>Jr*9n0+{;IT&|T?dCbf-X*$Ij$7or1l!8pc5Fm%N4F-O<>C+ z*Azpz+VZ-RAtR@`!31F)=M*=UBIG2?EhU>Xd}mV0VVyj;)zQIw4su5|mwtVFoW1`2 o$f5LhkiuzjMy-eEjVB*5iNw`=tdGnEK?G zoQ%(YMgm4TFPORM`I$$vf|ETo(hgh<803;*v(fKZI;uMhQvTfM&WJaPOE<`Tv=l#g zd?R!UsZ5P@7`EK|9rWCRc!RH@^$V%6#y0D(pqks@ZAUBCc)o1YC^p+E>zu7(Dha9hV*RjH{}a diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 3501880..30aea69 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -113,7 +113,8 @@ public String evaluate(String cell) { // -> cell reference } else if(Character.isLetter(c[i+1])) { - return "asfdsaf"; + String cellName = ""; + return this.evaluate(cellName); } else { return "#Error"; From 030732e539bb8220157342eae498f2e9979db6a2 Mon Sep 17 00:00:00 2001 From: Heikki Heiskanen Date: Wed, 12 Oct 2016 18:55:58 +0300 Subject: [PATCH 177/177] Week 41 assignment done around 85%, left at #15. --- bin/Spreadsheet.class | Bin 2269 -> 5123 bytes bin/SpreadsheetTest.class | Bin 2958 -> 7298 bytes src/Spreadsheet.java | 308 ++++++++++++++++++++++++++++++++----- tests/SpreadsheetTest.java | 162 +++++++++++++++++++ 4 files changed, 435 insertions(+), 35 deletions(-) diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 9ea70c5eda30aa11c1552d1fe0409b943f765480..a4358bab80b53bc010c41b7b269a213e8da1c877 100644 GIT binary patch literal 5123 zcmaJ_Ym`&f75?@;caluzW|GX1!2v|%IWsaq1tSb^M!-=R(4h$UA|%(DU?v%p8w4#r z5Ug6?kJdq|VAWWycC<2xC~9l}w5zVZyXueD+SRW1N84pryH-n4`kk8_$OxK6ZuZ^# zoW1wi`#XE@;YXjoaTLHDyz7S{sOuTX+lf@6&$b;uOhII8Vq0QnCXwx(xn|2&JLw2Q znMA?qv@@CRM893&l2z`SqLa?dT$L_3^98j%>E3L@Ddug#ADipUk`9#twv#kDN#z_xkc9dU(sr0sV%JyFRbE#q`SAJ3bi2*^l z%H-w1CNnM>J0C^T7UK%*aL2^vqGerZ0R*r7uZ z#Ar0tLNL}s4Sbq9+d?gZnmWfqU70%9f>ov_SqPP>DHiGx^kbSJdP?)fi9#Pw62#Q9 z-Zl$iMD$71S-ZQ~zs1h4OKiz7+zqR8$wX#-BA?dp9@BLC(#%w7RaJT!71e7q-cwsn zKYQ!xtU8>JIeyHhnp1w!Ckq!KPUIwWStpUs7B01S2x8Sb%fOl6x=E{;Yhfnlea32K zMU_>L`5|aA-u6Nb&qQ^Z>B6&TX_2Qul`ry;5 zo%Eo1`tH{C+U<)hEXN9lY@o=UbE|iHo>uMr{No5}wk0w}x*M=Hk#Ot)E)gJrRrGzm zmUZWx6}e(IwOk)Bhz@jHScA0;v6JiUOXOXY@w_dqS9S()xxhE+H+=jy0d;VqkAhikCek81_> zr!b)}fQ5txg-WDSdQH+o3OYxH^iBNXW$M!GUX6u5jg}D(dg0R!Znbc|-WW({9XB|B z^b1CRHpR<|=}gLYgO$_1vj&Vn^%)Z4Bm>K^LGixap~u}sMB$eg|F$X z1u9oLfcprgNuB9@vY1Iwqu>Dx7h{&D9A*KEJg(F0%h=gor%!`@uSW0_r(wd2jvwC?w46%6dl$O0DSP{xqO<0@W%}L} zmTynm15P@Z_2VfP-s;t9r?203(#exc*lv;nY)Q;VC+#yS(#4v^Dy*aC*eM2x?Tc|OIElQoHpk^YqR1sA z&E>S$R+X7AJ{0R=13gMoGg~aJdqzjQ+SyK*vUFrqB-ZA5YiLZaXQSv#6go4x0@;@p za}F)aR^~Qq-&i@Om3Q5&yaqjIse+!n?z*H|Na_n93>dpgo@785UOfx2wT(E%X~CxJ zO(WaWj)6*xno{0+a*C*K(Ou=L#5uu_1B`V~u9#2SE7H2(MXFlb44rD6OK>XAG#qGj z^W~eLZw5;&bPMJax&gbtY`^X=o3H!J*2`Z*H`kN1l-@$^tk{^-b_lVy zBN)B$5SkBSOq)80ar!Y{KPKqMME#h|HB-5!GSA=|D$v0Vxi+RBMyJ9R zr%n}gbxowllU&^s%8O6x4tct%04r(5pjy_Gvhvy*MuQPHS2c94R&i6sYgF8);{NKx zjT&*d)g|~EE*+XajMd#L9#HXG6%VR-or+r}^;o-_6PdOjquSe#nkkp8HRClUbw_*5 zniFZ?kNTLk7vz~GWxKqE`;86~=H@x^PziyKP{UmF`{i~O z4|z!Fs8{iD2@UPB@SMoh{qXG$$?mYk!tF;7ocLQTw3i`^Q%w!kxX(xl&F!&>>tD#E zC=#zLA+$Rpv54OD=U8|U*7R5~RyT~EA$sH*INLSA<3&l(VSQ2`g`O=lb>PH@%{*Yu z=GSq>VO(wC3hry@>WH{jqb00sk40S<&uXqej4hl^1_t3PVIG|*VYVx!(l%|MOJY%T zgsKuEnt4+D?x@6~+TjvgKb^i*3tggvp)Fz$@i^P%m9iMTP%;lsFFUoKz6y+fM8%ceux)*K$j z{W>YsHRlE141Naqox<--e*3(4&8vK`CcVIWU+Mi`-e$6Vm~npz(=|EXCC}C5M3-#R z#z}-mc%Rq%`#7Cd25DP zQ+8qx?!rE!&loTY*r)o{PIVieRL`klbr?@_1#6?xjYpV^7FMho>>4v!pJ%a-eTjAX z0#?g7+HfK3*j#cKkh6qTC+4$yEkYLyWH;+s4>n;PuI2!_2I+=`>vh4*j=e!_w7r=&mNRQ7w^i;uYTFWmVt z=dNS)^%FcQ!ZFLlgHn&Z(#WxC9Ot8R@Qh5svoZtE$pX?B<3+gwFUcmnEZ5*w>BVa@ zfH&k;yeYfzmh8bhazEacNAP`l8b6R{@t!=7AId?leH%ZP_wl~`5Rwr{9+wqrpR82RNtb$6E>XjBsX8L7)KR%iy({a~`?5j(LN=;jqg#C_3H2x0qW&$t z>X`JIKFOL9DVSr#F(*mUoGLe(?XuI1%PrO!vx*WD*caC zxwk5_%jwbze-+2CUR2IRG9erHNK~%MA6Uj8oPHyQpC8HM&)Njy4DgUMrIPn z?0`hdI1H0&Bpz1d5MD=!sOZ9BQuV||*{iT|Kc|H^s4uK`xx6C?sUsB%Z}L{^38?Jx zTl9DdIlsl?6AWv>5Amae{~-ME8lT`m6FSNDb6e#DoYmOl$3C<9Q;g%TYY4>SI9nQw zWAKHJfiE@EWPE~YR41crCR!B4G_!Uw)z*Km+H+1|BEo01NtbA8pLrZpsq{aH8jFMc z_$M`Q^y5jh{H%#;4@O05W4=26XOW@*u=3`u4ep49FPJV*4PRrJPRIlF_dx{ZAtvf! XjN-L!mPf0`$T1!m1#dHqY{LHsYQ>4f literal 2269 zcmZ`*U2GIp6#nkcbZ38N+wHbfDMfyYKwG+0porX*9m+i!VNy_-uS4@s$Meo7pK{EHusSx#ynyo$ovM zoPl5dy}tyY6S@MQKzMAnXy|DxYZ$fySs;2|zod8M^n9jcWcs|3vIV3WeO91m&^;;H zX0BsMpY0I{j+vRfZkLLNK-bf!z2&V7GiDdfe5Pl$XAd#_y=LCD_b^FI>x6)uEToMP zBt%pM5mHbiP`i@1U$?T%9YQrCK?uZDRKf3XGxNr9X=d6ej_cDo@`()=QhIJeFPhHY zbINwsv;-o96{5*O${19+wPiKK*43^s)?%H4Cc>=nA}19uVm<4bD&%e5%v(o|w*|CH z%yKzS@X~4Pc9aY7~ow;*4QgdWOQ~l#$Ch`d8l3 zdjK*Xv-Q*klJ)8#S&r~+l_a10SgjKd?RFJ$>|n`eOT5`#dDCNBk@xv>1gb9Sxf1CH z49C!IBY>R(2%wYPC!Dk4f_=D9%BK%G@;iU1^o3Ew|+a8d?Shp7DkOu;KihJ>-2jpkTj1-ActAd_83wMHNXL6i`g-pqVi# zS#C+TPKK}#hgH1p90g2k(6AXAzyJev>s;E>&pCvSsu;u&6XlG2#?HDeKHwaTI82W@ z-SI4P0wN{gn@S3VOl#Q4=(c%@l@gO~vho87R4+H$p^GIw$F2^g9fnDkj5Gzg1T0%G z+Q$k!^BeiJYY3CWlGUwbu3&K}kCzIz1ASh>C=tdArDDoBY&ruJt(cJ=PGzu(11Is* zL2}O2@vp+2k8dW^=CpDR({q4Pd`d*y?m}(*0oAAOBKjR_zj34MxK_J367L02L%W_n zwR{H}8n_djjx`=$iaC7rt#A7lwcGEZ(T6$IdYcVC{D|ho*h`Cykg$RtMueD6%;lgr zlo331Vqq(`5x>Q~C7NiqqRmSv0_B8bFnv;gP&kWJZu7> zgIRopeR)}pG)mPG3cMJ5Wk^cMQld&q_$!swKc#GF0sh#o#r8Ys8kQ1@ln6+Ppp*zL z;P<%H8QnII`gnXvPP=AMPE;-6=eQQ?jK=3tt%YuYK6wGRU0>fkuFDBOZTYMlQR7&N zfE#kfa}zQtCBj;$iYM->E}${4scwph%p)}sTtMWiDl|2|bnEe7T6hj>yB5%bcd&ag z*0)%O`W}1fFQ-^Q^Rn~M93}O8VV!P}|EeOchJ+S!;M%mRIn=bv)OxsIb3C(wsU?y_w43;aOj(T~eGf_E^44={|6FoJ71 zhEFhtFYpF#Vgk2u3SaZqT}D6-6EjOvS=ryS%@?MkfB-U|^vMPRYfy~F*s6mk>|8b7HO2i3Tesl?^0w+2A-C{Qt zoa7Mqhy=BrWF_}d#T2a&RrgWnI6nzrv8Jc#Q{8bpj>g9N%^&tV{}FhL59-6&{{W35(jfo< diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 8bd29b77f1bac6feaf6e3f0e91bfbc6e76cbee58..296240371eb9f6ab29c2e286109f84adf2670bce 100644 GIT binary patch literal 7298 zcmb7|S9ly(701t&WosMhT0+a)Xelj&pE2F!N4(M`w~uL)24|ESvvQg-q1n3l zUS4c=i@L*T)mR;NgwblJrbIO@*Ypg7(fXsF>FOmup*uRK$#=NBxZ2g7^-e@-zbx%wq=y4ztTEBH(2KNxtq z1k{D=A|IEw(TK>0!e?NoxoEb|u*b@>YVrblWd>w4ZqopC^+@;4+Ll=`<_=kQNpoGE zKWw@RjlyL2s6q#jhHbv4I^k6e3htu)9KVVR9YWmc+Co~P_b_U$Eil?HRiT?X%eHaa z)QYDo(aj-GjE1C!j$WEJxXS(Vs#A!?;W!MlaPU4f9PGD9?aOH?_vVe*nq@Q~-CCt^5A#R{Dk zdBkAolg5Lh@&dP2Ynt2skXNS-59#JD_MM&(YiV;Hk1=8ZxU&&rlmT10jJ;vzg&K_X=hq16uIl_ zDA!ledSaE){^S{~^^tInbFSrhiHpa=OSlRKF?Odz97dNW_bz;jUM&wojF4ARgo;<> zC?x;ujLsACyQ_<?ijD# zbdRA8cZ$mjI*hd@d|vqmtvY^|R*&_aqmG)x^L+XWQs7275{}mf24%+zR9#3L z0ARFHiZI|q#Bfm+k?KrsIzwCfQk`dL`&Fq;{pYB+##{@Jgd3egDQc(Hw2nHc6Bk#( z-W+(Uve%Z`>k#w+?SwLh+{gmG0hS`rjbRmoP?6fzml}qSc^XpGjJ+2?!+K~C@ofmj zzOl;hsK&l$k<`6D^&JxGCQvtnx&_RwG1Ps@saX+g*3Y?&+6`(N)E-cKW2o;;PJNf4 z?vJDnfVvaZ45))K)XS4o4+`qLBdNon?gn)asC#3mhm%vUXdLSZsQW<8f_hmDbu2mc zs>ZSI2lW7`mxFpRhI(~!>NSmHJq+pWo`|Gg2kP~p9tZVA4E2WO)b}^e@Qt9Vpxy+k7DH8~)M9xecGV{0O{o*0BGS}k z6g`;E9P}yB3z(5b{Dq;16m(Um4sSn%kk~4yd^^M$IXy8cBb2rtEM|T#1UHI(I?E-B584RNRZ|+!syH_! z0!ejh3TAyJb3t{W1b2z~&$XaB_e048Q1T#@JcN8ajC?#2QX{L*2c>GHH;503-WZh7 zgB!%7pg#us<2a>Hgs8F`#4X9Gw+ia*k<=$aeG1g4L478MdS`O#M+9|KB=uQPp9A%I zP+y3lek?iluEx|CL466-mqC3chI&tO>b-&*eQ$XU)Ym~h1M1lr>c^8)Khc=_2B_Zx z_1mDn8AH8aN|l~z(Zkg_hhD~Qc>YNW&h&Rc|1Rj?!%6x+&h!sL3S?*c0jUD%DSEJR z+;4&WLy&)jxPKg?%1+V4$*GSB>Zc?7`6raSy{pG!{tyr4c6N&O9|zXkPop#DCF`b=`_7Xqc`bSXz1nQq-sLv&*J};tt)W3rIH&Fi`L;Y%U>WhLJJu&_P>OVpK7pVV^p}w4)`ih`_Ei%^sfcjrh{|D;Z hG1S+RQ(tcwD{CT!EunVSOdHtJ80uNvpql91{{dN}fI0vG delta 108 zcmZp&>=WlY^>5cc1_lNbhUAT07g;7Vvx!fRW##9OV`N}*H05AOU}Rvnbu^t^!mZE9 zw|NQoZPv*z#f70OZ*h_W%F@ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 30aea69..0e34637 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -1,10 +1,26 @@ + + import java.util.*; + +// Spaghetti code, exhibit A. public class Spreadsheet { + // member variables + // TODO: this needs to be cleared on every "new" evaluation. + private List lastCellNames = new ArrayList(); + + // flags for doing math. + boolean sumNext = false; + boolean subtractNext = false; + boolean multiplyNext = false; + boolean divideNext = false; + boolean moduloNext = false; + // dictionary of cells and values. // cell => key // value => value + // --> private Map map = new HashMap(); public String get(String cell) { @@ -20,13 +36,20 @@ public void set(String cell, String value) { public String evaluate(String cell) { + // cell's value in a string format. String value = ""; + + // cell's value in a character array format. char[] c; + + // flags for input types etc. boolean isNegative = false; boolean isString = false; boolean containsEquals = false; + boolean usedMathFunctions = false; - // get the value of the cell. + // Get the value of the cell. + // or if not found return error. if(map.containsKey(cell)) { value = map.get(cell); } else { @@ -37,24 +60,25 @@ public String evaluate(String cell) { c = value.toCharArray(); // this is a counter that counts digits in the value. + // TODO: this is really botched. Oh dear god (v_v) int digitCount = 0; - // TODO: - // 1. Refactor: using same-ish code multiple times, could be done better (in for loop). - // 2. if value is "= ", there is no error message for special cases. - // 3. make it recursive (I guess). - - // TODO: - // start & end positions are smelly. + // this is the result if there are math functions in the cell. + int calculatedResult = 0; - // for cutting the string to substring. - // used to manipulate the value string in the return statements. + // For cutting the string to substring. + // Used to manipulate the value string in the return statements. + // TODO: start & end positions are smelly. int startPos = 0; int endPos = 0; - // loop through the value and check for letters. + // Loop through the value. + // TODO: + // 1. Maybe create sub-methods to clean "main" for-loop. for(int i = 0; i < c.length; i++) { + // SPECIAL CASES BEGIN: + // if whole value is a string. if(c[0] == '\'' && c[c.length - 1] == '\'') { isString = true; @@ -62,15 +86,27 @@ public String evaluate(String cell) { } // if the first character is negative (-). + // only used when there are no equals sign. if(c[i] == '-' && i == 0) { isNegative = true; continue; } - // if there is a '=' character then - // the subsequent char can only be '-', '\'' or a digit. - if(c[i] == '=') { + // SPECIAL CASES END. + // If there is an equals character. + if(c[i] == '=') { + + // if there is nothing else than an equals sign. + // TODO: refactor, unused variable. + // -> wrap this around the rest of this block + // -> or use myChar instead of c[i+1] + try { + char myChar = c[i + 1]; + } catch (ArrayIndexOutOfBoundsException e) { + return "#Error"; + } + containsEquals = true; // next character is negative sign. @@ -78,55 +114,247 @@ public String evaluate(String cell) { startPos = i+1; isNegative = true; continue; - + // next character is opening single quote. + // -> there might be multiple concatenations or none. } else if (c[i+1] == '\'') { - boolean hasClosingQuote = false; - startPos = i+2; + int concatenationCount = 0; + + // Every other is starting point. + // Example: if there are 2 concatenations there should be three strings + // and therefore three different starting and ending points. + List startingAndEndingPoints = new ArrayList(); - // loop through the remaining characters for closing quote. - for(int j = i+2; j < c.length; j++) { - if(c[j] == '\'') { - hasClosingQuote = true; - endPos = j; - break; + // Check if there are string concatenations. + for(int k = 0; k < c.length; k++) { + if(c[k] == '&') { + concatenationCount ++; } } - // TODO: - // characters after the closing quote are being discarded. - - // return value if the closing quote is found. - if(hasClosingQuote) { - return value.substring(startPos, endPos); + // This if is here because we want to avoid breaking the code at this point. + // If there is no concatenations it means that it's just a single string. + // TODO: refactor this. + if(concatenationCount == 0) { + boolean hasClosingQuote = false; + startPos = i+2; + + // Loop through the remaining characters until closing quote is found or end of c. + for(int j = i+2; j < c.length; j++) { + + if(c[j] == '\'') { + hasClosingQuote = true; + endPos = j; + break; + } + } + + // Return value if the closing quote is found. + if(hasClosingQuote) { + return value.substring(startPos, endPos); + } else { + return "#Error"; + } } else { - return "#Error"; + + // if there are two single quotes next to each other + // -> there should be '&' sign between them + // --> return error. + for(int j = 0; j < c.length - 1; j++) { + if(c[j] == '\'') { + if(c[j+1] == '\'') return "#Error"; + } + } + + // This is the first character in the string after opening single quote. + startingAndEndingPoints.add(i+2); + + boolean newString = false; + String resultString = ""; + + // Loop through the whole value of the cell and + // mark starting and ending points for each string. + for(int j = i+2; j < c.length; j++) { + + if(c[j] == '&') { + + // If there are odd number of quotes, + // -> means that this sign is inside a string. + // --> we want to jump over it. + // ---> it's not a new String yet. + if(startingAndEndingPoints.size() % 2 != 0) continue; + + newString = true; + continue; + } + + if(c[j] == '\'') { + if(newString) { + startingAndEndingPoints.add(j + 1); + newString = false; + } else { + startingAndEndingPoints.add(j); + } + } + } + + // There should always be even number of points. + if(startingAndEndingPoints.size() % 2 != 0) return "#Error"; + + // create a string from substrings. + for(int k = 0; k < startingAndEndingPoints.size(); k++) { + + // Only loop every second point, because we only want the start points. + // -> because the end point is the next point after the start point. + if(k % 2 != 0) continue; + + int startPoint = startingAndEndingPoints.get(k); + int endPoint = startingAndEndingPoints.get(k+1); + + resultString += value.substring(startPoint, endPoint); + } + + return resultString; } - // next character is a digit. + // Next character is a digit. + // This means that there are probably going to be some math functions + // so we can put the value to calculatedResult just in case. } else if(Character.isDigit(c[i+1])) { + calculatedResult = (c[i+1] - '0'); startPos = i+1; continue; - // next character is a letter. + // Next character is a letter. // -> cell reference + // TODO: this might not mean it's a cell reference! + // Should we check if the letter is also upper case? } else if(Character.isLetter(c[i+1])) { - String cellName = ""; + // Hard coded to take only TWO next characters as + // cell reference. If there are not two then return error. + + // TODO: for loop so long that there is either space or + // some special character like +, -, /, %, etc. + + char scnd = c[i+1]; + char thrd = ' '; + + // check if there is third character. + // example: "=A5" + // --> 1. '=' + // --> 2. 'A' + // --> 3. '5' + try { + thrd = c[i+2]; + } catch (ArrayIndexOutOfBoundsException e) { + return "#Error"; + } + + // create our cell name as a string. + // -> "=A5" + // --> cellName == A5 + String cellName = "" + scnd + thrd; + + // If the last cell's name is the same as the target of this next cell. + // -> circulating. + if(lastCellNames.contains(cellName)) { + return "#Circular"; + } + + // Set the lastCellName to the cell that we evaluated. + lastCellNames.add(cell); + return this.evaluate(cellName); } else { + // in other case just return error. return "#Error"; } } + // Check for math functions + // if one is found then flip it's flag to true. + switch(c[i]) { + case '+': + sumNext = true; + usedMathFunctions = true; + break; + + case '-': + subtractNext = true; + usedMathFunctions = true; + break; + + case '/': + divideNext = true; + usedMathFunctions = true; + break; + + case '*': + multiplyNext = true; + usedMathFunctions = true; + break; + + case '%': + moduloNext = true; + usedMathFunctions = true; + break; + } + + // if the character is a digit. if(Character.isDigit(c[i])) { + + // if the preceding character was a math function + // then calculate and reset the math flags. + if(sumNext) { + calculatedResult += (c[i] - '0'); + ResetMathFlags(); + } else if(subtractNext) { + calculatedResult -= (c[i] - '0'); + ResetMathFlags(); + } else if(divideNext) { + try { + calculatedResult /= (c[i] - '0'); + ResetMathFlags(); + } catch(ArithmeticException e) { + return "#Error"; + } + } else if(multiplyNext) { + calculatedResult *= (c[i] - '0'); + ResetMathFlags(); + } else if(moduloNext) { + try { + calculatedResult %= (c[i] - '0'); + ResetMathFlags(); + } catch(ArithmeticException e) { + return "#Error"; + } + } else { + // nothing to see here. (o_o) + } digitCount ++; + + // if character is letter. + } else if(Character.isLetter(c[i])) { + + // if we have already used math functions + // we don't allow letters. + if(usedMathFunctions) { + return "#Error"; + } } } - // if the WHOLE value is a string. + // if we did some sort of math calculations, just return the result. + // example: cell had "=1+1" + // so we raised usedMathFunctions, because we noticed the '+' sign. + if(usedMathFunctions) { + return "" + calculatedResult; + } + + // if the WHOLE input value is a string. // return a substring without single quotes. if(isString) { return value.substring(1, value.length() - 1); @@ -148,7 +376,7 @@ public String evaluate(String cell) { } } - //"remove" one from value length + // "remove" one from value length // 1. negative sign if(digitCount != (c.length - 1)) { return "#Error"; @@ -166,4 +394,14 @@ public String evaluate(String cell) { } } + + private void ResetMathFlags() { + sumNext = false; + subtractNext = false; + multiplyNext = false; + divideNext = false; + moduloNext = false; + } + + } diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 09de584..cdb7f8b 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -89,6 +89,21 @@ public void spreadsheet_evaluate_simple_equals_formula_int() { assertEquals("5", ss.evaluate("A1")); } + @Test + public void spreadsheet_evaluate_equals_error() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "="); + assertEquals("#Error", ss.evaluate("A1")); + } + + @Test + public void spreadsheet_evaluate_incorrect_cell_reference() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A5", "5"); + ss.set("A1", "=A"); + assertEquals("#Error", ss.evaluate("A1")); + } + @Test public void spreadsheet_evaluate_cell_reference() { Spreadsheet ss = new Spreadsheet(); @@ -97,4 +112,151 @@ public void spreadsheet_evaluate_cell_reference() { assertEquals("5", ss.evaluate("A1")); } + @Test + public void spreadsheet_evaluate_multiple_cell_references() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A5", "10"); + ss.set("A1", "=A5"); + ss.set("A2", "=A1"); + assertEquals("10", ss.evaluate("A2")); + } + + @Test + public void spreadsheet_evaluate_multiple_cell_references_string() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A5", "'test'"); + ss.set("A1", "=A5"); + ss.set("A2", "=A1"); + assertEquals("test", ss.evaluate("A2")); + } + + @Test + public void spreadsheet_evaluate_circular_error() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "=A2"); + ss.set("A2", "=A1"); + assertEquals("#Circular", ss.evaluate("A2")); + } + + @Test + public void spreadsheet_evaluate_multiple_cell_circular_error() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "=A2"); + ss.set("A2", "=A3"); + ss.set("A3", "=A1"); + assertEquals("#Circular", ss.evaluate("A1")); + } + + @Test + public void spreadsheet_evaluate_integer_operation_plus() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "=1+1"); + assertEquals("2", ss.evaluate("A1")); + } + + @Test + public void spreadsheet_evaluate_math_operation_plus_multiply() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "=1+1*2"); + assertEquals("4", ss.evaluate("A1")); + } + + @Test + public void spreadsheet_evaluate_math_operation_division() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "=2/2"); + assertEquals("1", ss.evaluate("A1")); + } + + @Test + public void spreadsheet_evaluate_math_operation_modulo() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "=6%5"); + assertEquals("1", ss.evaluate("A1")); + } + + @Test + public void spreadsheet_evaluate_math_division_by_zero() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "=1/0"); + assertEquals("#Error", ss.evaluate("A1")); + } + + @Test + public void spreadsheet_evaluate_math_modulo_by_zero() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "=1%0"); + assertEquals("#Error", ss.evaluate("A1")); + } + + @Test + public void spreadsheet_evaluate_cell_reference_math_function() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "=1+1"); + ss.set("A2", "=A1"); + assertEquals("2", ss.evaluate("A2")); + } + + @Test + public void spreadsheet_evaluate_math_operation_plus_incorrect_input() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "=1+1A"); + assertEquals("#Error", ss.evaluate("A1")); + } + + @Test + public void spreadsheet_evaluate_string_concatenation_one() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "='awesome'&'sauce'"); + assertEquals("awesomesauce", ss.evaluate("A1")); + } + + @Test + public void spreadsheet_evaluate_string_concatenation_two() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "='best'&'awesome'&'sauce'"); + assertEquals("bestawesomesauce", ss.evaluate("A1")); + } + + @Test + public void spreadsheet_evaluate_string_concatenation_three() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "='moms'&'best'&'awesome'&'sauce'"); + assertEquals("momsbestawesomesauce", ss.evaluate("A1")); + } + + @Test + public void spreadsheet_evaluate_string_concatenation_four() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "='moms'&'best'&'awesome'&'hot'&'sauce'"); + assertEquals("momsbestawesomehotsauce", ss.evaluate("A1")); + } + + @Test + public void spreadsheet_evaluate_string_concatenation_no_sign() { // this doesn't even use the concatenation code block. + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "='moms''spaghetti'"); + assertEquals("moms", ss.evaluate("A1")); + } + + @Test + public void spreadsheet_evaluate_string_concatenation_incorrect_sign_placement() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "='moms&''spaghetti'"); + assertEquals("#Error", ss.evaluate("A1")); + } + + @Test + public void spreadsheet_evaluate_string_concatenation_signs_in_strings() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "='moms&'&'spaghetti'"); + assertEquals("moms&spaghetti", ss.evaluate("A1")); + } + + @Test + public void spreadsheet_evaluate_string_concatenation_odd_number_quotes() { + Spreadsheet ss = new Spreadsheet(); + ss.set("A1", "='moms'&best'"); + assertEquals("#Error", ss.evaluate("A1")); + } }