From 41a786ae890ff118ecc6b105e13981926d232369 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 5 Oct 2016 16:27:38 +0300 Subject: [PATCH 001/215] besouro automatic message --- .besouro/20161005162327369/actions.txt | 12 ++++++++++++ .besouro/20161005162327369/besouroEpisodes.txt | 0 .besouro/20161005162327369/disagreements.txt | 0 .../randomHeuristicEpisodes.txt | 0 .besouro/20161005162327369/userComments.txt | 0 .besouro/20161005162327369/zorroEpisodes.txt | 0 bin/.gitignore | 2 ++ tests/SpreadsheetTest.java | 17 +++++++++++++---- 8 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 .besouro/20161005162327369/actions.txt create mode 100644 .besouro/20161005162327369/besouroEpisodes.txt create mode 100644 .besouro/20161005162327369/disagreements.txt create mode 100644 .besouro/20161005162327369/randomHeuristicEpisodes.txt create mode 100644 .besouro/20161005162327369/userComments.txt create mode 100644 .besouro/20161005162327369/zorroEpisodes.txt create mode 100644 bin/.gitignore diff --git a/.besouro/20161005162327369/actions.txt b/.besouro/20161005162327369/actions.txt new file mode 100644 index 0000000..0ba9515 --- /dev/null +++ b/.besouro/20161005162327369/actions.txt @@ -0,0 +1,12 @@ +FileOpenedAction 1475673807464 SpreadsheetTest.java 162 1 1 0 +RefactoringAction 1475673852555 SpreadsheetTest.java RENAME test()=>void test_A_1() METHOD +RefactoringAction 1475673854065 SpreadsheetTest.java RENAME test_A_1()=>void test_A1_() METHOD +RefactoringAction 1475673857579 SpreadsheetTest.java RENAME test_A1_()=>void test_A1_MINUS() METHOD +RefactoringAction 1475673859088 SpreadsheetTest.java RENAME test_A1_MINUS()=>void test_A1_MINUS_1() METHOD +RefactoringAction 1475673876598 SpreadsheetTest.java RENAME test_A1_MINUS_1()=>void testAssignment_A1_MINUS_1() METHOD +RefactoringAction 1475673908173 SpreadsheetTest.java ADD void initilize() METHOD +RefactoringAction 1475673913691 SpreadsheetTest.java RENAME testAssignment_A1_MINUS_1()=>void testAssignment_A1_Minus_1() METHOD +RefactoringAction 1475673919208 SpreadsheetTest.java RENAME testAssignment_A1_Minus_1()=>void testAssignment_A1_Neg_1() METHOD +RefactoringAction 1475673930822 SpreadsheetTest.java ADD import org.junit.Before IMPORT +RefactoringAction 1475673941255 SpreadsheetTest.java ADD Spreadsheet sheet FIELD +EditAction 1475674057673 SpreadsheetTest.java 363 2 4 1 diff --git a/.besouro/20161005162327369/besouroEpisodes.txt b/.besouro/20161005162327369/besouroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161005162327369/disagreements.txt b/.besouro/20161005162327369/disagreements.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161005162327369/randomHeuristicEpisodes.txt b/.besouro/20161005162327369/randomHeuristicEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161005162327369/userComments.txt b/.besouro/20161005162327369/userComments.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161005162327369/zorroEpisodes.txt b/.besouro/20161005162327369/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..4a9a8b3 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -1,15 +1,24 @@ import static org.junit.Assert.*; - +import org.junit.Before; import org.junit.Test; public class SpreadsheetTest { - + Spreadsheet sheet; + + @Before + public void initilize() { + sheet = new Spreadsheet(); + } + @Test - public void test() { - fail("Not yet implemented"); + public void testAssignment_A1_Neg_1() { + sheet.set("A1", "-1"); + + String result = sheet.evaluate("A1"); + assertEquals("-1", result); } } From aef8e663b833b436d3f14b6385219e74fd08a03d Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 5 Oct 2016 16:28:00 +0300 Subject: [PATCH 002/215] besouro automatic message --- .besouro/20161005162327369/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 490 -> 897 bytes src/Spreadsheet.java | 3 +-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.besouro/20161005162327369/actions.txt b/.besouro/20161005162327369/actions.txt index 0ba9515..b7ea403 100644 --- a/.besouro/20161005162327369/actions.txt +++ b/.besouro/20161005162327369/actions.txt @@ -10,3 +10,6 @@ RefactoringAction 1475673919208 SpreadsheetTest.java RENAME testAssignment_A1_Mi RefactoringAction 1475673930822 SpreadsheetTest.java ADD import org.junit.Before IMPORT RefactoringAction 1475673941255 SpreadsheetTest.java ADD Spreadsheet sheet FIELD EditAction 1475674057673 SpreadsheetTest.java 363 2 4 1 +UnitTestCaseAction 1475674065053 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475674065054 SpreadsheetTest.java FAIL +EditAction 1475674079540 Spreadsheet.java 241 3 2 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index e7086bd9ef1b6a8b7afcfb717afbaddbf99a7876..119dda68132b8a0f67c18a8ca6fde0a0d251a5f8 100644 GIT binary patch literal 897 zcmZuv+iuf95IviuapJg?I8C55T*{?QQd$#V3`7z(d~Q(+>HiUk8D;vYy~9L4jA z2v7LL6Abnsm~wB#L#fYcvY^gn#8Az$>vl+?tOcYeKNEKAIQEsCi;;{Zf&0E6D6VAS z6P9>G*O|ps?YtBpf>87fY%)|b4V$Q;QU=2f3u`D+R3y@mBI){b;j3}KJ3bQbxJxt0 z&?TLeu+5O`cT2cU@t~`@?pnBq9WoyYn$ccsupHb_h0=F>tC{vlBOh3Jh(`=1an8M% zD>AqHA9#BeZ(Gh|Wdo-9UZ7uFI+g6&&!4#nhK=Mv@@O5|YC zT1=7#)@g4o3UCb@bRv@k&Y_xC*%UR=vxJzcJ3mo-cZvEpG?siOAv9Bk7?+&ZKhB$1 zIJZ*H_r$4j&CXXe>|1v80(TbM3)~;r&HeA#U251UP;HeoYN*q*jYgu?Sa76Tbu#}L N2jqj{km_@A{sK|EydVGo delta 326 zcmYL^%}T>S6ot>kCaKe?u|KvdNS7+eY`W`85LcxxBJKw}hAH_eld0gU_z1x#aiv)B z0elo6LcFnRH|NZ~_q&HXkN)Qd|M+@)2Qa{4$ILb{d zrt?f&aZSBp9ZiPTIJf-=W&1jvB`Q^!RTGXj_Iz|0!u85|Q7B^rbkSp|-ASD=bdE<; zc`rpGvsgsd=qw(d+%WJcpPO5CsT0M}j%G&5$KS+!Okxg{&3aLS3zEL_Z6*m5+@dv Date: Wed, 5 Oct 2016 16:28:39 +0300 Subject: [PATCH 003/215] besouro automatic message --- .besouro/20161005162327369/actions.txt | 7 +++++++ .besouro/20161005162327369/besouroEpisodes.txt | 4 ++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161005162327369/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 613 -> 622 bytes tests/SpreadsheetTest.java | 11 ++++++++++- 6 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.besouro/20161005162327369/actions.txt b/.besouro/20161005162327369/actions.txt index b7ea403..fd4f09e 100644 --- a/.besouro/20161005162327369/actions.txt +++ b/.besouro/20161005162327369/actions.txt @@ -13,3 +13,10 @@ EditAction 1475674057673 SpreadsheetTest.java 363 2 4 1 UnitTestCaseAction 1475674065053 SpreadsheetTest.java FAIL UnitTestSessionAction 1475674065054 SpreadsheetTest.java FAIL EditAction 1475674079540 Spreadsheet.java 241 3 2 0 +UnitTestCaseAction 1475674082276 SpreadsheetTest.java OK +UnitTestSessionAction 1475674082277 SpreadsheetTest.java OK +RefactoringAction 1475674094033 SpreadsheetTest.java ADD void testAssignment_A1_Neg_1()/2 METHOD +RefactoringAction 1475674104052 SpreadsheetTest.java REMOVE testAssignment_A1_Neg_1()/2 METHOD +RefactoringAction 1475674108563 SpreadsheetTest.java ADD void testAssignment_A1_Neg_1()/2 METHOD +RefactoringAction 1475674112583 SpreadsheetTest.java RENAME testAssignment_A1_Neg_1()/2=>void testAssignment_A1_Pos_1() METHOD +EditAction 1475674118513 SpreadsheetTest.java 514 3 7 2 diff --git a/.besouro/20161005162327369/besouroEpisodes.txt b/.besouro/20161005162327369/besouroEpisodes.txt index e69de29..6d4aa08 100644 --- a/.besouro/20161005162327369/besouroEpisodes.txt +++ b/.besouro/20161005162327369/besouroEpisodes.txt @@ -0,0 +1,4 @@ +1475674082277 test-addition 2 274 true +1475674082278 test-addition 1 274 true +1475674082279 test-addition 2 274 true +1475674082280 test-addition 1 274 true diff --git a/.besouro/20161005162327369/randomHeuristicEpisodes.txt b/.besouro/20161005162327369/randomHeuristicEpisodes.txt index e69de29..f1efe9b 100644 --- a/.besouro/20161005162327369/randomHeuristicEpisodes.txt +++ b/.besouro/20161005162327369/randomHeuristicEpisodes.txt @@ -0,0 +1 @@ +1475674082277 test-addition 2 274 true diff --git a/.besouro/20161005162327369/zorroEpisodes.txt b/.besouro/20161005162327369/zorroEpisodes.txt index e69de29..4090060 100644 --- a/.besouro/20161005162327369/zorroEpisodes.txt +++ b/.besouro/20161005162327369/zorroEpisodes.txt @@ -0,0 +1 @@ +1475674082277 test-addition 2 274 false diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 92b411f05752a6cee6d06c9769e1b70d40aa0840..af88ad337856e2d3ea6550ec77e4302df95c5f1c 100644 GIT binary patch delta 100 zcmaFL@{Wb;)W2Q(7#J8#7^F6G2{UqVFo-iUFzFg@mStpTbTVfEa)7eTLSh?$6cYm% nkYoc2GBEHla05v(h%^Ha122#VRLCH}APAIaWRL*zm>47h4>}37 delta 42 xcmaFI@|1<^)W2Q(7#J8#7$i1w2{Ue1Wn^cZJeyI9k$>_wMtOEIpcE5>H~<@b3K{?a diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 4a9a8b3..8665c2c 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -11,7 +11,7 @@ public class SpreadsheetTest { public void initilize() { sheet = new Spreadsheet(); } - + @Test public void testAssignment_A1_Neg_1() { sheet.set("A1", "-1"); @@ -20,5 +20,14 @@ public void testAssignment_A1_Neg_1() { assertEquals("-1", result); } + + @Test + public void testAssignment_A1_Pos_1() { + sheet.set("A1", "1"); + + String result = sheet.evaluate("A1"); + + assertEquals("1", result); + } } From b6b05e50f59b9fa106e1ad8d5f5311ca228d1fa1 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 5 Oct 2016 16:29:48 +0300 Subject: [PATCH 004/215] besouro automatic message --- .besouro/20161005162327369/actions.txt | 5 +++++ bin/SpreadsheetTest.class | Bin 897 -> 1048 bytes src/Spreadsheet.java | 5 +++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.besouro/20161005162327369/actions.txt b/.besouro/20161005162327369/actions.txt index fd4f09e..9857833 100644 --- a/.besouro/20161005162327369/actions.txt +++ b/.besouro/20161005162327369/actions.txt @@ -20,3 +20,8 @@ RefactoringAction 1475674104052 SpreadsheetTest.java REMOVE testAssignment_A1_Ne RefactoringAction 1475674108563 SpreadsheetTest.java ADD void testAssignment_A1_Neg_1()/2 METHOD RefactoringAction 1475674112583 SpreadsheetTest.java RENAME testAssignment_A1_Neg_1()/2=>void testAssignment_A1_Pos_1() METHOD EditAction 1475674118513 SpreadsheetTest.java 514 3 7 2 +UnitTestCaseAction 1475674121268 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475674121269 SpreadsheetTest.java FAIL +RefactoringAction 1475674130054 Spreadsheet.java ADD HashMap m FIELD +RefactoringAction 1475674135064 Spreadsheet.java RENAME m=>HashMap mValues FIELD +EditAction 1475674188056 Spreadsheet.java 256 3 2 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 119dda68132b8a0f67c18a8ca6fde0a0d251a5f8..dc04e272902e55bca96d852122a58c6b442f1bb0 100644 GIT binary patch delta 128 zcmZoff$?3=9k=48|L|44CA_OHzwV9E*!H)AMpu^Gf0!4dVmyi{lMB7z`L0 z7!4;|Fqt#5Y%XBpVVumytYWCYjX_Rp3xk-D)HVhsA0d719Smw4fyOa0@Bm361{NSG a#lX!V!yw8a#~{rhKRKFNp4||v!UzCNIvMW( delta 36 scmbQi(a6qq>ff$?3=9k=3r0LIA(b^rhX diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index e9b520c..ad75c22 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -1,13 +1,14 @@ public class Spreadsheet { - + HashMap mValues = new HashMap(); + public String get(String cell) { // to be implemented return null; } public void set(String cell, String value) { - // to be implemented + } public String evaluate(String cell) { From f5c291e087d18672656f0698abb030ecc0fafaa9 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 5 Oct 2016 16:32:40 +0300 Subject: [PATCH 005/215] besouro automatic message --- .besouro/20161005162327369/actions.txt | 18 ++++++++++++++++++ .../20161005162327369/besouroEpisodes.txt | 3 +++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161005162327369/zorroEpisodes.txt | 3 ++- bin/Spreadsheet.class | Bin 622 -> 962 bytes src/Spreadsheet.java | 7 ++++--- tests/SpreadsheetTest.java | 13 ++++++++----- 7 files changed, 36 insertions(+), 9 deletions(-) diff --git a/.besouro/20161005162327369/actions.txt b/.besouro/20161005162327369/actions.txt index 9857833..b81436d 100644 --- a/.besouro/20161005162327369/actions.txt +++ b/.besouro/20161005162327369/actions.txt @@ -25,3 +25,21 @@ UnitTestSessionAction 1475674121269 SpreadsheetTest.java FAIL RefactoringAction 1475674130054 Spreadsheet.java ADD HashMap m FIELD RefactoringAction 1475674135064 Spreadsheet.java RENAME m=>HashMap mValues FIELD EditAction 1475674188056 Spreadsheet.java 256 3 2 0 +CompilationAction 1475674190036 Spreadsheet.java +RefactoringAction 1475674193758 Spreadsheet.java ADD import java.util.HashMap IMPORT +CompilationAction 1475674242299 Spreadsheet.java +UnitTestCaseAction 1475674251229 SpreadsheetTest.java OK +UnitTestSessionAction 1475674251230 SpreadsheetTest.java OK +RefactoringAction 1475674265658 SpreadsheetTest.java ADD void testAssignment_A1_Pos_1()/2 METHOD +RefactoringAction 1475674275688 SpreadsheetTest.java RENAME testAssignment_A1_Pos_1()/2=>void testAssignment_A1_() METHOD +RefactoringAction 1475674306202 SpreadsheetTest.java RENAME testAssignment_A1_()=>void testAssignment_Invalid() METHOD +RefactoringAction 1475674310716 SpreadsheetTest.java RENAME testAssignment_Invalid()=>void testAssignment_InvalidInte() METHOD +RefactoringAction 1475674312729 SpreadsheetTest.java RENAME testAssignment_InvalidInte()=>void testAssignment_Invalid() METHOD +RefactoringAction 1475674316241 SpreadsheetTest.java RENAME testAssignment_Invalid()=>void testAssignment_InvalidInteger() METHOD +RefactoringAction 1475674320252 SpreadsheetTest.java RENAME testAssignment_InvalidInteger()=>void testAssignment_InvalidInteger_() METHOD +RefactoringAction 1475674322757 SpreadsheetTest.java RENAME testAssignment_InvalidInteger_()=>void testAssignment_InvalidInteger_Decimal() METHOD +RefactoringAction 1475674329269 SpreadsheetTest.java RENAME testAssignment_InvalidInteger_Decimal()=>void testAssignment_InvalidInteger_Decimal_() METHOD +RefactoringAction 1475674331778 SpreadsheetTest.java RENAME testAssignment_InvalidInteger_Decimal_()=>void testAssignment_InvalidInteger_DecimalPoint_() METHOD +RefactoringAction 1475674337291 SpreadsheetTest.java RENAME testAssignment_InvalidInteger_DecimalPoint_()=>void testAssignment_InvalidInteger_DecimalPoint_Error() METHOD +RefactoringAction 1475674346804 SpreadsheetTest.java RENAME testAssignment_InvalidInteger_DecimalPoint_Error()=>void testAssignmentInvalidInteger_DecimalPoint_Error() METHOD +EditAction 1475674360156 SpreadsheetTest.java 677 4 10 3 diff --git a/.besouro/20161005162327369/besouroEpisodes.txt b/.besouro/20161005162327369/besouroEpisodes.txt index 6d4aa08..fdd15ca 100644 --- a/.besouro/20161005162327369/besouroEpisodes.txt +++ b/.besouro/20161005162327369/besouroEpisodes.txt @@ -2,3 +2,6 @@ 1475674082278 test-addition 1 274 true 1475674082279 test-addition 2 274 true 1475674082280 test-addition 1 274 true +1475674251230 test-first 3 157 true +1475674251231 test-first 3 157 true +1475674251232 test-first 3 157 true diff --git a/.besouro/20161005162327369/randomHeuristicEpisodes.txt b/.besouro/20161005162327369/randomHeuristicEpisodes.txt index f1efe9b..df6cf2c 100644 --- a/.besouro/20161005162327369/randomHeuristicEpisodes.txt +++ b/.besouro/20161005162327369/randomHeuristicEpisodes.txt @@ -1 +1,2 @@ 1475674082277 test-addition 2 274 true +1475674251230 test-first 3 157 true diff --git a/.besouro/20161005162327369/zorroEpisodes.txt b/.besouro/20161005162327369/zorroEpisodes.txt index 4090060..cd33aca 100644 --- a/.besouro/20161005162327369/zorroEpisodes.txt +++ b/.besouro/20161005162327369/zorroEpisodes.txt @@ -1 +1,2 @@ -1475674082277 test-addition 2 274 false +1475674082277 test-addition 2 274 true +1475674251230 test-first 3 168 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index af88ad337856e2d3ea6550ec77e4302df95c5f1c..c7061487a32f0af07f3c8c63629e11711f490718 100644 GIT binary patch literal 962 zcmZ`%O>fgc5Pch`b>nOjr-cILtI*OW0g($rpjH(E32{i_5ER65ldck1t`j+Se-}v5 zN+2Q5{3yg*+e%Fh2ajiG=e>C|v%h|S`vKqyIyOoI)&4Bh>S#XEIiQ}e zci#<<^(YdsPX@}5^;}@Bm)ypY=Xc+z`Q%W|_5><@Zycy74z_t341XznUIt2Nr4)6*x8;0?k5w2X)jc5LlI1!m>c4=LPz0d@|JG zdo}c_X|*>UDSx0s&z!ShIhuIvsMgC3fEui^X2(0NqQZ7DM2#cu`=-Lh)Up;yH8)hd z|DY;nw+E(=I}&%XN#rah@>w34?jk?9ERvU%g#?yP&B6p$v~g6#G1jpyaSabHHTQoO z8@qqKhO{pMr$3Fuk$&x&(Ym?mJvKAIJ+8vy0~7qX5B_a>C9I%KpL?XOGV+pHCdciZ zLw3HS{_z~{S2RB-*=w}*gvTPTj0XKHjL8&(t61kru%YW2-&6ie1}i=p3&UWlgOv?( zJ-yA4CgTP+crS1hw`h%~Lsl``tDP@sK74eB+aE6EI0=Dd1GR*3GfiC(Rx?7vIfM;n j3*2AGd%?4jCll&3Z2iQ}Wub0Ps9f;Mh0qr9CA9wlM3Taz literal 622 zcmZut%TB^j5IxhDhrC6_$4WN}CQ3|Ks*Wt73`Q6=TbPU!5!(O$g4{x8AgWjg=> diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index ad75c22..ebc1c39 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -1,6 +1,7 @@ +import java.util.HashMap; public class Spreadsheet { - HashMap mValues = new HashMap(); + HashMap mValues = new HashMap(); public String get(String cell) { // to be implemented @@ -8,11 +9,11 @@ public String get(String cell) { } public void set(String cell, String value) { - + mValues.put(cell, value); } public String evaluate(String cell) { - return "-1"; + return (String) mValues.get(cell); } } diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 8665c2c..e553b99 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -15,19 +15,22 @@ public void initilize() { @Test public void testAssignment_A1_Neg_1() { sheet.set("A1", "-1"); - String result = sheet.evaluate("A1"); - assertEquals("-1", result); } - + @Test public void testAssignment_A1_Pos_1() { sheet.set("A1", "1"); - String result = sheet.evaluate("A1"); - assertEquals("1", result); } + + @Test + public void testAssignmentInvalidInteger_DecimalPoint_Error() { + sheet.set("A1", "1."); + String result = sheet.evaluate("A1"); + assertEquals("#Error", result); + } } From 40be0db1947189ddb8894cce5e23ca5ece34888d Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 5 Oct 2016 16:35:49 +0300 Subject: [PATCH 006/215] besouro automatic message --- .besouro/20161005162327369/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1048 -> 1236 bytes src/Spreadsheet.java | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/.besouro/20161005162327369/actions.txt b/.besouro/20161005162327369/actions.txt index b81436d..be878a7 100644 --- a/.besouro/20161005162327369/actions.txt +++ b/.besouro/20161005162327369/actions.txt @@ -43,3 +43,6 @@ RefactoringAction 1475674331778 SpreadsheetTest.java RENAME testAssignment_Inval RefactoringAction 1475674337291 SpreadsheetTest.java RENAME testAssignment_InvalidInteger_DecimalPoint_()=>void testAssignment_InvalidInteger_DecimalPoint_Error() METHOD RefactoringAction 1475674346804 SpreadsheetTest.java RENAME testAssignment_InvalidInteger_DecimalPoint_Error()=>void testAssignmentInvalidInteger_DecimalPoint_Error() METHOD EditAction 1475674360156 SpreadsheetTest.java 677 4 10 3 +UnitTestCaseAction 1475674363206 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475674363207 SpreadsheetTest.java FAIL +EditAction 1475674549163 Spreadsheet.java 453 3 4 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index dc04e272902e55bca96d852122a58c6b442f1bb0..bb36370f3b618d21a93d0ee5b655cedfbed79536 100644 GIT binary patch delta 183 zcmbQiafOrX)W2Q(7#J8#7%Vn&1v0tlm!uY#I2IRYrsw6R=9PHnl_ln6rg-L+q^749 z#k-^?XXYm61mtJtmBhOi73CLkFc>p3Fd6D`FqkqjuqlJZCPy-vGqO&e$n=O)h(VM= zm_eFBWO5C2Ca(koH-jWlL<%S(4HS`QG@Lw#SyjMj8-twI76vgPscj5OK0+pwFEWep Y$^#WE02M0&6)S-hvzr0k$;4m|09xfN#sB~S delta 73 zcmcb@IfH}i)W2Q(7#J8#7>qY^1u{)u$YjdMGWj~wBTiukQ6Q9N5SzS?MSk)_W-neT X25tr!pqLy`R30SCZV1%L#9#yf '9') + value = "#Error"; + } mValues.put(cell, value); } From db4bf301b6f1a5b139d0ad7bcdf3703dcdfb9f50 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 5 Oct 2016 16:36:05 +0300 Subject: [PATCH 007/215] besouro automatic message --- .besouro/20161005162327369/actions.txt | 1 + bin/Spreadsheet.class | Bin 962 -> 1185 bytes src/Spreadsheet.java | 5 ++++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.besouro/20161005162327369/actions.txt b/.besouro/20161005162327369/actions.txt index be878a7..3669d3a 100644 --- a/.besouro/20161005162327369/actions.txt +++ b/.besouro/20161005162327369/actions.txt @@ -46,3 +46,4 @@ EditAction 1475674360156 SpreadsheetTest.java 677 4 10 3 UnitTestCaseAction 1475674363206 SpreadsheetTest.java FAIL UnitTestSessionAction 1475674363207 SpreadsheetTest.java FAIL EditAction 1475674549163 Spreadsheet.java 453 3 4 0 +EditAction 1475674564225 Spreadsheet.java 474 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index c7061487a32f0af07f3c8c63629e11711f490718..655e287a05a63324120351c90066fcffac0fc5cd 100644 GIT binary patch delta 426 zcmYjLO-lk%6g_WdoTsLx*;daIBM2im_wLhq}?hW3S-kS#5sc!i&u(v%rmHwl3}zACq}X0!XjekE!)nrDg!Gr zxXW!(J=qbbyW*fx<5*^pDx}+M9nm-w?b^_{;=&YGucf%TA-!LGKnAD7^wbjq`?}iC z+vL1*j~TzJDY^B4C)0%^;3?ce9gpl>Doj%}TX*o8c!W1ep6FhW+%hHzr=b$MFbOxp z)D$J2h6e?B;iE|c3ZV{-Hil1!zfLA*(Ks=Q24l3Aq`(xZB`5>(a}LH4qz^`92^dh~ npUQq!>7V+uD^Wq(Y|4Hu^Mc?5#Y)z-s#WYWZ{!fqT59eaeL+E( delta 204 zcmZ3;d5E3s)W2Q(7#J8#7_>HWOOm?O0;F{d=KB$bPSk3ofp zL7YK#aw3za7(0VHBZELzVp*boPGVlVesD=qW?uT_E~dLdz6{Jj$iTp@wS_@YTW1@C zZ1_eXmx)0bNOA#b1_mA=&C4JHWGO(DGKeyW0eL`843Z2|42)owB9O%dWGhYfWswwB aKER;10VobJhYhSoU~)B!Ji7*1R1*MX(;wCV diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index a824bd2..4268795 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -10,9 +10,12 @@ public String get(String cell) { public void set(String cell, String value) { for (char c : value.toCharArray()) { - if (c < '0' || c > '9') + if (c < '0' || c > '9') { value = "#Error"; + break; + } } + mValues.put(cell, value); } From 18b902d4d0acf3ce03a7ac3b16f3bafee8ca0414 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 5 Oct 2016 16:38:32 +0300 Subject: [PATCH 008/215] besouro automatic message --- .besouro/20161005162327369/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1185 -> 1208 bytes src/Spreadsheet.java | 18 +++++++++++++----- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.besouro/20161005162327369/actions.txt b/.besouro/20161005162327369/actions.txt index 3669d3a..53ce7bb 100644 --- a/.besouro/20161005162327369/actions.txt +++ b/.besouro/20161005162327369/actions.txt @@ -47,3 +47,6 @@ UnitTestCaseAction 1475674363206 SpreadsheetTest.java FAIL UnitTestSessionAction 1475674363207 SpreadsheetTest.java FAIL EditAction 1475674549163 Spreadsheet.java 453 3 4 0 EditAction 1475674564225 Spreadsheet.java 474 3 4 0 +UnitTestCaseAction 1475674567149 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475674567150 SpreadsheetTest.java FAIL +EditAction 1475674711362 Spreadsheet.java 670 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 655e287a05a63324120351c90066fcffac0fc5cd..1553e5078990ca0e4ce7ed0e0c93a5d28827493a 100644 GIT binary patch delta 227 zcmZ3;xr1{t0jHVh&_$iSe*zyh+6K@_M;9moPQB^jg`7{M$}Ad3koAp}&W4K!2-C>qMZ uI+=|{PnDH{ot=S^ok0$W7#M*JT?PiG{|syl%m`tI$(}5RjN+54S=0bzz#G{B delta 204 zcmW-Z%?g505QWdx(Tk9! zFdRPSoHGxrv@Sb+|AGz)AW!ZHHo5ss4LzkZ+Pu9jHV6s-wgpD4m2$?5vkimt=P6T4jp*ZoI9DbKe;*Ucnjg1<|Vt$zL cbqOkL8Y>M_LP&IYAs9x0R%~e|yy8fMFRq3eVE_OC diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 4268795..9dd7b67 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -9,13 +9,21 @@ public String get(String cell) { } public void set(String cell, String value) { - for (char c : value.toCharArray()) { - if (c < '0' || c > '9') { - value = "#Error"; - break; + if (value.length() > 0) { + if (value.charAt(0) == '-') { + if (value.length() == 1) { + value = "#Error"; + } else { + for (int i = 1; i < value.length(); i++) { + char c = value.charAt(i); + if (c < '0' || c > '9') { + value = "#Error"; + break; + } + } + } } } - mValues.put(cell, value); } From 4940610726a30a4199febfb4fc6f816fc43681c9 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 5 Oct 2016 16:38:37 +0300 Subject: [PATCH 009/215] besouro automatic message --- .besouro/20161005162327369/actions.txt | 1 + bin/Spreadsheet.class | Bin 1208 -> 1219 bytes src/Spreadsheet.java | 1 + 3 files changed, 2 insertions(+) diff --git a/.besouro/20161005162327369/actions.txt b/.besouro/20161005162327369/actions.txt index 53ce7bb..25696b6 100644 --- a/.besouro/20161005162327369/actions.txt +++ b/.besouro/20161005162327369/actions.txt @@ -50,3 +50,4 @@ EditAction 1475674564225 Spreadsheet.java 474 3 4 0 UnitTestCaseAction 1475674567149 SpreadsheetTest.java FAIL UnitTestSessionAction 1475674567150 SpreadsheetTest.java FAIL EditAction 1475674711362 Spreadsheet.java 670 3 4 0 +EditAction 1475674716948 Spreadsheet.java 673 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 1553e5078990ca0e4ce7ed0e0c93a5d28827493a..3c6dcb334379b8473cdc8e27d99c102b392a1175 100644 GIT binary patch delta 453 zcmX|*OG^TA6vfY-87G}4^PN3ZL@OVoS(zo+izrZPSF|2NGLVA7+Pdi*xQ~Rutx`y| zh@f5Hp;aHCy-0N(rOo}{d(S!l`+K&%+mw%=msbE;gU1Z-7Z1XIb)UtUbWJ36czJCaH1VLCg{TqK~k3hx% delta 415 zcmYk1PfG$(6vfY*c{AhKSfe$WffHnw|0**RiV8y7<*FjW)k}mRK^Zh?<)&}ox`hz9 zRf>of613}E^eJl9bRDSVJsyYOz4x5^-t=eP|Ni|l1dzwpz~5)diDtccDVzhx5jPAx zkt`Q|SYl9PhmKQs{FubDffXb=pX?}CVPHjuz;RPlu1cbDA}(rG4QmWinYgcdEov>% ztd7Pu41|$;Xh|w-e?f*use73xM9+8BVL_1#yazj?T0FlWHM3plQFHqqdMH-vA#lr? z#Vw`lexx1|Ow(BWY(NGwrs=gkGXt{-V3DHYm_h;ua#Y>L3>_c^J_>|IU2Re%BbW#C zRFafLg%Gu+$uvXs6p9NIng*u9rVB=56>t$8qwJ3=WAwLIa-l;0w*UpMqtoDXR`wNk VpK>Jc3#zwCxO2xBv`vrZe*i^CJe>dl diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 9dd7b67..71f804c 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -24,6 +24,7 @@ public void set(String cell, String value) { } } } + mValues.put(cell, value); } From 23a4a66bb0388f1c9943c92526e96ec68ed45e70 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 5 Oct 2016 16:39:09 +0300 Subject: [PATCH 010/215] besouro automatic message --- .besouro/20161005162327369/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1219 -> 1219 bytes src/Spreadsheet.java | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.besouro/20161005162327369/actions.txt b/.besouro/20161005162327369/actions.txt index 25696b6..f018f86 100644 --- a/.besouro/20161005162327369/actions.txt +++ b/.besouro/20161005162327369/actions.txt @@ -51,3 +51,6 @@ UnitTestCaseAction 1475674567149 SpreadsheetTest.java FAIL UnitTestSessionAction 1475674567150 SpreadsheetTest.java FAIL EditAction 1475674711362 Spreadsheet.java 670 3 4 0 EditAction 1475674716948 Spreadsheet.java 673 3 4 0 +UnitTestCaseAction 1475674719003 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475674719004 SpreadsheetTest.java FAIL +EditAction 1475674748680 Spreadsheet.java 729 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3c6dcb334379b8473cdc8e27d99c102b392a1175..06609ccc443ab2ba6a7d6f74ff418074275aae19 100644 GIT binary patch delta 23 ecmX@id6;v92n(wWLkNTHWJ#80Muo|9S=0bXlLesw delta 23 ecmX@id6;v92n(w;LkNS+WJ#80M)}EeS=0bXbOoLO diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 71f804c..cda2137 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -10,7 +10,8 @@ public String get(String cell) { public void set(String cell, String value) { if (value.length() > 0) { - if (value.charAt(0) == '-') { + if (value.charAt(0) == '-' || + value.charAt(0) < '0' || value.charAt(0) > '9') { if (value.length() == 1) { value = "#Error"; } else { From 009d7f43e263ec3bfcf34134fee48d77ffa0a4bb Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 5 Oct 2016 16:39:24 +0300 Subject: [PATCH 011/215] besouro automatic message --- .besouro/20161005162327369/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1219 -> 1244 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161005162327369/actions.txt b/.besouro/20161005162327369/actions.txt index f018f86..79a4553 100644 --- a/.besouro/20161005162327369/actions.txt +++ b/.besouro/20161005162327369/actions.txt @@ -54,3 +54,6 @@ EditAction 1475674716948 Spreadsheet.java 673 3 4 0 UnitTestCaseAction 1475674719003 SpreadsheetTest.java FAIL UnitTestSessionAction 1475674719004 SpreadsheetTest.java FAIL EditAction 1475674748680 Spreadsheet.java 729 3 4 0 +UnitTestCaseAction 1475674753378 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475674753380 SpreadsheetTest.java FAIL +EditAction 1475674763591 Spreadsheet.java 731 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 06609ccc443ab2ba6a7d6f74ff418074275aae19..b80cc4453710fb76228afc79a5703f13f1ac1ffc 100644 GIT binary patch delta 195 zcmXAjPY%Iw6okKOrJ5+ER7ffjsYKFJ{}ODtfRNaUSaSs%hxn}#i33>m0IrQpx>HLjeqg6Gdn%=`FLMfVp2x(dBpgsA!XXwl zqRbSR1r=6Q+2FAi?|{#drnoRp>m>C=NilUAXn%@?GEC^wqc6jLe_{q03?+9l16%El KrPfkcqw@t8IT&{U delta 175 zcmXAjI|{;35Jk`PJ(Yl;7(Wm(L{S7u;tvr-!Op_QMmLkjMWh!yTdTJLx8WY#Kne$~ z=H7d_GxK&{&NJ0MA2dba5?g{Bhge&NZgS5a`gC1W6;z=tvq24?Iz3!MaU(n;nrvvX zqs?BjqtG*fB(VCg719wW2c+Fa{Zt~Vz<>!;X7WHJjX4VpOW_`+FvqAoOU+jGGi%0Q DRe}}X diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index cda2137..bf1bcc9 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -11,7 +11,7 @@ public String get(String cell) { public void set(String cell, String value) { if (value.length() > 0) { if (value.charAt(0) == '-' || - value.charAt(0) < '0' || value.charAt(0) > '9') { + value.charAt(0) >= '0' || value.charAt(0) <= '9') { if (value.length() == 1) { value = "#Error"; } else { From 7c3c1a1d2ff22109b0b20847bdb10e7b417ab9a0 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 5 Oct 2016 16:41:44 +0300 Subject: [PATCH 012/215] besouro automatic message --- .besouro/20161005162327369/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1244 -> 1244 bytes src/Spreadsheet.java | 17 ++++++----------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.besouro/20161005162327369/actions.txt b/.besouro/20161005162327369/actions.txt index 79a4553..d499a2f 100644 --- a/.besouro/20161005162327369/actions.txt +++ b/.besouro/20161005162327369/actions.txt @@ -57,3 +57,6 @@ EditAction 1475674748680 Spreadsheet.java 729 3 4 0 UnitTestCaseAction 1475674753378 SpreadsheetTest.java FAIL UnitTestSessionAction 1475674753380 SpreadsheetTest.java FAIL EditAction 1475674763591 Spreadsheet.java 731 3 4 0 +UnitTestCaseAction 1475674765892 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475674765893 SpreadsheetTest.java FAIL +EditAction 1475674903349 Spreadsheet.java 598 3 2 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index b80cc4453710fb76228afc79a5703f13f1ac1ffc..5d49b1eb14f94d6f6ef4772949dfbf800cc54fbe 100644 GIT binary patch delta 24 gcmcb^d53eu9A@rC47@tb+ZdDuEEjKH&TPsE0A?fyTL1t6 delta 24 gcmcb^d53eu9A@r?47@tb+ZdDuESGFv&TPsE0A?BoTL1t6 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index bf1bcc9..9950357 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -10,18 +10,13 @@ public String get(String cell) { public void set(String cell, String value) { if (value.length() > 0) { - if (value.charAt(0) == '-' || - value.charAt(0) >= '0' || value.charAt(0) <= '9') { - if (value.length() == 1) { + boolean isInteger = false, + for (int i = 1; i < value.length(); i++) { + char c = value.charAt(i); + if (i == 0 && ) + if (c < '0' || c > '9') { value = "#Error"; - } else { - for (int i = 1; i < value.length(); i++) { - char c = value.charAt(i); - if (c < '0' || c > '9') { - value = "#Error"; - break; - } - } + break; } } } From b2e992c366cff9bbcfa209055bd673a3b08c1694 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 5 Oct 2016 16:43:13 +0300 Subject: [PATCH 013/215] besouro automatic message --- .besouro/20161005162327369/actions.txt | 13 +++++++ .../20161005162327369/besouroEpisodes.txt | 36 ++++++++++++++++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161005162327369/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 1244 -> 1242 bytes src/Spreadsheet.java | 21 +++++----- tests/SpreadsheetTest.java | 11 +++++- 7 files changed, 72 insertions(+), 11 deletions(-) diff --git a/.besouro/20161005162327369/actions.txt b/.besouro/20161005162327369/actions.txt index d499a2f..af7b08b 100644 --- a/.besouro/20161005162327369/actions.txt +++ b/.besouro/20161005162327369/actions.txt @@ -60,3 +60,16 @@ EditAction 1475674763591 Spreadsheet.java 731 3 4 0 UnitTestCaseAction 1475674765892 SpreadsheetTest.java FAIL UnitTestSessionAction 1475674765893 SpreadsheetTest.java FAIL EditAction 1475674903349 Spreadsheet.java 598 3 2 0 +CompilationAction 1475674905204 Spreadsheet.java +CompilationAction 1475674905205 Spreadsheet.java +CompilationAction 1475674931826 Spreadsheet.java +CompilationAction 1475674931827 Spreadsheet.java +UnitTestCaseAction 1475674956026 SpreadsheetTest.java OK +UnitTestSessionAction 1475674956027 SpreadsheetTest.java OK +RefactoringAction 1475674970366 SpreadsheetTest.java ADD void testAssignmentInvalidInteger_DecimalPoint_Error()/2 METHOD +RefactoringAction 1475674975887 SpreadsheetTest.java RENAME testAssignmentInvalidInteger_DecimalPoint_Error()/2=>void testAssignmentInvalidInteger_A_Error() METHOD +RefactoringAction 1475674978398 SpreadsheetTest.java RENAME testAssignmentInvalidInteger_DecimalPoint_Error()=>void testAssignmentInvalidInteger_ExDecimalPoint_Error() METHOD +RefactoringAction 1475674981409 SpreadsheetTest.java RENAME testAssignmentInvalidInteger_ExDecimalPoint_Error()=>void testAssignmentInvalidInteger_ExcessDecimalPoint_Error() METHOD +RefactoringAction 1475674982418 SpreadsheetTest.java RENAME testAssignmentInvalidInteger_ExcessDecimalPoint_Error()=>void testAssignmentInvalidInteger_Excess_DecimalPoint_Error() METHOD +RefactoringAction 1475674985428 SpreadsheetTest.java RENAME testAssignmentInvalidInteger_A_Error()=>void testAssignmentInvalidInteger_Excess_A_Error() METHOD +EditAction 1475674993208 SpreadsheetTest.java 855 5 13 4 diff --git a/.besouro/20161005162327369/besouroEpisodes.txt b/.besouro/20161005162327369/besouroEpisodes.txt index fdd15ca..ab43299 100644 --- a/.besouro/20161005162327369/besouroEpisodes.txt +++ b/.besouro/20161005162327369/besouroEpisodes.txt @@ -5,3 +5,39 @@ 1475674251230 test-first 3 157 true 1475674251231 test-first 3 157 true 1475674251232 test-first 3 157 true +1475674956027 test-first 3 690 true +1475674956028 test-first 3 690 true +1475674956029 test-first 3 690 true +1475674956030 test-first 3 690 true +1475674956031 test-first 3 690 true +1475674956032 test-first 3 690 true +1475674956033 test-first 3 690 true +1475674956034 test-first 3 690 true +1475674956035 test-first 3 690 true +1475674956036 test-first 3 690 true +1475674956037 test-first 3 690 true +1475674956038 test-first 3 690 true +1475674956039 test-first 3 690 true +1475674956040 test-first 3 690 true +1475674956041 test-first 3 690 true +1475674956042 test-first 3 690 true +1475674956043 test-first 3 690 true +1475674956044 test-first 3 690 true +1475674956045 test-first 3 690 true +1475674956046 test-first 3 690 true +1475674956047 test-first 3 690 true +1475674956048 test-first 3 690 true +1475674956049 test-first 3 690 true +1475674956050 test-first 3 690 true +1475674956051 test-first 3 690 true +1475674956052 test-first 3 690 true +1475674956053 test-first 3 690 true +1475674956054 test-first 3 690 true +1475674956055 test-first 3 690 true +1475674956056 test-first 3 690 true +1475674956057 test-first 3 690 true +1475674956058 test-first 3 690 true +1475674956059 test-first 3 690 true +1475674956060 test-first 3 690 true +1475674956061 test-first 3 690 true +1475674956062 test-first 3 690 true diff --git a/.besouro/20161005162327369/randomHeuristicEpisodes.txt b/.besouro/20161005162327369/randomHeuristicEpisodes.txt index df6cf2c..30644ae 100644 --- a/.besouro/20161005162327369/randomHeuristicEpisodes.txt +++ b/.besouro/20161005162327369/randomHeuristicEpisodes.txt @@ -1,2 +1,3 @@ 1475674082277 test-addition 2 274 true 1475674251230 test-first 3 157 true +1475674956027 test-first 3 690 true diff --git a/.besouro/20161005162327369/zorroEpisodes.txt b/.besouro/20161005162327369/zorroEpisodes.txt index cd33aca..c670ebc 100644 --- a/.besouro/20161005162327369/zorroEpisodes.txt +++ b/.besouro/20161005162327369/zorroEpisodes.txt @@ -1,2 +1,3 @@ 1475674082277 test-addition 2 274 true 1475674251230 test-first 3 168 true +1475674956027 test-first 3 704 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 5d49b1eb14f94d6f6ef4772949dfbf800cc54fbe..cad968430c728b186261ed79536fe173b037a3d2 100644 GIT binary patch delta 406 zcmXAkOG`pw5Qd-coX^wIG|N18Pw1+pWjD(Lv7&{GF1w&zgj5hN%+_xD2ku-I1a6bU zMT=-1^ar9%f1-tSn@)T%Gv7P!Jj}d#U%kHP?}tZVk+p`ep(c(_4omB0g^uOpn?8ma z^E1wb!a6GykIN?tGZxQR-_>D<_w+npEEkRoC51Yu=8Rcu*-sBEcNd07RrtWf67-(V z>a?ztN;ta7P}<|@8Ue@CnY_ZP6Ok%)jZaeM2HVWm30`XD=tPsz>z|jQ8dhj>d+MI9 zX_4al4PlyeOH31x=*N(3(?KUe1|>!bQAvtrmN4_u%+kvSeQYtnu2{k{mi=E2hlu=S zP3iZe+$t%RA#aBnVVHQxkYWxk@DU*{h_WcoFl}GhN_`Shffm|mVOzpjqBkL_T`V~l dBwM-%G)X@(d@H))UhrpzXtk-MZ5dZx{RRIIJOKaz delta 435 zcmX|+O)mps6osF6X4>kQR#7dIkq9lN!=Nn{@e!*ong|Ptg``1LA{JtA!!NM+oph@q zU08^Z@s+KEc&HXLHOGELFJjL;T{Q>Kd*60FJFCN@?1V_cLuKe=oZGRYt4 zp%>*LN03II3}cLoVe^j51O}6`?FXHNxfc7aVl(=?FZ576%s5R-9m%Ksl dnZ7%jH7|P5bLsa|Bz)d~3hOV0V%p=+`~oS7KJown diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 9950357..dc56b02 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -9,18 +9,21 @@ public String get(String cell) { } public void set(String cell, String value) { - if (value.length() > 0) { - boolean isInteger = false, - for (int i = 1; i < value.length(); i++) { - char c = value.charAt(i); - if (i == 0 && ) - if (c < '0' || c > '9') { - value = "#Error"; - break; - } + boolean isInteger = true; + for (int i = 1; i < value.length(); i++) { + char c = value.charAt(i); + if (i == 0 && c == '-') + continue; + + if (c < '0' || c > '9') { + isInteger = false; + break; } } + if (!isInteger) + value = "#Error"; + mValues.put(cell, value); } diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index e553b99..1e9bf02 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -25,12 +25,19 @@ public void testAssignment_A1_Pos_1() { String result = sheet.evaluate("A1"); assertEquals("1", result); } - + @Test - public void testAssignmentInvalidInteger_DecimalPoint_Error() { + public void testAssignmentInvalidInteger_Excess_DecimalPoint_Error() { sheet.set("A1", "1."); String result = sheet.evaluate("A1"); assertEquals("#Error", result); } + + @Test + public void testAssignmentInvalidInteger_Excess_A_Error() { + sheet.set("A1", "5A"); + String result = sheet.evaluate("A1"); + assertEquals("#Error", result); + } } From aea5eaf8cb997339b6bbb0577b1976172955bf36 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 5 Oct 2016 16:44:15 +0300 Subject: [PATCH 014/215] besouro automatic message --- .besouro/20161005162327369/actions.txt | 9 +++++++++ .../20161005162327369/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161005162327369/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 1236 -> 1415 bytes tests/SpreadsheetTest.java | 9 ++++++++- 6 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.besouro/20161005162327369/actions.txt b/.besouro/20161005162327369/actions.txt index af7b08b..5a15441 100644 --- a/.besouro/20161005162327369/actions.txt +++ b/.besouro/20161005162327369/actions.txt @@ -73,3 +73,12 @@ RefactoringAction 1475674981409 SpreadsheetTest.java RENAME testAssignmentInvali RefactoringAction 1475674982418 SpreadsheetTest.java RENAME testAssignmentInvalidInteger_ExcessDecimalPoint_Error()=>void testAssignmentInvalidInteger_Excess_DecimalPoint_Error() METHOD RefactoringAction 1475674985428 SpreadsheetTest.java RENAME testAssignmentInvalidInteger_A_Error()=>void testAssignmentInvalidInteger_Excess_A_Error() METHOD EditAction 1475674993208 SpreadsheetTest.java 855 5 13 4 +UnitTestCaseAction 1475674996031 SpreadsheetTest.java OK +UnitTestSessionAction 1475674996032 SpreadsheetTest.java OK +RefactoringAction 1475675016450 SpreadsheetTest.java ADD void testAssignmentInvalidInteger_Excess_A_Error()/2 METHOD +RefactoringAction 1475675024971 SpreadsheetTest.java RENAME testAssignmentInvalidInteger_Excess_A_Error()/2=>void testAssignment_() METHOD +RefactoringAction 1475675026982 SpreadsheetTest.java RENAME testAssignment_()=>void testAssignment_A1() METHOD +RefactoringAction 1475675027993 SpreadsheetTest.java RENAME testAssignment_A1()=>void testAssignment_A1_() METHOD +RefactoringAction 1475675030005 SpreadsheetTest.java RENAME testAssignment_A1_()=>void testAssignment_A1_String() METHOD +RefactoringAction 1475675035514 SpreadsheetTest.java RENAME testAssignment_A1_String()=>void testAssignment_A1_ValidString() METHOD +EditAction 1475675054922 SpreadsheetTest.java 1022 6 16 5 diff --git a/.besouro/20161005162327369/besouroEpisodes.txt b/.besouro/20161005162327369/besouroEpisodes.txt index ab43299..268e1d0 100644 --- a/.besouro/20161005162327369/besouroEpisodes.txt +++ b/.besouro/20161005162327369/besouroEpisodes.txt @@ -41,3 +41,5 @@ 1475674956060 test-first 3 690 true 1475674956061 test-first 3 690 true 1475674956062 test-first 3 690 true +1475674996032 test-addition 1 25 true +1475674996033 test-addition 1 25 true diff --git a/.besouro/20161005162327369/randomHeuristicEpisodes.txt b/.besouro/20161005162327369/randomHeuristicEpisodes.txt index 30644ae..9cc8da2 100644 --- a/.besouro/20161005162327369/randomHeuristicEpisodes.txt +++ b/.besouro/20161005162327369/randomHeuristicEpisodes.txt @@ -1,3 +1,4 @@ 1475674082277 test-addition 2 274 true 1475674251230 test-first 3 157 true 1475674956027 test-first 3 690 true +1475674996032 test-addition 1 25 false diff --git a/.besouro/20161005162327369/zorroEpisodes.txt b/.besouro/20161005162327369/zorroEpisodes.txt index c670ebc..25b740a 100644 --- a/.besouro/20161005162327369/zorroEpisodes.txt +++ b/.besouro/20161005162327369/zorroEpisodes.txt @@ -1,3 +1,4 @@ 1475674082277 test-addition 2 274 true 1475674251230 test-first 3 168 true 1475674956027 test-first 3 704 true +1475674996032 test-addition 1 40 true diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index bb36370f3b618d21a93d0ee5b655cedfbed79536..4b35080a8e4fce8b9b1ec3268f2918d8f1f05734 100644 GIT binary patch delta 112 zcmcb@+0M;%>ff$?3=9k=4AvXD0+|@iCdV+zvbk0yrxq7au3*w+)CLKNK?LF*<6Vo2 z@{2eaEEpM>OdTiBXEJAG+kBnr2jk>iW)(*B$#pEsylM>G4C)M`3>pm544RYIvBff$?3=9k=3>F)?0+|@~C&w_!PHte*n0$}Pl#z9_2=fm{Rt5$p26F&Y Cv Date: Wed, 5 Oct 2016 16:46:10 +0300 Subject: [PATCH 015/215] besouro automatic message --- .besouro/20161005162327369/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1415 -> 1595 bytes src/Spreadsheet.java | 33 +++++++++++++++---------- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/.besouro/20161005162327369/actions.txt b/.besouro/20161005162327369/actions.txt index 5a15441..0c134d1 100644 --- a/.besouro/20161005162327369/actions.txt +++ b/.besouro/20161005162327369/actions.txt @@ -82,3 +82,6 @@ RefactoringAction 1475675027993 SpreadsheetTest.java RENAME testAssignment_A1()= RefactoringAction 1475675030005 SpreadsheetTest.java RENAME testAssignment_A1_()=>void testAssignment_A1_String() METHOD RefactoringAction 1475675035514 SpreadsheetTest.java RENAME testAssignment_A1_String()=>void testAssignment_A1_ValidString() METHOD EditAction 1475675054922 SpreadsheetTest.java 1022 6 16 5 +UnitTestCaseAction 1475675057844 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475675057845 SpreadsheetTest.java FAIL +EditAction 1475675169290 Spreadsheet.java 749 3 3 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 4b35080a8e4fce8b9b1ec3268f2918d8f1f05734..e8a881261483a83ad9df1eca9797ae7d1a2b8b80 100644 GIT binary patch delta 142 zcmZqY-p#{x>ff$?3=9k=3=SK)t}xlimZTP!I2IRYrsw6R=9R=d8peku=47S>mlS2@ zrE@S?Gcs_gCn^+!x#}DYwu}rMFz)0#Oy-R2n?;!Om?kT*s0dhXW02F@!XPFjwT(f^ kN62Qf1FHzHE(14%9)l=@K7%xa!Q@0%d3HOX^-K)*04Eff$?3=9k=4AvXDt}soOVK!xC+Z@E4$HdCOz{Fq$0N1ApO8@`> diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index dc56b02..b54f72b 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -9,21 +9,28 @@ public String get(String cell) { } public void set(String cell, String value) { - boolean isInteger = true; - for (int i = 1; i < value.length(); i++) { - char c = value.charAt(i); - if (i == 0 && c == '-') - continue; - - if (c < '0' || c > '9') { - isInteger = false; - break; + if (value.length() > 0) { + if (value.charAt(0) == '\'') { + + + } else { + boolean isInteger = true; + for (int i = 1; i < value.length(); i++) { + char c = value.charAt(i); + if (i == 0 && c == '-') + continue; + + if (c < '0' || c > '9') { + isInteger = false; + break; + } + } + + if (!isInteger) + value = "#Error"; + } } } - - if (!isInteger) - value = "#Error"; - mValues.put(cell, value); } From 9fcd37572feca4f6b63d8bfab315c4fcf6ebb0af Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 5 Oct 2016 16:46:48 +0300 Subject: [PATCH 016/215] besouro automatic message --- .besouro/20161005162327369/actions.txt | 10 ++++++++++ bin/Spreadsheet.class | Bin 1242 -> 1269 bytes src/Spreadsheet.java | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.besouro/20161005162327369/actions.txt b/.besouro/20161005162327369/actions.txt index 0c134d1..0959c36 100644 --- a/.besouro/20161005162327369/actions.txt +++ b/.besouro/20161005162327369/actions.txt @@ -85,3 +85,13 @@ EditAction 1475675054922 SpreadsheetTest.java 1022 6 16 5 UnitTestCaseAction 1475675057844 SpreadsheetTest.java FAIL UnitTestSessionAction 1475675057845 SpreadsheetTest.java FAIL EditAction 1475675169290 Spreadsheet.java 749 3 3 0 +CompilationAction 1475675171087 Spreadsheet.java +CompilationAction 1475675171088 Spreadsheet.java +CompilationAction 1475675171088 Spreadsheet.java +UnitTestCaseAction 1475675173515 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475675173515 SpreadsheetTest.java FAIL +CompilationAction 1475675186032 Spreadsheet.java +CompilationAction 1475675186034 Spreadsheet.java +CompilationAction 1475675186035 Spreadsheet.java +UnitTestCaseAction 1475675187905 SpreadsheetTest.java FAIL +UnitTestSessionAction 1475675187906 SpreadsheetTest.java FAIL diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index cad968430c728b186261ed79536fe173b037a3d2..4d0f63c32c2c007b7e3169f0492f557cdcb19418 100644 GIT binary patch delta 273 zcmW-bu}TAB5QM+Yza~Z!G-^>*O4r99%R;5o`|S8dC`h)&>z%1Pe(oKEw42Hex3z zX?zHKJ0HU4P;dzg%k0kV&U_Vrimx9M46kmkM+3pN!rlyZ)=O*<2>HuF|MqAkXsZ_{ zZ{PAFp;U0>fqpc`f8aE7W14fDj~r{P`}#~Ls;aHhCl`sIe!BWy%&Z-hC{U(iwZJ?z z>uW61rb>q;VwO3yZDQOBK4+HWoCX&(O@;9jQ&W33nZ0ROkO^uV%Gtk!Ew(M5$ASIa kLCv8-ca>eH*fXg|;g6cgFP@Y$G?y`*k=|=pg7jU3e_hHbp8x;= delta 246 zcmXAi!Ab&g5Qo3n|D>yEiLIhp3Z;vJnpp^47A!n?sa_!>@(>-udk?W!@6jy~y7&;? zJLN;zK?)j*ftlaTZ|0j->Lc~Kknm=5{WzQo+8npe(^RQvXb=jC``d@R=|phN)_A^@ z7b)?DBLQ4#qyv4X*DmNAd-2@0eKyIl#jfQVc{*%!NI>7bh!SU% z8ByWVHUhhf{@D~LT4!I(-$DLV$CPJrLDv|L4NmECgc^I_h{rZL!A=8`Klmcw6eYVx Py)}M3)4tT=cMX35Fc~7> diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index b54f72b..05c1e26 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -28,9 +28,9 @@ public void set(String cell, String value) { if (!isInteger) value = "#Error"; - } } } + mValues.put(cell, value); } From 15374420ab5e9a41eea6000c65284cbefa5cab52 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 13:56:38 +0300 Subject: [PATCH 017/215] besouro automatic message --- .besouro/20161012135455198/actions.txt | 2 ++ .besouro/20161012135455198/besouroEpisodes.txt | 0 .besouro/20161012135455198/disagreements.txt | 0 .besouro/20161012135455198/randomHeuristicEpisodes.txt | 0 .besouro/20161012135455198/userComments.txt | 0 .besouro/20161012135455198/zorroEpisodes.txt | 0 src/Spreadsheet.java | 3 +-- 7 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 .besouro/20161012135455198/actions.txt create mode 100644 .besouro/20161012135455198/besouroEpisodes.txt create mode 100644 .besouro/20161012135455198/disagreements.txt create mode 100644 .besouro/20161012135455198/randomHeuristicEpisodes.txt create mode 100644 .besouro/20161012135455198/userComments.txt create mode 100644 .besouro/20161012135455198/zorroEpisodes.txt diff --git a/.besouro/20161012135455198/actions.txt b/.besouro/20161012135455198/actions.txt new file mode 100644 index 0000000..81ce445 --- /dev/null +++ b/.besouro/20161012135455198/actions.txt @@ -0,0 +1,2 @@ +FileOpenedAction 1476269695411 SpreadsheetTest.java 1022 6 16 5 +EditAction 1476269797530 Spreadsheet.java 757 3 2 0 diff --git a/.besouro/20161012135455198/besouroEpisodes.txt b/.besouro/20161012135455198/besouroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161012135455198/disagreements.txt b/.besouro/20161012135455198/disagreements.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161012135455198/randomHeuristicEpisodes.txt b/.besouro/20161012135455198/randomHeuristicEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161012135455198/userComments.txt b/.besouro/20161012135455198/userComments.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161012135455198/zorroEpisodes.txt b/.besouro/20161012135455198/zorroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 05c1e26..b747758 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -11,8 +11,7 @@ public String get(String cell) { public void set(String cell, String value) { if (value.length() > 0) { if (value.charAt(0) == '\'') { - - + value = substring } else { boolean isInteger = true; for (int i = 1; i < value.length(); i++) { From fa3dcb4469a9ce64eff81ab63ff31a077323c1b0 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 13:58:43 +0300 Subject: [PATCH 018/215] besouro automatic message --- .besouro/20161012135455198/actions.txt | 19 ++++++++++++++++++ .../20161012135455198/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012135455198/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 1269 -> 1367 bytes src/Spreadsheet.java | 6 +++++- tests/SpreadsheetTest.java | 15 +++++++++++++- 7 files changed, 42 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012135455198/actions.txt b/.besouro/20161012135455198/actions.txt index 81ce445..f9e0f5e 100644 --- a/.besouro/20161012135455198/actions.txt +++ b/.besouro/20161012135455198/actions.txt @@ -1,2 +1,21 @@ FileOpenedAction 1476269695411 SpreadsheetTest.java 1022 6 16 5 EditAction 1476269797530 Spreadsheet.java 757 3 2 0 +CompilationAction 1476269801858 Spreadsheet.java +CompilationAction 1476269801861 Spreadsheet.java +CompilationAction 1476269801861 Spreadsheet.java +CompilationAction 1476269841129 Spreadsheet.java +CompilationAction 1476269841131 Spreadsheet.java +CompilationAction 1476269841132 Spreadsheet.java +UnitTestCaseAction 1476269845212 SpreadsheetTest.java OK +UnitTestSessionAction 1476269845218 SpreadsheetTest.java OK +RefactoringAction 1476269849759 SpreadsheetTest.java ADD void testAssignment_A1_ValidString()/2 METHOD +RefactoringAction 1476269857804 SpreadsheetTest.java RENAME testAssignment_A1_ValidString()/2=>void testAssignment_A1_String_Missing() METHOD +RefactoringAction 1476269890344 SpreadsheetTest.java RENAME testAssignment_A1_String_Missing()=>void testAssignment_A1_String_Missing_Single_Quote() METHOD +RefactoringAction 1476269896868 SpreadsheetTest.java RENAME testAssignment_A1_String_Missing_Single_Quote()=>void testAssignment_A1_String_Missing_SingleQuote() METHOD +RefactoringAction 1476269899389 SpreadsheetTest.java RENAME testAssignment_A1_String_Missing_SingleQuote()=>void testAssignment_A1_String_Missing_SingleQuote_Begin() METHOD +RefactoringAction 1476269902429 SpreadsheetTest.java ADD void testAssignment_A1_String_Missing_SingleQuote_Begin()/2 METHOD +RefactoringAction 1476269904950 SpreadsheetTest.java RENAME testAssignment_A1_String_Missing_SingleQuote_Begin()/2=>void testAssignment_A1_String_Missing_SingleQuote_EN() METHOD +RefactoringAction 1476269905968 SpreadsheetTest.java RENAME testAssignment_A1_String_Missing_SingleQuote_EN()=>void testAssignment_A1_String_Missing_SingleQuote_End() METHOD +RefactoringAction 1476269908486 SpreadsheetTest.java RENAME testAssignment_A1_String_Missing_SingleQuote_End()=>void testAssignment_A1_String_Missing_SingleQuote_End_Error() METHOD +RefactoringAction 1476269912518 SpreadsheetTest.java RENAME testAssignment_A1_String_Missing_SingleQuote_Begin()=>void testAssignment_A1_String_Missing_SingleQuote_Begin_Error() METHOD +EditAction 1476269922901 SpreadsheetTest.java 1400 8 22 7 diff --git a/.besouro/20161012135455198/besouroEpisodes.txt b/.besouro/20161012135455198/besouroEpisodes.txt index e69de29..b84b9dd 100644 --- a/.besouro/20161012135455198/besouroEpisodes.txt +++ b/.besouro/20161012135455198/besouroEpisodes.txt @@ -0,0 +1,2 @@ +1476269845218 regression 2 149 true +1476269845219 regression 1 149 true diff --git a/.besouro/20161012135455198/randomHeuristicEpisodes.txt b/.besouro/20161012135455198/randomHeuristicEpisodes.txt index e69de29..38e8b3f 100644 --- a/.besouro/20161012135455198/randomHeuristicEpisodes.txt +++ b/.besouro/20161012135455198/randomHeuristicEpisodes.txt @@ -0,0 +1 @@ +1476269845218 regression 2 149 false diff --git a/.besouro/20161012135455198/zorroEpisodes.txt b/.besouro/20161012135455198/zorroEpisodes.txt index e69de29..38e8b3f 100644 --- a/.besouro/20161012135455198/zorroEpisodes.txt +++ b/.besouro/20161012135455198/zorroEpisodes.txt @@ -0,0 +1 @@ +1476269845218 regression 2 149 false diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 4d0f63c32c2c007b7e3169f0492f557cdcb19418..ff3245bc106bdc8a487370dd6f16ec24e36c618e 100644 GIT binary patch delta 410 zcmXAly)T1d6vcl}`|8J=*SD7XEJ9nY7FFMBphHDP7z`p&kqD7iT5Omk_U=MRtQyk6 zAZClvUm}tQar;_s?sLw4&N=sfIzM#%?f3Zw7-g=gf2f2`Cw_wf0}5yUcsqZT+so`K z-2P-Tu(Y2(NkE^X5W&CEPrSZpe`fQC(6 z&O#+RuE>V0C3@?8*LW*{c1J@tLL%0~jOHfUp$cD95&z{?@s>cQmCgs5w3y3Oa0nFMwJ!UtiN^l`oqR+5 delta 332 zcmW-c&q@Me6vcnvjE**qm06Pp8YyV`r?USRh#)Q_D5!1i+6BHq+xD}sS4fgsw20Qd zfRE9t%}~*C_~3l^o_p>&+==@=<9`0Vy#xE4j@*gy(`*==%3wIWAG*v@_h`@zs@9`( z>)3KkK8uZ`wcBP$@rjG39a34SJqKU*;GuR_ACqlpw0S*}$R;Q3GB5N zW08Vzoh4c%n!cFL?o<;bR=WLf#MCb()46y>G$GGLJmJDy{MlC5Nn|t Mw3BP8PRySC11-@kfdBvi diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index b747758..18a438b 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -11,7 +11,11 @@ public String get(String cell) { public void set(String cell, String value) { if (value.length() > 0) { if (value.charAt(0) == '\'') { - value = substring + if (value.length() > 1) { + value = value.substring(1, value.length() - 1); + } else { + value = "#Error"; + } } else { boolean isInteger = true; for (int i = 1; i < value.length(); i++) { diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index a05dc70..fac2579 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -39,7 +39,7 @@ public void testAssignmentInvalidInteger_Excess_A_Error() { String result = sheet.evaluate("A1"); assertEquals("#Error", result); } - + @Test public void testAssignment_A1_ValidString() { sheet.set("A1", "'a string'"); @@ -47,4 +47,17 @@ public void testAssignment_A1_ValidString() { assertEquals("a string", result); } + @Test + public void testAssignment_A1_String_Missing_SingleQuote_Begin_Error() { + sheet.set("A1", "a string'"); + String result = sheet.evaluate("A1"); + assertEquals("#Error", result); + } + @Test + public void testAssignment_A1_String_Missing_SingleQuote_End_Error() { + sheet.set("A1", "a string'"); + String result = sheet.evaluate("A1"); + assertEquals("#Error", result); + } + } From ee2f69197375ce2952324324ec9fccdbe87598aa Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 13:58:52 +0300 Subject: [PATCH 019/215] besouro automatic message --- .besouro/20161012135455198/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 1595 -> 1962 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012135455198/actions.txt b/.besouro/20161012135455198/actions.txt index f9e0f5e..333e746 100644 --- a/.besouro/20161012135455198/actions.txt +++ b/.besouro/20161012135455198/actions.txt @@ -19,3 +19,4 @@ RefactoringAction 1476269905968 SpreadsheetTest.java RENAME testAssignment_A1_St RefactoringAction 1476269908486 SpreadsheetTest.java RENAME testAssignment_A1_String_Missing_SingleQuote_End()=>void testAssignment_A1_String_Missing_SingleQuote_End_Error() METHOD RefactoringAction 1476269912518 SpreadsheetTest.java RENAME testAssignment_A1_String_Missing_SingleQuote_Begin()=>void testAssignment_A1_String_Missing_SingleQuote_Begin_Error() METHOD EditAction 1476269922901 SpreadsheetTest.java 1400 8 22 7 +EditAction 1476269931184 SpreadsheetTest.java 1399 8 22 7 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index e8a881261483a83ad9df1eca9797ae7d1a2b8b80..f37b09bdbd738f0f618b4a630f4ef20d3fb878ea 100644 GIT binary patch delta 227 zcmdnZvx=YV)W2Q(7#J8#7+f}T2{G4Ol%y7yI2IRYrsw6R=9R=d8pa2g6lLb6$NOdi zMS*lMkjP05EX^-Tjdw~-&&-Q=Eh@?{;$U!KWZ+CxCsUH~;_u diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index fac2579..a5cc1ff 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -55,7 +55,7 @@ public void testAssignment_A1_String_Missing_SingleQuote_Begin_Error() { } @Test public void testAssignment_A1_String_Missing_SingleQuote_End_Error() { - sheet.set("A1", "a string'"); + sheet.set("A1", "a string"); String result = sheet.evaluate("A1"); assertEquals("#Error", result); } From 730ac6e61b9a66f0edabdd11a83685a4feebaf08 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 13:59:52 +0300 Subject: [PATCH 020/215] besouro automatic message --- .besouro/20161012135455198/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 1962 -> 1962 bytes tests/SpreadsheetTest.java | 3 ++- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012135455198/actions.txt b/.besouro/20161012135455198/actions.txt index 333e746..b70018d 100644 --- a/.besouro/20161012135455198/actions.txt +++ b/.besouro/20161012135455198/actions.txt @@ -20,3 +20,4 @@ RefactoringAction 1476269908486 SpreadsheetTest.java RENAME testAssignment_A1_St RefactoringAction 1476269912518 SpreadsheetTest.java RENAME testAssignment_A1_String_Missing_SingleQuote_Begin()=>void testAssignment_A1_String_Missing_SingleQuote_Begin_Error() METHOD EditAction 1476269922901 SpreadsheetTest.java 1400 8 22 7 EditAction 1476269931184 SpreadsheetTest.java 1399 8 22 7 +EditAction 1476269991718 SpreadsheetTest.java 1401 8 22 7 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index f37b09bdbd738f0f618b4a630f4ef20d3fb878ea..feb73470ee3e6dfafdfdc3fe356cb2c556985830 100644 GIT binary patch delta 17 YcmZ3*zlwiDFgv5o*^L1%rv+O8 diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index a5cc1ff..2d7c687 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -53,9 +53,10 @@ public void testAssignment_A1_String_Missing_SingleQuote_Begin_Error() { String result = sheet.evaluate("A1"); assertEquals("#Error", result); } + @Test public void testAssignment_A1_String_Missing_SingleQuote_End_Error() { - sheet.set("A1", "a string"); + sheet.set("A1", "'a string"); String result = sheet.evaluate("A1"); assertEquals("#Error", result); } From 925e37e2037d67df07090acd83e43312754ec59d Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:00:31 +0300 Subject: [PATCH 021/215] besouro automatic message --- .besouro/20161012135455198/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 1962 -> 1977 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012135455198/actions.txt b/.besouro/20161012135455198/actions.txt index b70018d..201d6ff 100644 --- a/.besouro/20161012135455198/actions.txt +++ b/.besouro/20161012135455198/actions.txt @@ -21,3 +21,6 @@ RefactoringAction 1476269912518 SpreadsheetTest.java RENAME testAssignment_A1_St EditAction 1476269922901 SpreadsheetTest.java 1400 8 22 7 EditAction 1476269931184 SpreadsheetTest.java 1399 8 22 7 EditAction 1476269991718 SpreadsheetTest.java 1401 8 22 7 +UnitTestCaseAction 1476269997873 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476269997874 SpreadsheetTest.java FAIL +EditAction 1476270030542 Spreadsheet.java 896 3 4 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index feb73470ee3e6dfafdfdc3fe356cb2c556985830..7e0a0a3c57959a358b84867f388d7eadf2144b0f 100644 GIT binary patch delta 72 zcmZ3*zmuQq)W2Q(7#J8#7~D2;O=jljU~pz+;8agkC@v|=%uC-qmw6jAqtoPjY|6aW c4BQMh45AFS4AKmClMk@Sv%3H_GBLOU0PMICWdHyG delta 56 zcmdnVzlxvh)W2Q(7#J8#7+f}TO=jM_hItz^qs?SSHf3Hb25tsx22lnZ25AP{$%bt5 L>`p+1ObpHd%BT!i diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 18a438b..cb9c51c 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -11,7 +11,7 @@ public String get(String cell) { public void set(String cell, String value) { if (value.length() > 0) { if (value.charAt(0) == '\'') { - if (value.length() > 1) { + if (value.length() > 1 && value.charAt(value.length() - 1)) { value = value.substring(1, value.length() - 1); } else { value = "#Error"; From ae2abf7396e943701966f95ff4bb456dea435534 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:00:51 +0300 Subject: [PATCH 022/215] besouro automatic message --- .besouro/20161012135455198/actions.txt | 2 ++ bin/Spreadsheet.class | Bin 1367 -> 1017 bytes src/Spreadsheet.java | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012135455198/actions.txt b/.besouro/20161012135455198/actions.txt index 201d6ff..2d46816 100644 --- a/.besouro/20161012135455198/actions.txt +++ b/.besouro/20161012135455198/actions.txt @@ -24,3 +24,5 @@ EditAction 1476269991718 SpreadsheetTest.java 1401 8 22 7 UnitTestCaseAction 1476269997873 SpreadsheetTest.java FAIL UnitTestSessionAction 1476269997874 SpreadsheetTest.java FAIL EditAction 1476270030542 Spreadsheet.java 896 3 4 0 +CompilationAction 1476270032816 Spreadsheet.java +EditAction 1476270050821 Spreadsheet.java 904 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index ff3245bc106bdc8a487370dd6f16ec24e36c618e..b1103f5d6ae4e3cab36240bbfa82e7c1ae923730 100644 GIT binary patch delta 322 zcmYL^y-or_6ot>M(S?zKihvC|{;;w@f`yfpjZffTEC(21%`&qN1BsPyV6#tRLNw7t zt$hI-eGnVt)yCZ9%Q+|KCilMcFQ31CKRyH4N9&H?vKt@k424TMmF-ySLHo#BV>1v8 z{Znn#*u+!S6J0Y(qFB1fXpvaciPh*p@a)M@36m%*ov|VaL^Ku?-BbNY(@vipp${~wwhEjUPik0w;A)}@;o=B%S@(6OMU^kt4 zVcAE>u=IcLv9pmLq@Ui$IsG(81MnwQFIF}lu=zsHLy@=uM$BWCnETTlC6viA>|l+! cNcxc4-fyEZ!*cT;wO7%nwt3%|H_D{*Z z%BEFyioJDdrYzv!HX9v_P3mo<=~y+(77&kUb(%q|(nssW14W@(#jLe`J0afj(l4@_SIYEbk-a)B6~GC5xy>+WY-^Vg~_o z(uZA)Wk{cYc)%n0aE$%|j?=3MB8)K}_#{So>k(+&WvEzSK9490h(YHpw-HAf2|UIr zJi%!^Wv+oFTKtJ^R=&WjN7Vn0$!v^#4oq^Q3*m+536O{_;Q|(UkVP!>p5R>bL#P<4YWiL07EYQ P?wGx=zC`evm(u?L-~xEG diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index cb9c51c..96bce37 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -11,7 +11,7 @@ public String get(String cell) { public void set(String cell, String value) { if (value.length() > 0) { if (value.charAt(0) == '\'') { - if (value.length() > 1 && value.charAt(value.length() - 1)) { + if (value.length() > 1 && value.charAt(value.length() - 1) == '\'') { value = value.substring(1, value.length() - 1); } else { value = "#Error"; From d322621e360f6dcc6df89e2f1ff4828989e3f25a Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:02:16 +0300 Subject: [PATCH 023/215] besouro automatic message --- .besouro/20161012135455198/actions.txt | 3 +++ .../20161012135455198/besouroEpisodes.txt | 6 ++++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012135455198/zorroEpisodes.txt | 3 ++- bin/Spreadsheet.class | Bin 1017 -> 1382 bytes tests/SpreadsheetTest.java | 1 - 6 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012135455198/actions.txt b/.besouro/20161012135455198/actions.txt index 2d46816..cf4f479 100644 --- a/.besouro/20161012135455198/actions.txt +++ b/.besouro/20161012135455198/actions.txt @@ -26,3 +26,6 @@ UnitTestSessionAction 1476269997874 SpreadsheetTest.java FAIL EditAction 1476270030542 Spreadsheet.java 896 3 4 0 CompilationAction 1476270032816 Spreadsheet.java EditAction 1476270050821 Spreadsheet.java 904 3 4 0 +UnitTestCaseAction 1476270056363 SpreadsheetTest.java OK +UnitTestSessionAction 1476270056364 SpreadsheetTest.java OK +EditAction 1476270135784 SpreadsheetTest.java 1400 8 22 7 diff --git a/.besouro/20161012135455198/besouroEpisodes.txt b/.besouro/20161012135455198/besouroEpisodes.txt index b84b9dd..a306307 100644 --- a/.besouro/20161012135455198/besouroEpisodes.txt +++ b/.besouro/20161012135455198/besouroEpisodes.txt @@ -1,2 +1,8 @@ 1476269845218 regression 2 149 true 1476269845219 regression 1 149 true +1476270056364 test-first 3 206 true +1476270056365 test-first 3 206 true +1476270056366 test-first 3 206 true +1476270056367 test-first 3 206 true +1476270056368 test-first 3 206 true +1476270056369 test-first 3 206 true diff --git a/.besouro/20161012135455198/randomHeuristicEpisodes.txt b/.besouro/20161012135455198/randomHeuristicEpisodes.txt index 38e8b3f..9ebd826 100644 --- a/.besouro/20161012135455198/randomHeuristicEpisodes.txt +++ b/.besouro/20161012135455198/randomHeuristicEpisodes.txt @@ -1 +1,2 @@ 1476269845218 regression 2 149 false +1476270056364 test-first 3 206 true diff --git a/.besouro/20161012135455198/zorroEpisodes.txt b/.besouro/20161012135455198/zorroEpisodes.txt index 38e8b3f..d7f5d59 100644 --- a/.besouro/20161012135455198/zorroEpisodes.txt +++ b/.besouro/20161012135455198/zorroEpisodes.txt @@ -1 +1,2 @@ -1476269845218 regression 2 149 false +1476269845218 regression 2 149 true +1476270056364 test-first 3 211 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index b1103f5d6ae4e3cab36240bbfa82e7c1ae923730..fd1c4776618afb2392314f48098c6137317b79b2 100644 GIT binary patch delta 677 zcmZ8eOKTHh6g}T$^5{6RX=`G9wDw`!nPzI@D}BVKYA85hR7^n>Hd6X0hR62*fng)NlTeoe9Ap!c=0-aW)+VM{!O?5-GB5H3_+>{Zn$g zShY)TroApr=LP)RR;_81q|z|!u3fer0r7xRp_r5sB_|LrxK`>z>J5O^`>s^FdQQR7l0Ei6P|URmPFVbF5n^?xsD~0 zUgoOum_(Z7ek?LGj)4XL4+Mqyj+hAdAWJ=jdW06Nh*KY7)>UFjd{uA0E|x!F>M(S?zKihvC|{;;w@f`yfpjZffTEC(21%`&qN1BsPyV6#tRLNw7t zt$hY1v8 z{Znn#*u+!S6J0Y(qFB1fXpvaciPh*p@a)M@36m%*ov|VaL^Ku?-BbNY(@vipp${~wwhEjUPik0w;A)}@;o=B%S@(6OMU^kt4 zVcAE>u=IcLv9pmLq#xe|l+! cNcxc4-fyEZ!*cT;wO7>B_WYjTpwL6}2MP2`PXGV_ diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 2d7c687..a780c8c 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -60,5 +60,4 @@ public void testAssignment_A1_String_Missing_SingleQuote_End_Error() { String result = sheet.evaluate("A1"); assertEquals("#Error", result); } - } From 3e6de0851543962a0c40662c91bb3c75c3aee741 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:03:42 +0300 Subject: [PATCH 024/215] besouro automatic message From f1ef3d5611f005cb5f7499a4c6d81f97ddc2e97c Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:17:13 +0300 Subject: [PATCH 025/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 2 ++ .../20161012141626179/besouroEpisodes.txt | 0 .besouro/20161012141626179/disagreements.txt | 0 .../randomHeuristicEpisodes.txt | 0 .besouro/20161012141626179/userComments.txt | 0 .besouro/20161012141626179/zorroEpisodes.txt | 0 bin/Spreadsheet.class | Bin 1382 -> 1458 bytes bin/SpreadsheetTest.class | Bin 1977 -> 2155 bytes src/Spreadsheet.java | 8 +++++++- tests/SpreadsheetTest.java | 11 +++++++++-- 10 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 .besouro/20161012141626179/actions.txt create mode 100644 .besouro/20161012141626179/besouroEpisodes.txt create mode 100644 .besouro/20161012141626179/disagreements.txt create mode 100644 .besouro/20161012141626179/randomHeuristicEpisodes.txt create mode 100644 .besouro/20161012141626179/userComments.txt create mode 100644 .besouro/20161012141626179/zorroEpisodes.txt diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt new file mode 100644 index 0000000..c9fa130 --- /dev/null +++ b/.besouro/20161012141626179/actions.txt @@ -0,0 +1,2 @@ +FileOpenedAction 1476270986408 Spreadsheet.java 1113 3 4 0 +EditAction 1476271032964 SpreadsheetTest.java 1580 9 22 7 diff --git a/.besouro/20161012141626179/besouroEpisodes.txt b/.besouro/20161012141626179/besouroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161012141626179/disagreements.txt b/.besouro/20161012141626179/disagreements.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161012141626179/randomHeuristicEpisodes.txt b/.besouro/20161012141626179/randomHeuristicEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161012141626179/userComments.txt b/.besouro/20161012141626179/userComments.txt new file mode 100644 index 0000000..e69de29 diff --git a/.besouro/20161012141626179/zorroEpisodes.txt b/.besouro/20161012141626179/zorroEpisodes.txt new file mode 100644 index 0000000..e69de29 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index fd1c4776618afb2392314f48098c6137317b79b2..8ef9bfa4951e1f52c62d39e30097a4dcb4002c8f 100644 GIT binary patch delta 250 zcmXw!KTASk7{!0~-nSu_kW{>RBNM!XFI=)e=1>SlPJV-E5{DoNL=YSrY?r#bUczwI zFcHUE`Xqh_H=nDxopYXtALlIgzN4eLy6a=H3;dZWPLGLEQ?mQl0bUsB0T~kts}{y? zK+Nc^cdJ9*V)^RO|5xv-PRf6h5CWo|1)4`$35g!~Akl~XP zzT`G0#}6(u^88|i0ymp#LQ9B~lESiytktQg9iiS*;0#5J66ahbWlu+tmlV-l$*WDY Os6Bsa-A6pXtaB?9@GaN? delta 198 zcmXAj%?bel6oo&=kiS6~|78?WHhu?%qOqF|E9D8KJb=ZNH4Dw&Gswci19=R&jorET z+C#pCYoT+o6;U&)gAaQlc7bFGw@_DKw$}g!)x&}QI7K{ZtkajjTh5}a^ R$!VUj>00W_*K#jv;|ByN86N-u diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 7e0a0a3c57959a358b84867f388d7eadf2144b0f..d10ec4a61d09fe9055175ec36fa2636b8e7e1e5f 100644 GIT binary patch delta 174 zcmdnV|5||S)W2Q(7#J8#7(6#}u`n{qOy*}4Wlb!}EKA+2!YIZlC0&wQT;f<;!T3Z;zgj^>#uu1VcF>o_DGl(*{Fi11FPBvtdXLkoWkBPwp0NDmH AzW@LL delta 58 zcmaDYu#=zb)W2Q(7#J8#7~D2;u`n` 0) { - if (value.charAt(0) == '\'') { + if (value.charAt(0) == '=') { + if (value.length() > 2 && value.charAt(value.length() - 1) == '\'') { + value = value.substring(2, value.length() - 1); + } else { + value = "#Error"; + } + } else if (value.charAt(0) == '\'') { if (value.length() > 1 && value.charAt(value.length() - 1) == '\'') { value = value.substring(1, value.length() - 1); } else { diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index a780c8c..05ffc15 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -13,14 +13,14 @@ public void initilize() { } @Test - public void testAssignment_A1_Neg_1() { + public void testAssignment_A1_Negative_1() { sheet.set("A1", "-1"); String result = sheet.evaluate("A1"); assertEquals("-1", result); } @Test - public void testAssignment_A1_Pos_1() { + public void testAssignment_A1_Postive_1() { sheet.set("A1", "1"); String result = sheet.evaluate("A1"); assertEquals("1", result); @@ -60,4 +60,11 @@ public void testAssignment_A1_String_Missing_SingleQuote_End_Error() { String result = sheet.evaluate("A1"); assertEquals("#Error", result); } + + @Test + public void testAssignment_A1_Assign_String() { + sheet.set("A1", ""='a string'"); + String result = sheet.evaluate("A1"); + assertEquals("a string", result); + } } From 0ccfe95aadab9f6bcf70bea66558518e9ecb8a92 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:17:22 +0300 Subject: [PATCH 026/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 2155 -> 2155 bytes src/Spreadsheet.java | 2 +- tests/SpreadsheetTest.java | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index c9fa130..a9f98cb 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -1,2 +1,5 @@ FileOpenedAction 1476270986408 Spreadsheet.java 1113 3 4 0 EditAction 1476271032964 SpreadsheetTest.java 1580 9 22 7 +CompilationAction 1476271033171 SpreadsheetTest.java +CompilationAction 1476271040180 SpreadsheetTest.java +EditAction 1476271042845 Spreadsheet.java 1113 3 4 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index d10ec4a61d09fe9055175ec36fa2636b8e7e1e5f..c3e9d9f7dc7f7f9f4f6edc6f689fdc16bd12bf3a 100644 GIT binary patch delta 22 dcmaDY@LFJl2nUzzHU>GZEev8pQj_I4d;wCw1`GfI delta 17 YcmaDY@LFJl2*>1k?3|3QljS&k0XeP(Pyhe` diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index d45f77d..fa803d2 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -11,7 +11,7 @@ public String get(String cell) { public void set(String cell, String value) { if (value.length() > 0) { if (value.charAt(0) == '=') { - if (value.length() > 2 && value.charAt(value.length() - 1) == '\'') { + if (value.length() > 3 && value.charAt(value.length() - 1) == '\'') { value = value.substring(2, value.length() - 1); } else { value = "#Error"; diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 05ffc15..48ced90 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -63,7 +63,7 @@ public void testAssignment_A1_String_Missing_SingleQuote_End_Error() { @Test public void testAssignment_A1_Assign_String() { - sheet.set("A1", ""='a string'"); + sheet.set("A1", "='a string'"); String result = sheet.evaluate("A1"); assertEquals("a string", result); } From e08b405aed449c5e379cfe18ccc0cd404007f355 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:22:10 +0300 Subject: [PATCH 027/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 7 +++++++ .../20161012141626179/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012141626179/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 1458 -> 1458 bytes 5 files changed, 11 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index a9f98cb..b2ed450 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -3,3 +3,10 @@ EditAction 1476271032964 SpreadsheetTest.java 1580 9 22 7 CompilationAction 1476271033171 SpreadsheetTest.java CompilationAction 1476271040180 SpreadsheetTest.java EditAction 1476271042845 Spreadsheet.java 1113 3 4 0 +UnitTestCaseAction 1476271043184 SpreadsheetTest.java OK +UnitTestSessionAction 1476271043185 SpreadsheetTest.java OK +RefactoringAction 1476271109564 Spreadsheet.java ADD int consume FIELD +RefactoringAction 1476271113085 Spreadsheet.java RENAME consume=>int consumeStringLiteral FIELD +RefactoringAction 1476271117605 Spreadsheet.java RENAME consumeStringLiteral=>int consumeStringLiteral(int) METHOD +RefactoringAction 1476271241223 Spreadsheet.java RENAME consumeStringLiteral(int)=>String consumeStringLiteral(String, int) METHOD +EditAction 1476271330224 Spreadsheet.java 1113 3 4 0 diff --git a/.besouro/20161012141626179/besouroEpisodes.txt b/.besouro/20161012141626179/besouroEpisodes.txt index e69de29..e83dec2 100644 --- a/.besouro/20161012141626179/besouroEpisodes.txt +++ b/.besouro/20161012141626179/besouroEpisodes.txt @@ -0,0 +1,2 @@ +1476271043185 regression 2 56 true +1476271043186 regression 1 56 true diff --git a/.besouro/20161012141626179/randomHeuristicEpisodes.txt b/.besouro/20161012141626179/randomHeuristicEpisodes.txt index e69de29..74e240d 100644 --- a/.besouro/20161012141626179/randomHeuristicEpisodes.txt +++ b/.besouro/20161012141626179/randomHeuristicEpisodes.txt @@ -0,0 +1 @@ +1476271043185 regression 2 56 true diff --git a/.besouro/20161012141626179/zorroEpisodes.txt b/.besouro/20161012141626179/zorroEpisodes.txt index e69de29..12648c0 100644 --- a/.besouro/20161012141626179/zorroEpisodes.txt +++ b/.besouro/20161012141626179/zorroEpisodes.txt @@ -0,0 +1 @@ +1476271043185 regression 2 56 false diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 8ef9bfa4951e1f52c62d39e30097a4dcb4002c8f..d17701ed4ecdbb108bac717ae5c2cd13a8e998f9 100644 GIT binary patch delta 14 WcmdnQy@`9n4Q58R%{Q5EG6Dc9gavj0 delta 14 WcmdnQy@`9n4Q58x%{Q5EG6Dc9eg$;^ From b0b3a64d18560806171531b8d70629ed554b4cfb Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:22:31 +0300 Subject: [PATCH 028/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + src/Spreadsheet.java | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index b2ed450..183383b 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -10,3 +10,4 @@ RefactoringAction 1476271113085 Spreadsheet.java RENAME consume=>int consumeStri RefactoringAction 1476271117605 Spreadsheet.java RENAME consumeStringLiteral=>int consumeStringLiteral(int) METHOD RefactoringAction 1476271241223 Spreadsheet.java RENAME consumeStringLiteral(int)=>String consumeStringLiteral(String, int) METHOD EditAction 1476271330224 Spreadsheet.java 1113 3 4 0 +EditAction 1476271351511 Spreadsheet.java 1393 3 4 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index fa803d2..633238f 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -14,7 +14,20 @@ public void set(String cell, String value) { if (value.length() > 3 && value.charAt(value.length() - 1) == '\'') { value = value.substring(2, value.length() - 1); } else { - value = "#Error"; + boolean isInteger = true; + for (int i = 1; i < value.length(); i++) { + char c = value.charAt(i); + if (i == 0 && c == '-') + continue; + + if (c < '0' || c > '9') { + isInteger = false; + break; + } + } + + if (!isInteger) + value = "#Error"; } } else if (value.charAt(0) == '\'') { if (value.length() > 1 && value.charAt(value.length() - 1) == '\'') { From e29ecab7079d050861fb6cf08d9e337228fdae2e Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:23:12 +0300 Subject: [PATCH 029/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 10 ++++++++++ .../20161012141626179/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012141626179/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 1458 -> 1613 bytes tests/SpreadsheetTest.java | 14 ++++++++++++++ 6 files changed, 27 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 183383b..58cffa2 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -11,3 +11,13 @@ RefactoringAction 1476271117605 Spreadsheet.java RENAME consumeStringLiteral=>in RefactoringAction 1476271241223 Spreadsheet.java RENAME consumeStringLiteral(int)=>String consumeStringLiteral(String, int) METHOD EditAction 1476271330224 Spreadsheet.java 1113 3 4 0 EditAction 1476271351511 Spreadsheet.java 1393 3 4 0 +UnitTestCaseAction 1476271355212 SpreadsheetTest.java OK +UnitTestSessionAction 1476271355212 SpreadsheetTest.java OK +RefactoringAction 1476271363360 SpreadsheetTest.java ADD void testAssignment_A1_Assign_String()/2 METHOD +RefactoringAction 1476271366887 SpreadsheetTest.java RENAME testAssignment_A1_Assign_String()/2=>void testAssignment_A1_Assign_() METHOD +RefactoringAction 1476271368404 SpreadsheetTest.java RENAME testAssignment_A1_Assign_()=>void testAssignment_A1_Assign_Integer() METHOD +RefactoringAction 1476271373926 SpreadsheetTest.java RENAME testAssignment_A1_Assign_Integer()=>void testAssignment_A1_Assign_Integer_Positive() METHOD +RefactoringAction 1476271383472 SpreadsheetTest.java ADD void testAssignment_A1_Assign_Integer_Positive()/2 METHOD +RefactoringAction 1476271384488 SpreadsheetTest.java RENAME testAssignment_A1_Assign_Integer_Positive()/2=>void testAssignment_A1_Assign_Integer_Positie() METHOD +RefactoringAction 1476271387003 SpreadsheetTest.java RENAME testAssignment_A1_Assign_Integer_Positie()=>void testAssignment_A1_Assign_Integer_Negative() METHOD +EditAction 1476271392139 SpreadsheetTest.java 1910 11 31 10 diff --git a/.besouro/20161012141626179/besouroEpisodes.txt b/.besouro/20161012141626179/besouroEpisodes.txt index e83dec2..aeff825 100644 --- a/.besouro/20161012141626179/besouroEpisodes.txt +++ b/.besouro/20161012141626179/besouroEpisodes.txt @@ -1,2 +1,3 @@ 1476271043185 regression 2 56 true 1476271043186 regression 1 56 true +1476271355212 refactoring 2A 245 true diff --git a/.besouro/20161012141626179/randomHeuristicEpisodes.txt b/.besouro/20161012141626179/randomHeuristicEpisodes.txt index 74e240d..e113fda 100644 --- a/.besouro/20161012141626179/randomHeuristicEpisodes.txt +++ b/.besouro/20161012141626179/randomHeuristicEpisodes.txt @@ -1 +1,2 @@ 1476271043185 regression 2 56 true +1476271355212 refactoring 2A 245 true diff --git a/.besouro/20161012141626179/zorroEpisodes.txt b/.besouro/20161012141626179/zorroEpisodes.txt index 12648c0..023e023 100644 --- a/.besouro/20161012141626179/zorroEpisodes.txt +++ b/.besouro/20161012141626179/zorroEpisodes.txt @@ -1 +1,2 @@ 1476271043185 regression 2 56 false +1476271355212 refactoring 2A 312 false diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index d17701ed4ecdbb108bac717ae5c2cd13a8e998f9..3070a9c6336203ce3c189b27bbb278da4cbafeb5 100644 GIT binary patch delta 332 zcmX|+Q7c1n7{-79^FPNd8)wWIO&Bw5gxN-uM4bnU`7r-!XoY&t+WnL3FJJ~Fya(p{@^V48YT zJ(|3|VZQWv<%}c{B0!i3-K6Ouhf6`G6?$2x505C@^iyVlT?W}B&c1kuBsgM(V@5e) zj4IMqEb zOf3~>2=%8HL|L-8$)a3pN}_Wt%fFuB^HSUq=)Zg4b{lQCD3Mtrg&zXSRo}!^*vGbf PI(>p>%kfmnoI0sr<|{Uk delta 245 zcmXAkJ8D8<5Ju0mk1Y#^nDAP5o=EK;}tAwQ%vBG|{E zqOI1h!40^GOky|R%*Wx((fi~1-svgr3j+%{I2#gER*t^m!EVeb{4Ff?Vg%J$_o=$^ z`Q9NaO)uB@xWP}302ORpNzVjn6XKOHT_W_jr7!&fG2XaiM4T}RCM5YF#f&s_?perf zNrp99w&dC42nCuKE1^Xsi67CLptS$7DASc-Ta+lHGvrA`s`AQMkTnr9d6Z@hk87%v L+13gwYh```xqK#N diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 48ced90..05e0da6 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -67,4 +67,18 @@ public void testAssignment_A1_Assign_String() { String result = sheet.evaluate("A1"); assertEquals("a string", result); } + + @Test + public void testAssignment_A1_Assign_Integer_Positive() { + sheet.set("A1", "=1"); + String result = sheet.evaluate("A1"); + assertEquals("1", result); + } + + @Test + public void testAssignment_A1_Assign_Integer_Negative() { + sheet.set("A1", "=-1"); + String result = sheet.evaluate("A1"); + assertEquals("-1", result); + } } From fc16c4bce3b890f9e70c9e641bdbe425f50046ef Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:24:42 +0300 Subject: [PATCH 030/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 2155 -> 2496 bytes src/Spreadsheet.java | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 58cffa2..2d99ce2 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -21,3 +21,6 @@ RefactoringAction 1476271383472 SpreadsheetTest.java ADD void testAssignment_A1_ RefactoringAction 1476271384488 SpreadsheetTest.java RENAME testAssignment_A1_Assign_Integer_Positive()/2=>void testAssignment_A1_Assign_Integer_Positie() METHOD RefactoringAction 1476271387003 SpreadsheetTest.java RENAME testAssignment_A1_Assign_Integer_Positie()=>void testAssignment_A1_Assign_Integer_Negative() METHOD EditAction 1476271392139 SpreadsheetTest.java 1910 11 31 10 +UnitTestCaseAction 1476271393345 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476271393345 SpreadsheetTest.java FAIL +EditAction 1476271482839 Spreadsheet.java 1393 3 4 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index c3e9d9f7dc7f7f9f4f6edc6f689fdc16bd12bf3a..8637463a2eb0e5f008532c1456f6aad8aa8b61ad 100644 GIT binary patch delta 223 zcmaDYa6p*r)W2Q(7#J8#82mSKJz%caEJ-acaV##*OwY?r%`1s_G>nJv;yv?9Qqxn5 z;sf%FGfOhdQaKnr85x*t4H+2->+wrXPlV|4VPs&o)dgze3eGPrN=|jl%t>Wr5D6|Q zN=-~D&X~j^&&ab`fyIqw@*-9hMvuvXtjfHe4BQM}45AF)4AKlflN(v(8NDViWL0JK do_w1{nKu9^8wivQ0?G!1WZ8Xz{$XP90{|b=Ke_+_ delta 36 scmX>g{91tP)W2Q(7#J8#7(6#}Jz$<3%wo#OwYihUjfItgfr-Hb0PZ0QHvj+t diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 633238f..22f36a5 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -17,7 +17,7 @@ public void set(String cell, String value) { boolean isInteger = true; for (int i = 1; i < value.length(); i++) { char c = value.charAt(i); - if (i == 0 && c == '-') + if (i == 1 && c == '-') continue; if (c < '0' || c > '9') { @@ -37,7 +37,7 @@ public void set(String cell, String value) { } } else { boolean isInteger = true; - for (int i = 1; i < value.length(); i++) { + for (int i = 0; i < value.length(); i++) { char c = value.charAt(i); if (i == 0 && c == '-') continue; From 2227f947cdb3be8019ad6d4d4980507023d21264 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:25:26 +0300 Subject: [PATCH 031/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1613 -> 1614 bytes src/Spreadsheet.java | 2 ++ 3 files changed, 5 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 2d99ce2..a0c4f90 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -24,3 +24,6 @@ EditAction 1476271392139 SpreadsheetTest.java 1910 11 31 10 UnitTestCaseAction 1476271393345 SpreadsheetTest.java FAIL UnitTestSessionAction 1476271393345 SpreadsheetTest.java FAIL EditAction 1476271482839 Spreadsheet.java 1393 3 4 0 +UnitTestCaseAction 1476271484626 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476271484627 SpreadsheetTest.java FAIL +EditAction 1476271526652 Spreadsheet.java 1445 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3070a9c6336203ce3c189b27bbb278da4cbafeb5..6199b1bb3f0ed3a307a4a61aea2d7fff14c0555c 100644 GIT binary patch delta 313 zcmXYsIZFdk6otR%dlL~7a2sQUxJ6vzM2X8}+=8fJEeICciePDB5fFRZ*GsIdgn%%( zfMsmdLh%=fU|}gJXuvzh?%aFMx#!&b_(QyMrF-Tu#6ZQokn}O1o({=0FO=Df7BRbK z+U&bdxVNTgd~-_PbB!o`$2F#G6DF(fY+#m@wl!U}muB&B9hVJ~Y}3gODRyaPpEM=9 zIiQy#`Z%GVGcr^d;G981hPYsu8%C&-<&jaI$??J%uZ;61+y|3c^lT-QyRg5@- delta 281 zcmX|+u}VU56ommB=tu|b&t_pDJRM2#>FB0RE5n=PJ*^2|1`?C{1e@5JempwAvd z_OVGZ;(#v>`4;!X31iYs$SKVk>p+QR=Qc_7N##)BmLO_|M?x-XyyRF$4f4WiGV;)s f#GjJIl+d~DE^L2cbFwqVYWANcrT*|)wppJ7pffQ9 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 22f36a5..8e65fca 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -28,6 +28,8 @@ public void set(String cell, String value) { if (!isInteger) value = "#Error"; + + value.substring(1, value.length() - 1); } } else if (value.charAt(0) == '\'') { if (value.length() > 1 && value.charAt(value.length() - 1) == '\'') { From d2b94c850310b2becdebf5862f268528fd6954ec Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:25:30 +0300 Subject: [PATCH 032/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 1614 -> 1631 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index a0c4f90..dc03863 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -27,3 +27,4 @@ EditAction 1476271482839 Spreadsheet.java 1393 3 4 0 UnitTestCaseAction 1476271484626 SpreadsheetTest.java FAIL UnitTestSessionAction 1476271484627 SpreadsheetTest.java FAIL EditAction 1476271526652 Spreadsheet.java 1445 3 4 0 +EditAction 1476271530657 Spreadsheet.java 1444 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 6199b1bb3f0ed3a307a4a61aea2d7fff14c0555c..fe1a118668be0581bef5cdfb4f57975b6296ff04 100644 GIT binary patch delta 275 zcmXYsyGjF56h+s`y)#jWk_ zAdtc$YU|?*Bw#ftcn9p(*?V)?`zi6BxVcm5eKanJ=Lbw*it<%JCb@A%%e<(ZJeyE$ zCta^};Oi)%PXcC-%$9DeHd*tkcTdll;erg;WVt2BJ$W7|@W>n;iu5Sa$LEcCK3U|8 zB?grFrYKMmO;zGFBt?@k;F#g4593VOE21gV*r=tlr5I}*vdjvKbsFZ}Ni{p{{3~7S qu2Qk9`nFe<8V+^)W&yAEOI+lKNf`;zv5+A*WYl~(d$MT?ZvGE4Cp0Ml delta 262 zcmXYsJxfAi7>2Lc_dUl1g^Vl`8tRmNs70TCWJ@J3^$+?L{Q(!J28Z4~YIG2U;2;H! zwlze}5)rrtL2@eaQQWTQe(wAE=tiHTt$Uq3z~F*%Gd}az{A9F`H+gu&g?-h_>d6NB z$ke9NXZF-w={lZ$H|6Rj3*53u6OR^4+>yd(g*K}^vPOq>UP$vsmJc@gWRsrszS*JA zF2CfJLxE}FoXBuL31*}k(i} 1 && value.charAt(value.length() - 1) == '\'') { From 7749b27f7d38dc0778a2e9f19e2b02f05619c380 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:25:34 +0300 Subject: [PATCH 033/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + src/Spreadsheet.java | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index dc03863..7e9affc 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -28,3 +28,4 @@ UnitTestCaseAction 1476271484626 SpreadsheetTest.java FAIL UnitTestSessionAction 1476271484627 SpreadsheetTest.java FAIL EditAction 1476271526652 Spreadsheet.java 1445 3 4 0 EditAction 1476271530657 Spreadsheet.java 1444 3 4 0 +EditAction 1476271534543 Spreadsheet.java 1450 3 4 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index acc3661..eb4b5ca 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -28,8 +28,9 @@ public void set(String cell, String value) { if (!isInteger) value = "#Error"; - - value.substring(1, value.length() - 1); + else + + value.substring(1, value.length() - 1); } } else if (value.charAt(0) == '\'') { if (value.length() > 1 && value.charAt(value.length() - 1) == '\'') { From 3dc01a45d74c51b61fdc865cec6b6af5451b588b Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:25:36 +0300 Subject: [PATCH 034/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 1631 -> 1634 bytes src/Spreadsheet.java | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 7e9affc..6bf1bda 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -29,3 +29,4 @@ UnitTestSessionAction 1476271484627 SpreadsheetTest.java FAIL EditAction 1476271526652 Spreadsheet.java 1445 3 4 0 EditAction 1476271530657 Spreadsheet.java 1444 3 4 0 EditAction 1476271534543 Spreadsheet.java 1450 3 4 0 +EditAction 1476271536856 Spreadsheet.java 1449 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index fe1a118668be0581bef5cdfb4f57975b6296ff04..cf9d6aa469ec62be0ac2e7646ed5dacd7f4d2292 100644 GIT binary patch delta 226 zcmXAky-Px29EG1>ulLFo2MMpB&|s!f_a=T-h>1~K5Dl*VFXdj-JGqEXu1*dT2!RNS zo3={Q+z>(F)T?gK!{NX=%kV1P8>qws0c;T0?{m-++gE*3k!qWUo~yKc=(V~DI{V&z zmsfoqSUo+HW_)S`NBJK_9@S4^qy~2O6WHHE6n!2tf!z zLxb%_&VmR{PMwR}^Zps$car!?JP%an0*wJl1|i$`q5>6?TRVH;HZqL8)+swxtMX+R zs;y13d}%v+(z{`YK3VR_@x(4KWyS=2v(GOTW>lF| Date: Wed, 12 Oct 2016 14:25:45 +0300 Subject: [PATCH 035/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 1634 -> 1634 bytes src/Spreadsheet.java | 6 +++--- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 6bf1bda..d40a5ba 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -30,3 +30,4 @@ EditAction 1476271526652 Spreadsheet.java 1445 3 4 0 EditAction 1476271530657 Spreadsheet.java 1444 3 4 0 EditAction 1476271534543 Spreadsheet.java 1450 3 4 0 EditAction 1476271536856 Spreadsheet.java 1449 3 4 0 +EditAction 1476271545287 Spreadsheet.java 1448 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index cf9d6aa469ec62be0ac2e7646ed5dacd7f4d2292..cd730644886aac5dd892641d4d662095308053c9 100644 GIT binary patch delta 95 zcmV-l0HFWk4B`y1Ck0I)0E_@40GR+I0I&cg0K5Pt0KWhx0Kxz$0L1_)0LK6-0L=g^ z0M!620O0^F0OSBK0P+AZ0Q3Mc0QUeY0RsRv0S5p!0SW**0Tci`lXL~g0X~yF1}0Ek B6^;M^ delta 95 zcmV-l0HFWk4B`y1Ck0I*0E_@50GR+J0I&ch0K5Pu0KWhy0Kxz%0L1_*0LK6;0L=g_ z0M!630O0^G0OSBL0P+Aa0Q3Md0QUeZ0RsRw0S5p#0SW*+0Tci{lXL~g0Y8&G1}0QB B6{7$E diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 6151a13..ba6eef6 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -26,10 +26,10 @@ public void set(String cell, String value) { } } - if (!isInteger) - value = "#Error"; - else + if (isInteger) value.substring(1, value.length() - 1); + else + value = "#Error"; } } else if (value.charAt(0) == '\'') { if (value.length() > 1 && value.charAt(value.length() - 1) == '\'') { From 39043415c4d9c648355b1b6a694979131c536032 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:26:20 +0300 Subject: [PATCH 036/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 5 +++++ bin/Spreadsheet.class | Bin 1634 -> 1634 bytes src/Spreadsheet.java | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index d40a5ba..cb8cabb 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -31,3 +31,8 @@ EditAction 1476271530657 Spreadsheet.java 1444 3 4 0 EditAction 1476271534543 Spreadsheet.java 1450 3 4 0 EditAction 1476271536856 Spreadsheet.java 1449 3 4 0 EditAction 1476271545287 Spreadsheet.java 1448 3 4 0 +UnitTestCaseAction 1476271546431 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476271546431 SpreadsheetTest.java FAIL +UnitTestCaseAction 1476271558005 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476271558005 SpreadsheetTest.java FAIL +EditAction 1476271580780 Spreadsheet.java 1448 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index cd730644886aac5dd892641d4d662095308053c9..00631af952647af3439b11b57be8f3957fc4f63c 100644 GIT binary patch delta 48 zcmaFF^N44I6^rOh1|c05oox)VEGgR<)WerEv Date: Wed, 12 Oct 2016 14:26:26 +0300 Subject: [PATCH 037/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1634 -> 1634 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index cb8cabb..9f8d3ad 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -36,3 +36,6 @@ UnitTestSessionAction 1476271546431 SpreadsheetTest.java FAIL UnitTestCaseAction 1476271558005 SpreadsheetTest.java FAIL UnitTestSessionAction 1476271558005 SpreadsheetTest.java FAIL EditAction 1476271580780 Spreadsheet.java 1448 3 4 0 +UnitTestCaseAction 1476271582094 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476271582095 SpreadsheetTest.java FAIL +EditAction 1476271586756 Spreadsheet.java 1448 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 00631af952647af3439b11b57be8f3957fc4f63c..470bd88c8fb93306442d7b65bdc9bc5fffa5f0f0 100644 GIT binary patch delta 14 VcmaFF^N44I9SbAtW_uQ8CIBWx1MmO< delta 14 VcmaFF^N44I9SbANW_uQ8CIBWr1MdI; diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 132c65c..ba6eef6 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -27,7 +27,7 @@ public void set(String cell, String value) { } if (isInteger) - value.substring(2, value.length() - 1); + value.substring(1, value.length() - 1); else value = "#Error"; } From ac6f3ede1fb8bb3b5c3850e22a785f34ab8c5f07 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:26:53 +0300 Subject: [PATCH 038/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1634 -> 1634 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 9f8d3ad..03808e2 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -39,3 +39,6 @@ EditAction 1476271580780 Spreadsheet.java 1448 3 4 0 UnitTestCaseAction 1476271582094 SpreadsheetTest.java FAIL UnitTestSessionAction 1476271582095 SpreadsheetTest.java FAIL EditAction 1476271586756 Spreadsheet.java 1448 3 4 0 +UnitTestCaseAction 1476271588373 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476271588374 SpreadsheetTest.java FAIL +EditAction 1476271613891 Spreadsheet.java 1448 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 470bd88c8fb93306442d7b65bdc9bc5fffa5f0f0..00631af952647af3439b11b57be8f3957fc4f63c 100644 GIT binary patch delta 14 VcmaFF^N44I9SbANW_uQ8CIBWr1MdI; delta 14 VcmaFF^N44I9SbAtW_uQ8CIBWx1MmO< diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index ba6eef6..b514f95 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -17,7 +17,7 @@ public void set(String cell, String value) { boolean isInteger = true; for (int i = 1; i < value.length(); i++) { char c = value.charAt(i); - if (i == 1 && c == '-') + if (i == 0 && c == '-') continue; if (c < '0' || c > '9') { From 6a797653c149411d1f8c0ed67d1875296bd30126 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:27:09 +0300 Subject: [PATCH 039/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1634 -> 1633 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 03808e2..562fef2 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -42,3 +42,6 @@ EditAction 1476271586756 Spreadsheet.java 1448 3 4 0 UnitTestCaseAction 1476271588373 SpreadsheetTest.java FAIL UnitTestSessionAction 1476271588374 SpreadsheetTest.java FAIL EditAction 1476271613891 Spreadsheet.java 1448 3 4 0 +UnitTestCaseAction 1476271614958 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476271614959 SpreadsheetTest.java FAIL +EditAction 1476271629143 Spreadsheet.java 1448 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 00631af952647af3439b11b57be8f3957fc4f63c..2c7204f6b37365d5b3a41a95a339e5abaa161e0e 100644 GIT binary patch delta 269 zcmX|+JxfAi0EM5|``!zJf~46sP$Mf$Z{$ZRe$*1w)=<#Y5=7t+Xo!Xy1;=-3ivB@O zcTf-n2?Wu__CAId7YUqujc9w$Im0>U!}socZW-|-Bo>H};}U%krenAy0=tjg%?(SP z%b=PVe)%f*q-x5Vs>spp35%Sv#055&M5wdC6;ZB<(O`uptK5^|i8b1+(_w=yNqTJZ zLW%)t#yGsO#V6ZL$?#2<87bkRAS{Z)OGN~!5(3Wf&L`^DuvQ#sjIfOOHM5#LlsP6x i9)p_Z9SZu_p`KBsgsDsS|I+?{I#xr|7Gd>e-uwUraxWIE&FC-P22BqHR8YlkQl--M6 zv5CDTj+|AH1kT!;@3Emg`g!|wyoF<%EW6~`BhNm498lzt0Ztj@j3Le`QD>NI%G@x* zEu-8q#yufT#%U4JW`Z{+`Cy7qV!jB)P?1g&>82_f7RdlRbp4Fg)_!%YsmxPAe#2N* o2McU6%?ySms?1W+57%`pz5Jss-wbk+_3y#aH_e|gu>b%7 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index b514f95..0b61509 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -41,7 +41,7 @@ public void set(String cell, String value) { boolean isInteger = true; for (int i = 0; i < value.length(); i++) { char c = value.charAt(i); - if (i == 0 && c == '-') + if (i == 1 && c == '-') continue; if (c < '0' || c > '9') { From baf6ce90d2be41e8eb38d25962c54a849ed9ef4d Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:27:10 +0300 Subject: [PATCH 040/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 1633 -> 1634 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 562fef2..7fd7d68 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -45,3 +45,4 @@ EditAction 1476271613891 Spreadsheet.java 1448 3 4 0 UnitTestCaseAction 1476271614958 SpreadsheetTest.java FAIL UnitTestSessionAction 1476271614959 SpreadsheetTest.java FAIL EditAction 1476271629143 Spreadsheet.java 1448 3 4 0 +EditAction 1476271630900 Spreadsheet.java 1448 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 2c7204f6b37365d5b3a41a95a339e5abaa161e0e..f3a058db61586f6c0dc6dbcf59cf7ee2b03d98f6 100644 GIT binary patch delta 188 zcmaFJ^N44|E@lCL1{MZ31_nk^oox)V^BCDCpJLW$yf*n4a{zm*khbq~hWg2YEc(*^ zV74cV9kUtBat1>kQI>5C%4V#hEG!Eq^Rj3$o|$}V9;fF%%IQkk->oBGlL<+HwG<6CI(YRHU=|BP6jJRVFqgk z5e5c^7zR#|`3#~AVn7~dauoV9dbGaFW52!GysS=$N1K={>PdE04NS3&;S4c diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 0b61509..5b647e0 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -17,7 +17,7 @@ public void set(String cell, String value) { boolean isInteger = true; for (int i = 1; i < value.length(); i++) { char c = value.charAt(i); - if (i == 0 && c == '-') + if (i == 1 && c == '-') continue; if (c < '0' || c > '9') { From d3e613ba9ee2e25747bfa446e00607c7fdac515f Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:27:36 +0300 Subject: [PATCH 041/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1634 -> 1635 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 7fd7d68..682b81d 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -46,3 +46,6 @@ UnitTestCaseAction 1476271614958 SpreadsheetTest.java FAIL UnitTestSessionAction 1476271614959 SpreadsheetTest.java FAIL EditAction 1476271629143 Spreadsheet.java 1448 3 4 0 EditAction 1476271630900 Spreadsheet.java 1448 3 4 0 +UnitTestCaseAction 1476271632075 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476271632075 SpreadsheetTest.java FAIL +EditAction 1476271656829 Spreadsheet.java 1448 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f3a058db61586f6c0dc6dbcf59cf7ee2b03d98f6..30d97c59c7abc0f5464edae94de7e6f6120f8667 100644 GIT binary patch delta 260 zcmX|+JxhX70EM61dtXy>kjPIkBsJ>w4Zl)Rvngr~3S3+x=m#{|5RHl3om`@y;N&2J zAVeS-4NAKb{eTc0yNa}(bDrUxGj-40?XD5JMB)J9vpa-e#HMX@h}>6 ZdP1H8rY=2O)8Rjzs1GwB{OZSi_yha{Em8mg delta 287 zcmXYs&nrY>7=@qD_ueZSlDT)xs6hsCU75k$X~vJ0SSrfOMoIYtEHn$2%JSRDLUxv{ zWrA(8W><0@AD=AywXm-zg&Rgf4_t;zP`bH0~A-JIYutNG=xuLF*=~=wss42K+ zTjJ(RcX_X}B#~T_4Slg6k>ksm>6SoMO;KJBH}Kh{j~$Zil46fu_DOTV0LKh*!Z4>~ zxMGA`M!92*d&YTSf=2?LnWRoggDF0k=9?@(qg5^2#cIm3E5mCUgq024ziBik0o0^kU3G?Zc{{a1~GOPdq diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 5b647e0..ba6eef6 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -41,7 +41,7 @@ public void set(String cell, String value) { boolean isInteger = true; for (int i = 0; i < value.length(); i++) { char c = value.charAt(i); - if (i == 1 && c == '-') + if (i == 0 && c == '-') continue; if (c < '0' || c > '9') { From ff4a945055dd062318a171d0b00633b9393bd08d Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:27:52 +0300 Subject: [PATCH 042/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 1635 -> 1634 bytes src/Spreadsheet.java | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 682b81d..5675e8e 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -49,3 +49,4 @@ EditAction 1476271630900 Spreadsheet.java 1448 3 4 0 UnitTestCaseAction 1476271632075 SpreadsheetTest.java FAIL UnitTestSessionAction 1476271632075 SpreadsheetTest.java FAIL EditAction 1476271656829 Spreadsheet.java 1448 3 4 0 +EditAction 1476271672771 Spreadsheet.java 1448 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 30d97c59c7abc0f5464edae94de7e6f6120f8667..00631af952647af3439b11b57be8f3957fc4f63c 100644 GIT binary patch delta 187 zcmaFN^N44|E@lCL1{MZ31_nk^oox)V^BCDCpJLW$yf*n4b0B+*khbq~hPuf?Ec#M@ zV73Q~9kUtBas~q(QI>5C%4V#hEVCx_v1l=#oqU|7+xa1bF2fTBeTGjA1`J;q3>m&N zXfZM~m@=|6m@#rOSTTw)STl$)Ffhb0aDr@P5M>Yp@<1#}1}O$c5Nq;OR&`Nl1|tSz e24;p+43-Qg45mOAUS&|4e34a`QEc*m))WA-%O&Li delta 169 zcmW;GI}3qf9ES1h-}AiAgXAU3WKa&h&I7Tq800V;eGikx`k1X&lff5ICX4Lk6G%xB zukCj&clRZ94Q+NRJVfIGiRHJXR^l}W<;dB*)W|!J '9') { From 408b2a41395889aed138937b22f3f81514f89f4a Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:28:38 +0300 Subject: [PATCH 043/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1634 -> 1633 bytes src/Spreadsheet.java | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 5675e8e..2da4084 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -50,3 +50,6 @@ UnitTestCaseAction 1476271632075 SpreadsheetTest.java FAIL UnitTestSessionAction 1476271632075 SpreadsheetTest.java FAIL EditAction 1476271656829 Spreadsheet.java 1448 3 4 0 EditAction 1476271672771 Spreadsheet.java 1448 3 4 0 +UnitTestCaseAction 1476271674324 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476271674324 SpreadsheetTest.java FAIL +EditAction 1476271718270 Spreadsheet.java 1448 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 00631af952647af3439b11b57be8f3957fc4f63c..78b1241c79cc5e317dde8a88551269768b5559f9 100644 GIT binary patch delta 266 zcmX|+JxhXN7=^Ff_X7lj@GBLp$O^SL%t|9I8id*!3YuJm2>byK(omz&_$*D)Kd{N6 zAP7VV#1`GN1{aqQoO={;yUsboIp@dI_q@CsE9aQlAbzJo^hqqoXb@XGe&&8+*s5gu z)X-Rvo~oHADrbJ(T@v7mC9Vl^LzpsNDnzNWOpR3@SmTixb=G-fgLgLhAWoA6Et0g^ zqKm^f+x(K^j~zy&8Iu$j8L`QVo1FN_;|GekC;N13P%BO~hKV3kGp)(RAs6hjhryBN deKPvgnVym5085t^X6ffV?W&FylAsz`xBsBKF5mzF delta 279 zcmXYs%_~G<7{z~&_q`(;CCzI-Y9wRCb;ZS8jE{|CX+hc8O8EmUSjbY@y(=5d&URL_ zkWxxYrYwy8Nd5pRTaS<3Ip_D(IZr$Nnyz1&!UmQUh>IE&FC-P22BqHR8YlkQl--M6 zv5CDTj+|AH1kT!;@3Emg`g!|wyoF<%EW6~`BhNm498lzt0Ztj@j3Le`QD>NI%G@x* zEu-8q#yufT#%U4JW`Z{+`Cy7qV!jB)P?1g&>82_f7RdlRbp4Fg)_!%YsmxPAe#2N* o2McU6%?ySms?1W+57%`pz5Jss-wbk+_3y#aH_e|gu>b%7 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index a7cd0cb..ba6eef6 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -15,9 +15,9 @@ public void set(String cell, String value) { value = value.substring(2, value.length() - 1); } else { boolean isInteger = true; - for (int i = 0; i < value.length(); i++) { + for (int i = 1; i < value.length(); i++) { char c = value.charAt(i); - if (i == 0 && c == '-') + if (i == 1 && c == '-') continue; if (c < '0' || c > '9') { From d864eb4159c2a1081cde091247df315fee9aecc8 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:28:49 +0300 Subject: [PATCH 044/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1633 -> 1634 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 2da4084..0d22c35 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -53,3 +53,6 @@ EditAction 1476271672771 Spreadsheet.java 1448 3 4 0 UnitTestCaseAction 1476271674324 SpreadsheetTest.java FAIL UnitTestSessionAction 1476271674324 SpreadsheetTest.java FAIL EditAction 1476271718270 Spreadsheet.java 1448 3 4 0 +UnitTestCaseAction 1476271722227 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476271722228 SpreadsheetTest.java FAIL +EditAction 1476271729317 Spreadsheet.java 1448 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 78b1241c79cc5e317dde8a88551269768b5559f9..00631af952647af3439b11b57be8f3957fc4f63c 100644 GIT binary patch delta 279 zcmXYs%_~G<7{z~&_q`(;CCzI-Y9wRCb;ZS8jE{|CX+hc8O8EmUSjbY@y(=5d&URL_ zkWxxYrYwy8Nd5pRTaS<3Ip_D(IZr$Nnyz1&!UmQUh>IE&FC-P22BqHR8YlkQl--M6 zv5CDTj+|AH1kT!;@3Emg`g!|wyoF<%EW6~`BhNm498lzt0Ztj@j3Le`QD>NI%G@x* zEu-8q#yufT#%U4JW`Z{+`Cy7qV!jB)P?1g&>82_f7RdlRbp4Fg)_!%YsmxPAe#2N* o2McU6%?ySms?1W+57%`pz5Jss-wbk+_3y#aH_e|gu>b%7 delta 266 zcmX|+JxhXN7=^Ff_X7lj@GBLp$O^SL%t|9I8id*!3YuJm2>byK(omz&_$*D)Kd{N6 zAP7VV#1`GN1{aqQoO={;yUsboIp@dI_q@CsE9aQlAbzJo^hqqoXb@XGe&&8+*s5gu z)X-Rvo~oHADrbJ(T@v7mC9Vl^LzpsNDnzNWOpR3@SmTixb=G-fgLgLhAWoA6Et0g^ zqKm^f+x(K^j~zy&8Iu$j8L`QVo1FN_;|GekC;N13P%BO~hKV3kGp)(RAs6hjhryBN deKPvgnVym5085t^X6ffV?W&FylAsz`xBsBKF5mzF diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index ba6eef6..132c65c 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -27,7 +27,7 @@ public void set(String cell, String value) { } if (isInteger) - value.substring(1, value.length() - 1); + value.substring(2, value.length() - 1); else value = "#Error"; } From 63f366356cf23812d020d2cf9d351b0a9650c064 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:28:51 +0300 Subject: [PATCH 045/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1634 -> 1634 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 0d22c35..e781fbc 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -56,3 +56,6 @@ EditAction 1476271718270 Spreadsheet.java 1448 3 4 0 UnitTestCaseAction 1476271722227 SpreadsheetTest.java FAIL UnitTestSessionAction 1476271722228 SpreadsheetTest.java FAIL EditAction 1476271729317 Spreadsheet.java 1448 3 4 0 +UnitTestCaseAction 1476271730167 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476271730168 SpreadsheetTest.java FAIL +EditAction 1476271731824 Spreadsheet.java 1448 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 00631af952647af3439b11b57be8f3957fc4f63c..470bd88c8fb93306442d7b65bdc9bc5fffa5f0f0 100644 GIT binary patch delta 14 VcmaFF^N44I9SbAtW_uQ8CIBWx1MmO< delta 14 VcmaFF^N44I9SbANW_uQ8CIBWr1MdI; diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 132c65c..ba6eef6 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -27,7 +27,7 @@ public void set(String cell, String value) { } if (isInteger) - value.substring(2, value.length() - 1); + value.substring(1, value.length() - 1); else value = "#Error"; } From c7d575d598016e275176cab8efe17f127552daf2 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:29:43 +0300 Subject: [PATCH 046/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1634 -> 1634 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index e781fbc..102bf6e 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -59,3 +59,6 @@ EditAction 1476271729317 Spreadsheet.java 1448 3 4 0 UnitTestCaseAction 1476271730167 SpreadsheetTest.java FAIL UnitTestSessionAction 1476271730168 SpreadsheetTest.java FAIL EditAction 1476271731824 Spreadsheet.java 1448 3 4 0 +UnitTestCaseAction 1476271732852 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476271732852 SpreadsheetTest.java FAIL +EditAction 1476271783844 Spreadsheet.java 1444 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 470bd88c8fb93306442d7b65bdc9bc5fffa5f0f0..00631af952647af3439b11b57be8f3957fc4f63c 100644 GIT binary patch delta 14 VcmaFF^N44I9SbANW_uQ8CIBWr1MdI; delta 14 VcmaFF^N44I9SbAtW_uQ8CIBWx1MmO< diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index ba6eef6..4a31d1d 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -27,7 +27,7 @@ public void set(String cell, String value) { } if (isInteger) - value.substring(1, value.length() - 1); + value.substring(1, value.length()); else value = "#Error"; } From 6289e609a4fd25a079bf63713e9839170fc8dba2 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:29:51 +0300 Subject: [PATCH 047/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 5 +++++ bin/Spreadsheet.class | Bin 1634 -> 1632 bytes src/Spreadsheet.java | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 102bf6e..486839a 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -62,3 +62,8 @@ EditAction 1476271731824 Spreadsheet.java 1448 3 4 0 UnitTestCaseAction 1476271732852 SpreadsheetTest.java FAIL UnitTestSessionAction 1476271732852 SpreadsheetTest.java FAIL EditAction 1476271783844 Spreadsheet.java 1444 3 4 0 +UnitTestCaseAction 1476271785301 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476271785302 SpreadsheetTest.java FAIL +UnitTestCaseAction 1476271786410 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476271786411 SpreadsheetTest.java FAIL +EditAction 1476271791197 Spreadsheet.java 1444 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 00631af952647af3439b11b57be8f3957fc4f63c..0e45d47ef5c550c89fcb9c2e660cfcb9887e93b5 100644 GIT binary patch delta 229 zcmXAku}cDB9EP7?-*;-DaA+4OM4=X`CuV9;;gUEuxVQ8t_!l?|t>4fl4$k7_AOt}i z2!YGBC(aHTxHNfZ+w;8d^1iG1GCrB9(?>KBkd!;+WFXpAQ*w55NG}W`=2@rAS|#Mm z{Hcei?dmW#ZN2REIpc*aujCk$XT~{iT=32%9~AH?@<|CFmv73fsPMxTzf{>$6rmv& zHxlDclH79yJaHIq!QnWtkkVw3Jyiob;Fb>8)KF$*IgUr`-T*s~ zl01?Gdc?vJSX>4cQi?S4N0oriXwap~JxYI=mgUm^H Date: Wed, 12 Oct 2016 14:29:53 +0300 Subject: [PATCH 048/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1632 -> 1632 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 486839a..a162f1e 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -67,3 +67,6 @@ UnitTestSessionAction 1476271785302 SpreadsheetTest.java FAIL UnitTestCaseAction 1476271786410 SpreadsheetTest.java FAIL UnitTestSessionAction 1476271786411 SpreadsheetTest.java FAIL EditAction 1476271791197 Spreadsheet.java 1444 3 4 0 +UnitTestCaseAction 1476271792308 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476271792308 SpreadsheetTest.java FAIL +EditAction 1476271793806 Spreadsheet.java 1443 3 2 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 0e45d47ef5c550c89fcb9c2e660cfcb9887e93b5..ece7db819498de08fb684f794073cace9d1e00a7 100644 GIT binary patch delta 14 VcmaFB^MGfA9SbAtW_uPzCIBW31L^<( delta 14 VcmaFB^MGfA9SbANW_uPzCIBV|1L*(& diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 03de883..374b87b 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -27,7 +27,7 @@ public void set(String cell, String value) { } if (isInteger) - value.substring(2, value.length()); + value.substring(, value.length()); else value = "#Error"; } From d197ec23bc87e48b02b8907fb03273dd52a1fe63 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:30:12 +0300 Subject: [PATCH 049/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1632 -> 1632 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index a162f1e..6d2aedb 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -70,3 +70,6 @@ EditAction 1476271791197 Spreadsheet.java 1444 3 4 0 UnitTestCaseAction 1476271792308 SpreadsheetTest.java FAIL UnitTestSessionAction 1476271792308 SpreadsheetTest.java FAIL EditAction 1476271793806 Spreadsheet.java 1443 3 2 0 +CompilationAction 1476271793914 Spreadsheet.java +CompilationAction 1476271794340 Spreadsheet.java +EditAction 1476271812343 Spreadsheet.java 1444 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index ece7db819498de08fb684f794073cace9d1e00a7..0e45d47ef5c550c89fcb9c2e660cfcb9887e93b5 100644 GIT binary patch delta 14 VcmaFB^MGfA9SbANW_uPzCIBV|1L*(& delta 14 VcmaFB^MGfA9SbAtW_uPzCIBW31L^<( diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 374b87b..03de883 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -27,7 +27,7 @@ public void set(String cell, String value) { } if (isInteger) - value.substring(, value.length()); + value.substring(2, value.length()); else value = "#Error"; } From c7419d038788a08e39606ba89842ce3528adedaa Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:30:27 +0300 Subject: [PATCH 050/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1632 -> 1632 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 6d2aedb..136a02a 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -73,3 +73,6 @@ EditAction 1476271793806 Spreadsheet.java 1443 3 2 0 CompilationAction 1476271793914 Spreadsheet.java CompilationAction 1476271794340 Spreadsheet.java EditAction 1476271812343 Spreadsheet.java 1444 3 4 0 +UnitTestCaseAction 1476271813853 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476271813854 SpreadsheetTest.java FAIL +EditAction 1476271827682 Spreadsheet.java 1452 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 0e45d47ef5c550c89fcb9c2e660cfcb9887e93b5..ece7db819498de08fb684f794073cace9d1e00a7 100644 GIT binary patch delta 14 VcmaFB^MGfA9SbAtW_uPzCIBW31L^<( delta 14 VcmaFB^MGfA9SbANW_uPzCIBV|1L*(& diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 03de883..b6f455f 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -27,7 +27,7 @@ public void set(String cell, String value) { } if (isInteger) - value.substring(2, value.length()); + value = value.substring(1, value.length()); else value = "#Error"; } From 42e3320d0eb2b7520864fb718195b75a8d197012 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:30:32 +0300 Subject: [PATCH 051/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 + .../20161012141626179/besouroEpisodes.txt | 204 ++++++++++++++++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012141626179/zorroEpisodes.txt | 5 +- bin/Spreadsheet.class | Bin 1632 -> 1632 bytes src/Spreadsheet.java | 1 - 6 files changed, 211 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 136a02a..91820e4 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -76,3 +76,6 @@ EditAction 1476271812343 Spreadsheet.java 1444 3 4 0 UnitTestCaseAction 1476271813853 SpreadsheetTest.java FAIL UnitTestSessionAction 1476271813854 SpreadsheetTest.java FAIL EditAction 1476271827682 Spreadsheet.java 1452 3 4 0 +UnitTestCaseAction 1476271828706 SpreadsheetTest.java OK +UnitTestSessionAction 1476271828706 SpreadsheetTest.java OK +EditAction 1476271832090 Spreadsheet.java 1446 3 4 0 diff --git a/.besouro/20161012141626179/besouroEpisodes.txt b/.besouro/20161012141626179/besouroEpisodes.txt index aeff825..9784e61 100644 --- a/.besouro/20161012141626179/besouroEpisodes.txt +++ b/.besouro/20161012141626179/besouroEpisodes.txt @@ -1,3 +1,207 @@ 1476271043185 regression 2 56 true 1476271043186 regression 1 56 true 1476271355212 refactoring 2A 245 true +1476271828706 test-first 3 465 true +1476271828707 test-first 3 465 true +1476271828708 test-first 3 465 true +1476271828709 test-first 3 465 true +1476271828710 test-first 3 465 true +1476271828711 test-first 3 465 true +1476271828712 test-first 3 465 true +1476271828713 test-first 3 465 true +1476271828714 test-first 3 465 true +1476271828715 test-first 3 465 true +1476271828716 test-first 3 465 true +1476271828717 test-first 3 465 true +1476271828718 test-first 3 465 true +1476271828719 test-first 3 465 true +1476271828720 test-first 3 465 true +1476271828721 test-first 3 465 true +1476271828722 test-first 3 465 true +1476271828723 test-first 3 465 true +1476271828724 test-first 3 465 true +1476271828725 test-first 3 465 true +1476271828726 test-first 3 465 true +1476271828727 test-first 3 465 true +1476271828728 test-first 3 465 true +1476271828729 test-first 3 465 true +1476271828730 test-first 3 465 true +1476271828731 test-first 3 465 true +1476271828732 test-first 3 465 true +1476271828733 test-first 3 465 true +1476271828734 test-first 3 465 true +1476271828735 test-first 3 465 true +1476271828736 test-first 3 465 true +1476271828737 test-first 3 465 true +1476271828738 test-first 3 465 true +1476271828739 test-first 3 465 true +1476271828740 test-first 3 465 true +1476271828741 test-first 3 465 true +1476271828742 test-first 3 465 true +1476271828743 test-first 3 465 true +1476271828744 test-first 3 465 true +1476271828745 test-first 3 465 true +1476271828746 test-first 3 465 true +1476271828747 test-first 3 465 true +1476271828748 test-first 3 465 true +1476271828749 test-first 3 465 true +1476271828750 test-first 3 465 true +1476271828751 test-first 3 465 true +1476271828752 test-first 3 465 true +1476271828753 test-first 3 465 true +1476271828754 test-first 3 465 true +1476271828755 test-first 3 465 true +1476271828756 test-first 3 465 true +1476271828757 test-first 3 465 true +1476271828758 test-first 3 465 true +1476271828759 test-first 3 465 true +1476271828760 test-first 3 465 true +1476271828761 test-first 3 465 true +1476271828762 test-first 3 465 true +1476271828763 test-first 3 465 true +1476271828764 test-first 3 465 true +1476271828765 test-first 3 465 true +1476271828766 test-first 3 465 true +1476271828767 test-first 3 465 true +1476271828768 test-first 3 465 true +1476271828769 test-first 3 465 true +1476271828770 test-first 3 465 true +1476271828771 test-first 3 465 true +1476271828772 test-first 3 465 true +1476271828773 test-first 3 465 true +1476271828774 test-first 3 465 true +1476271828775 test-first 3 465 true +1476271828776 test-first 3 465 true +1476271828777 test-first 3 465 true +1476271828778 test-first 3 465 true +1476271828779 test-first 3 465 true +1476271828780 test-first 3 465 true +1476271828781 test-first 3 465 true +1476271828782 test-first 3 465 true +1476271828783 test-first 3 465 true +1476271828784 test-first 3 465 true +1476271828785 test-first 3 465 true +1476271828786 test-first 3 465 true +1476271828787 test-first 3 465 true +1476271828788 test-first 3 465 true +1476271828789 test-first 3 465 true +1476271828790 test-first 3 465 true +1476271828791 test-first 3 465 true +1476271828792 test-first 3 465 true +1476271828793 test-first 3 465 true +1476271828794 test-first 3 465 true +1476271828795 test-first 3 465 true +1476271828796 test-first 3 465 true +1476271828797 test-first 3 465 true +1476271828798 test-first 3 465 true +1476271828799 test-first 3 465 true +1476271828800 test-first 3 465 true +1476271828801 test-first 3 465 true +1476271828802 test-first 3 465 true +1476271828803 test-first 3 465 true +1476271828804 test-first 3 465 true +1476271828805 test-first 3 465 true +1476271828806 test-first 3 465 true +1476271828807 test-first 3 465 true +1476271828808 test-first 3 465 true +1476271828809 test-first 3 465 true +1476271828810 test-first 3 465 true +1476271828811 test-first 3 465 true +1476271828812 test-first 3 465 true +1476271828813 test-first 3 465 true +1476271828814 test-first 3 465 true +1476271828815 test-first 3 465 true +1476271828816 test-first 3 465 true +1476271828817 test-first 3 465 true +1476271828818 test-first 3 465 true +1476271828819 test-first 3 465 true +1476271828820 test-first 3 465 true +1476271828821 test-first 3 465 true +1476271828822 test-first 3 465 true +1476271828823 test-first 3 465 true +1476271828824 test-first 3 465 true +1476271828825 test-first 3 465 true +1476271828826 test-first 3 465 true +1476271828827 test-first 3 465 true +1476271828828 test-first 3 465 true +1476271828829 test-first 3 465 true +1476271828830 test-first 3 465 true +1476271828831 test-first 3 465 true +1476271828832 test-first 3 465 true +1476271828833 test-first 3 465 true +1476271828834 test-first 3 465 true +1476271828835 test-first 3 465 true +1476271828836 test-first 3 465 true +1476271828837 test-first 3 465 true +1476271828838 test-first 3 465 true +1476271828839 test-first 3 465 true +1476271828840 test-first 3 465 true +1476271828841 test-first 3 465 true +1476271828842 test-first 3 465 true +1476271828843 test-first 3 465 true +1476271828844 test-first 3 465 true +1476271828845 test-first 3 465 true +1476271828846 test-first 3 465 true +1476271828847 test-first 3 465 true +1476271828848 test-first 3 465 true +1476271828849 test-first 3 465 true +1476271828850 test-first 3 465 true +1476271828851 test-first 3 465 true +1476271828852 test-first 3 465 true +1476271828853 test-first 3 465 true +1476271828854 test-first 3 465 true +1476271828855 test-first 3 465 true +1476271828856 test-first 3 465 true +1476271828857 test-first 3 465 true +1476271828858 test-first 3 465 true +1476271828859 test-first 3 465 true +1476271828860 test-first 3 465 true +1476271828861 test-first 3 465 true +1476271828862 test-first 3 465 true +1476271828863 test-first 3 465 true +1476271828864 test-first 3 465 true +1476271828865 test-first 3 465 true +1476271828866 test-first 3 465 true +1476271828867 test-first 3 465 true +1476271828868 test-first 3 465 true +1476271828869 test-first 3 465 true +1476271828870 test-first 3 465 true +1476271828871 test-first 3 465 true +1476271828872 test-first 3 465 true +1476271828873 test-first 3 465 true +1476271828874 test-first 3 465 true +1476271828875 test-first 3 465 true +1476271828876 test-first 3 465 true +1476271828877 test-first 3 465 true +1476271828878 test-first 3 465 true +1476271828879 test-first 3 465 true +1476271828880 test-first 3 465 true +1476271828881 test-first 3 465 true +1476271828882 test-first 3 465 true +1476271828883 test-first 3 465 true +1476271828884 test-first 3 465 true +1476271828885 test-first 3 465 true +1476271828886 test-first 3 465 true +1476271828887 test-first 3 465 true +1476271828888 test-first 3 465 true +1476271828889 test-first 3 465 true +1476271828890 test-first 3 465 true +1476271828891 test-first 3 465 true +1476271828892 test-first 3 465 true +1476271828893 test-first 3 465 true +1476271828894 test-first 3 465 true +1476271828895 test-first 3 465 true +1476271828896 test-first 3 465 true +1476271828897 test-first 3 465 true +1476271828898 test-first 3 465 true +1476271828899 test-first 3 465 true +1476271828900 test-first 3 465 true +1476271828901 test-first 3 465 true +1476271828902 test-first 3 465 true +1476271828903 test-first 3 465 true +1476271828904 test-first 3 465 true +1476271828905 test-first 3 465 true +1476271828906 test-first 3 465 true +1476271828907 test-first 3 465 true +1476271828908 test-first 3 465 true +1476271828909 test-first 3 465 true diff --git a/.besouro/20161012141626179/randomHeuristicEpisodes.txt b/.besouro/20161012141626179/randomHeuristicEpisodes.txt index e113fda..b20070c 100644 --- a/.besouro/20161012141626179/randomHeuristicEpisodes.txt +++ b/.besouro/20161012141626179/randomHeuristicEpisodes.txt @@ -1,2 +1,3 @@ 1476271043185 regression 2 56 true 1476271355212 refactoring 2A 245 true +1476271828706 test-first 3 465 true diff --git a/.besouro/20161012141626179/zorroEpisodes.txt b/.besouro/20161012141626179/zorroEpisodes.txt index 023e023..a60621a 100644 --- a/.besouro/20161012141626179/zorroEpisodes.txt +++ b/.besouro/20161012141626179/zorroEpisodes.txt @@ -1,2 +1,3 @@ -1476271043185 regression 2 56 false -1476271355212 refactoring 2A 312 false +1476271043185 regression 2 56 true +1476271355212 refactoring 2A 312 true +1476271828706 test-first 3 473 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index ece7db819498de08fb684f794073cace9d1e00a7..dee13f270df795d953b51b0ceb94cd168d539569 100644 GIT binary patch delta 22 dcmaFB^MGfA9SbLm&Nc?wZ4BzZo84I?nE+Bb1{weW delta 22 dcmaFB^MGfA9SbL`&Nc?wZ4Bz+o84I?nE+CQ1| Date: Wed, 12 Oct 2016 14:30:41 +0300 Subject: [PATCH 052/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 1632 -> 1632 bytes src/Spreadsheet.java | 5 +++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 91820e4..e1e1a6b 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -79,3 +79,4 @@ EditAction 1476271827682 Spreadsheet.java 1452 3 4 0 UnitTestCaseAction 1476271828706 SpreadsheetTest.java OK UnitTestSessionAction 1476271828706 SpreadsheetTest.java OK EditAction 1476271832090 Spreadsheet.java 1446 3 4 0 +EditAction 1476271841506 Spreadsheet.java 1459 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index dee13f270df795d953b51b0ceb94cd168d539569..98845ced69015c8bbbe5285b41f48fd86743d6dd 100644 GIT binary patch delta 103 zcmV~$zX}0y007|cH=GPNnO*YVAq)(zJcbv!(F-W+4c&u|u+ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index cac8061..4ec1460 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -25,10 +25,11 @@ public void set(String cell, String value) { break; } } - if (isInteger) + if (isInteger) { value = value.substring(1, value.length()); - else + } else { value = "#Error"; + } } } else if (value.charAt(0) == '\'') { if (value.length() > 1 && value.charAt(value.length() - 1) == '\'') { From e7e157c1c05dffa00854de1172037c3c83313298 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:32:10 +0300 Subject: [PATCH 053/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 9 +++++++++ bin/Spreadsheet.class | Bin 1632 -> 1636 bytes tests/SpreadsheetTest.java | 14 ++++++++++++++ 3 files changed, 23 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index e1e1a6b..76192ce 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -80,3 +80,12 @@ UnitTestCaseAction 1476271828706 SpreadsheetTest.java OK UnitTestSessionAction 1476271828706 SpreadsheetTest.java OK EditAction 1476271832090 Spreadsheet.java 1446 3 4 0 EditAction 1476271841506 Spreadsheet.java 1459 3 4 0 +RefactoringAction 1476271897178 SpreadsheetTest.java ADD void testAssignment_A1_Assign_Integer_Positive()/2 METHOD +RefactoringAction 1476271901717 SpreadsheetTest.java REMOVE testAssignment_A1_Assign_Integer_Positive()/2 METHOD +RefactoringAction 1476271903729 SpreadsheetTest.java ADD void testAssignment_A1_Assign_String()/2 METHOD +RefactoringAction 1476271906747 SpreadsheetTest.java RENAME testAssignment_A1_Assign_String()/2=>void testAssignment_A1_Assign_String_Error() METHOD +RefactoringAction 1476271916265 SpreadsheetTest.java RENAME testAssignment_A1_Assign_String_Error()=>void testAssignment_A1_Assign_String_Missing_SingleQuote_End_Error() METHOD +RefactoringAction 1476271918778 SpreadsheetTest.java RENAME testAssignment_A1_Assign_String_Missing_SingleQuote_End_Error()=>void testAssignment_A1_Assign_String_Missing_SingleQuote_Begin_Error() METHOD +RefactoringAction 1476271921796 SpreadsheetTest.java ADD void testAssignment_A1_Assign_String_Missing_SingleQuote_Begin_Error()/2 METHOD +RefactoringAction 1476271925809 SpreadsheetTest.java RENAME testAssignment_A1_Assign_String_Missing_SingleQuote_Begin_Error()/2=>void testAssignment_A1_Assign_String_Missing_SingleQuote_End_Error() METHOD +EditAction 1476271930435 SpreadsheetTest.java 2310 13 37 12 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 98845ced69015c8bbbe5285b41f48fd86743d6dd..b953899a783345a9bd73c80f08d0bade0807d2d5 100644 GIT binary patch delta 116 zcmV-)0E_?N4CD;3x&r}Gv%3Q%0Rxr*C6nR=K~sbP9sq{`9{`E~A^?{FBLJ=dBmlYq zB>=quCIG+yC;-C%DFDR)Dges>D*)2~ECAmCEdb&GF97fWFaYuZF#z=dDggliH30=zxCji3$C;-I(DFDj=Dge^}D*)dBECAvFE&%WVF97lYFaY%cDFFchGyw$wH30|! SIRO#?I+Jz<#{oT)J_aU;=NiZW diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 05e0da6..3044326 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -68,6 +68,20 @@ public void testAssignment_A1_Assign_String() { assertEquals("a string", result); } + @Test + public void testAssignment_A1_Assign_String_Missing_SingleQuote_Begin_Error() { + sheet.set("A1", "=a string'"); + String result = sheet.evaluate("A1"); + assertEquals("a string", result); + } + + @Test + public void testAssignment_A1_Assign_String_Missing_SingleQuote_End_Error() { + sheet.set("A1", "='a string"); + String result = sheet.evaluate("A1"); + assertEquals("a string", result); + } + @Test public void testAssignment_A1_Assign_Integer_Positive() { sheet.set("A1", "=1"); From 61af6aeedce4e3c7e7a30ae9bce224b7194fd27e Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:32:15 +0300 Subject: [PATCH 054/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 2496 -> 2894 bytes src/Spreadsheet.java | 1 + 3 files changed, 2 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 76192ce..a3c01ec 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -89,3 +89,4 @@ RefactoringAction 1476271918778 SpreadsheetTest.java RENAME testAssignment_A1_As RefactoringAction 1476271921796 SpreadsheetTest.java ADD void testAssignment_A1_Assign_String_Missing_SingleQuote_Begin_Error()/2 METHOD RefactoringAction 1476271925809 SpreadsheetTest.java RENAME testAssignment_A1_Assign_String_Missing_SingleQuote_Begin_Error()/2=>void testAssignment_A1_Assign_String_Missing_SingleQuote_End_Error() METHOD EditAction 1476271930435 SpreadsheetTest.java 2310 13 37 12 +EditAction 1476271935451 Spreadsheet.java 1465 3 4 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 8637463a2eb0e5f008532c1456f6aad8aa8b61ad..89d0aabc5c58926f8feb1f0d40a46057a6467d27 100644 GIT binary patch delta 192 zcmX>gd`^t()W2Q(7#J8#7(zF4Jz!?EpDfQJIk|~hTFxmoJu@%fwWuh+h=akCk%7xL zQK7h`C^Iizosq#7s!WZ~2PC5olbS5UqB5C>g^SUDvN($|W6)%87F$NX&7CZjER%aU zL??@LCW7f+PQA&EY$}X?lXtNy^M*5UGej_mGDI>+Gek{JV3TJInB2go${08~i&L35 X4k#NBluZE2CW2(ygMkiaVh8~M(5){G delta 68 zcmV-K0K5Or7Qhn<%Ko~(0000q08g Date: Wed, 12 Oct 2016 14:33:28 +0300 Subject: [PATCH 055/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1636 -> 1636 bytes src/Spreadsheet.java | 10 +++++++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index a3c01ec..8592905 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -90,3 +90,6 @@ RefactoringAction 1476271921796 SpreadsheetTest.java ADD void testAssignment_A1_ RefactoringAction 1476271925809 SpreadsheetTest.java RENAME testAssignment_A1_Assign_String_Missing_SingleQuote_Begin_Error()/2=>void testAssignment_A1_Assign_String_Missing_SingleQuote_End_Error() METHOD EditAction 1476271930435 SpreadsheetTest.java 2310 13 37 12 EditAction 1476271935451 Spreadsheet.java 1465 3 4 0 +UnitTestCaseAction 1476271935782 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476271935782 SpreadsheetTest.java FAIL +EditAction 1476272008819 Spreadsheet.java 1569 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index b953899a783345a9bd73c80f08d0bade0807d2d5..38079906ec31c7d56ac1eae81fa8c23003473568 100644 GIT binary patch delta 107 zcmV~$zX}0y007|cH=GPN*$?Gk9KygrJck!Cn3b~L;4NfUN=XKz2T-~Pkh1%}JkH}| z5-k&JWg8V+RXa6%bq5V6O=m3^ZC4#PsfVtoo|nG2fsdiDk)JdK;}DsIqG>3ZWvl2O J7TLVe`~xB07i9nd delta 107 zcmV~$zX}0y007|cH=GPNnH}ZN#UTs~l=tu=2D4Ju8@z?gN-4=;^Z-it08)0}SHwkp zOrmAgT4JMSt8S-Zuj!!Wr0pzq(Q(yvlX>WQ>U$Y@8~Pae8vDsYFbR=qD4T_fdA^G7 JVUaIN=^q^E7fk>F diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index f26884d..896a219 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -10,9 +10,13 @@ public String get(String cell) { public void set(String cell, String value) { if (value.length() > 0) { - if (value.charAt(0) == '=') { - if (value.length() > 3 && value.charAt(value.length() - 1) == '\'') { - value = value.substring(2, value.length() - 1); + if (value.charAt(0) == '=' && value.length() > 1) { + if (value.charAt(1) == '\'') { + if (value.charAt(value.length() - 1) == '\'' && value.length() > 2) { + value = value.substring(1, value.length() - 1); + } else { + value = "#Error"; + } } else { boolean isInteger = true; for (int i = 1; i < value.length(); i++) { From 5149fcf18a64539aeaff2fd0063be2ab02ce9d72 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:33:34 +0300 Subject: [PATCH 056/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 1636 -> 1675 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 8592905..4ed6595 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -93,3 +93,4 @@ EditAction 1476271935451 Spreadsheet.java 1465 3 4 0 UnitTestCaseAction 1476271935782 SpreadsheetTest.java FAIL UnitTestSessionAction 1476271935782 SpreadsheetTest.java FAIL EditAction 1476272008819 Spreadsheet.java 1569 3 4 0 +EditAction 1476272014191 Spreadsheet.java 1569 3 4 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 38079906ec31c7d56ac1eae81fa8c23003473568..dc264ae57b109247a64b31d7a975169a65645f94 100644 GIT binary patch delta 382 zcmXw#JxfAy6vlu5?!EScmT6g%>^Wi*l-P~%0eRLe4;%0-;g$kNlgNS>n%9$nT zbxus(QleE7W=q(R|Co;>l&m-bn%F%CFs$AzD6BJ_~O%^JO|<6(n7 zw&*91k8K7hG03h=?lHsxLCSEX$Ry89@j`-k zrfHHa^UVxDq*MoK)kQ|RNGLy96=G2hv!Y_GN(Cs=Y27bXe8Mc`CxB|9q@Xsbn3t?s uGzxM;inRQ!By}>(VaU>)?Y^>LyG^`d+n$%qB;H@vjmn!*RJqEsW9$#6vOpLB delta 343 zcmXw#yGjFL5QV?r{dbL!#JKSmA>N`{HES?lvR)!7EK&yqo0JKH4`5-ljUZ^bpq-?! z7OND2KtKe+G7lh#jhzVg&T8z=nKLuz%v{CZqYrJPR7GQfO1dr5w@SN4i%ep_i60iM zJLcRF=z3Uon%J)S&z&HyKm2PJfhdE-7$MFQ!)%hk6Sjj*nIsiPIb@6@CTK9pF)2<& zJ0;B-)0{KI1+!d|;f4k7WoMf#9UQtW^T-NM2z>tYu3BD!&s7Q>W9AJv+L0^5A&Of!s Vd|%y`l{$~@1re*J%0a`*{s1U5Gz0(u diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 896a219..5a82ffd 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -13,7 +13,7 @@ public void set(String cell, String value) { if (value.charAt(0) == '=' && value.length() > 1) { if (value.charAt(1) == '\'') { if (value.charAt(value.length() - 1) == '\'' && value.length() > 2) { - value = value.substring(1, value.length() - 1); + value = value.substring(2, value.length() - 1); } else { value = "#Error"; } From a556300205b9f5c8fea61786dd130a8e5056e089 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:33:53 +0300 Subject: [PATCH 057/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1675 -> 1675 bytes tests/SpreadsheetTest.java | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 4ed6595..ced95be 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -94,3 +94,6 @@ UnitTestCaseAction 1476271935782 SpreadsheetTest.java FAIL UnitTestSessionAction 1476271935782 SpreadsheetTest.java FAIL EditAction 1476272008819 Spreadsheet.java 1569 3 4 0 EditAction 1476272014191 Spreadsheet.java 1569 3 4 0 +UnitTestCaseAction 1476272019651 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272019651 SpreadsheetTest.java FAIL +EditAction 1476272033240 SpreadsheetTest.java 2253 13 37 12 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index dc264ae57b109247a64b31d7a975169a65645f94..1f2a7d5e2dcbfb7935dc0d6ac25a6a43ecf1f4e0 100644 GIT binary patch delta 14 VcmeC??dIL^kC~Bm^MB?ZCIBc61uFmm delta 14 VcmeC??dIL^kC~BW^MB?ZCIBc01u6gl diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 3044326..e4d539c 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -72,11 +72,11 @@ public void testAssignment_A1_Assign_String() { public void testAssignment_A1_Assign_String_Missing_SingleQuote_Begin_Error() { sheet.set("A1", "=a string'"); String result = sheet.evaluate("A1"); - assertEquals("a string", result); + assertEquals("#Error", result); } @Test - public void testAssignment_A1_Assign_String_Missing_SingleQuote_End_Error() { + public void #Error() { sheet.set("A1", "='a string"); String result = sheet.evaluate("A1"); assertEquals("a string", result); From dc2c2ea489a4032da52c0800635a0c0cdd8ecd49 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:34:32 +0300 Subject: [PATCH 058/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 12 ++++++++++++ .../20161012141626179/besouroEpisodes.txt | 12 ++++++++++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012141626179/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 2894 -> 2894 bytes tests/SpreadsheetTest.java | 13 ++++++++++--- 6 files changed, 36 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index ced95be..5624e00 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -97,3 +97,15 @@ EditAction 1476272014191 Spreadsheet.java 1569 3 4 0 UnitTestCaseAction 1476272019651 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272019651 SpreadsheetTest.java FAIL EditAction 1476272033240 SpreadsheetTest.java 2253 13 37 12 +CompilationAction 1476272033348 SpreadsheetTest.java +CompilationAction 1476272033348 SpreadsheetTest.java +RefactoringAction 1476272034385 SpreadsheetTest.java RENAME Error()=>void testAssignment_A1_Assign_String_Missing_SingleQuote_End_Error() METHOD +CompilationAction 1476272035720 SpreadsheetTest.java +CompilationAction 1476272035721 SpreadsheetTest.java +UnitTestCaseAction 1476272036857 SpreadsheetTest.java OK +UnitTestSessionAction 1476272036858 SpreadsheetTest.java OK +RefactoringAction 1476272059909 SpreadsheetTest.java ADD void testAssignment_A1_Assign_Integer_Negative()/2 METHOD +RefactoringAction 1476272067436 SpreadsheetTest.java RENAME testAssignment_A1_Assign_Integer_Negative()/2=>void testAssignment_A1_Reference_Integer_Negative() METHOD +RefactoringAction 1476272069450 SpreadsheetTest.java RENAME testAssignment_A1_Reference_Integer_Negative()=>void testAssignment_A1_Reference_A2Integer_Negative() METHOD +RefactoringAction 1476272070466 SpreadsheetTest.java RENAME testAssignment_A1_Reference_A2Integer_Negative()=>void testAssignment_A1_Reference_A2_Integer_Negative() METHOD +EditAction 1476272072894 SpreadsheetTest.java 2469 14 40 13 diff --git a/.besouro/20161012141626179/besouroEpisodes.txt b/.besouro/20161012141626179/besouroEpisodes.txt index 9784e61..d486974 100644 --- a/.besouro/20161012141626179/besouroEpisodes.txt +++ b/.besouro/20161012141626179/besouroEpisodes.txt @@ -205,3 +205,15 @@ 1476271828907 test-first 3 465 true 1476271828908 test-first 3 465 true 1476271828909 test-first 3 465 true +1476272036858 test-first 3 204 true +1476272036859 test-last 1 204 false +1476272036860 test-last 1 204 false +1476272036861 test-first 3 204 true +1476272036862 test-last 1 204 false +1476272036863 test-last 1 204 false +1476272036864 test-first 3 204 true +1476272036865 test-last 1 204 false +1476272036866 test-last 1 204 false +1476272036867 test-first 3 204 true +1476272036868 test-last 1 204 false +1476272036869 test-last 1 204 false diff --git a/.besouro/20161012141626179/randomHeuristicEpisodes.txt b/.besouro/20161012141626179/randomHeuristicEpisodes.txt index b20070c..e6320d6 100644 --- a/.besouro/20161012141626179/randomHeuristicEpisodes.txt +++ b/.besouro/20161012141626179/randomHeuristicEpisodes.txt @@ -1,3 +1,4 @@ 1476271043185 regression 2 56 true 1476271355212 refactoring 2A 245 true 1476271828706 test-first 3 465 true +1476272036858 test-first 3 204 true diff --git a/.besouro/20161012141626179/zorroEpisodes.txt b/.besouro/20161012141626179/zorroEpisodes.txt index a60621a..6d372bc 100644 --- a/.besouro/20161012141626179/zorroEpisodes.txt +++ b/.besouro/20161012141626179/zorroEpisodes.txt @@ -1,3 +1,4 @@ 1476271043185 regression 2 56 true 1476271355212 refactoring 2A 312 true 1476271828706 test-first 3 473 true +1476272036858 test-first 3 208 true diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 89d0aabc5c58926f8feb1f0d40a46057a6467d27..4423a9173766d00d01edb86af9134977d9edf093 100644 GIT binary patch delta 24 dcmX>nc1~==63)pxI7BD!nc1~==63)qboT8I=awdZ4&H7yOi~w>12c`f3 diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index e4d539c..c9fcf0b 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -76,10 +76,10 @@ public void testAssignment_A1_Assign_String_Missing_SingleQuote_Begin_Error() { } @Test - public void #Error() { + public void testAssignment_A1_Assign_String_Missing_SingleQuote_End_Error() { sheet.set("A1", "='a string"); String result = sheet.evaluate("A1"); - assertEquals("a string", result); + assertEquals("#Error", result); } @Test @@ -88,11 +88,18 @@ public void testAssignment_A1_Assign_Integer_Positive() { String result = sheet.evaluate("A1"); assertEquals("1", result); } - + @Test public void testAssignment_A1_Assign_Integer_Negative() { sheet.set("A1", "=-1"); String result = sheet.evaluate("A1"); assertEquals("-1", result); } + + @Test + public void testAssignment_A1_Reference_A2_Integer() { + sheet.set("A1", "=-1"); + String result = sheet.evaluate("A1"); + assertEquals("-1", result); + } } From d7027370d534e8cbeb8f768e4c2591d89e8ad89a Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:36:02 +0300 Subject: [PATCH 059/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 13 +++++++++++++ bin/SpreadsheetTest.class | Bin 2894 -> 3053 bytes tests/SpreadsheetTest.java | 17 +++++++++++++---- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 5624e00..83c1ba4 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -109,3 +109,16 @@ RefactoringAction 1476272067436 SpreadsheetTest.java RENAME testAssignment_A1_As RefactoringAction 1476272069450 SpreadsheetTest.java RENAME testAssignment_A1_Reference_Integer_Negative()=>void testAssignment_A1_Reference_A2Integer_Negative() METHOD RefactoringAction 1476272070466 SpreadsheetTest.java RENAME testAssignment_A1_Reference_A2Integer_Negative()=>void testAssignment_A1_Reference_A2_Integer_Negative() METHOD EditAction 1476272072894 SpreadsheetTest.java 2469 14 40 13 +RefactoringAction 1476272080499 SpreadsheetTest.java ADD void testAssignment_A1_Reference_A2_Integer()/2 METHOD +RefactoringAction 1476272083507 SpreadsheetTest.java RENAME testAssignment_A1_Reference_A2_Integer()/2=>void testAssignment_A1_Reference_A2_String() METHOD +RefactoringAction 1476272086520 SpreadsheetTest.java REMOVE testAssignment_A1_Reference_A2_String() METHOD +RefactoringAction 1476272087532 SpreadsheetTest.java ADD void testAssignment_A1_Reference_A2_String() METHOD +RefactoringAction 1476272101583 SpreadsheetTest.java RENAME testAssignment_A1_Reference_A2_String()=>void testAssignment_A2_Reference_A2_String() METHOD +RefactoringAction 1476272103090 SpreadsheetTest.java RENAME testAssignment_A2_Reference_A2_String()=>void testAssignment_A1_Reference_A2_String() METHOD +RefactoringAction 1476272108611 SpreadsheetTest.java RENAME testAssignment_A1_Reference_A2_String()=>void testAssignment_A2_Reference_A2_String() METHOD +RefactoringAction 1476272112126 SpreadsheetTest.java RENAME testAssignment_A2_Reference_A2_String()=>void testAssignment_A1_Reference_A2_String() METHOD +RefactoringAction 1476272117638 SpreadsheetTest.java RENAME testAssignment_A1_Reference_A2_String()=>void testAssignment_A2_Reference_A2_String() METHOD +RefactoringAction 1476272119650 SpreadsheetTest.java RENAME testAssignment_A2_Reference_A2_String()=>void testAssignment_A2_Reference_AA_String() METHOD +RefactoringAction 1476272122167 SpreadsheetTest.java RENAME testAssignment_A1_Reference_A2_Integer()=>void testAssignment_A2_Reference_A2_Integer() METHOD +RefactoringAction 1476272123679 SpreadsheetTest.java RENAME testAssignment_A2_Reference_A2_Integer()=>void testAssignment_A2_Reference_A1_Integer() METHOD +EditAction 1476272162079 SpreadsheetTest.java 2697 15 45 14 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 4423a9173766d00d01edb86af9134977d9edf093..f6509232b21b02cd5c31b5ea41e608c4f0cdf749 100644 GIT binary patch delta 104 zcmX>n_Ewzh)W2Q(7#J8#7{WGky=GBYD@iRbaV##*OwY?r%`1s_G>i{QO-n6G%}Y*= zcQlIk%qvMvPc54KnZ=xuf3r5L9NXlBtSXbgbE)vAGH^4bF^DpxGe|RJOb+0bXAc1y I%)}510HK^8_W%F@ delta 36 scmaDWeol<*)W2Q(7#J8#7(zF4y=Iv#$7;&Rw>gAWj*XRpfr%jm0PUCw>i_@% diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index c9fcf0b..660eca5 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -97,9 +97,18 @@ public void testAssignment_A1_Assign_Integer_Negative() { } @Test - public void testAssignment_A1_Reference_A2_Integer() { - sheet.set("A1", "=-1"); - String result = sheet.evaluate("A1"); - assertEquals("-1", result); + public void testAssignment_A2_Reference_AA_String() { + sheet.set("A1", "'a string'"); + sheet.set("A2", "=A1"); + String result = sheet.evaluate("A2"); + assertEquals("a string", result); + } + + @Test + public void testAssignment_A2_Reference_A1_Integer() { + sheet.set("A1", "123"); + sheet.set("A2", "=A1"); + String result = sheet.evaluate("A2"); + assertEquals("123", result); } } From 4ee16672cbd882d237442d6de307c4ecb4d8aa21 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:36:09 +0300 Subject: [PATCH 060/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 3053 -> 3267 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 83c1ba4..3b98839 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -122,3 +122,6 @@ RefactoringAction 1476272119650 SpreadsheetTest.java RENAME testAssignment_A2_Re RefactoringAction 1476272122167 SpreadsheetTest.java RENAME testAssignment_A1_Reference_A2_Integer()=>void testAssignment_A2_Reference_A2_Integer() METHOD RefactoringAction 1476272123679 SpreadsheetTest.java RENAME testAssignment_A2_Reference_A2_Integer()=>void testAssignment_A2_Reference_A1_Integer() METHOD EditAction 1476272162079 SpreadsheetTest.java 2697 15 45 14 +UnitTestCaseAction 1476272163788 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272163789 SpreadsheetTest.java FAIL +EditAction 1476272169442 SpreadsheetTest.java 2697 15 45 14 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index f6509232b21b02cd5c31b5ea41e608c4f0cdf749..5df10ac98a42f88758c4dd95f71c24b5ad674739 100644 GIT binary patch delta 357 zcmaDWepr(0)W2Q(7#J8#7-Bbay=KW&ElDjdaV##*OwY?r%`1s_G>Q*OO-n6G%}Y*= zcXW&oE-A{)OXpw+Wn^G-G~!?gXJlZubu?sTP{XUyFy1q-BsD#?h=U;tsKe06c(M$u zIitYl5LP2L)occ41}2~*)U~!ShzUsvS#4vG12aQ}!r;uwAJ|3A#TZzD>QWiF8PXWU z7}6OO7%~{t7%~}nfudp%GZ^?7_<=kH26hG=23-b5AdHxNkX^J4-IhqW(MYyzV^H!D oiqzi0ptccc2onPj*kF*Qxj;+vfR^L~jV=IMT1ddsXt4em0LbD;AOHXW delta 104 zcmX>s`Bt3k)W2Q(7#J8#7{WGky=GBYD@iRbaV##*OwY?r%`1s_G>i{QO-n6G%}Y*= zcQlIk%qvMvPc51p$7;^Vzj+#~5!+-3Hi5}W+$y}O4BQN945AF_4AKl4lN;IO*+YN^ IGckk$0CnXa-~a#s diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 660eca5..6177deb 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -97,7 +97,7 @@ public void testAssignment_A1_Assign_Integer_Negative() { } @Test - public void testAssignment_A2_Reference_AA_String() { + public void testAssignment_A2_Reference_A1_String() { sheet.set("A1", "'a string'"); sheet.set("A2", "=A1"); String result = sheet.evaluate("A2"); From 86f28238fcf730c40a5e2caf26aec8e07d1e8ff1 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:37:06 +0300 Subject: [PATCH 061/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 5 +++++ bin/SpreadsheetTest.class | Bin 3267 -> 3267 bytes src/Spreadsheet.java | 3 +++ 3 files changed, 8 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 3b98839..7970f9c 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -125,3 +125,8 @@ EditAction 1476272162079 SpreadsheetTest.java 2697 15 45 14 UnitTestCaseAction 1476272163788 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272163789 SpreadsheetTest.java FAIL EditAction 1476272169442 SpreadsheetTest.java 2697 15 45 14 +UnitTestCaseAction 1476272170616 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272170616 SpreadsheetTest.testAssignment_A2_Reference_A1_String FAIL +UnitTestCaseAction 1476272177296 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272177296 SpreadsheetTest.java FAIL +EditAction 1476272226192 Spreadsheet.java 1616 3 4 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 5df10ac98a42f88758c4dd95f71c24b5ad674739..be75c6bf62a44614c1ddc93746cde0825e5b3e5c 100644 GIT binary patch delta 14 VcmX>sd029TFe{_sW)ar)>;NQJ1T_Ev delta 14 VcmX>sd029TFe{_uW)ar)>;NRU1VsP< diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 5a82ffd..0d19755 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -17,6 +17,9 @@ public void set(String cell, String value) { } else { value = "#Error"; } + + } else if ( (c < '0' || c > '9')) { + } else { boolean isInteger = true; for (int i = 1; i < value.length(); i++) { From a39756832705a86a780930b9950be052bc0e6069 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:42:38 +0300 Subject: [PATCH 062/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1675 -> 1696 bytes src/Spreadsheet.java | 16 +++++++++++++--- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 7970f9c..c74b99c 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -130,3 +130,6 @@ UnitTestSessionAction 1476272170616 SpreadsheetTest.testAssignment_A2_Reference_ UnitTestCaseAction 1476272177296 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272177296 SpreadsheetTest.java FAIL EditAction 1476272226192 Spreadsheet.java 1616 3 4 0 +CompilationAction 1476272226325 Spreadsheet.java +CompilationAction 1476272505602 Spreadsheet.java +EditAction 1476272558261 Spreadsheet.java 1910 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 1f2a7d5e2dcbfb7935dc0d6ac25a6a43ecf1f4e0..f4810d249df9895bdac77d64b6be866da3705ae8 100644 GIT binary patch delta 343 zcmXYsJxfAy6o;SVy&4iXq|~rfQo)L@`L1b{K{YrOw6}#IH2MJy8lxdDG=`Pb&>{#9 zt$mAVj)EwHAm|1A-*kJjE)PWV)h7~Ny^lE#5^l4ZtR8L=F)o5 zl7ZLpg{^CzOx?DrbBqC%+Fg(CmZpzArl>K^K0z9UI3Ua+Gn^2?BFd?97sR<@mJV}t znWu-z9SQDPDXqw%D(YVsxMC6A_F}~0pmfy84RjcNT{{buVJvRUV delta 323 zcmXYs%}N4c6o#MUj8g^!QKn5fP%8a6mQAUZ5e2SVNC-ijz#9-H+L7(OBJ?DY>??N2D90o@CB->uE*R&U z3GSKXfeep0JTb)!)4Y-6gBe=5d@@TwUb-nr4@EJ_iA70lmSlt#$#|?11-6K^wUtUt zP3>ecg#0B}rI1prs '9')) { - + } else if (!(value.charAt(1) < '0' || value.charAt(1) > '9')) { + // Reference / No-op, return possible errors when + // the cell is actually evaluated + } else { boolean isInteger = true; for (int i = 1; i < value.length(); i++) { @@ -67,7 +69,15 @@ public void set(String cell, String value) { } public String evaluate(String cell) { - return (String) mValues.get(cell); + String value = (String) mValues.get(cell); + if (!(value.charAt(1) < '0' || value.charAt(1) > '9')) { + if (mValues.containsKey(value)) { + + } else { + return "#Error"; + } + } + return value; } } From b265714e1367d6e0881c7e057f3e29171dac1bb1 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:43:06 +0300 Subject: [PATCH 063/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 1696 -> 1820 bytes src/Spreadsheet.java | 3 +++ 3 files changed, 4 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index c74b99c..9478187 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -133,3 +133,4 @@ EditAction 1476272226192 Spreadsheet.java 1616 3 4 0 CompilationAction 1476272226325 Spreadsheet.java CompilationAction 1476272505602 Spreadsheet.java EditAction 1476272558261 Spreadsheet.java 1910 3 6 0 +EditAction 1476272586848 Spreadsheet.java 1956 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f4810d249df9895bdac77d64b6be866da3705ae8..d430b54b3197c2ea89580590fbd970d9b1569148 100644 GIT binary patch delta 226 zcmZ3$JBN?!)W2Q(7#J8#7@Rk9U1l=iV&G%2<6*F8aA0KMPR`FONzBYE_D-#2WDwQx z$x19s)Xz!GOV{^L%1TWxvDS>*e3z+$xxR;iiGdktihL_9W delta 100 zcmbQkw}6-H)W2Q(7#J8#80}U;~ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 66ad193..063b255 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -70,13 +70,16 @@ public void set(String cell, String value) { public String evaluate(String cell) { String value = (String) mValues.get(cell); + if (!(value.charAt(1) < '0' || value.charAt(1) > '9')) { if (mValues.containsKey(value)) { + return (String) mValues.get(value); } else { return "#Error"; } } + return value; } From d6dad3cd42f46bf72e19eea7b07a49842dbd271d Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:43:34 +0300 Subject: [PATCH 064/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1820 -> 1837 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 9478187..77fb663 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -134,3 +134,6 @@ CompilationAction 1476272226325 Spreadsheet.java CompilationAction 1476272505602 Spreadsheet.java EditAction 1476272558261 Spreadsheet.java 1910 3 6 0 EditAction 1476272586848 Spreadsheet.java 1956 3 6 0 +UnitTestCaseAction 1476272588247 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272588248 SpreadsheetTest.java FAIL +EditAction 1476272614094 Spreadsheet.java 1983 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index d430b54b3197c2ea89580590fbd970d9b1569148..e6fc47e8565144ed87afd36bfa8e3e08e82a4535 100644 GIT binary patch delta 177 zcmXYqy9&ZU6hx03i3k$kf`TDnA-Y?{DjKxVN_=492U+y2Y|qh8qT)wZ-XR(OxL=m1}I wON|{7do%|UPNbaaNE78-bm_?@s}uSHl>~^HiBrrauA+V<6+$J|S^~x953LOv8UO$Q delta 160 zcmXAhxeCHS6h%)a8Z9IkH(VeDv~q?p=~S@LN`-)bWM$_Uh>chaQ^?eQn1wIo7MHud z_l_U2yGEBAiV(2N4~h0{zNDpTc;;REWLB&7i=^s}XL~2=X=j|=g!F|+G=&dzIFfNf nQ<8ILAZb?rW+ '9')) { + if (!(value.charAt(1) < '0' || value.charAt(1) > '9') && !value.equals("#Error")) { if (mValues.containsKey(value)) { return (String) mValues.get(value); From d47d39aa283269dd03e3b4c3a156ce71f7d4af1c Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:43:43 +0300 Subject: [PATCH 065/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1837 -> 1865 bytes src/Spreadsheet.java | 9 --------- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 77fb663..ca5c4b8 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -137,3 +137,6 @@ EditAction 1476272586848 Spreadsheet.java 1956 3 6 0 UnitTestCaseAction 1476272588247 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272588248 SpreadsheetTest.java FAIL EditAction 1476272614094 Spreadsheet.java 1983 3 6 0 +UnitTestCaseAction 1476272615006 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272615006 SpreadsheetTest.java FAIL +EditAction 1476272623062 Spreadsheet.java 1770 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index e6fc47e8565144ed87afd36bfa8e3e08e82a4535..03a8e548b2f15f71dd1cca41795cdaa20a758a85 100644 GIT binary patch delta 232 zcmZ3>cao3m)W2Q(7#J8#7~D2;U1f5VW3c04uxD^!WME4zEKSTQW@Hf6@X1OnOVrOv z%uCnzPs&P7F0s~(;$q-qaN=Qb1}WuE&d)1J%*-qHPOaR`%Ur>1wTyv@ff;D5tJW3< zLG5h}RtFg5e05m1F(?ZdEMzc%uq+odsObm+Wo>6M$buB=Y-4boyp2uMPm{qL=pr8m z2L^wj4Z#c|K%*2O1~P~;hyi&(qZuR_q!<_(co-}h41p{r1`D7lCj-+T1_yQqIVPZ# K3s8WG!4&{NH7y$e delta 168 zcmX@fx0a9V)W2Q(7#J8#7@Rk9U1bvEW3c04uxD^!WZ+KD&nrpH%q#Xzt(^RUNn*1C za|JW!Tm~ivW}teT$qU&;h1GRfwlOFRST1Ie)!M=!sI!g1cJd`QO+N(&Zw74!9|m&< ze+DatU '9') && !value.equals("#Error")) { - if (mValues.containsKey(value)) { - return (String) mValues.get(value); - - } else { - return "#Error"; - } - } - return value; } From c3de78b22e91e6fc6b0c0e4770432c0d460521b4 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:43:50 +0300 Subject: [PATCH 066/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1865 -> 1712 bytes src/Spreadsheet.java | 9 +++++++++ 3 files changed, 12 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index ca5c4b8..6feead7 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -140,3 +140,6 @@ EditAction 1476272614094 Spreadsheet.java 1983 3 6 0 UnitTestCaseAction 1476272615006 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272615006 SpreadsheetTest.java FAIL EditAction 1476272623062 Spreadsheet.java 1770 3 5 0 +UnitTestCaseAction 1476272624177 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272624178 SpreadsheetTest.java FAIL +EditAction 1476272630138 Spreadsheet.java 1983 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 03a8e548b2f15f71dd1cca41795cdaa20a758a85..1947a15dec1b45fb54047ef43edefe10eef0af05 100644 GIT binary patch delta 116 zcmX@fw}F@I)W2Q(7#J8#80z+Ax`9l*fEzzh`R)7ruysJ)HB>HveBug(Ub z2or-akmLf=3=AF&JPck8B0!b`L^XpbgBXwp)W;ynAjQB4lxJcv1hSZbY+Il>6N4Q9 DA^;Ce delta 271 zcmdnMdyN-Rs% z&q>Tn*Y{7#N=+`Y){Np};A3#&VQ>a1f k)WitXV98(zWHB*V07W?&nEo(0urtUp0i|4k0!$390Nfojg#Z8m diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index bd1ae54..628da8a 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -71,6 +71,15 @@ public void set(String cell, String value) { public String evaluate(String cell) { String value = (String) mValues.get(cell); + if (!(value.charAt(1) < '0' || value.charAt(1) > '9') && !value.equals("#Error")) { + if (mValues.containsKey(value)) { + return (String) mValues.get(value); + + } else { + return "#Error"; + } + } + return value; } From 0cb74319b71af0c4c5864d8352b501dafd4a3ad1 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:44:26 +0300 Subject: [PATCH 067/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 1712 -> 1865 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 6feead7..e41b020 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -143,3 +143,4 @@ EditAction 1476272623062 Spreadsheet.java 1770 3 5 0 UnitTestCaseAction 1476272624177 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272624178 SpreadsheetTest.java FAIL EditAction 1476272630138 Spreadsheet.java 1983 3 6 0 +EditAction 1476272666108 Spreadsheet.java 2009 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 1947a15dec1b45fb54047ef43edefe10eef0af05..03a8e548b2f15f71dd1cca41795cdaa20a758a85 100644 GIT binary patch delta 271 zcmdnMdyN-Rs% z&q>Tn*Y{7#N=+`Y){Np};A3#&VQ>a1f k)WitXV98(zWHB*V07W?&nEo(0urtUp0i|4k0!$390Nfojg#Z8m delta 116 zcmX@fw}F@I)W2Q(7#J8#80z+Ax`9l*fEzzh`R)7ruysJ)HB>HveBug(Ub z2or-akmLf=3=AF&JPck8B0!b`L^XpbgBXwp)W;ynAjQB4lxJcv1hSZbY+Il>6N4Q9 DA^;Ce diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 628da8a..642df98 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -18,7 +18,7 @@ public void set(String cell, String value) { value = "#Error"; } - } else if (!(value.charAt(1) < '0' || value.charAt(1) > '9')) { + } else if (!(value.charAt(1) < '0' || value.charAt(1) > '9') && value.charAt(1) != '-') { // Reference / No-op, return possible errors when // the cell is actually evaluated From 8a8602436b5f30f794c3a34373045eeab395ea56 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:44:38 +0300 Subject: [PATCH 068/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1865 -> 1875 bytes src/Spreadsheet.java | 8 -------- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index e41b020..305bcf8 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -144,3 +144,6 @@ UnitTestCaseAction 1476272624177 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272624178 SpreadsheetTest.java FAIL EditAction 1476272630138 Spreadsheet.java 1983 3 6 0 EditAction 1476272666108 Spreadsheet.java 2009 3 6 0 +UnitTestCaseAction 1476272668396 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272668396 SpreadsheetTest.java FAIL +EditAction 1476272678250 Spreadsheet.java 1799 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 03a8e548b2f15f71dd1cca41795cdaa20a758a85..100c0316c3076dcc374bdc5b554077a9155cb20e 100644 GIT binary patch delta 347 zcmXYtyGufG6vsbDuZDyYq1nqGS1`kCny=ecdO!s^G_(A!rJ>7K7%7xX>8ANDVE5 z;1_6WZmJIu1yKY+V2S;2x;^JSaDKn@px^8DwmWu=h8Lt{Gzp)HX}Fuj2bRvcbrxEU zD|43_`6i7HTE^1RCgGo%s6|5s1W9m2uDnELKK@Ar^;P2#WmB^ znW4cfO$_cx@WedNBzeW;jWi!*_{8FyEFE&1SLtaA{J}1%zBjo zuuZ@72*Zr1$)TXCCI6IC '9') && !value.equals("#Error")) { - if (mValues.containsKey(value)) { - return (String) mValues.get(value); - - } else { - return "#Error"; - } - } return value; } From 4078f54e3774dd8e2610968d194ec45848709cd9 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:44:47 +0300 Subject: [PATCH 069/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1875 -> 1722 bytes src/Spreadsheet.java | 6 +----- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 305bcf8..6164378 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -147,3 +147,6 @@ EditAction 1476272666108 Spreadsheet.java 2009 3 6 0 UnitTestCaseAction 1476272668396 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272668396 SpreadsheetTest.java FAIL EditAction 1476272678250 Spreadsheet.java 1799 3 5 0 +UnitTestCaseAction 1476272679420 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272679421 SpreadsheetTest.java FAIL +EditAction 1476272687655 Spreadsheet.java 1604 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 100c0316c3076dcc374bdc5b554077a9155cb20e..0cff539b07d3805ef1795d9808132e9d24454053 100644 GIT binary patch delta 116 zcmcc2w~LqS)W2Q(7#J8#80z}&HveBug(Ub z2or-akmLf=3=AF&JPh6pB0!b`L^XpbgBXwp)W;ynAjQB4lxJcv1hSZbY+Il>6N4Q9 DF4+%j delta 271 zcmdnRdzp{x)W2Q(7#J8#7~D2;U1oCTVvu97<6*F8aA0I$OD!x-%qeDM5Y_O>N-Rs% z&q>Tn*Y{7#N=+`Y){Np};A3#&VQ>a1f k)WitXV98(zWHB*V07W?&nEo(0urtUp0i|4k0!$390Qg5UqW}N^ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 4cc7593..798a45a 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -18,11 +18,7 @@ public void set(String cell, String value) { value = "#Error"; } - } else if (!(value.charAt(1) < '0' || value.charAt(1) > '9') && value.charAt(1) != '-') { - // Reference / No-op, return possible errors when - // the cell is actually evaluated - - } else { + }else { boolean isInteger = true; for (int i = 1; i < value.length(); i++) { char c = value.charAt(i); From b308cad63f01fb99d025c32347c09f6b08b7a102 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:45:31 +0300 Subject: [PATCH 070/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1722 -> 1691 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 6164378..fa5a19d 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -150,3 +150,6 @@ EditAction 1476272678250 Spreadsheet.java 1799 3 5 0 UnitTestCaseAction 1476272679420 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272679421 SpreadsheetTest.java FAIL EditAction 1476272687655 Spreadsheet.java 1604 3 5 0 +UnitTestCaseAction 1476272689015 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272689015 SpreadsheetTest.java FAIL +EditAction 1476272731189 Spreadsheet.java 1605 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 0cff539b07d3805ef1795d9808132e9d24454053..f16ea3dbd769a82d78c4f5f555b5a33f3ec96382 100644 GIT binary patch delta 327 zcmXYs%Sr+P6o$X!%$QvUqMI2Sp#|lL&SYM?K~WGbB!r+%;0pw8+l0`vML{lF6crJ) zEC^iq06jnuL>CBJ`T&6ybS%&6=X~&=@6_xQ`?h98cQEmTIEgBeGYKb*DzWbQ3yzx$ z^NPdDtC6yvdz`}cUDE87@)`pa39`W;B|>a5#5Q4eiBM*kJ!J<(IU>d>qntCwCF9&M z!98&vaCjua6G>i3@rKI>9(5-9Bu#^i1jtGUIk9mi#H>V^lMxmq&SIH9V3YQyH2o^0 zqbZ~s@|QeKK23^EnN{`+zR;?e}M7{}% V-N5uU2vqX^g0)N+E0uk}`wL39H{$>R delta 357 zcmXYt%Su9V5Qo3<91W=h5}I}~O2G_|X$1 zn4?3K2j+RiR!iJRD ztm6f$xb2hhF{Ub;##Jo&r$t2$6>(QBNTYE`kqlY&h8kgVjV2sp>I`y(7-OK hktw`AD$d{!Ln7b!#pt3tx- Date: Wed, 12 Oct 2016 14:45:34 +0300 Subject: [PATCH 071/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + src/Spreadsheet.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index fa5a19d..463a375 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -153,3 +153,4 @@ EditAction 1476272687655 Spreadsheet.java 1604 3 5 0 UnitTestCaseAction 1476272689015 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272689015 SpreadsheetTest.java FAIL EditAction 1476272731189 Spreadsheet.java 1605 3 5 0 +EditAction 1476272734457 Spreadsheet.java 1581 3 5 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 816b421..d0e960f 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -34,7 +34,6 @@ public void set(String cell, String value) { if (isInteger) { value = value.substring(1, value.length()); } else { - value = "#Error"; } } } else if (value.charAt(0) == '\'') { From 9f92a72f50ae36350bce3922ac64e0839f38a665 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:46:00 +0300 Subject: [PATCH 072/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1691 -> 1676 bytes 2 files changed, 3 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 463a375..8a9b000 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -154,3 +154,6 @@ UnitTestCaseAction 1476272689015 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272689015 SpreadsheetTest.java FAIL EditAction 1476272731189 Spreadsheet.java 1605 3 5 0 EditAction 1476272734457 Spreadsheet.java 1581 3 5 0 +UnitTestCaseAction 1476272736873 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272736873 SpreadsheetTest.java FAIL +EditAction 1476272760042 Spreadsheet.java 1581 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f16ea3dbd769a82d78c4f5f555b5a33f3ec96382..c905c63bfe5853e10625b3c31f0acb734d30eff3 100644 GIT binary patch delta 300 zcmXYsK`TUI6o#KO_q%hEThm}BQ?r@DU@kMmoxwn z)l_Mbr^Xz%IojyzcNXwFwoR^U=S^mrSf&+(QNcSBPP6x3aLzu5&WUq#Yi0LP#6dhiAag21z7>#j7tT430(Hre zezgjT=ajd8#e+_%W!Lpp!~(`lbdd7&j?&fz7(DcNTnG>{#D7S7@KCw zRJO6$VwNeY=CNIJ)Tm>dqbm_M^qrYDZINx$X|uCL&o>SGmxRa<1LB0JSV+ Date: Wed, 12 Oct 2016 14:46:17 +0300 Subject: [PATCH 073/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + src/Spreadsheet.java | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 8a9b000..ef40f73 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -157,3 +157,4 @@ EditAction 1476272734457 Spreadsheet.java 1581 3 5 0 UnitTestCaseAction 1476272736873 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272736873 SpreadsheetTest.java FAIL EditAction 1476272760042 Spreadsheet.java 1581 3 5 0 +EditAction 1476272777480 Spreadsheet.java 1789 3 6 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index d0e960f..332d7ea 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -65,7 +65,15 @@ public void set(String cell, String value) { public String evaluate(String cell) { String value = (String) mValues.get(cell); - + + if (!(value.charAt(1) < '0' || value.charAt(1) > '9') && !value.equals("#Error")) { + if (mValues.containsKey(value)) { + return (String) mValues.get(value); + + } else { + return "#Error"; + } + } return value; } From 405e29330a88776afd015210afd7fb3412a9199f Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:46:30 +0300 Subject: [PATCH 074/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1676 -> 1829 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index ef40f73..e69b000 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -158,3 +158,6 @@ UnitTestCaseAction 1476272736873 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272736873 SpreadsheetTest.java FAIL EditAction 1476272760042 Spreadsheet.java 1581 3 5 0 EditAction 1476272777480 Spreadsheet.java 1789 3 6 0 +UnitTestCaseAction 1476272782132 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272782133 SpreadsheetTest.java FAIL +EditAction 1476272790071 Spreadsheet.java 1736 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index c905c63bfe5853e10625b3c31f0acb734d30eff3..3004addae66a0e0fca0281b41bcc6177c7209a0b 100644 GIT binary patch delta 271 zcmeC-UCPIG>ff$?3=9k=3~n2_E;BiEF~~94@i5pkI50A>r52VZ<`gqBh-&y`C6*=X z=OpH(>-#5Vr6!kHYesP~@G&^?FgSyhawq5Kl_X~76?>;vZobPD!d$Z46ci8036)Shg`J3m7b9Fo3Wu7c;2o2mxhnXEDfv6zXhaaGc4&4`qV%Y!K4k zptAvJ5Ho`?kd$Iz1Cq`RJPfW3nhb70ce^tff$?3=9k=4E7tjE;DUbU=Cr94q#wnUDN;)ZWHmb$~(6S7!rI zgo!~INOA#b1_oya9tJlC5gSK^(kYZp2$}=$-0$EHzwk=SciNOv4 D@{|tO diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 332d7ea..79cf2e0 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -66,7 +66,7 @@ public void set(String cell, String value) { public String evaluate(String cell) { String value = (String) mValues.get(cell); - if (!(value.charAt(1) < '0' || value.charAt(1) > '9') && !value.equals("#Error")) { + if (!value.equals("#Error")) { if (mValues.containsKey(value)) { return (String) mValues.get(value); From 371ac49661cb907c3265be939c0d886aa23fb450 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:46:41 +0300 Subject: [PATCH 075/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1829 -> 1809 bytes src/Spreadsheet.java | 15 ++++++--------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index e69b000..8369b8d 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -161,3 +161,6 @@ EditAction 1476272777480 Spreadsheet.java 1789 3 6 0 UnitTestCaseAction 1476272782132 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272782133 SpreadsheetTest.java FAIL EditAction 1476272790071 Spreadsheet.java 1736 3 6 0 +UnitTestCaseAction 1476272793130 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272793131 SpreadsheetTest.java FAIL +EditAction 1476272801183 Spreadsheet.java 1799 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3004addae66a0e0fca0281b41bcc6177c7209a0b..f68798464fcd5caa205154ae317288c65feed9b9 100644 GIT binary patch delta 112 zcmZ3=H<52c37hC71||k(1_lO0tt||K+S?ec4lv01PM*tVqMQs&e;9Pw8RVFNQZ7INCI(jk D=`szL delta 132 zcmbQpx0G)~37h6J1||k(1_lOKtt||K+S?ec4lv01>ac8MP!=#)$Y20rSuSQ!o7~A} z<)_Ku#$dwW&fvh{#o)}~#~=dKsQ}T>Aj%*H '9') && value.charAt(1) != '-') { + // Reference / No-op, return possible errors when + // the cell is actually evaluated + } else { boolean isInteger = true; for (int i = 1; i < value.length(); i++) { @@ -34,6 +38,7 @@ public void set(String cell, String value) { if (isInteger) { value = value.substring(1, value.length()); } else { + value = "#Error"; } } } else if (value.charAt(0) == '\'') { @@ -65,15 +70,7 @@ public void set(String cell, String value) { public String evaluate(String cell) { String value = (String) mValues.get(cell); - - if (!value.equals("#Error")) { - if (mValues.containsKey(value)) { - return (String) mValues.get(value); - - } else { - return "#Error"; - } - } + return value; } From a5950a9511c81ee31dde5d1753afad1c9ffe88a4 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:47:17 +0300 Subject: [PATCH 076/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1809 -> 1722 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 8369b8d..2973997 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -164,3 +164,6 @@ EditAction 1476272790071 Spreadsheet.java 1736 3 6 0 UnitTestCaseAction 1476272793130 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272793131 SpreadsheetTest.java FAIL EditAction 1476272801183 Spreadsheet.java 1799 3 5 0 +UnitTestCaseAction 1476272807725 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272807725 SpreadsheetTest.java FAIL +EditAction 1476272837046 Spreadsheet.java 1799 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f68798464fcd5caa205154ae317288c65feed9b9..0cff539b07d3805ef1795d9808132e9d24454053 100644 GIT binary patch delta 491 zcmXw#J4<6>5Qd-0IdL_Z5bu{YZcJE>=6JuvM7*FYL`2ZSO8t7lWpdEzjNygnlVuK&nVcElFu6B{7C1u3mys8DdOE_#tT~*QwO? z7b$TTriyC4IjT;vB(J(vc@%L@2lQgFLQ21@Uq5M$C<7$$>d=XT`$^Ju6(CY@2ldGw zD&Ls$hCcWr@=lHTUokzec#DG??75=o!mN%lv^3CmPFXxl>YBzG>r68qDm41^gfyj0 X=b^)H^?zsr1?W<(bD@RdeD}yd4t7&p delta 584 zcmXw$-%C?r7{@>FIcHm*rrAuVqaDoOx>IK>wVIeemPVRN5Cjp(Nk%AR5?atj47`gV z&~ueUbP+^%3t|^ugx3)T{UC^T=^qeuwJds$Tkplom*@Mu&-49$-<|r+2J_wDowvXs z)343XTE@iULYOhe6~XMCyKZhx(cE`s#l7b`IX8dXS-7>5U0NUMzhTnAWSETKdU$Cy zzwR#Q*JiW#y|PyBSjHd-s@pCRf2LY&y+mi@=yNvxg7Jcf-VfageTgLIUh=_98k6QD z+wi#(z21i5>D%;pt$`DT1zNaDl!cK5>$-oZ=e}Ws>ZX;wPv1#h}s{QU=2+grk~Bt0*HX#+d42oMV#8P3j8137SQO z96@ceULBy6AWfvr%CIx&Tq7+p4vFzakuuC#0%D7bUrgCmg9kpD#ud zMY|}EbeiOj`QIUG!c2*qY1+Aj&5VRHe_*w}y5PT4390HdOgC25sxP+=Z67;?rAZ1G IrJynO5Ax|~1ONa4 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 4cc7593..1b12f7c 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -36,7 +36,7 @@ public void set(String cell, String value) { } if (isInteger) { - value = value.substring(1, value.length()); + value = value.substring(0, value.length()); } else { value = "#Error"; } From 34e9eb10d477f3d0242ecbe37c9494809c6412a8 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:47:20 +0300 Subject: [PATCH 077/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1722 -> 1722 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 2973997..c061916 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -167,3 +167,6 @@ EditAction 1476272801183 Spreadsheet.java 1799 3 5 0 UnitTestCaseAction 1476272807725 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272807725 SpreadsheetTest.java FAIL EditAction 1476272837046 Spreadsheet.java 1799 3 5 0 +UnitTestCaseAction 1476272838200 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272838200 SpreadsheetTest.java FAIL +EditAction 1476272840633 Spreadsheet.java 1799 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 0cff539b07d3805ef1795d9808132e9d24454053..ceb62fa4e936cb117f4651f7f135679b2e307bc9 100644 GIT binary patch delta 14 VcmdnRyNh>22@50h=28|{CIBTu1TFvo delta 14 VcmdnRyNh>22@503=28|{CIBT!1TO#p diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 1b12f7c..0883ec8 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -36,7 +36,7 @@ public void set(String cell, String value) { } if (isInteger) { - value = value.substring(0, value.length()); + value = value.substring(2, value.length()); } else { value = "#Error"; } From 923298acd52589148191ef598aea1a730d0e7bfa Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:47:23 +0300 Subject: [PATCH 078/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1722 -> 1722 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index c061916..236a37a 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -170,3 +170,6 @@ EditAction 1476272837046 Spreadsheet.java 1799 3 5 0 UnitTestCaseAction 1476272838200 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272838200 SpreadsheetTest.java FAIL EditAction 1476272840633 Spreadsheet.java 1799 3 5 0 +UnitTestCaseAction 1476272841586 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272841587 SpreadsheetTest.java FAIL +EditAction 1476272843680 Spreadsheet.java 1799 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index ceb62fa4e936cb117f4651f7f135679b2e307bc9..7eff040d62922434f94451d9df515823b8524074 100644 GIT binary patch delta 14 VcmdnRyNh>22@50Z=28|{CIBT)1TX*q delta 14 VcmdnRyNh>22@50h=28|{CIBTu1TFvo diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 0883ec8..4cc7593 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -36,7 +36,7 @@ public void set(String cell, String value) { } if (isInteger) { - value = value.substring(2, value.length()); + value = value.substring(1, value.length()); } else { value = "#Error"; } From c3781f48886ef27c677dbfcc5f6ab6aad3928c4f Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:48:11 +0300 Subject: [PATCH 079/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 1722 -> 1722 bytes src/Spreadsheet.java | 6 +++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 236a37a..eef009f 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -173,3 +173,4 @@ EditAction 1476272840633 Spreadsheet.java 1799 3 5 0 UnitTestCaseAction 1476272841586 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272841587 SpreadsheetTest.java FAIL EditAction 1476272843680 Spreadsheet.java 1799 3 5 0 +EditAction 1476272891105 Spreadsheet.java 1910 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 7eff040d62922434f94451d9df515823b8524074..0cff539b07d3805ef1795d9808132e9d24454053 100644 GIT binary patch delta 14 VcmdnRyNh>22@503=28|{CIBT!1TO#p delta 14 VcmdnRyNh>22@50Z=28|{CIBT)1TX*q diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 4cc7593..b641e79 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -36,7 +36,11 @@ public void set(String cell, String value) { } if (isInteger) { - value = value.substring(1, value.length()); + if (value.charAt(1) != '-') { + value = value.substring(2, value.length()); + } else { + value = value.substring(1, value.length()); + } } else { value = "#Error"; } From da794ea4be1ce0af76e89d86adb5ecc4481eb54c Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:49:54 +0300 Subject: [PATCH 080/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1722 -> 1758 bytes src/Spreadsheet.java | 4 ---- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index eef009f..f727dc9 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -174,3 +174,6 @@ UnitTestCaseAction 1476272841586 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272841587 SpreadsheetTest.java FAIL EditAction 1476272843680 Spreadsheet.java 1799 3 5 0 EditAction 1476272891105 Spreadsheet.java 1910 3 5 0 +UnitTestCaseAction 1476272892078 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272892079 SpreadsheetTest.java FAIL +EditAction 1476272994427 Spreadsheet.java 1716 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 0cff539b07d3805ef1795d9808132e9d24454053..4a06bc9efbf106a0899a37af65f7aa74160ec5f7 100644 GIT binary patch delta 363 zcmXYty-NZC7>A$NyVDGhL^4efLLn*7@+-f>1Z_yr!k{gxu`Q@M+S}sxvJY^JCI?%E zmX;uBiKe#x11;#TYkPk01Mk;B|Ii->O6(C8H^_m}CweIzL+KOuSGzph1@(@h`K~O@ z%TyrQ?upk>ZJoX*l3HMDNsbShBh24LCTJ`7Kk~P llGQUua7lUfBQ#l;Q< z!9U>UC{F$WQ4noa{9@dma~^old!EdJc|FiF$LK^s+E$#Gv?kMy3_Bkz}u&fzU{++lG~k!MQ0Q05Jr zcPe~RWkgMcy2NNm5=W+SC5I<@no>~CVOg52$P(+)VuJ**Lo8@ak|{L>G{Y?NNArpz z?9oyARkRNKc+{w?HxJ0tz`;;Q*Fwz?ZfI43%)ebwnH3Tv+D7`DF_AA)Vh+(GL&oF& PZgk6NF~O#P6}5i>i~u~% diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index b641e79..9ee0d04 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -18,10 +18,6 @@ public void set(String cell, String value) { value = "#Error"; } - } else if (!(value.charAt(1) < '0' || value.charAt(1) > '9') && value.charAt(1) != '-') { - // Reference / No-op, return possible errors when - // the cell is actually evaluated - } else { boolean isInteger = true; for (int i = 1; i < value.length(); i++) { From 9cc762792013a7ec4881f28dde46a39633e8fa96 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:50:14 +0300 Subject: [PATCH 081/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1758 -> 1727 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index f727dc9..bd5e4d4 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -177,3 +177,6 @@ EditAction 1476272891105 Spreadsheet.java 1910 3 5 0 UnitTestCaseAction 1476272892078 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272892079 SpreadsheetTest.java FAIL EditAction 1476272994427 Spreadsheet.java 1716 3 5 0 +UnitTestCaseAction 1476272995352 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476272995352 SpreadsheetTest.java FAIL +EditAction 1476273014396 Spreadsheet.java 1716 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 4a06bc9efbf106a0899a37af65f7aa74160ec5f7..88fe3f5fb900b63f9d1ea7b012d41296ffca0c03 100644 GIT binary patch delta 328 zcmXYsUn@fa7>A#CXFF0RG=C-|XCpGlY-c+*$^Rm0DW#-#>q7YiTKNDjoZBTAn%pe4 zI>n7Up91$viIgJc9eb~Sy-&Tr=Y0y_g|BZ7t3nVHWGU$rJCjV(@QHWKol|Qpf)`Z1 z2g5db>zdfStlL3L%0+tEqL&@|C=um=ehwMnh!|xCIaYRp#VK(rB&agN6{FM{!)Kfu zlH4=NBR0=W@j{AM(!7)51BWlN5+En-xY9{phA7A|vy#A(6!T?qSP+*LS!9(6ut#g- z1G-gAM^jXlD)&p97B=X=hJ@ohBQn)!^58|2Vx5xkLYOKTDK6&k$R4gH=@ z{YzV%l79cf=7V@G-PW;Nh8)V>VK@|NJo$7}YR8On!Wd_aQzghb6I>ADib<|9X(;!| zG)-n`GfRg#UYX||iw`1v661$BT@vCUDZQk`AT2&J;wLM^ Date: Wed, 12 Oct 2016 14:50:18 +0300 Subject: [PATCH 082/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1727 -> 1727 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index bd5e4d4..54430a5 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -180,3 +180,6 @@ EditAction 1476272994427 Spreadsheet.java 1716 3 5 0 UnitTestCaseAction 1476272995352 SpreadsheetTest.java FAIL UnitTestSessionAction 1476272995352 SpreadsheetTest.java FAIL EditAction 1476273014396 Spreadsheet.java 1716 3 5 0 +UnitTestCaseAction 1476273016062 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476273016063 SpreadsheetTest.java FAIL +EditAction 1476273018842 Spreadsheet.java 1716 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 88fe3f5fb900b63f9d1ea7b012d41296ffca0c03..973765a8074f56b9ecadd69bc2c6e88d24a1fb5c 100644 GIT binary patch delta 14 VcmdnbyPtPME(;^`<~)`_CIBUY1U3Kw delta 14 VcmdnbyPtPME(;^e<~)`_CIBUe1UCQx diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index a7698d7..9ee0d04 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -35,7 +35,7 @@ public void set(String cell, String value) { if (value.charAt(1) != '-') { value = value.substring(2, value.length()); } else { - value = value.substring(0, value.length()); + value = value.substring(1, value.length()); } } else { value = "#Error"; From 17ff671038f836fabd25d305cb6f8f8281e5df0f Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:51:16 +0300 Subject: [PATCH 083/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 1727 -> 1727 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 54430a5..a4db548 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -183,3 +183,4 @@ EditAction 1476273014396 Spreadsheet.java 1716 3 5 0 UnitTestCaseAction 1476273016062 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273016063 SpreadsheetTest.java FAIL EditAction 1476273018842 Spreadsheet.java 1716 3 5 0 +EditAction 1476273076551 Spreadsheet.java 1716 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 973765a8074f56b9ecadd69bc2c6e88d24a1fb5c..88fe3f5fb900b63f9d1ea7b012d41296ffca0c03 100644 GIT binary patch delta 14 VcmdnbyPtPME(;^e<~)`_CIBUe1UCQx delta 14 VcmdnbyPtPME(;^`<~)`_CIBUY1U3Kw diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 9ee0d04..1e30625 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -32,7 +32,7 @@ public void set(String cell, String value) { } if (isInteger) { - if (value.charAt(1) != '-') { + if (value.charAt(2) != '-') { value = value.substring(2, value.length()); } else { value = value.substring(1, value.length()); From 40054c71b54963dd89f6c821d97f44100988ff9e Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:51:31 +0300 Subject: [PATCH 084/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1727 -> 1727 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index a4db548..64dd10f 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -184,3 +184,6 @@ UnitTestCaseAction 1476273016062 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273016063 SpreadsheetTest.java FAIL EditAction 1476273018842 Spreadsheet.java 1716 3 5 0 EditAction 1476273076551 Spreadsheet.java 1716 3 5 0 +UnitTestCaseAction 1476273077909 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476273077909 SpreadsheetTest.java FAIL +EditAction 1476273091043 Spreadsheet.java 1735 3 3 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 88fe3f5fb900b63f9d1ea7b012d41296ffca0c03..00da904688f24ed9869ef121ae19def260287607 100644 GIT binary patch delta 14 VcmdnbyPtPM7z-oo=5Uq_CIBRm1R($b delta 14 VcmdnbyPtPM7z-oI=5Uq_CIBRg1Rwwa diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 1e30625..a94eb62 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -32,7 +32,7 @@ public void set(String cell, String value) { } if (isInteger) { - if (value.charAt(2) != '-') { + if (value.length() > 2 value.charAt(2) != '-') { value = value.substring(2, value.length()); } else { value = value.substring(1, value.length()); From 4e3f60ad5fe745f3c66e0d4f458f9ecd620cc907 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:51:48 +0300 Subject: [PATCH 085/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 7 +++++++ bin/Spreadsheet.class | Bin 1727 -> 1735 bytes src/Spreadsheet.java | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 64dd10f..d393f19 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -187,3 +187,10 @@ EditAction 1476273076551 Spreadsheet.java 1716 3 5 0 UnitTestCaseAction 1476273077909 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273077909 SpreadsheetTest.java FAIL EditAction 1476273091043 Spreadsheet.java 1735 3 3 0 +CompilationAction 1476273091170 Spreadsheet.java +CompilationAction 1476273091170 Spreadsheet.java +CompilationAction 1476273092564 Spreadsheet.java +CompilationAction 1476273092565 Spreadsheet.java +UnitTestCaseAction 1476273094839 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476273094839 SpreadsheetTest.java FAIL +EditAction 1476273108119 Spreadsheet.java 1738 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 00da904688f24ed9869ef121ae19def260287607..f0fc2a533f3c60736d5c24b6dbd6c5af34fc2320 100644 GIT binary patch delta 270 zcmXYs%}N4c6o#MUj3XlmBBdy_(afaDDSvZJjM9Zci$Hflx8NNJ-ooso#XvhLf>{_8 zt=e@3ZM%Rd2qUQPqjt}Gp2ho~hs0CjdST=POe~ONCuHqHI*t)iNOms?^}!67`!9wY zTc);7u6XxT=ArFs6Aj4Sj!j#p0qe{ua>E99Y;sSTM;xBn=9LO>xO}j~Csn?v@l9PK zG$c+_(zGN?TS|CRrX!AWd-PO$_ zTH!!NLe)4@$gvun>4Y{};F47GjT{THCA3H$B{aiMj1CuE+ws&=Zo+9C3UK+Q8K>$P NIkw=Hl(%i~_8%pLEyw@> diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index a94eb62..55852d2 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -32,7 +32,7 @@ public void set(String cell, String value) { } if (isInteger) { - if (value.length() > 2 value.charAt(2) != '-') { + if (value.length() > 1 && value.charAt(2) != '-') { value = value.substring(2, value.length()); } else { value = value.substring(1, value.length()); From 6db1e4ff5d7a8505ea64d3228020d13fd784b5ef Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:51:53 +0300 Subject: [PATCH 086/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1735 -> 1735 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index d393f19..682797d 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -194,3 +194,6 @@ CompilationAction 1476273092565 Spreadsheet.java UnitTestCaseAction 1476273094839 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273094839 SpreadsheetTest.java FAIL EditAction 1476273108119 Spreadsheet.java 1738 3 5 0 +UnitTestCaseAction 1476273109194 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476273109195 SpreadsheetTest.java FAIL +EditAction 1476273113593 Spreadsheet.java 1738 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f0fc2a533f3c60736d5c24b6dbd6c5af34fc2320..3111a9cbd0c4dc01007b156e7561277552ee36cc 100644 GIT binary patch delta 14 VcmX@kdz^PeBnu 1 && value.charAt(2) != '-') { + if (value.length() > 2 && value.charAt(2) != '-') { value = value.substring(2, value.length()); } else { value = value.substring(1, value.length()); From 1d7daf07563cf7245005f43a7b3806a4a97177cf Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:52:13 +0300 Subject: [PATCH 087/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1735 -> 1735 bytes src/Spreadsheet.java | 6 +----- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 682797d..5eb23ff 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -197,3 +197,6 @@ EditAction 1476273108119 Spreadsheet.java 1738 3 5 0 UnitTestCaseAction 1476273109194 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273109195 SpreadsheetTest.java FAIL EditAction 1476273113593 Spreadsheet.java 1738 3 5 0 +UnitTestCaseAction 1476273118577 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476273118578 SpreadsheetTest.java FAIL +EditAction 1476273133161 Spreadsheet.java 1605 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3111a9cbd0c4dc01007b156e7561277552ee36cc..f0fc2a533f3c60736d5c24b6dbd6c5af34fc2320 100644 GIT binary patch delta 14 VcmX@kdz^PeBnu 2 && value.charAt(2) != '-') { - value = value.substring(2, value.length()); - } else { - value = value.substring(1, value.length()); - } + value = value.substring(1, value.length()); } else { value = "#Error"; } From fe59f030176883766ba8f4c545c3686d800c9178 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:53:53 +0300 Subject: [PATCH 088/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1735 -> 1691 bytes src/Spreadsheet.java | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 5eb23ff..977d605 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -200,3 +200,6 @@ EditAction 1476273113593 Spreadsheet.java 1738 3 5 0 UnitTestCaseAction 1476273118577 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273118578 SpreadsheetTest.java FAIL EditAction 1476273133161 Spreadsheet.java 1605 3 5 0 +UnitTestCaseAction 1476273134052 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476273134053 SpreadsheetTest.java FAIL +EditAction 1476273233544 Spreadsheet.java 1758 3 3 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f0fc2a533f3c60736d5c24b6dbd6c5af34fc2320..f16ea3dbd769a82d78c4f5f555b5a33f3ec96382 100644 GIT binary patch delta 262 zcmW-cJxjx26osGbo5T+clxl^Dg;FhO6HL4kfEYd1V^1Z z_ycqo1yKtH$4*XylW*iK&pB`}=RCPR_x?c@PqA=7{9r)-QkDWWU^%mUO_B!I4d?n( zg_G}DzkADz&RT8B=o722`mAct?w(z+!WAWq=Z-ZVDf5iaD*E;BU5B@&Nq$+IH`no_34JaEi(T8kVD#--%3i2PG*Xo4f7ivG5}(vUs#xr$=M i78}&es4+$AG_ct;=P`3SbaJNqzH?}InB_nxPV@&Me=!IE delta 343 zcmXYs%}N4s6vcnnnb8Ub5i=Bm(8|Oy&F_!G=mWBH5!5b-)@^!&o*`x#RK!5Lp*FK9 z2wJu43EK7mQ4mc={fFG0dwz#|?>UP+MQ-l2w2e*>WYct+JeQ8Cxn!bCm$<&6+c?&X zRt$Z`^8IVxt(d+tRrHBrlQIoITeu)<8ouX}RiRUBPruR}@|LIfPi&@fnBkUL?wR9( z9FLehQ{a_(-YD`xiBHOSR2Wc|05ut-E(scvq$OF}lA|N0VokcT$g*@W5t4qK_= '0' && value.charAt(1) <= '9')) { boolean isInteger = true; for (int i = 1; i < value.length(); i++) { char c = value.charAt(i); @@ -67,6 +67,9 @@ public void set(String cell, String value) { public String evaluate(String cell) { String value = (String) mValues.get(cell); + if (value.equals("#Error")) { + if (mValues.containsKey(value)) + } return value; } From fc55c16f80a1bc0445fe1584b14ec51eadc985a0 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:56:06 +0300 Subject: [PATCH 089/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 4 ++++ bin/Spreadsheet.class | Bin 1691 -> 1722 bytes src/Spreadsheet.java | 8 +++++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 977d605..0e1ca7f 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -203,3 +203,7 @@ EditAction 1476273133161 Spreadsheet.java 1605 3 5 0 UnitTestCaseAction 1476273134052 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273134053 SpreadsheetTest.java FAIL EditAction 1476273233544 Spreadsheet.java 1758 3 3 0 +CompilationAction 1476273233663 Spreadsheet.java +UnitTestCaseAction 1476273245829 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476273245829 SpreadsheetTest.java FAIL +EditAction 1476273366410 Spreadsheet.java 1777 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f16ea3dbd769a82d78c4f5f555b5a33f3ec96382..1ee0219ca0c953ccb79410246b4613ea5cc0588a 100644 GIT binary patch delta 347 zcmXYtu}VT=6o9|uy&4jNgyuD}K`Sh8sn^uhilQZlhW1_|f}l|x+JYvB2C0mKmI5Ji z5Q1KyH;ASlAPS8!ck~k35C4w5GM=7is@=s|cmnLrEkilS&A`4{o8!DQVBad5$t`F=lg}&8*=)f-O ZlMaC{Wq0I6y%~sQ4vAQ zg206j&;tZPbb+9y4-i;E$MURx&IkYbPQyO2ZyQE@50fxR%B$m^Nz60qB>I*vIBqY@ zD-LU~M#g&XPpx0yrOjRmHW;Q%lr2W6;IP9eyTsVXC18xIvIF8Ak>HdG&Y9$rDQ=kN zo+J;Xc*Nt0G%sX$Bg+RqO=kEcM~l2fC`b=QvB`?Vg19WoILne`C14QPrn@c8kjm(2 za#Tb9lCLSGie)X#VX( 1 && value.charAt(value.length() - 1) == '\'') { @@ -67,9 +72,6 @@ public void set(String cell, String value) { public String evaluate(String cell) { String value = (String) mValues.get(cell); - if (value.equals("#Error")) { - if (mValues.containsKey(value)) - } return value; } From 2e0e3462b330f78a8c93377646d9cbba88a3023c Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:56:39 +0300 Subject: [PATCH 090/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1722 -> 1747 bytes src/Spreadsheet.java | 3 +++ 3 files changed, 6 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 0e1ca7f..ec80931 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -207,3 +207,6 @@ CompilationAction 1476273233663 Spreadsheet.java UnitTestCaseAction 1476273245829 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273245829 SpreadsheetTest.java FAIL EditAction 1476273366410 Spreadsheet.java 1777 3 5 0 +UnitTestCaseAction 1476273367996 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476273367996 SpreadsheetTest.java FAIL +EditAction 1476273399458 Spreadsheet.java 1855 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 1ee0219ca0c953ccb79410246b4613ea5cc0588a..7945b9b4a72fe5c117fdeee5f06568671590a1f3 100644 GIT binary patch delta 329 zcmXAjJxfAy7{z~&_kV9nnI@STxEQ^VSG(qW8YEF+ue2q#^#OuDK(6`7$b^DIl5x>RXMU3;6X$~H~eV_go}U>rCmS@Q)MrACnwN>`>SQ^BOFQwqd?Xql-$hD3fzNO*t> V3v37d(me~m<_q Date: Wed, 12 Oct 2016 14:58:01 +0300 Subject: [PATCH 091/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1747 -> 1840 bytes src/Spreadsheet.java | 6 ++++++ 3 files changed, 9 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index ec80931..220718a 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -210,3 +210,6 @@ EditAction 1476273366410 Spreadsheet.java 1777 3 5 0 UnitTestCaseAction 1476273367996 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273367996 SpreadsheetTest.java FAIL EditAction 1476273399458 Spreadsheet.java 1855 3 6 0 +UnitTestCaseAction 1476273402048 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476273402048 SpreadsheetTest.java FAIL +EditAction 1476273481004 Spreadsheet.java 2090 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 7945b9b4a72fe5c117fdeee5f06568671590a1f3..1e1aef859b1ff78cc9667f46d02a6da977f9d685 100644 GIT binary patch delta 211 zcmcc2yMd4E)W2Q(7#J8#7@Rk9U1l=iV&G%2<6*F8aA0KMPR`FONzBYE_D-#2WDwQx z$x19s)Xz!GOV{^L%1TWxvDS>*e3xl9bA2rX69Y5Q6jiM)41(I*7_1I3$oYcUI@=g* zXEN|332)HZ0944#APgjh7+8R$Cj$?IH-k8X4}&s;KZ6KRL;+$LgD8U-kOwrDL6Sj= lff1-qlEDzjVq&lWigGY8{$WsNXOLsyWMpsz3NSG^0RYB}CXxUE delta 116 zcmdnMcbS*#)W2Q(7#J8#80sr?rJaPh-wB=1~DKHsE 2) { + value = value.substring(2, value.length() - 1); + } else { + value = "#Error"; + } } else if (value.charAt(1) == '-' || (value.charAt(1) >= '0' && value.charAt(1) <= '9')) { boolean isInteger = true; for (int i = 1; i < value.length(); i++) { From 816153fd13f8cd8829a484093ecb287de832637e Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:58:19 +0300 Subject: [PATCH 092/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 1840 -> 1921 bytes src/Spreadsheet.java | 3 ++- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 220718a..d1a2b56 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -213,3 +213,4 @@ EditAction 1476273399458 Spreadsheet.java 1855 3 6 0 UnitTestCaseAction 1476273402048 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273402048 SpreadsheetTest.java FAIL EditAction 1476273481004 Spreadsheet.java 2090 3 6 0 +EditAction 1476273499491 Spreadsheet.java 2057 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 1e1aef859b1ff78cc9667f46d02a6da977f9d685..4264b71c50f163f4cb2d2bb8880dc7bc9892cba8 100644 GIT binary patch delta 366 zcmXAlJxhXd6vcnH=TVBxA}Y1A7j3AN#C%Il$qYqOq9|yH2x@JJDB8s6h32O@8iFDS zgg~6yf<8e6eSnCzAP`*ot9Lq_ADnycEn7?7v5_ZmTaLEu44D*PSG9y$O<&`ns zaPf|t4<`6j?2Ac$nBtFVYIvwKBklO5lYrO>ijR=Q2}_cQq=?EAG06~@JoBGs_2a zd@|2BIe`T+$V&iQLKI|xqKx2(MM=_>B|}9Vs#0cIs>-%llLqT8*=0ix*klwqBGl6- zs!}?dEY;C&O?gc|Ro!P18-p_{6e#M;O;vL!;n$ 2) { + if (value.charAt(1) == '\'') { value = value.substring(2, value.length() - 1); } else { value = "#Error"; } + } else if (value.charAt(1) == '-' || (value.charAt(1) >= '0' && value.charAt(1) <= '9')) { boolean isInteger = true; for (int i = 1; i < value.length(); i++) { From 170e23638f77d9c2c5cb122ff236913a0718d22b Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:59:31 +0300 Subject: [PATCH 093/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1921 -> 1908 bytes src/Spreadsheet.java | 14 ++++++++------ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index d1a2b56..c6779d3 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -214,3 +214,6 @@ UnitTestCaseAction 1476273402048 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273402048 SpreadsheetTest.java FAIL EditAction 1476273481004 Spreadsheet.java 2090 3 6 0 EditAction 1476273499491 Spreadsheet.java 2057 3 6 0 +UnitTestCaseAction 1476273503882 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476273503882 SpreadsheetTest.java FAIL +EditAction 1476273571843 Spreadsheet.java 2080 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 4264b71c50f163f4cb2d2bb8880dc7bc9892cba8..140820025872d9e58b6f06673fa4413da0a1bac3 100644 GIT binary patch delta 370 zcmXAlJxhXN6o#*(uU2FqL}f-=X(8oHX8Dok2jyTvLMb>kiqu|Y5lBn@0LLhVf(Dl$ zh#+W>pdZlCTnH_>3DNWFcAs+{&biNhHqh+9|2BI}O*E_^7y2X4YbopIM?8ax8ox$E zyQNXJX?|CD$d|p7MZMiD8YA8sZe8oBhmw|)${uzO7~=>BCrogOlPg@@FiD*$o|xtt z53kJd#w_oOeK5x-^L*i>fzA(pS}gHLP*#+QsRswzV{7)RPFpp;2j-BE{^F;gQ(kdR8I yuIz@1U{OcY9V&669jXi{dj@4it?UkAZ?S3dR$r{;zHMyeR3Le^p-@eCCI107)IrPu delta 358 zcmXAlJxhXd6vcnH=h2MJA}Y1ALK`YAG2c>CQo|69C~9j6YH5rp+QjIE=BGItf+7fv zK>PwhpCE!hKtyYS;L=~+&OJXk_uTtyEB98uHIF9fm_e?6Ra`f6?$fGx`jWRo)6nmz z8&=(K%l3O$?0!B3Bf|pvVBQO;__W1{qRQQ#lz%S}LGahpM{HJV7*`h!Y~LzEM+EBSbN& qrP(%>Jh3)a1>9}Qf{L_+u{X$@LdLWCq-PDQ%Cobf61I#;XX+ok_B~wy diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 55eaf2e..24deb17 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -3,6 +3,8 @@ public class Spreadsheet { HashMap mValues = new HashMap(); + final public static ERROR = "#Error"; + public String get(String cell) { // to be implemented return null; @@ -15,14 +17,14 @@ public void set(String cell, String value) { if (value.charAt(value.length() - 1) == '\'' && value.length() > 2) { value = value.substring(2, value.length() - 1); } else { - value = "#Error"; + value = ERROR; } } else if ((value.charAt(value.length() - 1) == '\'')) { if (value.charAt(1) == '\'') { value = value.substring(2, value.length() - 1); } else { - value = "#Error"; + value = ERROR; } } else if (value.charAt(1) == '-' || (value.charAt(1) >= '0' && value.charAt(1) <= '9')) { @@ -41,19 +43,19 @@ public void set(String cell, String value) { if (isInteger) { value = value.substring(1, value.length()); } else { - value = "#Error"; + value = ERROR; } } else if (value.charAt(1) != '\'') { } else { - value = "#Error"; + value = ERROR; } } else if (value.charAt(0) == '\'') { if (value.length() > 1 && value.charAt(value.length() - 1) == '\'') { value = value.substring(1, value.length() - 1); } else { - value = "#Error"; + value = ERROR; } } else { boolean isInteger = true; @@ -69,7 +71,7 @@ public void set(String cell, String value) { } if (!isInteger) - value = "#Error"; + value = ERROR; } } From 766005f24cbbb141d001d95f54c51ca3eb9fdcba Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 14:59:59 +0300 Subject: [PATCH 094/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 7 +++++++ bin/Spreadsheet.class | Bin 1908 -> 1948 bytes src/Spreadsheet.java | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index c6779d3..5ef9349 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -217,3 +217,10 @@ EditAction 1476273499491 Spreadsheet.java 2057 3 6 0 UnitTestCaseAction 1476273503882 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273503882 SpreadsheetTest.java FAIL EditAction 1476273571843 Spreadsheet.java 2080 3 6 0 +CompilationAction 1476273571953 Spreadsheet.java +CompilationAction 1476273571953 Spreadsheet.java +CompilationAction 1476273578281 Spreadsheet.java +CompilationAction 1476273578281 Spreadsheet.java +UnitTestCaseAction 1476273580159 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476273580159 SpreadsheetTest.java FAIL +EditAction 1476273599185 Spreadsheet.java 2113 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 140820025872d9e58b6f06673fa4413da0a1bac3..25792be2ed157ac6caaf2a4a921e09e47624f238 100644 GIT binary patch literal 1948 zcma)7&r@4f6#j1VLPB_u5SpM>w15Qyfq>RP%CFLt+9-vQRJ4xc%p*LLSJQ+^UaED} zRY!NO+_a8Lr_8YErp_pJ>`ce4KmPz1uAS+O8(mSYe)qnB!QhOGd*40h+;i@C&Ua4o z?SrrG0yu_wFI)mGnf0=1tX1-+X?vjw1TPqujCjE)=Hg4M7tE|J;JvtF6sl%LpkqN< ztF~2$pD`-=v&QMnw3YoFXRxvl(sF`6L&;0W8(y~CP(JauK zDitfXQM45nA6f;PdgsgKQkjP-t7zFX0`7t6ih!0Xt(ktf5z^6yfER}Z+8coT(ScAi z1Uhwi&?FF8u!`nl_2Q~oK4+{Jm`rG)lr;(~M%j{bO{v*=i=}8?sH+^oyK^Q>)i=Yt4gHh^#L7G4APLz z8|68^r46K`DQSu67{&63a=Ynu8{ zH5FODB%6uvT9tIsHghHk6fbjGTxqT>SBeGB*hcnsc37?MK2tgxHks|fw2ntX!uQqt zzh9LuCv?o=Bs)G^D%yrstUPC476>1ZNR(*&nNqc!HBVcz4}x`6kH|(sH~YrTF>-OS zc_?|6ghM#hal67c2vkAEesX0k6!EbQzHrfa8pyT{)gug)KGj;nR?rkcrn|>O- z+>8h4jt>sw5lVuoch%x0_>~x3;+EVYBS zery}vpNKbO?rro3r#JAMRA`&H7t^Gse*^KDQmxg*!&35WA{6uN>W9v5i9|@}KDz&I z&t8y!-S(;5F2_9lDLS3g=yhbBQ}PDRYcpCx+rn5ZETJSkVNKgWYuFPU-ayk9B0SN- z&rfm_KKINP0#`H<)+DU!e|_I|6~UMiwn2pWP`-%|_8?tR^1DvvDo-c#?)^E0oERGO zmr)j#*BNcbEwPRMgYDY?hxS9)H8e5K;OB@85pDcM*$Qq&rR_zrpr+iv)i}az7@$H`t~(Iq6^0^A3L>zCjVgyMshU4NGro=d=MUoRYi&^muPKXTV#0pYk z4X4Cwm=_jpRiwpbJS*PDqIeHWssUf&IIy*L8;~cb0j2IKwxWwjpXa+zGv^Ivm%upN z@g@;ZAPEoOOgUCDMOj(-KG8`l?}MJ5_mTGWd%FIFSBO8*DOz`+xpv?S?!Xg>dusZ~ zo_y+assnvW_LwlVcJdK4ohWcDfob?RF&IcN?)AtD8qIiBap#0$jylFIpr e6KpqUR^G{3r`5?>;`V`9d%es>Fh@C>r~U?)ERAje literal 1908 zcma)6OK%%h7(LgXi5+JgJ1$P3kTy-)CQh6R5PjqhcdRd zW|^hfl3pz?>+3TDty!~B)~#B_5J)sz%sL`FWY(&f<-$y}B*{1}vu4?}k^=65NKQaW zt*sh9xZ&5(3ZDl7fsUs9KD5K%3W1OY6)ggRj9E6$)-J3Vl~?tZ5;27`Yk9qt(<`RD z*M*8zG+B{9)6f87a2E_#d~%=}VWe3^jCrF}k{KR#tzIHSRb{CD141=hM{+(KL5~MV z_c7qa(r^sDY){E37p$V)p0qSSuHghuQjss}l?CQf2GWs~)C_2dV35pIYb#Z|GT0LcoAiUzEhRTT1ED9L_-XtOtM~M#HmK~&O9`dSC=$~t&0TIi*jg)!K|jsmQgS& z0^)TplPk@Y=Sq=*tflAQ<|NgL@fy-mw@7_EW;AqR_Ax^KJF9d_YM96Kob3Es+0xB& z^#$XSK=^<{B1GfMuGK1eXcC5yC@ zHo?K$&<5|K{oHK?zedNGw)G+I?RFeD{S*Xveu6U1@j)1!ya|^2WIbM-UzhY1x8x2P zL1qUtOV3V6TlbU}PvJ220#D-^?!@H!lbKo=_T%U_y1x+bM%~-!3(jre4=GSKaX+d^ zN&g07QCqZHzaEx1brYeex-0Kr-V*W95ckpjw!M2n9<%n^)-Fdqd<|XBY4kes&M9#N z=ai%pSGF(~4NE9-HLNHb@Q2ml@CI78(8&`WeEcLf;dLjs5V)*}up(hy|L4cqgq#=(>z7f^+Fnaa(k-!#KEihO|3mw!`zl%( zXYea@3=!?{YjPCaHj(%E!X)_~_(@wk`Zy5N2;ww4kVXg@()uPTE^;6&j>J2(dXKbz zhHiY$*L?#=aT7hb!|}XJ@9%INKk!%ZGj+f4;s1(3{DvXiM-;y^*8@C@hZq-am=L{) zixEtUF-(bZOp8g(hy-8QJm$n1Bt;hUB8LUBibe4jQo^LJhBM+4mc;wWh>x&r58xXd zeva1e0P^Gvpp=bq6kSC6GV?yinm1V8I3_rbH;FcmNvO=3aR_4jbEo`iQ5Ze?emZefd$@O GSo{|-?S&Ws diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 24deb17..b1fea9b 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -3,7 +3,7 @@ public class Spreadsheet { HashMap mValues = new HashMap(); - final public static ERROR = "#Error"; + final public static String ERROR = "#Error"; public String get(String cell) { // to be implemented @@ -81,7 +81,7 @@ public void set(String cell, String value) { public String evaluate(String cell) { String value = (String) mValues.get(cell); - if (mValues.containsKey(value)) { + if (!mValues.equals(ERROR) && mValues.containsKey(value)) { return (String) mValues.get(cell); } From eb0c3445246ca20d40ce7b0b68a98cab927ca355 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:00:08 +0300 Subject: [PATCH 095/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 1948 -> 1979 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 5ef9349..58dfc9d 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -224,3 +224,4 @@ CompilationAction 1476273578281 Spreadsheet.java UnitTestCaseAction 1476273580159 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273580159 SpreadsheetTest.java FAIL EditAction 1476273599185 Spreadsheet.java 2113 3 6 0 +EditAction 1476273608753 Spreadsheet.java 2114 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 25792be2ed157ac6caaf2a4a921e09e47624f238..a50d8a805a9e52bb5d8a884cb082ce271222d8df 100644 GIT binary patch delta 177 zcmbQkznh=y)W2Q(7#J8#7(6y|eP?24OD!x-%qgDC%Pb+m#URY!!o%Ro;Kazlot&Rn zl9-uS?44SUns$Y)}32LN@8Aano# delta 165 zcmdnZKZl>|)W2Q(7#J8#7+g1UeP>ePPR`FONzBYE_D-#2WDwQx$x19s)Xz!GOV{^L z%1TWxvDS>*Y{C4VS+br&Nc@7$pP$YuHp=#49W}< z43a=q3J|pnQVh~S9#9v990L~vBLfdm))>fQVz2^=axgIdVNhmgPy)(01Nlr0E&u>p BAa?)& diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index b1fea9b..7d5c263 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -82,7 +82,7 @@ public String evaluate(String cell) { String value = (String) mValues.get(cell); if (!mValues.equals(ERROR) && mValues.containsKey(value)) { - return (String) mValues.get(cell); + return (String) mValues.get(value); } return value; From 868fae14517736f5f4875de620b1336e0f640f6f Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:00:27 +0300 Subject: [PATCH 096/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 1979 -> 1979 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 58dfc9d..863f44d 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -225,3 +225,6 @@ UnitTestCaseAction 1476273580159 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273580159 SpreadsheetTest.java FAIL EditAction 1476273599185 Spreadsheet.java 2113 3 6 0 EditAction 1476273608753 Spreadsheet.java 2114 3 6 0 +UnitTestCaseAction 1476273611092 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476273611092 SpreadsheetTest.java FAIL +EditAction 1476273627375 Spreadsheet.java 2161 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index a50d8a805a9e52bb5d8a884cb082ce271222d8df..a06da9568666c79193afe4b4fb0be47fe1f1da20 100644 GIT binary patch delta 13 UcmdnZzngzUI6I@x(^b delta 13 UcmdnZzngzUI6I^E Date: Wed, 12 Oct 2016 15:00:30 +0300 Subject: [PATCH 097/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 1979 -> 2003 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 863f44d..c83721c 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -228,3 +228,4 @@ EditAction 1476273608753 Spreadsheet.java 2114 3 6 0 UnitTestCaseAction 1476273611092 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273611092 SpreadsheetTest.java FAIL EditAction 1476273627375 Spreadsheet.java 2161 3 6 0 +EditAction 1476273630857 Spreadsheet.java 2157 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index a06da9568666c79193afe4b4fb0be47fe1f1da20..367af22187bcd17bc03193119993d220dc605b48 100644 GIT binary patch delta 318 zcmW-cJxfAi7>2LM^S+)EMRU=Vgg)R59SGC>BGWioT4=O1HARil5J5|{1O<(UYO;a? zhn6NAnp*k;{hL!k=eS+>b8~U?e8j)wZ*ywah@uFC+}T5>ALPn5hFFRElZ1kUdckuy z)PmVcM!N%PxaZ0;QzM>mU)53WIbiy>3M}i9q^(BY!I1gxz_s+f@kQSK)W;W#Vp5O@ zMTt?83}wkvkvdgrQWJ+|S*I>-R-{Kmc4^8!t8$1VC#=aSEjjbMOFDARrrgkzTeg`5 z_81R7AVbzq0p*AwBP#e5qR);y2xpx(4n>wQWQ!^#$|!$nhKipwHD4}~{-L8SJ@tnv U@=Ho$9xCK9mhjMN?JD#AAMyM;mH+?% delta 279 zcmXAjJxjx26h_ZY-XwlOqz_ z99*30AUHY;{tQQ*i*M?7&V9J|K41Qu|1zzntX~u^$aUCe;z3SByG<}y&-lp)>XC2V zQY9}g3~W3}SzoBY>*=zkpVg6nn=?0|%C~|{$IhMoPDy_{$CnWuV(BN5Nfu<5ROYBk zL`@RvlCmfb8q#7(c375OnzGM|9Iz^fCOctG&RCaoHsy*fMu0tf^Qw$8W-O<1`j9To s8?v}(n}`ZFnf`ExW>T8}E;UkO5|sI9`WSPlnj;m4b;m7=uZ!O6ABa^maR2}S diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 648eb78..4f563c4 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -47,7 +47,7 @@ public void set(String cell, String value) { } } else if (value.charAt(1) != '\'') { - value = value.substring(1, value.length() - 1); + value = value.substring(1, value.length()); } else { value = ERROR; } From 61a0ab766b195fedc1a689dafbd96012605fab22 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:01:30 +0300 Subject: [PATCH 098/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 10 + .../20161012141626179/besouroEpisodes.txt | 2265 +++++++++++++++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012141626179/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 2003 -> 2001 bytes tests/SpreadsheetTest.java | 8 + 6 files changed, 2285 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index c83721c..5cd3a3c 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -229,3 +229,13 @@ UnitTestCaseAction 1476273611092 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273611092 SpreadsheetTest.java FAIL EditAction 1476273627375 Spreadsheet.java 2161 3 6 0 EditAction 1476273630857 Spreadsheet.java 2157 3 6 0 +UnitTestCaseAction 1476273633108 SpreadsheetTest.java OK +UnitTestSessionAction 1476273633109 SpreadsheetTest.java OK +RefactoringAction 1476273654013 SpreadsheetTest.java ADD void testAssignment_A2_Reference_A1_Integer()/2 METHOD +RefactoringAction 1476273666030 SpreadsheetTest.java RENAME testAssignment_A2_Reference_A1_Integer()/2=>void testAssignment_A2_Reference_A1_Integer FIELD +RefactoringAction 1476273669053 SpreadsheetTest.java RENAME testAssignment_A2_Reference_A1_Integer()/2=>void testAssignment_A2_Reference_A1_Integer_() METHOD +RefactoringAction 1476273670564 SpreadsheetTest.java RENAME testAssignment_A2_Reference_A1_Integer_()=>void testAssignment_A2_Reference_A1_Integer()/2 METHOD +RefactoringAction 1476273673578 SpreadsheetTest.java RENAME testAssignment_A2_Reference_A1_Integer()/2=>void testAssignment_A2_InvalidReference_A1_Integer() METHOD +RefactoringAction 1476273676091 SpreadsheetTest.java RENAME testAssignment_A2_InvalidReference_A1_Integer()=>void testAssignment_A2_InvalidReference_A1_Integer_Error() METHOD +RefactoringAction 1476273679605 SpreadsheetTest.java RENAME testAssignment_A2_InvalidReference_A1_Integer_Error()=>void testAssignment_A2_InvalidReference_Error() METHOD +EditAction 1476273690677 SpreadsheetTest.java 2889 16 49 15 diff --git a/.besouro/20161012141626179/besouroEpisodes.txt b/.besouro/20161012141626179/besouroEpisodes.txt index d486974..7f701c7 100644 --- a/.besouro/20161012141626179/besouroEpisodes.txt +++ b/.besouro/20161012141626179/besouroEpisodes.txt @@ -217,3 +217,2268 @@ 1476272036867 test-first 3 204 true 1476272036868 test-last 1 204 false 1476272036869 test-last 1 204 false +1476273633109 test-first 3 1573 true +1476273633110 test-first 3 1573 true +1476273633111 test-first 3 1573 true +1476273633112 test-first 3 1573 true +1476273633113 test-first 3 1573 true +1476273633114 test-first 3 1573 true +1476273633115 test-first 3 1573 true +1476273633116 test-first 3 1573 true +1476273633117 test-first 3 1573 true +1476273633118 test-first 3 1573 true +1476273633119 test-first 3 1573 true +1476273633120 test-first 3 1573 true +1476273633121 test-first 3 1573 true +1476273633122 test-first 3 1573 true +1476273633123 test-first 3 1573 true +1476273633124 test-first 3 1573 true +1476273633125 test-first 3 1573 true +1476273633126 test-first 3 1573 true +1476273633127 test-first 3 1573 true +1476273633128 test-first 3 1573 true +1476273633129 test-first 3 1573 true +1476273633130 test-first 3 1573 true +1476273633131 test-first 3 1573 true +1476273633132 test-first 3 1573 true +1476273633133 test-first 3 1573 true +1476273633134 test-first 3 1573 true +1476273633135 test-first 3 1573 true +1476273633136 test-first 3 1573 true +1476273633137 test-first 3 1573 true +1476273633138 test-first 3 1573 true +1476273633139 test-first 3 1573 true +1476273633140 test-first 3 1573 true +1476273633141 test-first 3 1573 true +1476273633142 test-first 3 1573 true +1476273633143 test-first 3 1573 true +1476273633144 test-first 3 1573 true +1476273633145 test-first 3 1573 true +1476273633146 test-first 3 1573 true +1476273633147 test-first 3 1573 true +1476273633148 test-first 3 1573 true +1476273633149 test-first 3 1573 true +1476273633150 test-first 3 1573 true +1476273633151 test-first 3 1573 true +1476273633152 test-first 3 1573 true +1476273633153 test-first 3 1573 true +1476273633154 test-first 3 1573 true +1476273633155 test-first 3 1573 true +1476273633156 test-first 3 1573 true +1476273633157 test-first 3 1573 true +1476273633158 test-first 3 1573 true +1476273633159 test-first 3 1573 true +1476273633160 test-first 3 1573 true +1476273633161 test-first 3 1573 true +1476273633162 test-first 3 1573 true +1476273633163 test-first 3 1573 true +1476273633164 test-first 3 1573 true +1476273633165 test-first 3 1573 true +1476273633166 test-first 3 1573 true +1476273633167 test-first 3 1573 true +1476273633168 test-first 3 1573 true +1476273633169 test-first 3 1573 true +1476273633170 test-first 3 1573 true +1476273633171 test-first 3 1573 true +1476273633172 test-first 3 1573 true +1476273633173 test-first 3 1573 true +1476273633174 test-first 3 1573 true +1476273633175 test-first 3 1573 true +1476273633176 test-first 3 1573 true +1476273633177 test-first 3 1573 true +1476273633178 test-first 3 1573 true +1476273633179 test-first 3 1573 true +1476273633180 test-first 3 1573 true +1476273633181 test-first 3 1573 true +1476273633182 test-first 3 1573 true +1476273633183 test-first 3 1573 true +1476273633184 test-first 3 1573 true +1476273633185 test-first 3 1573 true +1476273633186 test-first 3 1573 true +1476273633187 test-first 3 1573 true +1476273633188 test-first 3 1573 true +1476273633189 test-first 3 1573 true +1476273633190 test-first 3 1573 true +1476273633191 test-first 3 1573 true +1476273633192 test-first 3 1573 true +1476273633193 test-first 3 1573 true +1476273633194 test-first 3 1573 true +1476273633195 test-first 3 1573 true +1476273633196 test-first 3 1573 true +1476273633197 test-first 3 1573 true +1476273633198 test-first 3 1573 true +1476273633199 test-first 3 1573 true +1476273633200 test-first 3 1573 true +1476273633201 test-first 3 1573 true +1476273633202 test-first 3 1573 true +1476273633203 test-first 3 1573 true +1476273633204 test-first 3 1573 true +1476273633205 test-first 3 1573 true +1476273633206 test-first 3 1573 true +1476273633207 test-first 3 1573 true +1476273633208 test-first 3 1573 true +1476273633209 test-first 3 1573 true +1476273633210 test-first 3 1573 true +1476273633211 test-first 3 1573 true +1476273633212 test-first 3 1573 true +1476273633213 test-first 3 1573 true +1476273633214 test-first 3 1573 true +1476273633215 test-first 3 1573 true +1476273633216 test-first 3 1573 true +1476273633217 test-first 3 1573 true +1476273633218 test-first 3 1573 true +1476273633219 test-first 3 1573 true +1476273633220 test-first 3 1573 true +1476273633221 test-first 3 1573 true +1476273633222 test-first 3 1573 true +1476273633223 test-first 3 1573 true +1476273633224 test-first 3 1573 true +1476273633225 test-first 3 1573 true +1476273633226 test-first 3 1573 true +1476273633227 test-first 3 1573 true +1476273633228 test-first 3 1573 true +1476273633229 test-first 3 1573 true +1476273633230 test-first 3 1573 true +1476273633231 test-first 3 1573 true +1476273633232 test-first 3 1573 true +1476273633233 test-first 3 1573 true +1476273633234 test-first 3 1573 true +1476273633235 test-first 3 1573 true +1476273633236 test-first 3 1573 true +1476273633237 test-first 3 1573 true +1476273633238 test-first 3 1573 true +1476273633239 test-first 3 1573 true +1476273633240 test-first 3 1573 true +1476273633241 test-first 3 1573 true +1476273633242 test-first 3 1573 true +1476273633243 test-first 3 1573 true +1476273633244 test-first 3 1573 true +1476273633245 test-first 3 1573 true +1476273633246 test-first 3 1573 true +1476273633247 test-first 3 1573 true +1476273633248 test-first 3 1573 true +1476273633249 test-first 3 1573 true +1476273633250 test-first 3 1573 true +1476273633251 test-first 3 1573 true +1476273633252 test-first 3 1573 true +1476273633253 test-first 3 1573 true +1476273633254 test-first 3 1573 true +1476273633255 test-first 3 1573 true +1476273633256 test-first 3 1573 true +1476273633257 test-first 3 1573 true +1476273633258 test-first 3 1573 true +1476273633259 test-first 3 1573 true +1476273633260 test-first 3 1573 true +1476273633261 test-first 3 1573 true +1476273633262 test-first 3 1573 true +1476273633263 test-first 3 1573 true +1476273633264 test-first 3 1573 true +1476273633265 test-first 3 1573 true +1476273633266 test-first 3 1573 true +1476273633267 test-first 3 1573 true +1476273633268 test-first 3 1573 true +1476273633269 test-first 3 1573 true +1476273633270 test-first 3 1573 true +1476273633271 test-first 3 1573 true +1476273633272 test-first 3 1573 true +1476273633273 test-first 3 1573 true +1476273633274 test-first 3 1573 true +1476273633275 test-first 3 1573 true +1476273633276 test-first 3 1573 true +1476273633277 test-first 3 1573 true +1476273633278 test-first 3 1573 true +1476273633279 test-first 3 1573 true +1476273633280 test-first 3 1573 true +1476273633281 test-first 3 1573 true +1476273633282 test-first 3 1573 true +1476273633283 test-first 3 1573 true +1476273633284 test-first 3 1573 true +1476273633285 test-first 3 1573 true +1476273633286 test-first 3 1573 true +1476273633287 test-first 3 1573 true +1476273633288 test-first 3 1573 true +1476273633289 test-first 3 1573 true +1476273633290 test-first 3 1573 true +1476273633291 test-first 3 1573 true +1476273633292 test-first 3 1573 true +1476273633293 test-first 3 1573 true +1476273633294 test-first 3 1573 true +1476273633295 test-first 3 1573 true +1476273633296 test-first 3 1573 true +1476273633297 test-first 3 1573 true +1476273633298 test-first 3 1573 true +1476273633299 test-first 3 1573 true +1476273633300 test-first 3 1573 true +1476273633301 test-first 3 1573 true +1476273633302 test-first 3 1573 true +1476273633303 test-first 3 1573 true +1476273633304 test-first 3 1573 true +1476273633305 test-first 3 1573 true +1476273633306 test-first 3 1573 true +1476273633307 test-first 3 1573 true +1476273633308 test-first 3 1573 true +1476273633309 test-first 3 1573 true +1476273633310 test-first 3 1573 true +1476273633311 test-first 3 1573 true +1476273633312 test-first 3 1573 true +1476273633313 test-first 3 1573 true +1476273633314 test-first 3 1573 true +1476273633315 test-first 3 1573 true +1476273633316 test-first 3 1573 true +1476273633317 test-first 3 1573 true +1476273633318 test-first 3 1573 true +1476273633319 test-first 3 1573 true +1476273633320 test-first 3 1573 true +1476273633321 test-first 3 1573 true +1476273633322 test-first 3 1573 true +1476273633323 test-first 3 1573 true +1476273633324 test-first 3 1573 true +1476273633325 test-first 3 1573 true +1476273633326 test-first 3 1573 true +1476273633327 test-first 3 1573 true +1476273633328 test-first 3 1573 true +1476273633329 test-first 3 1573 true +1476273633330 test-first 3 1573 true +1476273633331 test-first 3 1573 true +1476273633332 test-first 3 1573 true +1476273633333 test-first 3 1573 true +1476273633334 test-first 3 1573 true +1476273633335 test-first 3 1573 true +1476273633336 test-first 3 1573 true +1476273633337 test-first 3 1573 true +1476273633338 test-first 3 1573 true +1476273633339 test-first 3 1573 true +1476273633340 test-first 3 1573 true +1476273633341 test-first 3 1573 true +1476273633342 test-first 3 1573 true +1476273633343 test-first 3 1573 true +1476273633344 test-first 3 1573 true +1476273633345 test-first 3 1573 true +1476273633346 test-first 3 1573 true +1476273633347 test-first 3 1573 true +1476273633348 test-first 3 1573 true +1476273633349 test-first 3 1573 true +1476273633350 test-first 3 1573 true +1476273633351 test-first 3 1573 true +1476273633352 test-first 3 1573 true +1476273633353 test-first 3 1573 true +1476273633354 test-first 3 1573 true +1476273633355 test-first 3 1573 true +1476273633356 test-first 3 1573 true +1476273633357 test-first 3 1573 true +1476273633358 test-first 3 1573 true +1476273633359 test-first 3 1573 true +1476273633360 test-first 3 1573 true +1476273633361 test-first 3 1573 true +1476273633362 test-first 3 1573 true +1476273633363 test-first 3 1573 true +1476273633364 test-first 3 1573 true +1476273633365 test-first 3 1573 true +1476273633366 test-first 3 1573 true +1476273633367 test-first 3 1573 true +1476273633368 test-first 3 1573 true +1476273633369 test-first 3 1573 true +1476273633370 test-first 3 1573 true +1476273633371 test-first 3 1573 true +1476273633372 test-first 3 1573 true +1476273633373 test-first 3 1573 true +1476273633374 test-first 3 1573 true +1476273633375 test-first 3 1573 true +1476273633376 test-first 3 1573 true +1476273633377 test-first 3 1573 true +1476273633378 test-first 3 1573 true +1476273633379 test-first 3 1573 true +1476273633380 test-first 3 1573 true +1476273633381 test-first 3 1573 true +1476273633382 test-first 3 1573 true +1476273633383 test-first 3 1573 true +1476273633384 test-first 3 1573 true +1476273633385 test-first 3 1573 true +1476273633386 test-first 3 1573 true +1476273633387 test-first 3 1573 true +1476273633388 test-first 3 1573 true +1476273633389 test-first 3 1573 true +1476273633390 test-first 3 1573 true +1476273633391 test-first 3 1573 true +1476273633392 test-first 3 1573 true +1476273633393 test-first 3 1573 true +1476273633394 test-first 3 1573 true +1476273633395 test-first 3 1573 true +1476273633396 test-first 3 1573 true +1476273633397 test-first 3 1573 true +1476273633398 test-first 3 1573 true +1476273633399 test-first 3 1573 true +1476273633400 test-first 3 1573 true +1476273633401 test-first 3 1573 true +1476273633402 test-first 3 1573 true +1476273633403 test-first 3 1573 true +1476273633404 test-first 3 1573 true +1476273633405 test-first 3 1573 true +1476273633406 test-first 3 1573 true +1476273633407 test-first 3 1573 true +1476273633408 test-first 3 1573 true +1476273633409 test-first 3 1573 true +1476273633410 test-first 3 1573 true +1476273633411 test-first 3 1573 true +1476273633412 test-first 3 1573 true +1476273633413 test-first 3 1573 true +1476273633414 test-first 3 1573 true +1476273633415 test-first 3 1573 true +1476273633416 test-first 3 1573 true +1476273633417 test-first 3 1573 true +1476273633418 test-first 3 1573 true +1476273633419 test-first 3 1573 true +1476273633420 test-first 3 1573 true +1476273633421 test-first 3 1573 true +1476273633422 test-first 3 1573 true +1476273633423 test-first 3 1573 true +1476273633424 test-first 3 1573 true +1476273633425 test-first 3 1573 true +1476273633426 test-first 3 1573 true +1476273633427 test-first 3 1573 true +1476273633428 test-first 3 1573 true +1476273633429 test-first 3 1573 true +1476273633430 test-first 3 1573 true +1476273633431 test-first 3 1573 true +1476273633432 test-first 3 1573 true +1476273633433 test-first 3 1573 true +1476273633434 test-first 3 1573 true +1476273633435 test-first 3 1573 true +1476273633436 test-first 3 1573 true +1476273633437 test-first 3 1573 true +1476273633438 test-first 3 1573 true +1476273633439 test-first 3 1573 true +1476273633440 test-first 3 1573 true +1476273633441 test-first 3 1573 true +1476273633442 test-first 3 1573 true +1476273633443 test-first 3 1573 true +1476273633444 test-first 3 1573 true +1476273633445 test-first 3 1573 true +1476273633446 test-first 3 1573 true +1476273633447 test-first 3 1573 true +1476273633448 test-first 3 1573 true +1476273633449 test-first 3 1573 true +1476273633450 test-first 3 1573 true +1476273633451 test-first 3 1573 true +1476273633452 test-first 3 1573 true +1476273633453 test-first 3 1573 true +1476273633454 test-first 3 1573 true +1476273633455 test-first 3 1573 true +1476273633456 test-first 3 1573 true +1476273633457 test-first 3 1573 true +1476273633458 test-first 3 1573 true +1476273633459 test-first 3 1573 true +1476273633460 test-first 3 1573 true +1476273633461 test-first 3 1573 true +1476273633462 test-first 3 1573 true +1476273633463 test-first 3 1573 true +1476273633464 test-first 3 1573 true +1476273633465 test-first 3 1573 true +1476273633466 test-first 3 1573 true +1476273633467 test-first 3 1573 true +1476273633468 test-first 3 1573 true +1476273633469 test-first 3 1573 true +1476273633470 test-first 3 1573 true +1476273633471 test-first 3 1573 true +1476273633472 test-first 3 1573 true +1476273633473 test-first 3 1573 true +1476273633474 test-first 3 1573 true +1476273633475 test-first 3 1573 true +1476273633476 test-first 3 1573 true +1476273633477 test-first 3 1573 true +1476273633478 test-first 3 1573 true +1476273633479 test-first 3 1573 true +1476273633480 test-first 3 1573 true +1476273633481 test-first 3 1573 true +1476273633482 test-first 3 1573 true +1476273633483 test-first 3 1573 true +1476273633484 test-first 3 1573 true +1476273633485 test-first 3 1573 true +1476273633486 test-first 3 1573 true +1476273633487 test-first 3 1573 true +1476273633488 test-first 3 1573 true +1476273633489 test-first 3 1573 true +1476273633490 test-first 3 1573 true +1476273633491 test-first 3 1573 true +1476273633492 test-first 3 1573 true +1476273633493 test-first 3 1573 true +1476273633494 test-first 3 1573 true +1476273633495 test-first 3 1573 true +1476273633496 test-first 3 1573 true +1476273633497 test-first 3 1573 true +1476273633498 test-first 3 1573 true +1476273633499 test-first 3 1573 true +1476273633500 test-first 3 1573 true +1476273633501 test-first 3 1573 true +1476273633502 test-first 3 1573 true +1476273633503 test-first 3 1573 true +1476273633504 test-first 3 1573 true +1476273633505 test-first 3 1573 true +1476273633506 test-first 3 1573 true +1476273633507 test-first 3 1573 true +1476273633508 test-first 3 1573 true +1476273633509 test-first 3 1573 true +1476273633510 test-first 3 1573 true +1476273633511 test-first 3 1573 true +1476273633512 test-first 3 1573 true +1476273633513 test-first 3 1573 true +1476273633514 test-first 3 1573 true +1476273633515 test-first 3 1573 true +1476273633516 test-first 3 1573 true +1476273633517 test-first 3 1573 true +1476273633518 test-first 3 1573 true +1476273633519 test-first 3 1573 true +1476273633520 test-first 3 1573 true +1476273633521 test-first 3 1573 true +1476273633522 test-first 3 1573 true +1476273633523 test-first 3 1573 true +1476273633524 test-first 3 1573 true +1476273633525 test-first 3 1573 true +1476273633526 test-first 3 1573 true +1476273633527 test-first 3 1573 true +1476273633528 test-first 3 1573 true +1476273633529 test-first 3 1573 true +1476273633530 test-first 3 1573 true +1476273633531 test-first 3 1573 true +1476273633532 test-first 3 1573 true +1476273633533 test-first 3 1573 true +1476273633534 test-first 3 1573 true +1476273633535 test-first 3 1573 true +1476273633536 test-first 3 1573 true +1476273633537 test-first 3 1573 true +1476273633538 test-first 3 1573 true +1476273633539 test-first 3 1573 true +1476273633540 test-first 3 1573 true +1476273633541 test-first 3 1573 true +1476273633542 test-first 3 1573 true +1476273633543 test-first 3 1573 true +1476273633544 test-first 3 1573 true +1476273633545 test-first 3 1573 true +1476273633546 test-first 3 1573 true +1476273633547 test-first 3 1573 true +1476273633548 test-first 3 1573 true +1476273633549 test-first 3 1573 true +1476273633550 test-first 3 1573 true +1476273633551 test-first 3 1573 true +1476273633552 test-first 3 1573 true +1476273633553 test-first 3 1573 true +1476273633554 test-first 3 1573 true +1476273633555 test-first 3 1573 true +1476273633556 test-first 3 1573 true +1476273633557 test-first 3 1573 true +1476273633558 test-first 3 1573 true +1476273633559 test-first 3 1573 true +1476273633560 test-first 3 1573 true +1476273633561 test-first 3 1573 true +1476273633562 test-first 3 1573 true +1476273633563 test-first 3 1573 true +1476273633564 test-first 3 1573 true +1476273633565 test-first 3 1573 true +1476273633566 test-first 3 1573 true +1476273633567 test-first 3 1573 true +1476273633568 test-first 3 1573 true +1476273633569 test-first 3 1573 true +1476273633570 test-first 3 1573 true +1476273633571 test-first 3 1573 true +1476273633572 test-first 3 1573 true +1476273633573 test-first 3 1573 true +1476273633574 test-first 3 1573 true +1476273633575 test-first 3 1573 true +1476273633576 test-first 3 1573 true +1476273633577 test-first 3 1573 true +1476273633578 test-first 3 1573 true +1476273633579 test-first 3 1573 true +1476273633580 test-first 3 1573 true +1476273633581 test-first 3 1573 true +1476273633582 test-first 3 1573 true +1476273633583 test-first 3 1573 true +1476273633584 test-first 3 1573 true +1476273633585 test-first 3 1573 true +1476273633586 test-first 3 1573 true +1476273633587 test-first 3 1573 true +1476273633588 test-first 3 1573 true +1476273633589 test-first 3 1573 true +1476273633590 test-first 3 1573 true +1476273633591 test-first 3 1573 true +1476273633592 test-first 3 1573 true +1476273633593 test-first 3 1573 true +1476273633594 test-first 3 1573 true +1476273633595 test-first 3 1573 true +1476273633596 test-first 3 1573 true +1476273633597 test-first 3 1573 true +1476273633598 test-first 3 1573 true +1476273633599 test-first 3 1573 true +1476273633600 test-first 3 1573 true +1476273633601 test-first 3 1573 true +1476273633602 test-first 3 1573 true +1476273633603 test-first 3 1573 true +1476273633604 test-first 3 1573 true +1476273633605 test-first 3 1573 true +1476273633606 test-first 3 1573 true +1476273633607 test-first 3 1573 true +1476273633608 test-first 3 1573 true +1476273633609 test-first 3 1573 true +1476273633610 test-first 3 1573 true +1476273633611 test-first 3 1573 true +1476273633612 test-first 3 1573 true +1476273633613 test-first 3 1573 true +1476273633614 test-first 3 1573 true +1476273633615 test-first 3 1573 true +1476273633616 test-first 3 1573 true +1476273633617 test-first 3 1573 true +1476273633618 test-first 3 1573 true +1476273633619 test-first 3 1573 true +1476273633620 test-first 3 1573 true +1476273633621 test-first 3 1573 true +1476273633622 test-first 3 1573 true +1476273633623 test-first 3 1573 true +1476273633624 test-first 3 1573 true +1476273633625 test-first 3 1573 true +1476273633626 test-first 3 1573 true +1476273633627 test-first 3 1573 true +1476273633628 test-first 3 1573 true +1476273633629 test-first 3 1573 true +1476273633630 test-first 3 1573 true +1476273633631 test-first 3 1573 true +1476273633632 test-first 3 1573 true +1476273633633 test-first 3 1573 true +1476273633634 test-first 3 1573 true +1476273633635 test-first 3 1573 true +1476273633636 test-first 3 1573 true +1476273633637 test-first 3 1573 true +1476273633638 test-first 3 1573 true +1476273633639 test-first 3 1573 true +1476273633640 test-first 3 1573 true +1476273633641 test-first 3 1573 true +1476273633642 test-first 3 1573 true +1476273633643 test-first 3 1573 true +1476273633644 test-first 3 1573 true +1476273633645 test-first 3 1573 true +1476273633646 test-first 3 1573 true +1476273633647 test-first 3 1573 true +1476273633648 test-first 3 1573 true +1476273633649 test-first 3 1573 true +1476273633650 test-first 3 1573 true +1476273633651 test-first 3 1573 true +1476273633652 test-first 3 1573 true +1476273633653 test-first 3 1573 true +1476273633654 test-first 3 1573 true +1476273633655 test-first 3 1573 true +1476273633656 test-first 3 1573 true +1476273633657 test-first 3 1573 true +1476273633658 test-first 3 1573 true +1476273633659 test-first 3 1573 true +1476273633660 test-first 3 1573 true +1476273633661 test-first 3 1573 true +1476273633662 test-first 3 1573 true +1476273633663 test-first 3 1573 true +1476273633664 test-first 3 1573 true +1476273633665 test-first 3 1573 true +1476273633666 test-first 3 1573 true +1476273633667 test-first 3 1573 true +1476273633668 test-first 3 1573 true +1476273633669 test-first 3 1573 true +1476273633670 test-first 3 1573 true +1476273633671 test-first 3 1573 true +1476273633672 test-first 3 1573 true +1476273633673 test-first 3 1573 true +1476273633674 test-first 3 1573 true +1476273633675 test-first 3 1573 true +1476273633676 test-first 3 1573 true +1476273633677 test-first 3 1573 true +1476273633678 test-first 3 1573 true +1476273633679 test-first 3 1573 true +1476273633680 test-first 3 1573 true +1476273633681 test-first 3 1573 true +1476273633682 test-first 3 1573 true +1476273633683 test-first 3 1573 true +1476273633684 test-first 3 1573 true +1476273633685 test-first 3 1573 true +1476273633686 test-first 3 1573 true +1476273633687 test-first 3 1573 true +1476273633688 test-first 3 1573 true +1476273633689 test-first 3 1573 true +1476273633690 test-first 3 1573 true +1476273633691 test-first 3 1573 true +1476273633692 test-first 3 1573 true +1476273633693 test-first 3 1573 true +1476273633694 test-first 3 1573 true +1476273633695 test-first 3 1573 true +1476273633696 test-first 3 1573 true +1476273633697 test-first 3 1573 true +1476273633698 test-first 3 1573 true +1476273633699 test-first 3 1573 true +1476273633700 test-first 3 1573 true +1476273633701 test-first 3 1573 true +1476273633702 test-first 3 1573 true +1476273633703 test-first 3 1573 true +1476273633704 test-first 3 1573 true +1476273633705 test-first 3 1573 true +1476273633706 test-first 3 1573 true +1476273633707 test-first 3 1573 true +1476273633708 test-first 3 1573 true +1476273633709 test-first 3 1573 true +1476273633710 test-first 3 1573 true +1476273633711 test-first 3 1573 true +1476273633712 test-first 3 1573 true +1476273633713 test-first 3 1573 true +1476273633714 test-first 3 1573 true +1476273633715 test-first 3 1573 true +1476273633716 test-first 3 1573 true +1476273633717 test-first 3 1573 true +1476273633718 test-first 3 1573 true +1476273633719 test-first 3 1573 true +1476273633720 test-first 3 1573 true +1476273633721 test-first 3 1573 true +1476273633722 test-first 3 1573 true +1476273633723 test-first 3 1573 true +1476273633724 test-first 3 1573 true +1476273633725 test-first 3 1573 true +1476273633726 test-first 3 1573 true +1476273633727 test-first 3 1573 true +1476273633728 test-first 3 1573 true +1476273633729 test-first 3 1573 true +1476273633730 test-first 3 1573 true +1476273633731 test-first 3 1573 true +1476273633732 test-first 3 1573 true +1476273633733 test-first 3 1573 true +1476273633734 test-first 3 1573 true +1476273633735 test-first 3 1573 true +1476273633736 test-first 3 1573 true +1476273633737 test-first 3 1573 true +1476273633738 test-first 3 1573 true +1476273633739 test-first 3 1573 true +1476273633740 test-first 3 1573 true +1476273633741 test-first 3 1573 true +1476273633742 test-first 3 1573 true +1476273633743 test-first 3 1573 true +1476273633744 test-first 3 1573 true +1476273633745 test-first 3 1573 true +1476273633746 test-first 3 1573 true +1476273633747 test-first 3 1573 true +1476273633748 test-first 3 1573 true +1476273633749 test-first 3 1573 true +1476273633750 test-first 3 1573 true +1476273633751 test-first 3 1573 true +1476273633752 test-first 3 1573 true +1476273633753 test-first 3 1573 true +1476273633754 test-first 3 1573 true +1476273633755 test-first 3 1573 true +1476273633756 test-first 3 1573 true +1476273633757 test-first 3 1573 true +1476273633758 test-first 3 1573 true +1476273633759 test-first 3 1573 true +1476273633760 test-first 3 1573 true +1476273633761 test-first 3 1573 true +1476273633762 test-first 3 1573 true +1476273633763 test-first 3 1573 true +1476273633764 test-first 3 1573 true +1476273633765 test-first 3 1573 true +1476273633766 test-first 3 1573 true +1476273633767 test-first 3 1573 true +1476273633768 test-first 3 1573 true +1476273633769 test-first 3 1573 true +1476273633770 test-first 3 1573 true +1476273633771 test-first 3 1573 true +1476273633772 test-first 3 1573 true +1476273633773 test-first 3 1573 true +1476273633774 test-first 3 1573 true +1476273633775 test-first 3 1573 true +1476273633776 test-first 3 1573 true +1476273633777 test-first 3 1573 true +1476273633778 test-first 3 1573 true +1476273633779 test-first 3 1573 true +1476273633780 test-first 3 1573 true +1476273633781 test-first 3 1573 true +1476273633782 test-first 3 1573 true +1476273633783 test-first 3 1573 true +1476273633784 test-first 3 1573 true +1476273633785 test-first 3 1573 true +1476273633786 test-first 3 1573 true +1476273633787 test-first 3 1573 true +1476273633788 test-first 3 1573 true +1476273633789 test-first 3 1573 true +1476273633790 test-first 3 1573 true +1476273633791 test-first 3 1573 true +1476273633792 test-first 3 1573 true +1476273633793 test-first 3 1573 true +1476273633794 test-first 3 1573 true +1476273633795 test-first 3 1573 true +1476273633796 test-first 3 1573 true +1476273633797 test-first 3 1573 true +1476273633798 test-first 3 1573 true +1476273633799 test-first 3 1573 true +1476273633800 test-first 3 1573 true +1476273633801 test-first 3 1573 true +1476273633802 test-first 3 1573 true +1476273633803 test-first 3 1573 true +1476273633804 test-first 3 1573 true +1476273633805 test-first 3 1573 true +1476273633806 test-first 3 1573 true +1476273633807 test-first 3 1573 true +1476273633808 test-first 3 1573 true +1476273633809 test-first 3 1573 true +1476273633810 test-first 3 1573 true +1476273633811 test-first 3 1573 true +1476273633812 test-first 3 1573 true +1476273633813 test-first 3 1573 true +1476273633814 test-first 3 1573 true +1476273633815 test-first 3 1573 true +1476273633816 test-first 3 1573 true +1476273633817 test-first 3 1573 true +1476273633818 test-first 3 1573 true +1476273633819 test-first 3 1573 true +1476273633820 test-first 3 1573 true +1476273633821 test-first 3 1573 true +1476273633822 test-first 3 1573 true +1476273633823 test-first 3 1573 true +1476273633824 test-first 3 1573 true +1476273633825 test-first 3 1573 true +1476273633826 test-first 3 1573 true +1476273633827 test-first 3 1573 true +1476273633828 test-first 3 1573 true +1476273633829 test-first 3 1573 true +1476273633830 test-first 3 1573 true +1476273633831 test-first 3 1573 true +1476273633832 test-first 3 1573 true +1476273633833 test-first 3 1573 true +1476273633834 test-first 3 1573 true +1476273633835 test-first 3 1573 true +1476273633836 test-first 3 1573 true +1476273633837 test-first 3 1573 true +1476273633838 test-first 3 1573 true +1476273633839 test-first 3 1573 true +1476273633840 test-first 3 1573 true +1476273633841 test-first 3 1573 true +1476273633842 test-first 3 1573 true +1476273633843 test-first 3 1573 true +1476273633844 test-first 3 1573 true +1476273633845 test-first 3 1573 true +1476273633846 test-first 3 1573 true +1476273633847 test-first 3 1573 true +1476273633848 test-first 3 1573 true +1476273633849 test-first 3 1573 true +1476273633850 test-first 3 1573 true +1476273633851 test-first 3 1573 true +1476273633852 test-first 3 1573 true +1476273633853 test-first 3 1573 true +1476273633854 test-first 3 1573 true +1476273633855 test-first 3 1573 true +1476273633856 test-first 3 1573 true +1476273633857 test-first 3 1573 true +1476273633858 test-first 3 1573 true +1476273633859 test-first 3 1573 true +1476273633860 test-first 3 1573 true +1476273633861 test-first 3 1573 true +1476273633862 test-first 3 1573 true +1476273633863 test-first 3 1573 true +1476273633864 test-first 3 1573 true +1476273633865 test-first 3 1573 true +1476273633866 test-first 3 1573 true +1476273633867 test-first 3 1573 true +1476273633868 test-first 3 1573 true +1476273633869 test-first 3 1573 true +1476273633870 test-first 3 1573 true +1476273633871 test-first 3 1573 true +1476273633872 test-first 3 1573 true +1476273633873 test-first 3 1573 true +1476273633874 test-first 3 1573 true +1476273633875 test-first 3 1573 true +1476273633876 test-first 3 1573 true +1476273633877 test-first 3 1573 true +1476273633878 test-first 3 1573 true +1476273633879 test-first 3 1573 true +1476273633880 test-first 3 1573 true +1476273633881 test-first 3 1573 true +1476273633882 test-first 3 1573 true +1476273633883 test-first 3 1573 true +1476273633884 test-first 3 1573 true +1476273633885 test-first 3 1573 true +1476273633886 test-first 3 1573 true +1476273633887 test-first 3 1573 true +1476273633888 test-first 3 1573 true +1476273633889 test-first 3 1573 true +1476273633890 test-first 3 1573 true +1476273633891 test-first 3 1573 true +1476273633892 test-first 3 1573 true +1476273633893 test-first 3 1573 true +1476273633894 test-first 3 1573 true +1476273633895 test-first 3 1573 true +1476273633896 test-first 3 1573 true +1476273633897 test-first 3 1573 true +1476273633898 test-first 3 1573 true +1476273633899 test-first 3 1573 true +1476273633900 test-first 3 1573 true +1476273633901 test-first 3 1573 true +1476273633902 test-first 3 1573 true +1476273633903 test-first 3 1573 true +1476273633904 test-first 3 1573 true +1476273633905 test-first 3 1573 true +1476273633906 test-first 3 1573 true +1476273633907 test-first 3 1573 true +1476273633908 test-first 3 1573 true +1476273633909 test-first 3 1573 true +1476273633910 test-first 3 1573 true +1476273633911 test-first 3 1573 true +1476273633912 test-first 3 1573 true +1476273633913 test-first 3 1573 true +1476273633914 test-first 3 1573 true +1476273633915 test-first 3 1573 true +1476273633916 test-first 3 1573 true +1476273633917 test-first 3 1573 true +1476273633918 test-first 3 1573 true +1476273633919 test-first 3 1573 true +1476273633920 test-first 3 1573 true +1476273633921 test-first 3 1573 true +1476273633922 test-first 3 1573 true +1476273633923 test-first 3 1573 true +1476273633924 test-first 3 1573 true +1476273633925 test-first 3 1573 true +1476273633926 test-first 3 1573 true +1476273633927 test-first 3 1573 true +1476273633928 test-first 3 1573 true +1476273633929 test-first 3 1573 true +1476273633930 test-first 3 1573 true +1476273633931 test-first 3 1573 true +1476273633932 test-first 3 1573 true +1476273633933 test-first 3 1573 true +1476273633934 test-first 3 1573 true +1476273633935 test-first 3 1573 true +1476273633936 test-first 3 1573 true +1476273633937 test-first 3 1573 true +1476273633938 test-first 3 1573 true +1476273633939 test-first 3 1573 true +1476273633940 test-first 3 1573 true +1476273633941 test-first 3 1573 true +1476273633942 test-first 3 1573 true +1476273633943 test-first 3 1573 true +1476273633944 test-first 3 1573 true +1476273633945 test-first 3 1573 true +1476273633946 test-first 3 1573 true +1476273633947 test-first 3 1573 true +1476273633948 test-first 3 1573 true +1476273633949 test-first 3 1573 true +1476273633950 test-first 3 1573 true +1476273633951 test-first 3 1573 true +1476273633952 test-first 3 1573 true +1476273633953 test-first 3 1573 true +1476273633954 test-first 3 1573 true +1476273633955 test-first 3 1573 true +1476273633956 test-first 3 1573 true +1476273633957 test-first 3 1573 true +1476273633958 test-first 3 1573 true +1476273633959 test-first 3 1573 true +1476273633960 test-first 3 1573 true +1476273633961 test-first 3 1573 true +1476273633962 test-first 3 1573 true +1476273633963 test-first 3 1573 true +1476273633964 test-first 3 1573 true +1476273633965 test-first 3 1573 true +1476273633966 test-first 3 1573 true +1476273633967 test-first 3 1573 true +1476273633968 test-first 3 1573 true +1476273633969 test-first 3 1573 true +1476273633970 test-first 3 1573 true +1476273633971 test-first 3 1573 true +1476273633972 test-first 3 1573 true +1476273633973 test-first 3 1573 true +1476273633974 test-first 3 1573 true +1476273633975 test-first 3 1573 true +1476273633976 test-first 3 1573 true +1476273633977 test-first 3 1573 true +1476273633978 test-first 3 1573 true +1476273633979 test-first 3 1573 true +1476273633980 test-first 3 1573 true +1476273633981 test-first 3 1573 true +1476273633982 test-first 3 1573 true +1476273633983 test-first 3 1573 true +1476273633984 test-first 3 1573 true +1476273633985 test-first 3 1573 true +1476273633986 test-first 3 1573 true +1476273633987 test-first 3 1573 true +1476273633988 test-first 3 1573 true +1476273633989 test-first 3 1573 true +1476273633990 test-first 3 1573 true +1476273633991 test-first 3 1573 true +1476273633992 test-first 3 1573 true +1476273633993 test-first 3 1573 true +1476273633994 test-first 3 1573 true +1476273633995 test-first 3 1573 true +1476273633996 test-first 3 1573 true +1476273633997 test-first 3 1573 true +1476273633998 test-first 3 1573 true +1476273633999 test-first 3 1573 true +1476273634000 test-first 3 1573 true +1476273634001 test-first 3 1573 true +1476273634002 test-first 3 1573 true +1476273634003 test-first 3 1573 true +1476273634004 test-first 3 1573 true +1476273634005 test-first 3 1573 true +1476273634006 test-first 3 1573 true +1476273634007 test-first 3 1573 true +1476273634008 test-first 3 1573 true +1476273634009 test-first 3 1573 true +1476273634010 test-first 3 1573 true +1476273634011 test-first 3 1573 true +1476273634012 test-first 3 1573 true +1476273634013 test-first 3 1573 true +1476273634014 test-first 3 1573 true +1476273634015 test-first 3 1573 true +1476273634016 test-first 3 1573 true +1476273634017 test-first 3 1573 true +1476273634018 test-first 3 1573 true +1476273634019 test-first 3 1573 true +1476273634020 test-first 3 1573 true +1476273634021 test-first 3 1573 true +1476273634022 test-first 3 1573 true +1476273634023 test-first 3 1573 true +1476273634024 test-first 3 1573 true +1476273634025 test-first 3 1573 true +1476273634026 test-first 3 1573 true +1476273634027 test-first 3 1573 true +1476273634028 test-first 3 1573 true +1476273634029 test-first 3 1573 true +1476273634030 test-first 3 1573 true +1476273634031 test-first 3 1573 true +1476273634032 test-first 3 1573 true +1476273634033 test-first 3 1573 true +1476273634034 test-first 3 1573 true +1476273634035 test-first 3 1573 true +1476273634036 test-first 3 1573 true +1476273634037 test-first 3 1573 true +1476273634038 test-first 3 1573 true +1476273634039 test-first 3 1573 true +1476273634040 test-first 3 1573 true +1476273634041 test-first 3 1573 true +1476273634042 test-first 3 1573 true +1476273634043 test-first 3 1573 true +1476273634044 test-first 3 1573 true +1476273634045 test-first 3 1573 true +1476273634046 test-first 3 1573 true +1476273634047 test-first 3 1573 true +1476273634048 test-first 3 1573 true +1476273634049 test-first 3 1573 true +1476273634050 test-first 3 1573 true +1476273634051 test-first 3 1573 true +1476273634052 test-first 3 1573 true +1476273634053 test-first 3 1573 true +1476273634054 test-first 3 1573 true +1476273634055 test-first 3 1573 true +1476273634056 test-first 3 1573 true +1476273634057 test-first 3 1573 true +1476273634058 test-first 3 1573 true +1476273634059 test-first 3 1573 true +1476273634060 test-first 3 1573 true +1476273634061 test-first 3 1573 true +1476273634062 test-first 3 1573 true +1476273634063 test-first 3 1573 true +1476273634064 test-first 3 1573 true +1476273634065 test-first 3 1573 true +1476273634066 test-first 3 1573 true +1476273634067 test-first 3 1573 true +1476273634068 test-first 3 1573 true +1476273634069 test-first 3 1573 true +1476273634070 test-first 3 1573 true +1476273634071 test-first 3 1573 true +1476273634072 test-first 3 1573 true +1476273634073 test-first 3 1573 true +1476273634074 test-first 3 1573 true +1476273634075 test-first 3 1573 true +1476273634076 test-first 3 1573 true +1476273634077 test-first 3 1573 true +1476273634078 test-first 3 1573 true +1476273634079 test-first 3 1573 true +1476273634080 test-first 3 1573 true +1476273634081 test-first 3 1573 true +1476273634082 test-first 3 1573 true +1476273634083 test-first 3 1573 true +1476273634084 test-first 3 1573 true +1476273634085 test-first 3 1573 true +1476273634086 test-first 3 1573 true +1476273634087 test-first 3 1573 true +1476273634088 test-first 3 1573 true +1476273634089 test-first 3 1573 true +1476273634090 test-first 3 1573 true +1476273634091 test-first 3 1573 true +1476273634092 test-first 3 1573 true +1476273634093 test-first 3 1573 true +1476273634094 test-first 3 1573 true +1476273634095 test-first 3 1573 true +1476273634096 test-first 3 1573 true +1476273634097 test-first 3 1573 true +1476273634098 test-first 3 1573 true +1476273634099 test-first 3 1573 true +1476273634100 test-first 3 1573 true +1476273634101 test-first 3 1573 true +1476273634102 test-first 3 1573 true +1476273634103 test-first 3 1573 true +1476273634104 test-first 3 1573 true +1476273634105 test-first 3 1573 true +1476273634106 test-first 3 1573 true +1476273634107 test-first 3 1573 true +1476273634108 test-first 3 1573 true +1476273634109 test-first 3 1573 true +1476273634110 test-first 3 1573 true +1476273634111 test-first 3 1573 true +1476273634112 test-first 3 1573 true +1476273634113 test-first 3 1573 true +1476273634114 test-first 3 1573 true +1476273634115 test-first 3 1573 true +1476273634116 test-first 3 1573 true +1476273634117 test-first 3 1573 true +1476273634118 test-first 3 1573 true +1476273634119 test-first 3 1573 true +1476273634120 test-first 3 1573 true +1476273634121 test-first 3 1573 true +1476273634122 test-first 3 1573 true +1476273634123 test-first 3 1573 true +1476273634124 test-first 3 1573 true +1476273634125 test-first 3 1573 true +1476273634126 test-first 3 1573 true +1476273634127 test-first 3 1573 true +1476273634128 test-first 3 1573 true +1476273634129 test-first 3 1573 true +1476273634130 test-first 3 1573 true +1476273634131 test-first 3 1573 true +1476273634132 test-first 3 1573 true +1476273634133 test-first 3 1573 true +1476273634134 test-first 3 1573 true +1476273634135 test-first 3 1573 true +1476273634136 test-first 3 1573 true +1476273634137 test-first 3 1573 true +1476273634138 test-first 3 1573 true +1476273634139 test-first 3 1573 true +1476273634140 test-first 3 1573 true +1476273634141 test-first 3 1573 true +1476273634142 test-first 3 1573 true +1476273634143 test-first 3 1573 true +1476273634144 test-first 3 1573 true +1476273634145 test-first 3 1573 true +1476273634146 test-first 3 1573 true +1476273634147 test-first 3 1573 true +1476273634148 test-first 3 1573 true +1476273634149 test-first 3 1573 true +1476273634150 test-first 3 1573 true +1476273634151 test-first 3 1573 true +1476273634152 test-first 3 1573 true +1476273634153 test-first 3 1573 true +1476273634154 test-first 3 1573 true +1476273634155 test-first 3 1573 true +1476273634156 test-first 3 1573 true +1476273634157 test-first 3 1573 true +1476273634158 test-first 3 1573 true +1476273634159 test-first 3 1573 true +1476273634160 test-first 3 1573 true +1476273634161 test-first 3 1573 true +1476273634162 test-first 3 1573 true +1476273634163 test-first 3 1573 true +1476273634164 test-first 3 1573 true +1476273634165 test-first 3 1573 true +1476273634166 test-first 3 1573 true +1476273634167 test-first 3 1573 true +1476273634168 test-first 3 1573 true +1476273634169 test-first 3 1573 true +1476273634170 test-first 3 1573 true +1476273634171 test-first 3 1573 true +1476273634172 test-first 3 1573 true +1476273634173 test-first 3 1573 true +1476273634174 test-first 3 1573 true +1476273634175 test-first 3 1573 true +1476273634176 test-first 3 1573 true +1476273634177 test-first 3 1573 true +1476273634178 test-first 3 1573 true +1476273634179 test-first 3 1573 true +1476273634180 test-first 3 1573 true +1476273634181 test-first 3 1573 true +1476273634182 test-first 3 1573 true +1476273634183 test-first 3 1573 true +1476273634184 test-first 3 1573 true +1476273634185 test-first 3 1573 true +1476273634186 test-first 3 1573 true +1476273634187 test-first 3 1573 true +1476273634188 test-first 3 1573 true +1476273634189 test-first 3 1573 true +1476273634190 test-first 3 1573 true +1476273634191 test-first 3 1573 true +1476273634192 test-first 3 1573 true +1476273634193 test-first 3 1573 true +1476273634194 test-first 3 1573 true +1476273634195 test-first 3 1573 true +1476273634196 test-first 3 1573 true +1476273634197 test-first 3 1573 true +1476273634198 test-first 3 1573 true +1476273634199 test-first 3 1573 true +1476273634200 test-first 3 1573 true +1476273634201 test-first 3 1573 true +1476273634202 test-first 3 1573 true +1476273634203 test-first 3 1573 true +1476273634204 test-first 3 1573 true +1476273634205 test-first 3 1573 true +1476273634206 test-first 3 1573 true +1476273634207 test-first 3 1573 true +1476273634208 test-first 3 1573 true +1476273634209 test-first 3 1573 true +1476273634210 test-first 3 1573 true +1476273634211 test-first 3 1573 true +1476273634212 test-first 3 1573 true +1476273634213 test-first 3 1573 true +1476273634214 test-first 3 1573 true +1476273634215 test-first 3 1573 true +1476273634216 test-first 3 1573 true +1476273634217 test-first 3 1573 true +1476273634218 test-first 3 1573 true +1476273634219 test-first 3 1573 true +1476273634220 test-first 3 1573 true +1476273634221 test-first 3 1573 true +1476273634222 test-first 3 1573 true +1476273634223 test-first 3 1573 true +1476273634224 test-first 3 1573 true +1476273634225 test-first 3 1573 true +1476273634226 test-first 3 1573 true +1476273634227 test-first 3 1573 true +1476273634228 test-first 3 1573 true +1476273634229 test-first 3 1573 true +1476273634230 test-first 3 1573 true +1476273634231 test-first 3 1573 true +1476273634232 test-first 3 1573 true +1476273634233 test-first 3 1573 true +1476273634234 test-first 3 1573 true +1476273634235 test-first 3 1573 true +1476273634236 test-first 3 1573 true +1476273634237 test-first 3 1573 true +1476273634238 test-first 3 1573 true +1476273634239 test-first 3 1573 true +1476273634240 test-first 3 1573 true +1476273634241 test-first 3 1573 true +1476273634242 test-first 3 1573 true +1476273634243 test-first 3 1573 true +1476273634244 test-first 3 1573 true +1476273634245 test-first 3 1573 true +1476273634246 test-first 3 1573 true +1476273634247 test-first 3 1573 true +1476273634248 test-first 3 1573 true +1476273634249 test-first 3 1573 true +1476273634250 test-first 3 1573 true +1476273634251 test-first 3 1573 true +1476273634252 test-first 3 1573 true +1476273634253 test-first 3 1573 true +1476273634254 test-first 3 1573 true +1476273634255 test-first 3 1573 true +1476273634256 test-first 3 1573 true +1476273634257 test-first 3 1573 true +1476273634258 test-first 3 1573 true +1476273634259 test-first 3 1573 true +1476273634260 test-first 3 1573 true +1476273634261 test-first 3 1573 true +1476273634262 test-first 3 1573 true +1476273634263 test-first 3 1573 true +1476273634264 test-first 3 1573 true +1476273634265 test-first 3 1573 true +1476273634266 test-first 3 1573 true +1476273634267 test-first 3 1573 true +1476273634268 test-first 3 1573 true +1476273634269 test-first 3 1573 true +1476273634270 test-first 3 1573 true +1476273634271 test-first 3 1573 true +1476273634272 test-first 3 1573 true +1476273634273 test-first 3 1573 true +1476273634274 test-first 3 1573 true +1476273634275 test-first 3 1573 true +1476273634276 test-first 3 1573 true +1476273634277 test-first 3 1573 true +1476273634278 test-first 3 1573 true +1476273634279 test-first 3 1573 true +1476273634280 test-first 3 1573 true +1476273634281 test-first 3 1573 true +1476273634282 test-first 3 1573 true +1476273634283 test-first 3 1573 true +1476273634284 test-first 3 1573 true +1476273634285 test-first 3 1573 true +1476273634286 test-first 3 1573 true +1476273634287 test-first 3 1573 true +1476273634288 test-first 3 1573 true +1476273634289 test-first 3 1573 true +1476273634290 test-first 3 1573 true +1476273634291 test-first 3 1573 true +1476273634292 test-first 3 1573 true +1476273634293 test-first 3 1573 true +1476273634294 test-first 3 1573 true +1476273634295 test-first 3 1573 true +1476273634296 test-first 3 1573 true +1476273634297 test-first 3 1573 true +1476273634298 test-first 3 1573 true +1476273634299 test-first 3 1573 true +1476273634300 test-first 3 1573 true +1476273634301 test-first 3 1573 true +1476273634302 test-first 3 1573 true +1476273634303 test-first 3 1573 true +1476273634304 test-first 3 1573 true +1476273634305 test-first 3 1573 true +1476273634306 test-first 3 1573 true +1476273634307 test-first 3 1573 true +1476273634308 test-first 3 1573 true +1476273634309 test-first 3 1573 true +1476273634310 test-first 3 1573 true +1476273634311 test-first 3 1573 true +1476273634312 test-first 3 1573 true +1476273634313 test-first 3 1573 true +1476273634314 test-first 3 1573 true +1476273634315 test-first 3 1573 true +1476273634316 test-first 3 1573 true +1476273634317 test-first 3 1573 true +1476273634318 test-first 3 1573 true +1476273634319 test-first 3 1573 true +1476273634320 test-first 3 1573 true +1476273634321 test-first 3 1573 true +1476273634322 test-first 3 1573 true +1476273634323 test-first 3 1573 true +1476273634324 test-first 3 1573 true +1476273634325 test-first 3 1573 true +1476273634326 test-first 3 1573 true +1476273634327 test-first 3 1573 true +1476273634328 test-first 3 1573 true +1476273634329 test-first 3 1573 true +1476273634330 test-first 3 1573 true +1476273634331 test-first 3 1573 true +1476273634332 test-first 3 1573 true +1476273634333 test-first 3 1573 true +1476273634334 test-first 3 1573 true +1476273634335 test-first 3 1573 true +1476273634336 test-first 3 1573 true +1476273634337 test-first 3 1573 true +1476273634338 test-first 3 1573 true +1476273634339 test-first 3 1573 true +1476273634340 test-first 3 1573 true +1476273634341 test-first 3 1573 true +1476273634342 test-first 3 1573 true +1476273634343 test-first 3 1573 true +1476273634344 test-first 3 1573 true +1476273634345 test-first 3 1573 true +1476273634346 test-first 3 1573 true +1476273634347 test-first 3 1573 true +1476273634348 test-first 3 1573 true +1476273634349 test-first 3 1573 true +1476273634350 test-first 3 1573 true +1476273634351 test-first 3 1573 true +1476273634352 test-first 3 1573 true +1476273634353 test-first 3 1573 true +1476273634354 test-first 3 1573 true +1476273634355 test-first 3 1573 true +1476273634356 test-first 3 1573 true +1476273634357 test-first 3 1573 true +1476273634358 test-first 3 1573 true +1476273634359 test-first 3 1573 true +1476273634360 test-first 3 1573 true +1476273634361 test-first 3 1573 true +1476273634362 test-first 3 1573 true +1476273634363 test-first 3 1573 true +1476273634364 test-first 3 1573 true +1476273634365 test-first 3 1573 true +1476273634366 test-first 3 1573 true +1476273634367 test-first 3 1573 true +1476273634368 test-first 3 1573 true +1476273634369 test-first 3 1573 true +1476273634370 test-first 3 1573 true +1476273634371 test-first 3 1573 true +1476273634372 test-first 3 1573 true +1476273634373 test-first 3 1573 true +1476273634374 test-first 3 1573 true +1476273634375 test-first 3 1573 true +1476273634376 test-first 3 1573 true +1476273634377 test-first 3 1573 true +1476273634378 test-first 3 1573 true +1476273634379 test-first 3 1573 true +1476273634380 test-first 3 1573 true +1476273634381 test-first 3 1573 true +1476273634382 test-first 3 1573 true +1476273634383 test-first 3 1573 true +1476273634384 test-first 3 1573 true +1476273634385 test-first 3 1573 true +1476273634386 test-first 3 1573 true +1476273634387 test-first 3 1573 true +1476273634388 test-first 3 1573 true +1476273634389 test-first 3 1573 true +1476273634390 test-first 3 1573 true +1476273634391 test-first 3 1573 true +1476273634392 test-first 3 1573 true +1476273634393 test-first 3 1573 true +1476273634394 test-first 3 1573 true +1476273634395 test-first 3 1573 true +1476273634396 test-first 3 1573 true +1476273634397 test-first 3 1573 true +1476273634398 test-first 3 1573 true +1476273634399 test-first 3 1573 true +1476273634400 test-first 3 1573 true +1476273634401 test-first 3 1573 true +1476273634402 test-first 3 1573 true +1476273634403 test-first 3 1573 true +1476273634404 test-first 3 1573 true +1476273634405 test-first 3 1573 true +1476273634406 test-first 3 1573 true +1476273634407 test-first 3 1573 true +1476273634408 test-first 3 1573 true +1476273634409 test-first 3 1573 true +1476273634410 test-first 3 1573 true +1476273634411 test-first 3 1573 true +1476273634412 test-first 3 1573 true +1476273634413 test-first 3 1573 true +1476273634414 test-first 3 1573 true +1476273634415 test-first 3 1573 true +1476273634416 test-first 3 1573 true +1476273634417 test-first 3 1573 true +1476273634418 test-first 3 1573 true +1476273634419 test-first 3 1573 true +1476273634420 test-first 3 1573 true +1476273634421 test-first 3 1573 true +1476273634422 test-first 3 1573 true +1476273634423 test-first 3 1573 true +1476273634424 test-first 3 1573 true +1476273634425 test-first 3 1573 true +1476273634426 test-first 3 1573 true +1476273634427 test-first 3 1573 true +1476273634428 test-first 3 1573 true +1476273634429 test-first 3 1573 true +1476273634430 test-first 3 1573 true +1476273634431 test-first 3 1573 true +1476273634432 test-first 3 1573 true +1476273634433 test-first 3 1573 true +1476273634434 test-first 3 1573 true +1476273634435 test-first 3 1573 true +1476273634436 test-first 3 1573 true +1476273634437 test-first 3 1573 true +1476273634438 test-first 3 1573 true +1476273634439 test-first 3 1573 true +1476273634440 test-first 3 1573 true +1476273634441 test-first 3 1573 true +1476273634442 test-first 3 1573 true +1476273634443 test-first 3 1573 true +1476273634444 test-first 3 1573 true +1476273634445 test-first 3 1573 true +1476273634446 test-first 3 1573 true +1476273634447 test-first 3 1573 true +1476273634448 test-first 3 1573 true +1476273634449 test-first 3 1573 true +1476273634450 test-first 3 1573 true +1476273634451 test-first 3 1573 true +1476273634452 test-first 3 1573 true +1476273634453 test-first 3 1573 true +1476273634454 test-first 3 1573 true +1476273634455 test-first 3 1573 true +1476273634456 test-first 3 1573 true +1476273634457 test-first 3 1573 true +1476273634458 test-first 3 1573 true +1476273634459 test-first 3 1573 true +1476273634460 test-first 3 1573 true +1476273634461 test-first 3 1573 true +1476273634462 test-first 3 1573 true +1476273634463 test-first 3 1573 true +1476273634464 test-first 3 1573 true +1476273634465 test-first 3 1573 true +1476273634466 test-first 3 1573 true +1476273634467 test-first 3 1573 true +1476273634468 test-first 3 1573 true +1476273634469 test-first 3 1573 true +1476273634470 test-first 3 1573 true +1476273634471 test-first 3 1573 true +1476273634472 test-first 3 1573 true +1476273634473 test-first 3 1573 true +1476273634474 test-first 3 1573 true +1476273634475 test-first 3 1573 true +1476273634476 test-first 3 1573 true +1476273634477 test-first 3 1573 true +1476273634478 test-first 3 1573 true +1476273634479 test-first 3 1573 true +1476273634480 test-first 3 1573 true +1476273634481 test-first 3 1573 true +1476273634482 test-first 3 1573 true +1476273634483 test-first 3 1573 true +1476273634484 test-first 3 1573 true +1476273634485 test-first 3 1573 true +1476273634486 test-first 3 1573 true +1476273634487 test-first 3 1573 true +1476273634488 test-first 3 1573 true +1476273634489 test-first 3 1573 true +1476273634490 test-first 3 1573 true +1476273634491 test-first 3 1573 true +1476273634492 test-first 3 1573 true +1476273634493 test-first 3 1573 true +1476273634494 test-first 3 1573 true +1476273634495 test-first 3 1573 true +1476273634496 test-first 3 1573 true +1476273634497 test-first 3 1573 true +1476273634498 test-first 3 1573 true +1476273634499 test-first 3 1573 true +1476273634500 test-first 3 1573 true +1476273634501 test-first 3 1573 true +1476273634502 test-first 3 1573 true +1476273634503 test-first 3 1573 true +1476273634504 test-first 3 1573 true +1476273634505 test-first 3 1573 true +1476273634506 test-first 3 1573 true +1476273634507 test-first 3 1573 true +1476273634508 test-first 3 1573 true +1476273634509 test-first 3 1573 true +1476273634510 test-first 3 1573 true +1476273634511 test-first 3 1573 true +1476273634512 test-first 3 1573 true +1476273634513 test-first 3 1573 true +1476273634514 test-first 3 1573 true +1476273634515 test-first 3 1573 true +1476273634516 test-first 3 1573 true +1476273634517 test-first 3 1573 true +1476273634518 test-first 3 1573 true +1476273634519 test-first 3 1573 true +1476273634520 test-first 3 1573 true +1476273634521 test-first 3 1573 true +1476273634522 test-first 3 1573 true +1476273634523 test-first 3 1573 true +1476273634524 test-first 3 1573 true +1476273634525 test-first 3 1573 true +1476273634526 test-first 3 1573 true +1476273634527 test-first 3 1573 true +1476273634528 test-first 3 1573 true +1476273634529 test-first 3 1573 true +1476273634530 test-first 3 1573 true +1476273634531 test-first 3 1573 true +1476273634532 test-first 3 1573 true +1476273634533 test-first 3 1573 true +1476273634534 test-first 3 1573 true +1476273634535 test-first 3 1573 true +1476273634536 test-first 3 1573 true +1476273634537 test-first 3 1573 true +1476273634538 test-first 3 1573 true +1476273634539 test-first 3 1573 true +1476273634540 test-first 3 1573 true +1476273634541 test-first 3 1573 true +1476273634542 test-first 3 1573 true +1476273634543 test-first 3 1573 true +1476273634544 test-first 3 1573 true +1476273634545 test-first 3 1573 true +1476273634546 test-first 3 1573 true +1476273634547 test-first 3 1573 true +1476273634548 test-first 3 1573 true +1476273634549 test-first 3 1573 true +1476273634550 test-first 3 1573 true +1476273634551 test-first 3 1573 true +1476273634552 test-first 3 1573 true +1476273634553 test-first 3 1573 true +1476273634554 test-first 3 1573 true +1476273634555 test-first 3 1573 true +1476273634556 test-first 3 1573 true +1476273634557 test-first 3 1573 true +1476273634558 test-first 3 1573 true +1476273634559 test-first 3 1573 true +1476273634560 test-first 3 1573 true +1476273634561 test-first 3 1573 true +1476273634562 test-first 3 1573 true +1476273634563 test-first 3 1573 true +1476273634564 test-first 3 1573 true +1476273634565 test-first 3 1573 true +1476273634566 test-first 3 1573 true +1476273634567 test-first 3 1573 true +1476273634568 test-first 3 1573 true +1476273634569 test-first 3 1573 true +1476273634570 test-first 3 1573 true +1476273634571 test-first 3 1573 true +1476273634572 test-first 3 1573 true +1476273634573 test-first 3 1573 true +1476273634574 test-first 3 1573 true +1476273634575 test-first 3 1573 true +1476273634576 test-first 3 1573 true +1476273634577 test-first 3 1573 true +1476273634578 test-first 3 1573 true +1476273634579 test-first 3 1573 true +1476273634580 test-first 3 1573 true +1476273634581 test-first 3 1573 true +1476273634582 test-first 3 1573 true +1476273634583 test-first 3 1573 true +1476273634584 test-first 3 1573 true +1476273634585 test-first 3 1573 true +1476273634586 test-first 3 1573 true +1476273634587 test-first 3 1573 true +1476273634588 test-first 3 1573 true +1476273634589 test-first 3 1573 true +1476273634590 test-first 3 1573 true +1476273634591 test-first 3 1573 true +1476273634592 test-first 3 1573 true +1476273634593 test-first 3 1573 true +1476273634594 test-first 3 1573 true +1476273634595 test-first 3 1573 true +1476273634596 test-first 3 1573 true +1476273634597 test-first 3 1573 true +1476273634598 test-first 3 1573 true +1476273634599 test-first 3 1573 true +1476273634600 test-first 3 1573 true +1476273634601 test-first 3 1573 true +1476273634602 test-first 3 1573 true +1476273634603 test-first 3 1573 true +1476273634604 test-first 3 1573 true +1476273634605 test-first 3 1573 true +1476273634606 test-first 3 1573 true +1476273634607 test-first 3 1573 true +1476273634608 test-first 3 1573 true +1476273634609 test-first 3 1573 true +1476273634610 test-first 3 1573 true +1476273634611 test-first 3 1573 true +1476273634612 test-first 3 1573 true +1476273634613 test-first 3 1573 true +1476273634614 test-first 3 1573 true +1476273634615 test-first 3 1573 true +1476273634616 test-first 3 1573 true +1476273634617 test-first 3 1573 true +1476273634618 test-first 3 1573 true +1476273634619 test-first 3 1573 true +1476273634620 test-first 3 1573 true +1476273634621 test-first 3 1573 true +1476273634622 test-first 3 1573 true +1476273634623 test-first 3 1573 true +1476273634624 test-first 3 1573 true +1476273634625 test-first 3 1573 true +1476273634626 test-first 3 1573 true +1476273634627 test-first 3 1573 true +1476273634628 test-first 3 1573 true +1476273634629 test-first 3 1573 true +1476273634630 test-first 3 1573 true +1476273634631 test-first 3 1573 true +1476273634632 test-first 3 1573 true +1476273634633 test-first 3 1573 true +1476273634634 test-first 3 1573 true +1476273634635 test-first 3 1573 true +1476273634636 test-first 3 1573 true +1476273634637 test-first 3 1573 true +1476273634638 test-first 3 1573 true +1476273634639 test-first 3 1573 true +1476273634640 test-first 3 1573 true +1476273634641 test-first 3 1573 true +1476273634642 test-first 3 1573 true +1476273634643 test-first 3 1573 true +1476273634644 test-first 3 1573 true +1476273634645 test-first 3 1573 true +1476273634646 test-first 3 1573 true +1476273634647 test-first 3 1573 true +1476273634648 test-first 3 1573 true +1476273634649 test-first 3 1573 true +1476273634650 test-first 3 1573 true +1476273634651 test-first 3 1573 true +1476273634652 test-first 3 1573 true +1476273634653 test-first 3 1573 true +1476273634654 test-first 3 1573 true +1476273634655 test-first 3 1573 true +1476273634656 test-first 3 1573 true +1476273634657 test-first 3 1573 true +1476273634658 test-first 3 1573 true +1476273634659 test-first 3 1573 true +1476273634660 test-first 3 1573 true +1476273634661 test-first 3 1573 true +1476273634662 test-first 3 1573 true +1476273634663 test-first 3 1573 true +1476273634664 test-first 3 1573 true +1476273634665 test-first 3 1573 true +1476273634666 test-first 3 1573 true +1476273634667 test-first 3 1573 true +1476273634668 test-first 3 1573 true +1476273634669 test-first 3 1573 true +1476273634670 test-first 3 1573 true +1476273634671 test-first 3 1573 true +1476273634672 test-first 3 1573 true +1476273634673 test-first 3 1573 true +1476273634674 test-first 3 1573 true +1476273634675 test-first 3 1573 true +1476273634676 test-first 3 1573 true +1476273634677 test-first 3 1573 true +1476273634678 test-first 3 1573 true +1476273634679 test-first 3 1573 true +1476273634680 test-first 3 1573 true +1476273634681 test-first 3 1573 true +1476273634682 test-first 3 1573 true +1476273634683 test-first 3 1573 true +1476273634684 test-first 3 1573 true +1476273634685 test-first 3 1573 true +1476273634686 test-first 3 1573 true +1476273634687 test-first 3 1573 true +1476273634688 test-first 3 1573 true +1476273634689 test-first 3 1573 true +1476273634690 test-first 3 1573 true +1476273634691 test-first 3 1573 true +1476273634692 test-first 3 1573 true +1476273634693 test-first 3 1573 true +1476273634694 test-first 3 1573 true +1476273634695 test-first 3 1573 true +1476273634696 test-first 3 1573 true +1476273634697 test-first 3 1573 true +1476273634698 test-first 3 1573 true +1476273634699 test-first 3 1573 true +1476273634700 test-first 3 1573 true +1476273634701 test-first 3 1573 true +1476273634702 test-first 3 1573 true +1476273634703 test-first 3 1573 true +1476273634704 test-first 3 1573 true +1476273634705 test-first 3 1573 true +1476273634706 test-first 3 1573 true +1476273634707 test-first 3 1573 true +1476273634708 test-first 3 1573 true +1476273634709 test-first 3 1573 true +1476273634710 test-first 3 1573 true +1476273634711 test-first 3 1573 true +1476273634712 test-first 3 1573 true +1476273634713 test-first 3 1573 true +1476273634714 test-first 3 1573 true +1476273634715 test-first 3 1573 true +1476273634716 test-first 3 1573 true +1476273634717 test-first 3 1573 true +1476273634718 test-first 3 1573 true +1476273634719 test-first 3 1573 true +1476273634720 test-first 3 1573 true +1476273634721 test-first 3 1573 true +1476273634722 test-first 3 1573 true +1476273634723 test-first 3 1573 true +1476273634724 test-first 3 1573 true +1476273634725 test-first 3 1573 true +1476273634726 test-first 3 1573 true +1476273634727 test-first 3 1573 true +1476273634728 test-first 3 1573 true +1476273634729 test-first 3 1573 true +1476273634730 test-first 3 1573 true +1476273634731 test-first 3 1573 true +1476273634732 test-first 3 1573 true +1476273634733 test-first 3 1573 true +1476273634734 test-first 3 1573 true +1476273634735 test-first 3 1573 true +1476273634736 test-first 3 1573 true +1476273634737 test-first 3 1573 true +1476273634738 test-first 3 1573 true +1476273634739 test-first 3 1573 true +1476273634740 test-first 3 1573 true +1476273634741 test-first 3 1573 true +1476273634742 test-first 3 1573 true +1476273634743 test-first 3 1573 true +1476273634744 test-first 3 1573 true +1476273634745 test-first 3 1573 true +1476273634746 test-first 3 1573 true +1476273634747 test-first 3 1573 true +1476273634748 test-first 3 1573 true +1476273634749 test-first 3 1573 true +1476273634750 test-first 3 1573 true +1476273634751 test-first 3 1573 true +1476273634752 test-first 3 1573 true +1476273634753 test-first 3 1573 true +1476273634754 test-first 3 1573 true +1476273634755 test-first 3 1573 true +1476273634756 test-first 3 1573 true +1476273634757 test-first 3 1573 true +1476273634758 test-first 3 1573 true +1476273634759 test-first 3 1573 true +1476273634760 test-first 3 1573 true +1476273634761 test-first 3 1573 true +1476273634762 test-first 3 1573 true +1476273634763 test-first 3 1573 true +1476273634764 test-first 3 1573 true +1476273634765 test-first 3 1573 true +1476273634766 test-first 3 1573 true +1476273634767 test-first 3 1573 true +1476273634768 test-first 3 1573 true +1476273634769 test-first 3 1573 true +1476273634770 test-first 3 1573 true +1476273634771 test-first 3 1573 true +1476273634772 test-first 3 1573 true +1476273634773 test-first 3 1573 true +1476273634774 test-first 3 1573 true +1476273634775 test-first 3 1573 true +1476273634776 test-first 3 1573 true +1476273634777 test-first 3 1573 true +1476273634778 test-first 3 1573 true +1476273634779 test-first 3 1573 true +1476273634780 test-first 3 1573 true +1476273634781 test-first 3 1573 true +1476273634782 test-first 3 1573 true +1476273634783 test-first 3 1573 true +1476273634784 test-first 3 1573 true +1476273634785 test-first 3 1573 true +1476273634786 test-first 3 1573 true +1476273634787 test-first 3 1573 true +1476273634788 test-first 3 1573 true +1476273634789 test-first 3 1573 true +1476273634790 test-first 3 1573 true +1476273634791 test-first 3 1573 true +1476273634792 test-first 3 1573 true +1476273634793 test-first 3 1573 true +1476273634794 test-first 3 1573 true +1476273634795 test-first 3 1573 true +1476273634796 test-first 3 1573 true +1476273634797 test-first 3 1573 true +1476273634798 test-first 3 1573 true +1476273634799 test-first 3 1573 true +1476273634800 test-first 3 1573 true +1476273634801 test-first 3 1573 true +1476273634802 test-first 3 1573 true +1476273634803 test-first 3 1573 true +1476273634804 test-first 3 1573 true +1476273634805 test-first 3 1573 true +1476273634806 test-first 3 1573 true +1476273634807 test-first 3 1573 true +1476273634808 test-first 3 1573 true +1476273634809 test-first 3 1573 true +1476273634810 test-first 3 1573 true +1476273634811 test-first 3 1573 true +1476273634812 test-first 3 1573 true +1476273634813 test-first 3 1573 true +1476273634814 test-first 3 1573 true +1476273634815 test-first 3 1573 true +1476273634816 test-first 3 1573 true +1476273634817 test-first 3 1573 true +1476273634818 test-first 3 1573 true +1476273634819 test-first 3 1573 true +1476273634820 test-first 3 1573 true +1476273634821 test-first 3 1573 true +1476273634822 test-first 3 1573 true +1476273634823 test-first 3 1573 true +1476273634824 test-first 3 1573 true +1476273634825 test-first 3 1573 true +1476273634826 test-first 3 1573 true +1476273634827 test-first 3 1573 true +1476273634828 test-first 3 1573 true +1476273634829 test-first 3 1573 true +1476273634830 test-first 3 1573 true +1476273634831 test-first 3 1573 true +1476273634832 test-first 3 1573 true +1476273634833 test-first 3 1573 true +1476273634834 test-first 3 1573 true +1476273634835 test-first 3 1573 true +1476273634836 test-first 3 1573 true +1476273634837 test-first 3 1573 true +1476273634838 test-first 3 1573 true +1476273634839 test-first 3 1573 true +1476273634840 test-first 3 1573 true +1476273634841 test-first 3 1573 true +1476273634842 test-first 3 1573 true +1476273634843 test-first 3 1573 true +1476273634844 test-first 3 1573 true +1476273634845 test-first 3 1573 true +1476273634846 test-first 3 1573 true +1476273634847 test-first 3 1573 true +1476273634848 test-first 3 1573 true +1476273634849 test-first 3 1573 true +1476273634850 test-first 3 1573 true +1476273634851 test-first 3 1573 true +1476273634852 test-first 3 1573 true +1476273634853 test-first 3 1573 true +1476273634854 test-first 3 1573 true +1476273634855 test-first 3 1573 true +1476273634856 test-first 3 1573 true +1476273634857 test-first 3 1573 true +1476273634858 test-first 3 1573 true +1476273634859 test-first 3 1573 true +1476273634860 test-first 3 1573 true +1476273634861 test-first 3 1573 true +1476273634862 test-first 3 1573 true +1476273634863 test-first 3 1573 true +1476273634864 test-first 3 1573 true +1476273634865 test-first 3 1573 true +1476273634866 test-first 3 1573 true +1476273634867 test-first 3 1573 true +1476273634868 test-first 3 1573 true +1476273634869 test-first 3 1573 true +1476273634870 test-first 3 1573 true +1476273634871 test-first 3 1573 true +1476273634872 test-first 3 1573 true +1476273634873 test-first 3 1573 true +1476273634874 test-first 3 1573 true +1476273634875 test-first 3 1573 true +1476273634876 test-first 3 1573 true +1476273634877 test-first 3 1573 true +1476273634878 test-first 3 1573 true +1476273634879 test-first 3 1573 true +1476273634880 test-first 3 1573 true +1476273634881 test-first 3 1573 true +1476273634882 test-first 3 1573 true +1476273634883 test-first 3 1573 true +1476273634884 test-first 3 1573 true +1476273634885 test-first 3 1573 true +1476273634886 test-first 3 1573 true +1476273634887 test-first 3 1573 true +1476273634888 test-first 3 1573 true +1476273634889 test-first 3 1573 true +1476273634890 test-first 3 1573 true +1476273634891 test-first 3 1573 true +1476273634892 test-first 3 1573 true +1476273634893 test-first 3 1573 true +1476273634894 test-first 3 1573 true +1476273634895 test-first 3 1573 true +1476273634896 test-first 3 1573 true +1476273634897 test-first 3 1573 true +1476273634898 test-first 3 1573 true +1476273634899 test-first 3 1573 true +1476273634900 test-first 3 1573 true +1476273634901 test-first 3 1573 true +1476273634902 test-first 3 1573 true +1476273634903 test-first 3 1573 true +1476273634904 test-first 3 1573 true +1476273634905 test-first 3 1573 true +1476273634906 test-first 3 1573 true +1476273634907 test-first 3 1573 true +1476273634908 test-first 3 1573 true +1476273634909 test-first 3 1573 true +1476273634910 test-first 3 1573 true +1476273634911 test-first 3 1573 true +1476273634912 test-first 3 1573 true +1476273634913 test-first 3 1573 true +1476273634914 test-first 3 1573 true +1476273634915 test-first 3 1573 true +1476273634916 test-first 3 1573 true +1476273634917 test-first 3 1573 true +1476273634918 test-first 3 1573 true +1476273634919 test-first 3 1573 true +1476273634920 test-first 3 1573 true +1476273634921 test-first 3 1573 true +1476273634922 test-first 3 1573 true +1476273634923 test-first 3 1573 true +1476273634924 test-first 3 1573 true +1476273634925 test-first 3 1573 true +1476273634926 test-first 3 1573 true +1476273634927 test-first 3 1573 true +1476273634928 test-first 3 1573 true +1476273634929 test-first 3 1573 true +1476273634930 test-first 3 1573 true +1476273634931 test-first 3 1573 true +1476273634932 test-first 3 1573 true +1476273634933 test-first 3 1573 true +1476273634934 test-first 3 1573 true +1476273634935 test-first 3 1573 true +1476273634936 test-first 3 1573 true +1476273634937 test-first 3 1573 true +1476273634938 test-first 3 1573 true +1476273634939 test-first 3 1573 true +1476273634940 test-first 3 1573 true +1476273634941 test-first 3 1573 true +1476273634942 test-first 3 1573 true +1476273634943 test-first 3 1573 true +1476273634944 test-first 3 1573 true +1476273634945 test-first 3 1573 true +1476273634946 test-first 3 1573 true +1476273634947 test-first 3 1573 true +1476273634948 test-first 3 1573 true +1476273634949 test-first 3 1573 true +1476273634950 test-first 3 1573 true +1476273634951 test-first 3 1573 true +1476273634952 test-first 3 1573 true +1476273634953 test-first 3 1573 true +1476273634954 test-first 3 1573 true +1476273634955 test-first 3 1573 true +1476273634956 test-first 3 1573 true +1476273634957 test-first 3 1573 true +1476273634958 test-first 3 1573 true +1476273634959 test-first 3 1573 true +1476273634960 test-first 3 1573 true +1476273634961 test-first 3 1573 true +1476273634962 test-first 3 1573 true +1476273634963 test-first 3 1573 true +1476273634964 test-first 3 1573 true +1476273634965 test-first 3 1573 true +1476273634966 test-first 3 1573 true +1476273634967 test-first 3 1573 true +1476273634968 test-first 3 1573 true +1476273634969 test-first 3 1573 true +1476273634970 test-first 3 1573 true +1476273634971 test-first 3 1573 true +1476273634972 test-first 3 1573 true +1476273634973 test-first 3 1573 true +1476273634974 test-first 3 1573 true +1476273634975 test-first 3 1573 true +1476273634976 test-first 3 1573 true +1476273634977 test-first 3 1573 true +1476273634978 test-first 3 1573 true +1476273634979 test-first 3 1573 true +1476273634980 test-first 3 1573 true +1476273634981 test-first 3 1573 true +1476273634982 test-first 3 1573 true +1476273634983 test-first 3 1573 true +1476273634984 test-first 3 1573 true +1476273634985 test-first 3 1573 true +1476273634986 test-first 3 1573 true +1476273634987 test-first 3 1573 true +1476273634988 test-first 3 1573 true +1476273634989 test-first 3 1573 true +1476273634990 test-first 3 1573 true +1476273634991 test-first 3 1573 true +1476273634992 test-first 3 1573 true +1476273634993 test-first 3 1573 true +1476273634994 test-first 3 1573 true +1476273634995 test-first 3 1573 true +1476273634996 test-first 3 1573 true +1476273634997 test-first 3 1573 true +1476273634998 test-first 3 1573 true +1476273634999 test-first 3 1573 true +1476273635000 test-first 3 1573 true +1476273635001 test-first 3 1573 true +1476273635002 test-first 3 1573 true +1476273635003 test-first 3 1573 true +1476273635004 test-first 3 1573 true +1476273635005 test-first 3 1573 true +1476273635006 test-first 3 1573 true +1476273635007 test-first 3 1573 true +1476273635008 test-first 3 1573 true +1476273635009 test-first 3 1573 true +1476273635010 test-first 3 1573 true +1476273635011 test-first 3 1573 true +1476273635012 test-first 3 1573 true +1476273635013 test-first 3 1573 true +1476273635014 test-first 3 1573 true +1476273635015 test-first 3 1573 true +1476273635016 test-first 3 1573 true +1476273635017 test-first 3 1573 true +1476273635018 test-first 3 1573 true +1476273635019 test-first 3 1573 true +1476273635020 test-first 3 1573 true +1476273635021 test-first 3 1573 true +1476273635022 test-first 3 1573 true +1476273635023 test-first 3 1573 true +1476273635024 test-first 3 1573 true +1476273635025 test-first 3 1573 true +1476273635026 test-first 3 1573 true +1476273635027 test-first 3 1573 true +1476273635028 test-first 3 1573 true +1476273635029 test-first 3 1573 true +1476273635030 test-first 3 1573 true +1476273635031 test-first 3 1573 true +1476273635032 test-first 3 1573 true +1476273635033 test-first 3 1573 true +1476273635034 test-first 3 1573 true +1476273635035 test-first 3 1573 true +1476273635036 test-first 3 1573 true +1476273635037 test-first 3 1573 true +1476273635038 test-first 3 1573 true +1476273635039 test-first 3 1573 true +1476273635040 test-first 3 1573 true +1476273635041 test-first 3 1573 true +1476273635042 test-first 3 1573 true +1476273635043 test-first 3 1573 true +1476273635044 test-first 3 1573 true +1476273635045 test-first 3 1573 true +1476273635046 test-first 3 1573 true +1476273635047 test-first 3 1573 true +1476273635048 test-first 3 1573 true +1476273635049 test-first 3 1573 true +1476273635050 test-first 3 1573 true +1476273635051 test-first 3 1573 true +1476273635052 test-first 3 1573 true +1476273635053 test-first 3 1573 true +1476273635054 test-first 3 1573 true +1476273635055 test-first 3 1573 true +1476273635056 test-first 3 1573 true +1476273635057 test-first 3 1573 true +1476273635058 test-first 3 1573 true +1476273635059 test-first 3 1573 true +1476273635060 test-first 3 1573 true +1476273635061 test-first 3 1573 true +1476273635062 test-first 3 1573 true +1476273635063 test-first 3 1573 true +1476273635064 test-first 3 1573 true +1476273635065 test-first 3 1573 true +1476273635066 test-first 3 1573 true +1476273635067 test-first 3 1573 true +1476273635068 test-first 3 1573 true +1476273635069 test-first 3 1573 true +1476273635070 test-first 3 1573 true +1476273635071 test-first 3 1573 true +1476273635072 test-first 3 1573 true +1476273635073 test-first 3 1573 true +1476273635074 test-first 3 1573 true +1476273635075 test-first 3 1573 true +1476273635076 test-first 3 1573 true +1476273635077 test-first 3 1573 true +1476273635078 test-first 3 1573 true +1476273635079 test-first 3 1573 true +1476273635080 test-first 3 1573 true +1476273635081 test-first 3 1573 true +1476273635082 test-first 3 1573 true +1476273635083 test-first 3 1573 true +1476273635084 test-first 3 1573 true +1476273635085 test-first 3 1573 true +1476273635086 test-first 3 1573 true +1476273635087 test-first 3 1573 true +1476273635088 test-first 3 1573 true +1476273635089 test-first 3 1573 true +1476273635090 test-first 3 1573 true +1476273635091 test-first 3 1573 true +1476273635092 test-first 3 1573 true +1476273635093 test-first 3 1573 true +1476273635094 test-first 3 1573 true +1476273635095 test-first 3 1573 true +1476273635096 test-first 3 1573 true +1476273635097 test-first 3 1573 true +1476273635098 test-first 3 1573 true +1476273635099 test-first 3 1573 true +1476273635100 test-first 3 1573 true +1476273635101 test-first 3 1573 true +1476273635102 test-first 3 1573 true +1476273635103 test-first 3 1573 true +1476273635104 test-first 3 1573 true +1476273635105 test-first 3 1573 true +1476273635106 test-first 3 1573 true +1476273635107 test-first 3 1573 true +1476273635108 test-first 3 1573 true +1476273635109 test-first 3 1573 true +1476273635110 test-first 3 1573 true +1476273635111 test-first 3 1573 true +1476273635112 test-first 3 1573 true +1476273635113 test-first 3 1573 true +1476273635114 test-first 3 1573 true +1476273635115 test-first 3 1573 true +1476273635116 test-first 3 1573 true +1476273635117 test-first 3 1573 true +1476273635118 test-first 3 1573 true +1476273635119 test-first 3 1573 true +1476273635120 test-first 3 1573 true +1476273635121 test-first 3 1573 true +1476273635122 test-first 3 1573 true +1476273635123 test-first 3 1573 true +1476273635124 test-first 3 1573 true +1476273635125 test-first 3 1573 true +1476273635126 test-first 3 1573 true +1476273635127 test-first 3 1573 true +1476273635128 test-first 3 1573 true +1476273635129 test-first 3 1573 true +1476273635130 test-first 3 1573 true +1476273635131 test-first 3 1573 true +1476273635132 test-first 3 1573 true +1476273635133 test-first 3 1573 true +1476273635134 test-first 3 1573 true +1476273635135 test-first 3 1573 true +1476273635136 test-first 3 1573 true +1476273635137 test-first 3 1573 true +1476273635138 test-first 3 1573 true +1476273635139 test-first 3 1573 true +1476273635140 test-first 3 1573 true +1476273635141 test-first 3 1573 true +1476273635142 test-first 3 1573 true +1476273635143 test-first 3 1573 true +1476273635144 test-first 3 1573 true +1476273635145 test-first 3 1573 true +1476273635146 test-first 3 1573 true +1476273635147 test-first 3 1573 true +1476273635148 test-first 3 1573 true +1476273635149 test-first 3 1573 true +1476273635150 test-first 3 1573 true +1476273635151 test-first 3 1573 true +1476273635152 test-first 3 1573 true +1476273635153 test-first 3 1573 true +1476273635154 test-first 3 1573 true +1476273635155 test-first 3 1573 true +1476273635156 test-first 3 1573 true +1476273635157 test-first 3 1573 true +1476273635158 test-first 3 1573 true +1476273635159 test-first 3 1573 true +1476273635160 test-first 3 1573 true +1476273635161 test-first 3 1573 true +1476273635162 test-first 3 1573 true +1476273635163 test-first 3 1573 true +1476273635164 test-first 3 1573 true +1476273635165 test-first 3 1573 true +1476273635166 test-first 3 1573 true +1476273635167 test-first 3 1573 true +1476273635168 test-first 3 1573 true +1476273635169 test-first 3 1573 true +1476273635170 test-first 3 1573 true +1476273635171 test-first 3 1573 true +1476273635172 test-first 3 1573 true +1476273635173 test-first 3 1573 true +1476273635174 test-first 3 1573 true +1476273635175 test-first 3 1573 true +1476273635176 test-first 3 1573 true +1476273635177 test-first 3 1573 true +1476273635178 test-first 3 1573 true +1476273635179 test-first 3 1573 true +1476273635180 test-first 3 1573 true +1476273635181 test-first 3 1573 true +1476273635182 test-first 3 1573 true +1476273635183 test-first 3 1573 true +1476273635184 test-first 3 1573 true +1476273635185 test-first 3 1573 true +1476273635186 test-first 3 1573 true +1476273635187 test-first 3 1573 true +1476273635188 test-first 3 1573 true +1476273635189 test-first 3 1573 true +1476273635190 test-first 3 1573 true +1476273635191 test-first 3 1573 true +1476273635192 test-first 3 1573 true +1476273635193 test-first 3 1573 true +1476273635194 test-first 3 1573 true +1476273635195 test-first 3 1573 true +1476273635196 test-first 3 1573 true +1476273635197 test-first 3 1573 true +1476273635198 test-first 3 1573 true +1476273635199 test-first 3 1573 true +1476273635200 test-first 3 1573 true +1476273635201 test-first 3 1573 true +1476273635202 test-first 3 1573 true +1476273635203 test-first 3 1573 true +1476273635204 test-first 3 1573 true +1476273635205 test-first 3 1573 true +1476273635206 test-first 3 1573 true +1476273635207 test-first 3 1573 true +1476273635208 test-first 3 1573 true +1476273635209 test-first 3 1573 true +1476273635210 test-first 3 1573 true +1476273635211 test-first 3 1573 true +1476273635212 test-first 3 1573 true +1476273635213 test-first 3 1573 true +1476273635214 test-first 3 1573 true +1476273635215 test-first 3 1573 true +1476273635216 test-first 3 1573 true +1476273635217 test-first 3 1573 true +1476273635218 test-first 3 1573 true +1476273635219 test-first 3 1573 true +1476273635220 test-first 3 1573 true +1476273635221 test-first 3 1573 true +1476273635222 test-first 3 1573 true +1476273635223 test-first 3 1573 true +1476273635224 test-first 3 1573 true +1476273635225 test-first 3 1573 true +1476273635226 test-first 3 1573 true +1476273635227 test-first 3 1573 true +1476273635228 test-first 3 1573 true +1476273635229 test-first 3 1573 true +1476273635230 test-first 3 1573 true +1476273635231 test-first 3 1573 true +1476273635232 test-first 3 1573 true +1476273635233 test-first 3 1573 true +1476273635234 test-first 3 1573 true +1476273635235 test-first 3 1573 true +1476273635236 test-first 3 1573 true +1476273635237 test-first 3 1573 true +1476273635238 test-first 3 1573 true +1476273635239 test-first 3 1573 true +1476273635240 test-first 3 1573 true +1476273635241 test-first 3 1573 true +1476273635242 test-first 3 1573 true +1476273635243 test-first 3 1573 true +1476273635244 test-first 3 1573 true +1476273635245 test-first 3 1573 true +1476273635246 test-first 3 1573 true +1476273635247 test-first 3 1573 true +1476273635248 test-first 3 1573 true +1476273635249 test-first 3 1573 true +1476273635250 test-first 3 1573 true +1476273635251 test-first 3 1573 true +1476273635252 test-first 3 1573 true +1476273635253 test-first 3 1573 true +1476273635254 test-first 3 1573 true +1476273635255 test-first 3 1573 true +1476273635256 test-first 3 1573 true +1476273635257 test-first 3 1573 true +1476273635258 test-first 3 1573 true +1476273635259 test-first 3 1573 true +1476273635260 test-first 3 1573 true +1476273635261 test-first 3 1573 true +1476273635262 test-first 3 1573 true +1476273635263 test-first 3 1573 true +1476273635264 test-first 3 1573 true +1476273635265 test-first 3 1573 true +1476273635266 test-first 3 1573 true +1476273635267 test-first 3 1573 true +1476273635268 test-first 3 1573 true +1476273635269 test-first 3 1573 true +1476273635270 test-first 3 1573 true +1476273635271 test-first 3 1573 true +1476273635272 test-first 3 1573 true +1476273635273 test-first 3 1573 true +1476273635274 test-first 3 1573 true +1476273635275 test-first 3 1573 true +1476273635276 test-first 3 1573 true +1476273635277 test-first 3 1573 true +1476273635278 test-first 3 1573 true +1476273635279 test-first 3 1573 true +1476273635280 test-first 3 1573 true +1476273635281 test-first 3 1573 true +1476273635282 test-first 3 1573 true +1476273635283 test-first 3 1573 true +1476273635284 test-first 3 1573 true +1476273635285 test-first 3 1573 true +1476273635286 test-first 3 1573 true +1476273635287 test-first 3 1573 true +1476273635288 test-first 3 1573 true +1476273635289 test-first 3 1573 true +1476273635290 test-first 3 1573 true +1476273635291 test-first 3 1573 true +1476273635292 test-first 3 1573 true +1476273635293 test-first 3 1573 true +1476273635294 test-first 3 1573 true +1476273635295 test-first 3 1573 true +1476273635296 test-first 3 1573 true +1476273635297 test-first 3 1573 true +1476273635298 test-first 3 1573 true +1476273635299 test-first 3 1573 true +1476273635300 test-first 3 1573 true +1476273635301 test-first 3 1573 true +1476273635302 test-first 3 1573 true +1476273635303 test-first 3 1573 true +1476273635304 test-first 3 1573 true +1476273635305 test-first 3 1573 true +1476273635306 test-first 3 1573 true +1476273635307 test-first 3 1573 true +1476273635308 test-first 3 1573 true +1476273635309 test-first 3 1573 true +1476273635310 test-first 3 1573 true +1476273635311 test-first 3 1573 true +1476273635312 test-first 3 1573 true +1476273635313 test-first 3 1573 true +1476273635314 test-first 3 1573 true +1476273635315 test-first 3 1573 true +1476273635316 test-first 3 1573 true +1476273635317 test-first 3 1573 true +1476273635318 test-first 3 1573 true +1476273635319 test-first 3 1573 true +1476273635320 test-first 3 1573 true +1476273635321 test-first 3 1573 true +1476273635322 test-first 3 1573 true +1476273635323 test-first 3 1573 true +1476273635324 test-first 3 1573 true +1476273635325 test-first 3 1573 true +1476273635326 test-first 3 1573 true +1476273635327 test-first 3 1573 true +1476273635328 test-first 3 1573 true +1476273635329 test-first 3 1573 true +1476273635330 test-first 3 1573 true +1476273635331 test-first 3 1573 true +1476273635332 test-first 3 1573 true +1476273635333 test-first 3 1573 true +1476273635334 test-first 3 1573 true +1476273635335 test-first 3 1573 true +1476273635336 test-first 3 1573 true +1476273635337 test-first 3 1573 true +1476273635338 test-first 3 1573 true +1476273635339 test-first 3 1573 true +1476273635340 test-first 3 1573 true +1476273635341 test-first 3 1573 true +1476273635342 test-first 3 1573 true +1476273635343 test-first 3 1573 true +1476273635344 test-first 3 1573 true +1476273635345 test-first 3 1573 true +1476273635346 test-first 3 1573 true +1476273635347 test-first 3 1573 true +1476273635348 test-first 3 1573 true +1476273635349 test-first 3 1573 true +1476273635350 test-first 3 1573 true +1476273635351 test-first 3 1573 true +1476273635352 test-first 3 1573 true +1476273635353 test-first 3 1573 true +1476273635354 test-first 3 1573 true +1476273635355 test-first 3 1573 true +1476273635356 test-first 3 1573 true +1476273635357 test-first 3 1573 true +1476273635358 test-first 3 1573 true +1476273635359 test-first 3 1573 true +1476273635360 test-first 3 1573 true +1476273635361 test-first 3 1573 true +1476273635362 test-first 3 1573 true +1476273635363 test-first 3 1573 true +1476273635364 test-first 3 1573 true +1476273635365 test-first 3 1573 true +1476273635366 test-first 3 1573 true +1476273635367 test-first 3 1573 true +1476273635368 test-first 3 1573 true +1476273635369 test-first 3 1573 true +1476273635370 test-first 3 1573 true +1476273635371 test-first 3 1573 true +1476273635372 test-first 3 1573 true +1476273635373 test-first 3 1573 true diff --git a/.besouro/20161012141626179/randomHeuristicEpisodes.txt b/.besouro/20161012141626179/randomHeuristicEpisodes.txt index e6320d6..564a449 100644 --- a/.besouro/20161012141626179/randomHeuristicEpisodes.txt +++ b/.besouro/20161012141626179/randomHeuristicEpisodes.txt @@ -2,3 +2,4 @@ 1476271355212 refactoring 2A 245 true 1476271828706 test-first 3 465 true 1476272036858 test-first 3 204 true +1476273633109 test-first 3 1573 true diff --git a/.besouro/20161012141626179/zorroEpisodes.txt b/.besouro/20161012141626179/zorroEpisodes.txt index 6d372bc..4affafd 100644 --- a/.besouro/20161012141626179/zorroEpisodes.txt +++ b/.besouro/20161012141626179/zorroEpisodes.txt @@ -2,3 +2,4 @@ 1476271355212 refactoring 2A 312 true 1476271828706 test-first 3 473 true 1476272036858 test-first 3 208 true +1476273633109 test-first 3 1596 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 367af22187bcd17bc03193119993d220dc605b48..af0118ec92399bd139a5d7e6647f6d4bd4f22fe4 100644 GIT binary patch delta 263 zcmW;GJxjx27=_{c*tdyRAwj5G3xa}V2^48;t(s~{tyKI#=;$CgJBZ*Wf}r61x`|&P zIJgKxar7^U|HIkQq}z3#!-40=`}W@F&0GP41G)|S%s%KU%=HQU_(^03^TMCqG!-`) zAKQ6VY|l;L76n6*&dgnCvQ_YiADV3Uv5@z5k*BI*B8^hh6m?Zt(h3bVSyqcx zwTacCscqKOV_k=|bVQ;P+B#)JXK8mySJ!OmhFw|qC;C=sfM^` epU8eWrDBJKh(&Vh(x65iqn`bBLQUAR`}q%)O)kCw delta 265 zcmW;Gu}Z^W7=_{Yw7(6ON^3zh6$Ayz5-8HxS~0c~t5vb$(#c75bP~ZuTm%KjAKj{g zf`f}76esUNybZ6w$t2rzzQcjF(&GI#SZ5Lrr-CjZs&Hh89>-NK{rg6=n@gINLD*EsnfuyZ+~;XrmX9H{sS Date: Wed, 12 Oct 2016 15:01:34 +0300 Subject: [PATCH 099/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 3267 -> 3452 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 5cd3a3c..30dee6b 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -239,3 +239,4 @@ RefactoringAction 1476273673578 SpreadsheetTest.java RENAME testAssignment_A2_Re RefactoringAction 1476273676091 SpreadsheetTest.java RENAME testAssignment_A2_InvalidReference_A1_Integer()=>void testAssignment_A2_InvalidReference_A1_Integer_Error() METHOD RefactoringAction 1476273679605 SpreadsheetTest.java RENAME testAssignment_A2_InvalidReference_A1_Integer_Error()=>void testAssignment_A2_InvalidReference_Error() METHOD EditAction 1476273690677 SpreadsheetTest.java 2889 16 49 15 +EditAction 1476273694631 SpreadsheetTest.java 2892 16 49 15 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index be75c6bf62a44614c1ddc93746cde0825e5b3e5c..c1fa159921ccc0eff37f5277aef4f7054261d8b4 100644 GIT binary patch delta 125 zcmX>s`A3TD)W2Q(7#J8#7!o#eg|QlGl%y7yI2IRYrsw6R=9R=d8pV6&l_ln6rUa#? zr52^;C8x%_78T_eaWKR(GBDdZnof>mHD?suJdIU@eexnUk;%S1(u^^aGkKH+OBuKs d${55L${7?GDj3ulDksn7k!Ozs+Q!5X4*)n*Bdh=b delta 36 scmew(by$+?)W2Q(7#J8#7-Bbag|SYa!fMJWu=y0L20JSQ0~13G0P!#iY5)KL diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 7bfee14..a4f16da 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -117,6 +117,6 @@ public void testAssignment_A2_InvalidReference_Error() { sheet.set("A1", "123"); sheet.set("A2", "=A5"); String result = sheet.evaluate("A2"); - assertEquals("123", result); + assertEquals("#Error", result); } } From 575191a393db1bbca325854109b897448abfdf82 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:01:39 +0300 Subject: [PATCH 100/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 3452 -> 3452 bytes tests/SpreadsheetTest.java | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 30dee6b..ff129ff 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -240,3 +240,4 @@ RefactoringAction 1476273676091 SpreadsheetTest.java RENAME testAssignment_A2_In RefactoringAction 1476273679605 SpreadsheetTest.java RENAME testAssignment_A2_InvalidReference_A1_Integer_Error()=>void testAssignment_A2_InvalidReference_Error() METHOD EditAction 1476273690677 SpreadsheetTest.java 2889 16 49 15 EditAction 1476273694631 SpreadsheetTest.java 2892 16 49 15 +EditAction 1476273699198 SpreadsheetTest.java 2866 16 48 15 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index c1fa159921ccc0eff37f5277aef4f7054261d8b4..21778bb928734e7538515be17f7bf3fc268d3853 100644 GIT binary patch delta 15 Wcmew(^+#%h0q^9m?EI7Md2InVNCngY delta 15 Wcmew(^+#%h0q^A1Jff3bdCdVeiUpMb diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index a4f16da..a63bf80 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -114,7 +114,6 @@ public void testAssignment_A2_Reference_A1_Integer() { @Test public void testAssignment_A2_InvalidReference_Error() { - sheet.set("A1", "123"); sheet.set("A2", "=A5"); String result = sheet.evaluate("A2"); assertEquals("#Error", result); From 586507cac5ef02e8a0cd58ceac79c4cb598bbbd0 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:02:45 +0300 Subject: [PATCH 101/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 3452 -> 3437 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index ff129ff..92ece3e 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -241,3 +241,6 @@ RefactoringAction 1476273679605 SpreadsheetTest.java RENAME testAssignment_A2_In EditAction 1476273690677 SpreadsheetTest.java 2889 16 49 15 EditAction 1476273694631 SpreadsheetTest.java 2892 16 49 15 EditAction 1476273699198 SpreadsheetTest.java 2866 16 48 15 +UnitTestCaseAction 1476273701248 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476273701249 SpreadsheetTest.java FAIL +EditAction 1476273765021 Spreadsheet.java 2163 3 6 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 21778bb928734e7538515be17f7bf3fc268d3853..1f364b3c22bb639408957993616521ca2ce3329b 100644 GIT binary patch delta 45 zcmew(^;T*F8}H-14*)2i B3Y!1` delta 56 zcmaDW^+#$08}H;l+yX3-+Zf~~^Yf~Ti!rb=Fff!da5I!Kh%uBiC@@qos4-MdzQ`lb L9tV_RVu%L-lg|s$ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 4f563c4..43a4b9c 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -47,7 +47,7 @@ public void set(String cell, String value) { } } else if (value.charAt(1) != '\'') { - value = value.substring(1, value.length()); + value = "&" + value.substring(1, value.length()); } else { value = ERROR; } From bf1cf3c5b34d571031ec7fba4da995b654d23fbc Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:03:16 +0300 Subject: [PATCH 102/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 2001 -> 2197 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 92ece3e..d85aa6f 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -244,3 +244,4 @@ EditAction 1476273699198 SpreadsheetTest.java 2866 16 48 15 UnitTestCaseAction 1476273701248 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273701249 SpreadsheetTest.java FAIL EditAction 1476273765021 Spreadsheet.java 2163 3 6 0 +EditAction 1476273796193 Spreadsheet.java 2185 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index af0118ec92399bd139a5d7e6647f6d4bd4f22fe4..6699ec8f8e641d25a6c0c30cd607a31e35e71811 100644 GIT binary patch delta 626 zcmZ9J-%C?r7{@=)+1WX3oYKS;Ee%&|x+W)oq;u;0G0iqNe=RLZh>;?OsSWEcj3B6s zF5)CqP)P-W-W0@wg77-J>7VIh{d|w}DqeWs&+|S%zVGwA-^(@+`@jDA^aW_=;(LEs zn=?5hRA0;8%Gt}gl|?(do?lv79K5--Jin0l(JII(KQ`?ahd3)7X-xkg+}$+eMs!+4 z=@N|G+S=3jkLuvGR`-x z*%-H&VAA=k1&yr51%+YH&p-`22FUA3frc0IIN~V~D(~HrGWSA%Bc?N=+vZe-m3b>^ z=e8a)PwsKOv!h>cdgn6R5#7xSz2x|3?AeNzkF-T}w?Ki@1v(1EoL28ci95UAjg3m$ zq?&fAr9(n=N}Q;qRI?dkGC_}IRaeu*;XGa?novu5J)_oTHJ+)bl2JW=PRBbNK_P?)!RfU_ zE4CI29Xb`{3=ZP#<_{2mM4=QarO%0--s^sE?&s@$=XJ`z`g?u>6nXW-A58c@-Mk1G zX2kqV?7P)~$JER_>$y7rd9l#sxXbM?C!`yLl@jm#&@)@rV7D z-{#IPcwtwt{7tH6#L0O*ZBCh{^EUG(W{&fAoXUMBowws$#E|*r97@6LxUH7Ms3a-M z1IDF~2`NyLDJG>xS?W}zK~?6c$r97D&Wtpv%Ns)3pdp*g%9eWDEXW>dJ!ZwyOhV?_J8~ z+{;R@x$!c!Df+c=TDu%*SxevH!83Y?A}W_;mt*b_QkVb$ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 43a4b9c..c6a2134 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -81,7 +81,7 @@ public void set(String cell, String value) { public String evaluate(String cell) { String value = (String) mValues.get(cell); - if (!mValues.equals(ERROR) && mValues.containsKey(value)) { + if (value.length() > 0 && value.charAt(0) == '&' && mValues.containsKey(value)) { return (String) mValues.get(value); } From 4d48e5f20a34e3b5a4bd6e12fd6d348c9886820c Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:03:30 +0300 Subject: [PATCH 103/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 2197 -> 2183 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index d85aa6f..3709a1f 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -245,3 +245,4 @@ UnitTestCaseAction 1476273701248 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273701249 SpreadsheetTest.java FAIL EditAction 1476273765021 Spreadsheet.java 2163 3 6 0 EditAction 1476273796193 Spreadsheet.java 2185 3 6 0 +EditAction 1476273810226 Spreadsheet.java 2218 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 6699ec8f8e641d25a6c0c30cd607a31e35e71811..8926c91488efc6e39a8ea41ab796b51d06474e81 100644 GIT binary patch delta 162 zcmbO#*e=L*>ff$?3=9k=3?Uo2)-dyMC+FvtBxdFnd#6@T-peep`7N^ui(VfC69Y3) zm6_HS1~Khz4BiJAlzerzF(}SsP|;!D#-J{swtztjBncGso2FF)?@oML8H4|1g-aGbjONf`EJ`hF}1-B_4qQ delta 196 zcmZn{oGQq5>ff$?3=9k=4B;EO)-ap1r52VZ<`gqBh-&y`C6*=X=OpH(>-#5Vr6!kH zYesP~2r~rpFoZA!GBR){=jW9qX66-pr&eyh#Vo?2*~!4fzzj6ZP-_c=nD#aX?*j}< zz96;`&o&0XSqxGjw$3(&pvf{EYOcx*p$z&A5e$+*9SRVA3{nizKpxNp1~~>U21W)R g22} 0 && value.charAt(0) == '&' && mValues.containsKey(value)) { + if (value.length() > 0 && value.charAt(0) == '&' && mValues.containsKey(value.substring(1, value.length() - 1))) { return (String) mValues.get(value); } From 3173253a055e186b81e59f005ce922dd9a9ea4be Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:03:33 +0300 Subject: [PATCH 104/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 2183 -> 2193 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 3709a1f..e41efaa 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -246,3 +246,4 @@ UnitTestSessionAction 1476273701249 SpreadsheetTest.java FAIL EditAction 1476273765021 Spreadsheet.java 2163 3 6 0 EditAction 1476273796193 Spreadsheet.java 2185 3 6 0 EditAction 1476273810226 Spreadsheet.java 2218 3 6 0 +EditAction 1476273813875 Spreadsheet.java 2214 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 8926c91488efc6e39a8ea41ab796b51d06474e81..0a48377eff2d82bf63e5b033d92146a6c0d42f3f 100644 GIT binary patch delta 135 zcmZn{oG7^A9lPla237`U1_lNPtt|{<+S?es4=^bC>TF|BoX4Q2!@P|_T|jLCg9=De zhXo|elCq6Kd$J^lrmGP{D1#kC1cM|{w*tfr1}O$WHB*#0!29(82>Ps PurnwDWrBcwCWc@Dyq*#k diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index d5e0976..2ff1ed4 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -81,7 +81,7 @@ public void set(String cell, String value) { public String evaluate(String cell) { String value = (String) mValues.get(cell); - if (value.length() > 0 && value.charAt(0) == '&' && mValues.containsKey(value.substring(1, value.length() - 1))) { + if (value.length() > 0 && value.charAt(0) == '&' && mValues.containsKey(value.substring(1, value.length()))) { return (String) mValues.get(value); } From 5a15fff49dfe81fceaa8a33e3bfde9975cb62ec2 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:04:00 +0300 Subject: [PATCH 105/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2193 -> 2191 bytes src/Spreadsheet.java | 8 ++++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index e41efaa..0d47c00 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -247,3 +247,6 @@ EditAction 1476273765021 Spreadsheet.java 2163 3 6 0 EditAction 1476273796193 Spreadsheet.java 2185 3 6 0 EditAction 1476273810226 Spreadsheet.java 2218 3 6 0 EditAction 1476273813875 Spreadsheet.java 2214 3 6 0 +UnitTestCaseAction 1476273816683 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476273816683 SpreadsheetTest.java FAIL +EditAction 1476273840322 Spreadsheet.java 2257 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 0a48377eff2d82bf63e5b033d92146a6c0d42f3f..0ec9b1a807dc1c9031d1e03b520ee29d6d262705 100644 GIT binary patch delta 130 zcmbOz*e|%@9lOCa1{MZp1_lN@tt|{<+S?es4=^bC>TF|BoX4P}!@P|_T|jLCgAzzm zhXo`&S%E{x)qo+C!GmlJ#d delta 132 zcmeAdoG7^A9lOyC237`U1_lNPtt|{<+S?es4=^bC>TF|BoX4Q2!@P|_T|jLCg9=De zhXo|ek}_G2L&w#KA(X+6A%Z~?s8s=C0D}~RG>`{0ib0Nni-D1Whrxuw3CLn%@C1r- UFfjgMuw!RX0?Gsd`AiJK0Hf0r`2YX_ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 2ff1ed4..3a095d0 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -81,8 +81,12 @@ public void set(String cell, String value) { public String evaluate(String cell) { String value = (String) mValues.get(cell); - if (value.length() > 0 && value.charAt(0) == '&' && mValues.containsKey(value.substring(1, value.length()))) { - return (String) mValues.get(value); + if (value.length() > 0 && value.charAt(0) == '&') { + if (mValues.containsKey(value.substring(1, value.length()))) { + return (String) mValues.get(value); + } else { + return ERROR; + } } return value; From e3342a2b37eba07c5c13311c929dace1f489fa88 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:04:25 +0300 Subject: [PATCH 106/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2191 -> 2203 bytes src/Spreadsheet.java | 1 + 3 files changed, 4 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 0d47c00..79f2023 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -250,3 +250,6 @@ EditAction 1476273813875 Spreadsheet.java 2214 3 6 0 UnitTestCaseAction 1476273816683 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273816683 SpreadsheetTest.java FAIL EditAction 1476273840322 Spreadsheet.java 2257 3 6 0 +UnitTestCaseAction 1476273849218 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476273849218 SpreadsheetTest.java FAIL +EditAction 1476273865544 Spreadsheet.java 2309 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 0ec9b1a807dc1c9031d1e03b520ee29d6d262705..7f91292c6bee7e4597bf1b9b4393de47cadeba50 100644 GIT binary patch delta 182 zcmXAiI|{;35JitK!Jq^*7UBm*11ji4ZR`RPI}t772MhP&60AiKaRslCSGyutVBy3x zmzi_#+_?m|zXE>0(VD7hwM*@V+N(3mj EKQ`4I-T(jq delta 170 zcmXAiI|{-;6h%**Ktu$Mh4=x{DHL=Hu?`mLM6~b&?#3n92_lF~m_nv@MXtcY8`C`A zJMVDsJ-wvB%7dRkkd!zA3rSF|rf}x|? sQXcH6b70Pqj1ygvVc9~DzAp7KphjdRF37c3SP55&zGMlONFj*se|(f0$^ZZW diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 3a095d0..82f36f9 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -82,6 +82,7 @@ public String evaluate(String cell) { String value = (String) mValues.get(cell); if (value.length() > 0 && value.charAt(0) == '&') { + String key = value.substring(1, value.length()); if (mValues.containsKey(value.substring(1, value.length()))) { return (String) mValues.get(value); } else { From 75c92839537913b4a7543c55af34378a6b909774 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:04:34 +0300 Subject: [PATCH 107/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 2203 -> 2238 bytes src/Spreadsheet.java | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 79f2023..df7bb61 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -253,3 +253,4 @@ EditAction 1476273840322 Spreadsheet.java 2257 3 6 0 UnitTestCaseAction 1476273849218 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273849218 SpreadsheetTest.java FAIL EditAction 1476273865544 Spreadsheet.java 2309 3 6 0 +EditAction 1476273874612 Spreadsheet.java 2276 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 7f91292c6bee7e4597bf1b9b4393de47cadeba50..39e42f9f424245c956730f50cef25a27e26a38b6 100644 GIT binary patch delta 192 zcmXAi!3qIk6oo(Y|3!b2DJevmg()*)VZ%mQD2WAzEG(_$0X&DLl2;JT!UAhcOOK++ zmF`{Kb57s6Tl-?0`{#TC>I4V#P+Bb)>*G_UbnS|kfnNDU+6(F3aQc2oaYw^fA#Sp? zr|RpU72*vxsaR!IAS%d^IAihzxJ+m=rNfLab25^a|FvYviIN8tFhqoD(U!{+%8?F( U5(W}jZ#q#N*_WgdM&eqGzfpJ}ssI20 delta 158 zcmdldI9rhG)W2Q(7#J8#7(zC3U1Hw+h*^k5Z4mnD#aX?*j}o9L)P!~{Jz@R!=g+n(=ih&KNFo=PNA%sDeA(X*@A&kL>A%el4A%;N`D5C%| wh(U@$8ps10$sotT#lQ$uZ_3~VWHB*#0!29)nEo)>urnwz0i}X~0!$3S08fe;3jhEB diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 82f36f9..402d7da 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -83,8 +83,8 @@ public String evaluate(String cell) { if (value.length() > 0 && value.charAt(0) == '&') { String key = value.substring(1, value.length()); - if (mValues.containsKey(value.substring(1, value.length()))) { - return (String) mValues.get(value); + if (mValues.containsKey(key)) { + return (String) mValues.get(key); } else { return ERROR; } From c8d02223820c6e02f70fe455a72cfd0a34dd6de3 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:05:44 +0300 Subject: [PATCH 108/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 11 ++++++++ .../20161012141626179/besouroEpisodes.txt | 24 ++++++++++++++++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012141626179/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 2238 -> 2230 bytes tests/SpreadsheetTest.java | 10 ++++++-- 6 files changed, 45 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index df7bb61..e953a02 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -254,3 +254,14 @@ UnitTestCaseAction 1476273849218 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273849218 SpreadsheetTest.java FAIL EditAction 1476273865544 Spreadsheet.java 2309 3 6 0 EditAction 1476273874612 Spreadsheet.java 2276 3 6 0 +UnitTestCaseAction 1476273876065 SpreadsheetTest.java OK +UnitTestSessionAction 1476273876066 SpreadsheetTest.java OK +RefactoringAction 1476273901190 SpreadsheetTest.java ADD void testAssignment_A2_InvalidReference_Error()/2 METHOD +RefactoringAction 1476273905203 SpreadsheetTest.java RENAME testAssignment_A2_InvalidReference_Error()/2=>void testAssignment_A2_Reference_Error() METHOD +RefactoringAction 1476273907716 SpreadsheetTest.java RENAME testAssignment_A2_InvalidReference_Error()=>void testAssignment_A2_Reference_Error()/2 METHOD +RefactoringAction 1476273911229 SpreadsheetTest.java RENAME testAssignment_A2_Reference_Error()/2=>void testAssignment_A2_Reference_Invalid_Error() METHOD +RefactoringAction 1476273915743 SpreadsheetTest.java RENAME testAssignment_A2_Reference_Error()=>void testAssignment_A2_Reference_Circlular_Error() METHOD +RefactoringAction 1476273921256 SpreadsheetTest.java RENAME testAssignment_A2_Reference_Circlular_Error()=>void testAssignment_A2_Reference_Circular_Error() METHOD +RefactoringAction 1476273932289 SpreadsheetTest.java RENAME testAssignment_A2_Reference_Circular_Error()=>void testAssignment_Reference_Circular_Error() METHOD +RefactoringAction 1476273934302 SpreadsheetTest.java RENAME testAssignment_A2_Reference_Invalid_Error()=>void testAssignment_Reference_Invalid_Error() METHOD +EditAction 1476273944127 SpreadsheetTest.java 3034 17 51 16 diff --git a/.besouro/20161012141626179/besouroEpisodes.txt b/.besouro/20161012141626179/besouroEpisodes.txt index 7f701c7..f50de7c 100644 --- a/.besouro/20161012141626179/besouroEpisodes.txt +++ b/.besouro/20161012141626179/besouroEpisodes.txt @@ -2482,3 +2482,27 @@ 1476273635371 test-first 3 1573 true 1476273635372 test-first 3 1573 true 1476273635373 test-first 3 1573 true +1476273876066 test-first 3 222 true +1476273876067 test-first 3 222 true +1476273876068 test-first 3 222 true +1476273876069 test-first 3 222 true +1476273876070 test-first 3 222 true +1476273876071 test-first 3 222 true +1476273876072 test-first 3 222 true +1476273876073 test-first 3 222 true +1476273876074 test-first 3 222 true +1476273876075 test-first 3 222 true +1476273876076 test-first 3 222 true +1476273876077 test-first 3 222 true +1476273876078 test-first 3 222 true +1476273876079 test-first 3 222 true +1476273876080 test-first 3 222 true +1476273876081 test-first 3 222 true +1476273876082 test-first 3 222 true +1476273876083 test-first 3 222 true +1476273876084 test-first 3 222 true +1476273876085 test-first 3 222 true +1476273876086 test-first 3 222 true +1476273876087 test-first 3 222 true +1476273876088 test-first 3 222 true +1476273876089 test-first 3 222 true diff --git a/.besouro/20161012141626179/randomHeuristicEpisodes.txt b/.besouro/20161012141626179/randomHeuristicEpisodes.txt index 564a449..862d8a0 100644 --- a/.besouro/20161012141626179/randomHeuristicEpisodes.txt +++ b/.besouro/20161012141626179/randomHeuristicEpisodes.txt @@ -3,3 +3,4 @@ 1476271828706 test-first 3 465 true 1476272036858 test-first 3 204 true 1476273633109 test-first 3 1573 true +1476273876066 test-first 3 222 true diff --git a/.besouro/20161012141626179/zorroEpisodes.txt b/.besouro/20161012141626179/zorroEpisodes.txt index 4affafd..19a8175 100644 --- a/.besouro/20161012141626179/zorroEpisodes.txt +++ b/.besouro/20161012141626179/zorroEpisodes.txt @@ -3,3 +3,4 @@ 1476271828706 test-first 3 473 true 1476272036858 test-first 3 208 true 1476273633109 test-first 3 1596 true +1476273876066 test-first 3 242 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 39e42f9f424245c956730f50cef25a27e26a38b6..061a2616bef211bc222d3d76d51a1337f5442583 100644 GIT binary patch delta 166 zcmXAhy9&ZU5JgXR0}&B5ji7>H3Kx^L(8flBk4nT8Do6^y%F0Ik1PfU^@uRE+!HL2Y zXYRe6N9e-qE12HV_`o8*(MTMtC(+tEx@U$~J50TI!C1eD97$Hp29E4R?T5!nsh^M7 vlae#zKvQJ#UrCF$d?Keq8IKBM=0XZ1-9|{Wl)j4kkOo9@Z)rWYk}7sz5-=M4 delta 174 zcmdlcxKD7y7j}>R3@kv%z~HU5g+WYv8-w=&1|?seZ48R@7%X*|w=t*-s4Za7*I@w( zZDY{(11W>^wlVn4WZ(x2O*Y}sjI?41XK-VPWbkB&Wsn3Kss%BcL5e{d$OBr!AjiPP xz{tSEV9($LWHB+QGbk|x0a?sIJq!$d3`~C++}IhEfan)cmXRSCD9XeT0sw#e9YX*B diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index a63bf80..19fc2d5 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -113,9 +113,15 @@ public void testAssignment_A2_Reference_A1_Integer() { } @Test - public void testAssignment_A2_InvalidReference_Error() { + public void testAssignment_Reference_Invalid_Error() { + sheet.set("A1", "=A5"); + String result = sheet.evaluate("A1"); + assertEquals("#Error", result); + } + @Test + public void testAssignment_Reference_Circular_Error() { sheet.set("A2", "=A5"); String result = sheet.evaluate("A2"); - assertEquals("#Error", result); + assertEquals("#Circular", result); } } From d2f98a6bcf3ddd2bd7ad1afed9c063d96dff3f5d Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:05:59 +0300 Subject: [PATCH 109/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 3437 -> 3610 bytes tests/SpreadsheetTest.java | 4 +++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index e953a02..d7eb8dd 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -265,3 +265,4 @@ RefactoringAction 1476273921256 SpreadsheetTest.java RENAME testAssignment_A2_Re RefactoringAction 1476273932289 SpreadsheetTest.java RENAME testAssignment_A2_Reference_Circular_Error()=>void testAssignment_Reference_Circular_Error() METHOD RefactoringAction 1476273934302 SpreadsheetTest.java RENAME testAssignment_A2_Reference_Invalid_Error()=>void testAssignment_Reference_Invalid_Error() METHOD EditAction 1476273944127 SpreadsheetTest.java 3034 17 51 16 +EditAction 1476273959271 SpreadsheetTest.java 3062 17 52 16 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 1f364b3c22bb639408957993616521ca2ce3329b..d056fc73a05eaa445a7f3e6cdce1beb94b5196cc 100644 GIT binary patch delta 206 zcmaDWHA{x;)W2Q(7#J8#7?L+~g|XJFm82GzI2IRYrsw6R=9R<;rKY78rRF84#(UWr5D6|QN=;0eyn O8k2DiE(HJp0svpubs($& diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 19fc2d5..2054779 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -118,9 +118,11 @@ public void testAssignment_Reference_Invalid_Error() { String result = sheet.evaluate("A1"); assertEquals("#Error", result); } + @Test public void testAssignment_Reference_Circular_Error() { - sheet.set("A2", "=A5"); + sheet.set("A1", "=A2"); + sheet.set("A2", "=A1"); String result = sheet.evaluate("A2"); assertEquals("#Circular", result); } From 56f584bc664a60fbf7367f5e2fd6de9379d0d92d Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:06:05 +0300 Subject: [PATCH 110/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 3610 -> 3634 bytes tests/SpreadsheetTest.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index d7eb8dd..1140406 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -266,3 +266,4 @@ RefactoringAction 1476273932289 SpreadsheetTest.java RENAME testAssignment_A2_Re RefactoringAction 1476273934302 SpreadsheetTest.java RENAME testAssignment_A2_Reference_Invalid_Error()=>void testAssignment_Reference_Invalid_Error() METHOD EditAction 1476273944127 SpreadsheetTest.java 3034 17 51 16 EditAction 1476273959271 SpreadsheetTest.java 3062 17 52 16 +EditAction 1476273965763 SpreadsheetTest.java 3062 17 52 16 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index d056fc73a05eaa445a7f3e6cdce1beb94b5196cc..9461e545eeea1da4df0de8db1171b5558c34024a 100644 GIT binary patch delta 113 zcmbOwvq^^Q)W2Q(7#J8#7*aQKZDnO=wskb(U`X1$m-QR_Qp@u<}p_W0Kp>Fa+c6s(hpl&9HBml}i6+-|3 diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 2054779..57782ee 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -123,7 +123,7 @@ public void testAssignment_Reference_Invalid_Error() { public void testAssignment_Reference_Circular_Error() { sheet.set("A1", "=A2"); sheet.set("A2", "=A1"); - String result = sheet.evaluate("A2"); + String result = sheet.evaluate("A1"); assertEquals("#Circular", result); } } From fa0e91c37e4896c96a485033e613b721045c9369 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:07:23 +0300 Subject: [PATCH 111/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/SpreadsheetTest.class | Bin 3634 -> 3634 bytes src/Spreadsheet.java | 2 ++ 3 files changed, 5 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 1140406..bb1d607 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -267,3 +267,6 @@ RefactoringAction 1476273934302 SpreadsheetTest.java RENAME testAssignment_A2_Re EditAction 1476273944127 SpreadsheetTest.java 3034 17 51 16 EditAction 1476273959271 SpreadsheetTest.java 3062 17 52 16 EditAction 1476273965763 SpreadsheetTest.java 3062 17 52 16 +UnitTestCaseAction 1476273967822 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476273967823 SpreadsheetTest.java FAIL +EditAction 1476274043348 Spreadsheet.java 2357 3 6 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 9461e545eeea1da4df0de8db1171b5558c34024a..8bad274b9173cf85b97b48eb1b858188d145ff78 100644 GIT binary patch delta 13 Ucmdlavq@&d171d{$q#u00Va|KCjbBd delta 15 Xcmdlavq@&d1K!CAJZzJn@%jJ&G$sZS diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 402d7da..2eeb0a9 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -84,6 +84,8 @@ public String evaluate(String cell) { if (value.length() > 0 && value.charAt(0) == '&') { String key = value.substring(1, value.length()); if (mValues.containsKey(key)) { + String refValue = (String) mValues.get(key); + if (value.equals(anObject)) return (String) mValues.get(key); } else { return ERROR; From eb3d29fdab3d71330670acd58c2075b1464865bc Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:08:31 +0300 Subject: [PATCH 112/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 12 ++++++++++++ bin/Spreadsheet.class | Bin 2230 -> 2372 bytes src/Spreadsheet.java | 8 ++++++-- tests/SpreadsheetTest.java | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index bb1d607..32a9f42 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -270,3 +270,15 @@ EditAction 1476273965763 SpreadsheetTest.java 3062 17 52 16 UnitTestCaseAction 1476273967822 SpreadsheetTest.java FAIL UnitTestSessionAction 1476273967823 SpreadsheetTest.java FAIL EditAction 1476274043348 Spreadsheet.java 2357 3 6 0 +CompilationAction 1476274043459 Spreadsheet.java +RefactoringAction 1476274060140 Spreadsheet.java ADD String ERROR/2 FIELD +RefactoringAction 1476274062156 Spreadsheet.java RENAME ERROR/2=>String CIRCULAR FIELD +CompilationAction 1476274088659 Spreadsheet.java +CompilationAction 1476274088808 Spreadsheet.java +CompilationAction 1476274088808 Spreadsheet.java +CompilationAction 1476274102405 Spreadsheet.java +CompilationAction 1476274102406 Spreadsheet.java +UnitTestCaseAction 1476274104216 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476274104216 SpreadsheetTest.java FAIL +RefactoringAction 1476274110911 SpreadsheetTest.java RENAME testAssignment_Reference_Circular_Error()=>void testAssignment_Reference_Circular() METHOD +EditAction 1476274111450 SpreadsheetTest.java 3056 17 52 16 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 061a2616bef211bc222d3d76d51a1337f5442583..5670a31af0267d8f7dbe1b7a127a7b88c5896478 100644 GIT binary patch literal 2372 zcma)8ZEsU$7`~qM^o4RpOIbTM9mvbpZFCfH4!S{cD?XoAvi^I0a3YjrWMqzHKQ4(hy=V&@TkroIvss)-8 z#X{NC3Z_+y2h9SmU8AK^u_WM0B-4q>)NtAZKg-#bFiP1G4g^(fM!=0$fz1sqc@aWz0|eStIN=iTrHq0;UYVcKOJ}v2JlhPUidii`rIif1 zuL%`1XAq?3R2`;l%Q2@D#IEkfu6i0ptTC(S^Yki9ukbovjZQsNUUVYtM%PpGv%yx; zjUFPA*9&uI&O#z7&G)E?ppS}dPAd&Fm(rc=Nk~mp#XjsOkmbru*&3KYs5_Zlr(8E) z6li@y89U`j#mLXVL>m<3iPdK+R%F~ z)sPGkS8)_ClMZIlu0x=ud!3@?d`DCyaExdyRM`5V`dl{c>p5DJ)Q75xNZPCNY!ED? zoGh67oKDt>3w#VdNj_OV39=$%YS}A1Fg3Dxbm^#>q+XK;_^t-HAcs1o;+(X1>2FlDJZb8{dMa^33xNbN-3)!HzdLR zbsXL+=ZhUY5DwlP^5LoA&dpU5JZQrPc)8zb?N#nK)$M&ysN-qldkZZ_7(wvc-+Lb| zy$=wYzK^Y6q3sLH`#HWh)$%Cx^l|+>WvcCi4s7F25Uv+$@do(aBz?uQd_zW%)q(X$ z&ycOHc}j~NR&@e9vCEF(Xk#W9!`_WlvHO-%ewQ=&mA}5k64>3SRs~W zPJC7?={B}Mz=7#N|9uRsSyd6M;s~v-S+?)ks8|?Ss9?v_{RM1Kh1kdplA9`tS$#;!i~J z7q6Fxyz5%fFIsu6wd0@&^FoUwCQf2djA2Ne#u1T0TukDqxX61bi(yg3h$!)%c^9MN zJscPBQ}+Q*it9KfKEj0f6sIkcUg8lV{Z>iJl}%D98zo(vSn(Nl_6mDnWS1w{p<-2k z5~tu~&V;QM=Ml5D%)b+smPh~t*!mDjXV}^C2yP+%=D)t?6(~(B@c38Y>~uz*HAQGm zv0@#hv9+W2h}oTtHE)fhit+EzIVSma3m0v2bS>h{8h^&6Szi@rZXi}$N{>N{g}2bQ z=HhFUqRAT^wQsr3k{n%*$Wv_(yq7?Lx1Neg0yV{Po#R-}^U|N@=K?PAlf!Gcf~*B< zzg_GqsF<&TszR%Q8pbjD%O35qcA&INdy3Hy z#u)qoCYlIF7(%i{zhI)Bk;M4P#Md9-2S1yb_ydNh*Kr>)`zb2`UjBI!cb%uSj_Tb-*y-I=r5iu&}L&JnyeYq3>b-L=?z zYDL7DwQ@Onm6TU>9j{uap2-k8urq+pC#K}J)W9xuu@gBfKkLl7ok%J3ZUa5&r6N0L z7KfQj?@sk3l_qAO4|_PhQhB=Mjz!Sgol30(H-Not(_>BKWV!uGTLWtv_ z>i6@4mUZe;=;JtK;4lUV$DE(H@-u?I^-ODOucjJQAqEW$;iw?!6g(V)=I(VstN9)? za2&(z#(bHjA6}cwBllV+RwZjgRYj!cHFX2nEW4D-JJzg4*2zm;Hdl%(%atT6GLD(O z!fR0_OVCn|rb9Y5A#LDUj6Ow@|IVsh#todqd0x|OA@7)WzI4`lo@#ow5~$!)sW&M@z%IkHc#Dm8*Sch?;T{l-N0Q;=?T4G zU&Ovxi-OYcZ_)Jy)VKJHPw&yID!%lA?*`4*5ImST z1AFi%b3Nn()r!SV?yr6`cJR9ixh0w@6F(%5*Ity2_t1W!6{0*bOvRx5|UeyB||` z)f?kB_uZJ_4Zpxd7de1Q?8hY}Foj{f>b9rXOS{q@mg=>~z@ch;qSQ^WQJPz91ALE= R2%v+%Wj0TcVLl%&{0o1O)lL8a diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 2eeb0a9..c9de579 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -4,6 +4,7 @@ public class Spreadsheet { HashMap mValues = new HashMap(); final public static String ERROR = "#Error"; + final public static String CIRCULAR = "#Circular"; public String get(String cell) { // to be implemented @@ -85,8 +86,11 @@ public String evaluate(String cell) { String key = value.substring(1, value.length()); if (mValues.containsKey(key)) { String refValue = (String) mValues.get(key); - if (value.equals(anObject)) - return (String) mValues.get(key); + if (value.length() > 0 && value.charAt(0) == '&' && refValue.equals(value)) { + return CIRCULAR; + } else { + return (String) mValues.get(key); + } } else { return ERROR; } diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 57782ee..a55ca5d 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -120,7 +120,7 @@ public void testAssignment_Reference_Invalid_Error() { } @Test - public void testAssignment_Reference_Circular_Error() { + public void testAssignment_Reference_Circular() { sheet.set("A1", "=A2"); sheet.set("A2", "=A1"); String result = sheet.evaluate("A1"); From 4cf9d9258f025b76f1ba74698cef964a258b8d6a Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:08:41 +0300 Subject: [PATCH 113/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 3634 -> 3628 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 32a9f42..bd22426 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -282,3 +282,4 @@ UnitTestCaseAction 1476274104216 SpreadsheetTest.java FAIL UnitTestSessionAction 1476274104216 SpreadsheetTest.java FAIL RefactoringAction 1476274110911 SpreadsheetTest.java RENAME testAssignment_Reference_Circular_Error()=>void testAssignment_Reference_Circular() METHOD EditAction 1476274111450 SpreadsheetTest.java 3056 17 52 16 +EditAction 1476274121234 Spreadsheet.java 2506 3 6 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 8bad274b9173cf85b97b48eb1b858188d145ff78..3db0cc745663a53df5fabe94ffdcb8bc1ebe15de 100644 GIT binary patch delta 22 ecmdlavqomaBvwYn$%(9zlh?3vY~ICM!2tkR@dr=< delta 28 kcmZ1@vq@&dBvwZC$%(9zlh?3vu*SO<73FW<%v#9-0Ern1OaK4? diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index c9de579..637d942 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -89,7 +89,7 @@ public String evaluate(String cell) { if (value.length() > 0 && value.charAt(0) == '&' && refValue.equals(value)) { return CIRCULAR; } else { - return (String) mValues.get(key); + return (String) mValues.get(refValue); } } else { return ERROR; From 4819c7cd43d06bfec96e14061261c68b1e266257 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:09:00 +0300 Subject: [PATCH 114/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2372 -> 2373 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index bd22426..86239da 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -283,3 +283,6 @@ UnitTestSessionAction 1476274104216 SpreadsheetTest.java FAIL RefactoringAction 1476274110911 SpreadsheetTest.java RENAME testAssignment_Reference_Circular_Error()=>void testAssignment_Reference_Circular() METHOD EditAction 1476274111450 SpreadsheetTest.java 3056 17 52 16 EditAction 1476274121234 Spreadsheet.java 2506 3 6 0 +UnitTestCaseAction 1476274123534 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476274123535 SpreadsheetTest.java FAIL +EditAction 1476274140201 Spreadsheet.java 2484 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 5670a31af0267d8f7dbe1b7a127a7b88c5896478..f2a41bcbb7ebedd9e4974b4feb0d304eaf8350af 100644 GIT binary patch delta 157 zcmX>ibW~`A4TtqV24)6U1_p*att||a+S?fX4ltTF|Bna2>L!@P|_OF(S_Ly!&& zNN5{_o*zh=?ly+NnG9Bw%Q^IzBv~de0UBijF_1x)K@P|R8qJ`{ tz{SAGz{8Nl;0k0hF{lIS2q24@!Ja{DvJ|HbAI~qKFe5`0P&pGrGytKX93lV! delta 156 zcmX>qbVO)_4Ttq#24)6U1_p*)tt||a+S?fX4ltTF|Bna2>V!@P|_OF(S_L!b@| zNN5{_o*zh=?ly+NnGBYb%Q^HIbtf<9u(Zx#h-b)VNM?`$nq&eok3p6}4#)$V%%I4? t#lXnG!;r|}3S==cs57`QL;zXL4E79~lchOj__%)og&7&5fXbN|q5+VA93}t& diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 637d942..94f8711 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -89,7 +89,7 @@ public String evaluate(String cell) { if (value.length() > 0 && value.charAt(0) == '&' && refValue.equals(value)) { return CIRCULAR; } else { - return (String) mValues.get(refValue); + return refValue; } } else { return ERROR; From 73ec07bd3c0d581b08e3fd138b8e78a9448b3ab0 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:09:18 +0300 Subject: [PATCH 115/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2373 -> 2363 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 86239da..4bdcca2 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -286,3 +286,6 @@ EditAction 1476274121234 Spreadsheet.java 2506 3 6 0 UnitTestCaseAction 1476274123534 SpreadsheetTest.java FAIL UnitTestSessionAction 1476274123535 SpreadsheetTest.java FAIL EditAction 1476274140201 Spreadsheet.java 2484 3 6 0 +UnitTestCaseAction 1476274141633 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476274141633 SpreadsheetTest.java FAIL +EditAction 1476274158723 Spreadsheet.java 2490 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f2a41bcbb7ebedd9e4974b4feb0d304eaf8350af..e04ba357a6de6c7b9e9eb8ec6e201b229747a676 100644 GIT binary patch delta 157 zcmX>qv|DI{4Ttp?24)6U1_p){tt||a+S?fX4ltTF|Bna2>M!@P|_OF(S_gNF_a zNN5{_o*zh=?ly+NnG6P#%Q>`|Bv~e}TF|Bna2>L!@P|_OF(S_Ly!&& zNN5{_o*zh=?ly+NnG9Bw%Q>`oKzvCSh`z~-IgG6{8R8jo7?K%efQFhtjAoE!kOT67 xmM|zXa4|44@GvAXxB^*B4C+8S0?1-!uxHSkEXXOt$MXv)%*YT0RL;Z@4FFZQ9_;`C diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 94f8711..ed3c938 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -86,7 +86,7 @@ public String evaluate(String cell) { String key = value.substring(1, value.length()); if (mValues.containsKey(key)) { String refValue = (String) mValues.get(key); - if (value.length() > 0 && value.charAt(0) == '&' && refValue.equals(value)) { + if (refValue.length() > 0 && refValue.charAt(0) == '&' && refValue.equals(value)) { return CIRCULAR; } else { return refValue; From 12ed03964483c48b19c69b4655cb442a5abaeeac Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:10:03 +0300 Subject: [PATCH 116/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2363 -> 2365 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 4bdcca2..6934424 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -289,3 +289,6 @@ EditAction 1476274140201 Spreadsheet.java 2484 3 6 0 UnitTestCaseAction 1476274141633 SpreadsheetTest.java FAIL UnitTestSessionAction 1476274141633 SpreadsheetTest.java FAIL EditAction 1476274158723 Spreadsheet.java 2490 3 6 0 +UnitTestCaseAction 1476274160019 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476274160019 SpreadsheetTest.java FAIL +EditAction 1476274203034 Spreadsheet.java 2492 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index e04ba357a6de6c7b9e9eb8ec6e201b229747a676..288cc5b544936c9a5a48a744abd98f6d8247690e 100644 GIT binary patch delta 204 zcmXYqF$+Oq7=<7Aej*tp%N2@TipwCANGXfBMFuXB$mXBeOcwbG27QZ^Uu7`Jdr@b2 z-t(T*xyA4COEWxrViE+lr7Koh<36wljwXL%?3kKTtZ=61DBsdlT|ZXQ43E_Q=r;qLTF|Bna2>M!@P|_OF(S_gNF_a zNN5{_o*zh=?ly+NnG6O{CP;@BSbiRZq|W3%4yW8mhA4&@AdCmXB!*-L8K4Cw5NjA@ z8RURGpoI*I3|tJ13_J`G46Z;H6N5T~HIU5(bdWuR0z)K_#lqkNR4Ky1{Es1qok10X Relais5m09oP>zWq8UQNyBgp^& diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index ed3c938..2a51844 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -86,7 +86,7 @@ public String evaluate(String cell) { String key = value.substring(1, value.length()); if (mValues.containsKey(key)) { String refValue = (String) mValues.get(key); - if (refValue.length() > 0 && refValue.charAt(0) == '&' && refValue.equals(value)) { + if (refValue.length() > 0 && refValue.charAt(0) == '&' && refValue.equals(mValues)) { return CIRCULAR; } else { return refValue; From 6de544684b3480cc75ec2b51af7661a60aec7fd0 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:10:16 +0300 Subject: [PATCH 117/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2365 -> 2368 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 6934424..f80ef34 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -292,3 +292,6 @@ EditAction 1476274158723 Spreadsheet.java 2490 3 6 0 UnitTestCaseAction 1476274160019 SpreadsheetTest.java FAIL UnitTestSessionAction 1476274160019 SpreadsheetTest.java FAIL EditAction 1476274203034 Spreadsheet.java 2492 3 6 0 +UnitTestCaseAction 1476274205628 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476274205628 SpreadsheetTest.java FAIL +EditAction 1476274216667 Spreadsheet.java 2489 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 288cc5b544936c9a5a48a744abd98f6d8247690e..e537c6bb9b758bc5fe5dd6e2c1ec51c6b65e45c4 100644 GIT binary patch delta 219 zcmXwzO$z~G6onr%uSgb}Y^G4kP-9qOA;rcHW#yYDN)~>N6$|+Z7J7GT{uT?l~5FyEet~i4d9me8J+Bi(a XDSDDjW4`cXIA1+6L_$vGW-xmLDG(;_ delta 216 zcmXwyOA7&E6owx&pGb;iGeVI|jbR~Kh^%acQWkEFM0S3Sl?C|;7W#H-ewBrVoN=kM zc+NTR)9WSfiEBITJ}?OaJNt%J(TqHbLq}6MGjU9f9WPzzJIX(4Y9l{Z)r^nSf9M-6 zWvP#oveaLSS;{$_!p;4HIW9}qtk|+4Ep?4=DH*b|Nj*6t1c*wuCuC5j!&JzmOP-mK XVj#&R<_kAO@jFip88PSbGg!O 0 && refValue.charAt(0) == '&' && refValue.equals(mValues)) { + if (refValue.length() > 0 && refValue.charAt(0) == '&' && refValue.equals(cell)) { return CIRCULAR; } else { return refValue; From 12e9d48e805507c460df24bde3dddd0dd73d0dcf Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:10:25 +0300 Subject: [PATCH 118/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2368 -> 2365 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index f80ef34..27c9c56 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -295,3 +295,6 @@ EditAction 1476274203034 Spreadsheet.java 2492 3 6 0 UnitTestCaseAction 1476274205628 SpreadsheetTest.java FAIL UnitTestSessionAction 1476274205628 SpreadsheetTest.java FAIL EditAction 1476274216667 Spreadsheet.java 2489 3 6 0 +UnitTestCaseAction 1476274217664 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476274217664 SpreadsheetTest.java FAIL +EditAction 1476274225571 Spreadsheet.java 2495 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index e537c6bb9b758bc5fe5dd6e2c1ec51c6b65e45c4..5ba0e271bf369f6a63f948f8cc0e46909914ed07 100644 GIT binary patch delta 216 zcmXwyOA7&E6owx&pGb-(n-Pj!Y77g>LS$tll(KMZB(n2stSrb+u+XqwAEjV*{Zxhh8w#%GdvcoSh8VFO6uz0Qqp8(lX|j52oRNQSID45n~9J~ha6KO XMPHH$%okpW!grn+GGfl;XE1*QYak`? delta 219 zcmXwzO$z~G6onr%uSgb}Y^G4kP-9qOA;rcHW#yYDN)~>N6$|+Z7J7GT{uT?l~5FyEet~i4d9me8J+Bi(a XDSDDjW4`cXIA1+6L_$vGW-xmLDG(;_ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 899ca8e..de0c514 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -86,7 +86,7 @@ public String evaluate(String cell) { String key = value.substring(1, value.length()); if (mValues.containsKey(key)) { String refValue = (String) mValues.get(key); - if (refValue.length() > 0 && refValue.charAt(0) == '&' && refValue.equals(cell)) { + if (refValue.length() > 0 && refValue.charAt(0) == '&' && refValue.equals("&" + cell)) { return CIRCULAR; } else { return refValue; From e2f5d5a0e1d5024447d1e07aae97158394e7688d Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:11:17 +0300 Subject: [PATCH 119/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 + .../20161012141626179/besouroEpisodes.txt | 56 ++++++++++++++++++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012141626179/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 2365 -> 2380 bytes src/Spreadsheet.java | 5 +- 6 files changed, 63 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 27c9c56..7909fdc 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -298,3 +298,6 @@ EditAction 1476274216667 Spreadsheet.java 2489 3 6 0 UnitTestCaseAction 1476274217664 SpreadsheetTest.java FAIL UnitTestSessionAction 1476274217664 SpreadsheetTest.java FAIL EditAction 1476274225571 Spreadsheet.java 2495 3 6 0 +UnitTestCaseAction 1476274226787 SpreadsheetTest.java OK +UnitTestSessionAction 1476274226787 SpreadsheetTest.java OK +EditAction 1476274277483 Spreadsheet.java 2468 3 4 0 diff --git a/.besouro/20161012141626179/besouroEpisodes.txt b/.besouro/20161012141626179/besouroEpisodes.txt index f50de7c..2a63c19 100644 --- a/.besouro/20161012141626179/besouroEpisodes.txt +++ b/.besouro/20161012141626179/besouroEpisodes.txt @@ -2506,3 +2506,59 @@ 1476273876087 test-first 3 222 true 1476273876088 test-first 3 222 true 1476273876089 test-first 3 222 true +1476274226787 test-first 3 325 true +1476274226788 test-first 3 325 true +1476274226789 test-first 3 325 true +1476274226790 test-first 3 325 true +1476274226791 test-first 3 325 true +1476274226792 test-first 3 325 true +1476274226793 test-first 3 325 true +1476274226794 test-first 3 325 true +1476274226795 test-first 3 325 true +1476274226796 test-first 3 325 true +1476274226797 test-first 3 325 true +1476274226798 test-first 3 325 true +1476274226799 test-first 3 325 true +1476274226800 test-first 3 325 true +1476274226801 test-first 3 325 true +1476274226802 test-first 3 325 true +1476274226803 test-first 3 325 true +1476274226804 test-first 3 325 true +1476274226805 test-first 3 325 true +1476274226806 test-first 3 325 true +1476274226807 test-first 3 325 true +1476274226808 test-first 3 325 true +1476274226809 test-first 3 325 true +1476274226810 test-first 3 325 true +1476274226811 test-first 3 325 true +1476274226812 test-first 3 325 true +1476274226813 test-first 3 325 true +1476274226814 test-first 3 325 true +1476274226815 test-first 3 325 true +1476274226816 test-first 3 325 true +1476274226817 test-first 3 325 true +1476274226818 test-first 3 325 true +1476274226819 test-first 3 325 true +1476274226820 test-first 3 325 true +1476274226821 test-first 3 325 true +1476274226822 test-first 3 325 true +1476274226823 test-first 3 325 true +1476274226824 test-first 3 325 true +1476274226825 test-first 3 325 true +1476274226826 test-first 3 325 true +1476274226827 test-first 3 325 true +1476274226828 test-first 3 325 true +1476274226829 test-first 3 325 true +1476274226830 test-first 3 325 true +1476274226831 test-first 3 325 true +1476274226832 test-first 3 325 true +1476274226833 test-first 3 325 true +1476274226834 test-first 3 325 true +1476274226835 test-first 3 325 true +1476274226836 test-first 3 325 true +1476274226837 test-first 3 325 true +1476274226838 test-first 3 325 true +1476274226839 test-first 3 325 true +1476274226840 test-first 3 325 true +1476274226841 test-first 3 325 true +1476274226842 test-first 3 325 true diff --git a/.besouro/20161012141626179/randomHeuristicEpisodes.txt b/.besouro/20161012141626179/randomHeuristicEpisodes.txt index 862d8a0..8de2405 100644 --- a/.besouro/20161012141626179/randomHeuristicEpisodes.txt +++ b/.besouro/20161012141626179/randomHeuristicEpisodes.txt @@ -4,3 +4,4 @@ 1476272036858 test-first 3 204 true 1476273633109 test-first 3 1573 true 1476273876066 test-first 3 222 true +1476274226787 test-first 3 325 true diff --git a/.besouro/20161012141626179/zorroEpisodes.txt b/.besouro/20161012141626179/zorroEpisodes.txt index 19a8175..6b2d4bc 100644 --- a/.besouro/20161012141626179/zorroEpisodes.txt +++ b/.besouro/20161012141626179/zorroEpisodes.txt @@ -4,3 +4,4 @@ 1476272036858 test-first 3 208 true 1476273633109 test-first 3 1596 true 1476273876066 test-first 3 242 true +1476274226787 test-first 3 350 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 5ba0e271bf369f6a63f948f8cc0e46909914ed07..efef8e51e2418e93335f96d4bf6836fb685409fe 100644 GIT binary patch delta 249 zcmXwzK}!Nr6oo%$o+TnE4>u1|5S%2Pf}z+cotyrTwZaqhYIyPUP&Xxq)ar_w0Wz+3$b({PM_3GPBi^^#rf`k6>L_&^b H=P}sc!BR{Y;xdUU{)RdxyBRyMrCrx$e#VVT7p4tyR zqp2+QaT1pLOA$+zcc)-u>*6qH#*zhVRwSja{w*a%S~jUCLkJ&X$##VdinN&snRLi9 Y6;kvi8OMAv50L-P6GKK!M}7wG8-0o<2mk;8 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index de0c514..4dc9afd 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -7,8 +7,7 @@ public class Spreadsheet { final public static String CIRCULAR = "#Circular"; public String get(String cell) { - // to be implemented - return null; + return (String) mValues.get(cell);; } public void set(String cell, String value) { @@ -80,7 +79,7 @@ public void set(String cell, String value) { } public String evaluate(String cell) { - String value = (String) mValues.get(cell); + String value = if (value.length() > 0 && value.charAt(0) == '&') { String key = value.substring(1, value.length()); From ec2abea58dacdc2a8dc648097c9441656ccdc7d1 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:13:51 +0300 Subject: [PATCH 120/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 5 +++++ bin/Spreadsheet.class | Bin 2380 -> 2398 bytes src/Spreadsheet.java | 10 +++++++--- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 7909fdc..e939b63 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -301,3 +301,8 @@ EditAction 1476274225571 Spreadsheet.java 2495 3 6 0 UnitTestCaseAction 1476274226787 SpreadsheetTest.java OK UnitTestSessionAction 1476274226787 SpreadsheetTest.java OK EditAction 1476274277483 Spreadsheet.java 2468 3 4 0 +CompilationAction 1476274277602 Spreadsheet.java +CompilationAction 1476274277602 Spreadsheet.java +CompilationAction 1476274290640 Spreadsheet.java +CompilationAction 1476274290641 Spreadsheet.java +EditAction 1476274431229 Spreadsheet.java 2542 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index efef8e51e2418e93335f96d4bf6836fb685409fe..1abe568768132ac276ada46b0038385ae7e89abb 100644 GIT binary patch delta 1215 zcmZ9LUrZcT6vlsNW_Fis#)4Y}mlj%J`LlGkKnt`B-7QF~1-rCBDXgtc5DnN?no^>P zF|IM{downXHUgCpWj7w6qI zNe?9Gu-StngfG6fIKR9gnC;1tC<*r3bke1cxrN!Kp=H5pA4v{-o_#j^>2Z@roAkNk z#?H!vg0x2IrQhah2Hbayx{6*hHdzk4tHyvDLpIMb?EY%BhL74j&kOET=0`DM!fSK4 z*YGKuDNehO%=U@|Gd6iOw#=UkgBbdO-SHLiJw+P7C$Xuv!46%+h^|p~>RJ=TQBQ+f znnA02v^Uyl*L6FXaV*V2Hk=~KRr%O4i=?VD>r&|*ShpnNSl&t7I-QPpRIpwx*>#>7 zx<$+h`LTN5ox3d)F5(Fs4gA#kVGs10^qH<=4|=?(H$*6Oov)9pNC z6%A7E51~{cdGnu#^($04mRH;_&8Bx5pO}V^-ESy^gxPjRqOew>0Z*CGLjm;Zt_AK_g$##5bCGmll3h zG9M_BkJR^zN_PG+4!@D&clPp!7WjWQk#Uk0bIvN99BHU1dbBF)E)hCZBP_y&9>_1v*mIa7-0tXoKSlVpO57 zE2tM0jHS&slVgmKRu~SvGDAA>YPF`ot2h1`$rMg13}2CAYHmnJb)`eaJ)U#!ao%Hi zRR!T|vvr+(na(k9)TttqD-4yk-h1e`;>wHWB;(e9NeywUEC;>WlR=T`6(y{4Gwyy_ zQB#=EmvBnQKBeP5O&8N-m{CIVT;L3gO3!6p@n2R?&|&#yT`9e+FmIG5(xNkXNoQl~ g9o?E8Ra7SwRW;@o7a}Br|1S*v75P~-z~JS70p9@Q0RR91 delta 1248 zcmZ9L-%lJ>6vsbjXBM{W80eNCT@)&m-DS(r1&Xu_vgJox3tcD_DbNxPp$*VbGzgmb z;2NX8o3V-1*lwjsqkU+bnAOX8ed&mT%NaRA}N$C zon4+^T@Z|>%@#H-3d}9cuJo-6X47DDz(rCPt+Y8afrPzJsDARo{Ps;X=&J?#bId>bpO2iIs z0(*zA$%%-iYxeQvhOJwk$Zqtq>wLK7GSz<6dWAVZN^dZ2X3S3W8f|u^%cV0|X_|SS zcK!&)a*bF1y;r+Vxox@}3Md0^x_9zL@yW~Vx=s6Zq~j|(x3UVP3-oB#dtUC_zHCpV zC!6}m`A7UpQ^mV4jCfT?&CGVgCD!^sv5U^{!Gz1|e(gm{G;Pn9M4Odc-{dVFf#D75 z4s9BjQA#;cHOFoubm=&bP{AOTWZB8fiY!pWs#d(I<9tgk@d?lIsSa^N2Y6kpzNV4e z#JNj?AJxb|DfXNCHur!Q96dBsd@$(lSJs4AU*6^vF0F znc$$DrdQ_ZlUM1N6%NTe9F})EBJV5qAwzP3WAZV_fHggXT zYZOqlDkJ??XFt<5*0n%#+&fNp0$s{=Czi;}qwa;Wb|2b>_U5bodN6Tf$oL$Fo>0b|j%Q lp3>eJdPkey5>{1NRaJrUi1Vey{O@l9`l<3$XhML~{{dyo=t=+p diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 4dc9afd..e4334a5 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -1,13 +1,16 @@ import java.util.HashMap; public class Spreadsheet { + private class Value { + String value; + } HashMap mValues = new HashMap(); final public static String ERROR = "#Error"; final public static String CIRCULAR = "#Circular"; public String get(String cell) { - return (String) mValues.get(cell);; + return (String) mValues.get(cell); } public void set(String cell, String value) { @@ -48,6 +51,7 @@ public void set(String cell, String value) { } else if (value.charAt(1) != '\'') { value = "&" + value.substring(1, value.length()); + } else { value = ERROR; } @@ -79,9 +83,9 @@ public void set(String cell, String value) { } public String evaluate(String cell) { - String value = + String value = get(cell); - if (value.length() > 0 && value.charAt(0) == '&') { + if (value != null && value.length() > 0 && value.charAt(0) == '&') { String key = value.substring(1, value.length()); if (mValues.containsKey(key)) { String refValue = (String) mValues.get(key); From 7dca10ec9793af9902c0dd2211e1300e97ec6c33 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:15:29 +0300 Subject: [PATCH 121/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 11 +++++++++++ bin/.gitignore | 2 ++ bin/Spreadsheet.class | Bin 2398 -> 2507 bytes src/Spreadsheet.java | 13 ++++++++++--- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index e939b63..3bbfeca 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -306,3 +306,14 @@ CompilationAction 1476274277602 Spreadsheet.java CompilationAction 1476274290640 Spreadsheet.java CompilationAction 1476274290641 Spreadsheet.java EditAction 1476274431229 Spreadsheet.java 2542 3 6 0 +RefactoringAction 1476274435081 Spreadsheet.java ADD int type FIELD +RefactoringAction 1476274445105 Spreadsheet.java ADD ValueType ENUm FIELD +RefactoringAction 1476274459123 Spreadsheet.java REMOVE ENUm FIELD +RefactoringAction 1476274461646 Spreadsheet.java ADD ValueType VALUE FIELD +RefactoringAction 1476274464664 Spreadsheet.java ADD ValueType REFERENCE FIELD +CompilationAction 1476274469635 Spreadsheet.java +CompilationAction 1476274469635 Spreadsheet.java +RefactoringAction 1476274471688 Spreadsheet.java ADD ValueType type FIELD +CompilationAction 1476274474622 Spreadsheet.java +CompilationAction 1476274474623 Spreadsheet.java +EditAction 1476274529761 Spreadsheet.java 2610 3 6 0 diff --git a/bin/.gitignore b/bin/.gitignore index 2079672..6c34792 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,2 +1,4 @@ /Spreadsheet.class /SpreadsheetTest.class +/Spreadsheet$Value.class +/Spreadsheet$ValueType.class diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 1abe568768132ac276ada46b0038385ae7e89abb..f5fef91e82af5a2d8f7d86738396a66b02d116ab 100644 GIT binary patch delta 396 zcmZXQ+bhFy7{)*E+N>=pr!a?_L(ZWbmb1-ib6VMy^Je>r%&<-3hLk^mrIg%|D_6J? z<(`#4z{RdyDCHke^5s_V#rxLhdFpxIWJV&>{QQ0Y2sENyn{9fpkm?MFwTL6+k4Ckq z5ucDgz8=y1!RV5v#Y!jqp-oLN{B0uvA^RWpY_BVc=}+=|$L;z}NsHg<2PEsp@Fu&t z7|By(p@e)|DWIQ1oD?yPl{t!8QY1zxTa>Xw1*cSUMim!Sb43kz)bc@g<$xaB~xLp*YfS5BCebEa-Djm=UvOA7O-F#P83>cTx1x^Rg=1fiT$yu1R^E1g=%^eQ z71U5kGgZX!FpifbJ|^*#rJ4;x_Xu!6Er--`MLpLva7!b1H1S}TPXu|Pg#sbo411@Q zB5i!q&KDhg)5R~{^3fwdVFidNM6VLVM3tgXQ^b^}UvtD|lTd~Mtuv@?hP2Cwjv3Vn zV>&hLjHJ#<>5^&PFq8jrMHHN+lzC%l8 mValues = new HashMap(); + + HashMap mValues = new HashMap(); final public static String ERROR = "#Error"; final public static String CIRCULAR = "#Circular"; - public String get(String cell) { - return (String) mValues.get(cell); + public Value get(String cell) { + return (Value) mValues.get(cell); } public void set(String cell, String value) { From b9a90ad8f67b4f7e70705ee503140097fbbbe035 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:22:43 +0300 Subject: [PATCH 122/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 144 +++++++++++++++++++++++++ src/Spreadsheet.java | 17 +-- 2 files changed, 153 insertions(+), 8 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 3bbfeca..9352eef 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -317,3 +317,147 @@ RefactoringAction 1476274471688 Spreadsheet.java ADD ValueType type FIELD CompilationAction 1476274474622 Spreadsheet.java CompilationAction 1476274474623 Spreadsheet.java EditAction 1476274529761 Spreadsheet.java 2610 3 6 0 +CompilationAction 1476274529904 Spreadsheet.java +CompilationAction 1476274529904 Spreadsheet.java +CompilationAction 1476274529905 Spreadsheet.java +RefactoringAction 1476274562035 Spreadsheet.java REMOVE evaluate(String) METHOD +RefactoringAction 1476274570075 Spreadsheet.java ADD String evaluate(String) METHOD +RefactoringAction 1476274594244 Spreadsheet.java REMOVE evaluate(String) METHOD +RefactoringAction 1476274597261 Spreadsheet.java ADD String evaluate(String) METHOD +RefactoringAction 1476274646112 Spreadsheet.java ADD Value() METHOD +RefactoringAction 1476274646113 Spreadsheet.java ADD HashMap mValues FIELD +RefactoringAction 1476274646113 Spreadsheet.java ADD String ERROR FIELD +RefactoringAction 1476274646115 Spreadsheet.java ADD String CIRCULAR FIELD +RefactoringAction 1476274646115 Spreadsheet.java ADD Value get(String) METHOD +RefactoringAction 1476274646116 Spreadsheet.java ADD void set(String, String) METHOD +RefactoringAction 1476274646117 Spreadsheet.java ADD String evaluate(String) METHOD +RefactoringAction 1476274647628 Spreadsheet.java RENAME Value()=>Value(String) METHOD +RefactoringAction 1476274654149 Spreadsheet.java RENAME Value(String)=>Value(String, ValueType) METHOD +CompilationAction 1476274661994 Spreadsheet.java +CompilationAction 1476274661995 Spreadsheet.java +CompilationAction 1476274661996 Spreadsheet.java +CompilationAction 1476274662186 Spreadsheet.java +CompilationAction 1476274662187 Spreadsheet.java +CompilationAction 1476274662187 Spreadsheet.java +CompilationAction 1476274662187 Spreadsheet.java +CompilationAction 1476274662187 Spreadsheet.java +CompilationAction 1476274662188 Spreadsheet.java +CompilationAction 1476274662188 Spreadsheet.java +CompilationAction 1476274662188 Spreadsheet.java +CompilationAction 1476274662188 Spreadsheet.java +CompilationAction 1476274662189 Spreadsheet.java +CompilationAction 1476274662189 Spreadsheet.java +CompilationAction 1476274662189 Spreadsheet.java +CompilationAction 1476274663677 Spreadsheet.java +CompilationAction 1476274663678 Spreadsheet.java +CompilationAction 1476274663679 Spreadsheet.java +CompilationAction 1476274663679 Spreadsheet.java +CompilationAction 1476274663680 Spreadsheet.java +CompilationAction 1476274663680 Spreadsheet.java +CompilationAction 1476274663681 Spreadsheet.java +CompilationAction 1476274663681 Spreadsheet.java +CompilationAction 1476274663682 Spreadsheet.java +CompilationAction 1476274663682 Spreadsheet.java +CompilationAction 1476274663683 Spreadsheet.java +CompilationAction 1476274663840 Spreadsheet.java +CompilationAction 1476274663841 Spreadsheet.java +CompilationAction 1476274663841 Spreadsheet.java +CompilationAction 1476274663841 Spreadsheet.java +CompilationAction 1476274663841 Spreadsheet.java +CompilationAction 1476274663841 Spreadsheet.java +CompilationAction 1476274663841 Spreadsheet.java +CompilationAction 1476274663841 Spreadsheet.java +CompilationAction 1476274663842 Spreadsheet.java +CompilationAction 1476274663842 Spreadsheet.java +CompilationAction 1476274663842 Spreadsheet.java +CompilationAction 1476274663842 Spreadsheet.java +CompilationAction 1476274721292 Spreadsheet.java +CompilationAction 1476274721293 Spreadsheet.java +CompilationAction 1476274721294 Spreadsheet.java +CompilationAction 1476274721295 Spreadsheet.java +CompilationAction 1476274721296 Spreadsheet.java +CompilationAction 1476274721296 Spreadsheet.java +CompilationAction 1476274721297 Spreadsheet.java +CompilationAction 1476274721298 Spreadsheet.java +CompilationAction 1476274721299 Spreadsheet.java +CompilationAction 1476274721300 Spreadsheet.java +CompilationAction 1476274721300 Spreadsheet.java +CompilationAction 1476274721302 Spreadsheet.java +CompilationAction 1476274721482 Spreadsheet.java +CompilationAction 1476274721482 Spreadsheet.java +CompilationAction 1476274721482 Spreadsheet.java +CompilationAction 1476274721482 Spreadsheet.java +CompilationAction 1476274721483 Spreadsheet.java +CompilationAction 1476274721483 Spreadsheet.java +CompilationAction 1476274721483 Spreadsheet.java +CompilationAction 1476274721483 Spreadsheet.java +CompilationAction 1476274721483 Spreadsheet.java +RefactoringAction 1476274756958 Spreadsheet.java ADD ValueType VALUE/2 FIELD +RefactoringAction 1476274760479 Spreadsheet.java RENAME VALUE/2=>ValueType VALUE_VALID FIELD +RefactoringAction 1476274763500 Spreadsheet.java RENAME VALUE_VALID=>ValueType VALID FIELD +RefactoringAction 1476274770042 Spreadsheet.java ADD HashMap mValues FIELD +RefactoringAction 1476274770043 Spreadsheet.java ADD String ERROR FIELD +RefactoringAction 1476274770044 Spreadsheet.java ADD String CIRCULAR FIELD +RefactoringAction 1476274770045 Spreadsheet.java ADD Value get(String) METHOD +RefactoringAction 1476274770046 Spreadsheet.java ADD void set(String, String) METHOD +RefactoringAction 1476274770047 Spreadsheet.java ADD String evaluate(String) METHOD +RefactoringAction 1476274772569 Spreadsheet.java REMOVE VALID FIELD +RefactoringAction 1476274785682 Spreadsheet.java ADD String value FIELD +RefactoringAction 1476274785683 Spreadsheet.java ADD ValueType type FIELD +RefactoringAction 1476274785684 Spreadsheet.java ADD HashMap mValues FIELD +RefactoringAction 1476274785685 Spreadsheet.java ADD String ERROR FIELD +RefactoringAction 1476274785685 Spreadsheet.java ADD String CIRCULAR FIELD +RefactoringAction 1476274785686 Spreadsheet.java ADD Value get(String) METHOD +RefactoringAction 1476274785687 Spreadsheet.java ADD void set(String, String) METHOD +RefactoringAction 1476274785687 Spreadsheet.java ADD String evaluate(String) METHOD +CompilationAction 1476274795670 Spreadsheet.java +CompilationAction 1476274795670 Spreadsheet.java +CompilationAction 1476274795671 Spreadsheet.java +CompilationAction 1476274795672 Spreadsheet.java +CompilationAction 1476274795672 Spreadsheet.java +CompilationAction 1476274795673 Spreadsheet.java +CompilationAction 1476274795673 Spreadsheet.java +CompilationAction 1476274795673 Spreadsheet.java +CompilationAction 1476274795674 Spreadsheet.java +CompilationAction 1476274795857 Spreadsheet.java +CompilationAction 1476274795858 Spreadsheet.java +CompilationAction 1476274795858 Spreadsheet.java +CompilationAction 1476274795858 Spreadsheet.java +CompilationAction 1476274795858 Spreadsheet.java +CompilationAction 1476274795859 Spreadsheet.java +CompilationAction 1476274795859 Spreadsheet.java +CompilationAction 1476274795859 Spreadsheet.java +CompilationAction 1476274795859 Spreadsheet.java +RefactoringAction 1476274864275 Spreadsheet.java ADD ValueType VALUE/2 FIELD +RefactoringAction 1476274866293 Spreadsheet.java REMOVE VALUE/2 FIELD +RefactoringAction 1476274867311 Spreadsheet.java ADD ValueType VALUE/2 FIELD +CompilationAction 1476274868644 Spreadsheet.java +CompilationAction 1476274868644 Spreadsheet.java +CompilationAction 1476274868645 Spreadsheet.java +CompilationAction 1476274868645 Spreadsheet.java +CompilationAction 1476274868646 Spreadsheet.java +CompilationAction 1476274868646 Spreadsheet.java +CompilationAction 1476274868647 Spreadsheet.java +CompilationAction 1476274868647 Spreadsheet.java +CompilationAction 1476274868648 Spreadsheet.java +CompilationAction 1476274868831 Spreadsheet.java +CompilationAction 1476274868831 Spreadsheet.java +CompilationAction 1476274868831 Spreadsheet.java +CompilationAction 1476274868832 Spreadsheet.java +CompilationAction 1476274868832 Spreadsheet.java +CompilationAction 1476274868832 Spreadsheet.java +CompilationAction 1476274868833 Spreadsheet.java +CompilationAction 1476274868833 Spreadsheet.java +CompilationAction 1476274868833 Spreadsheet.java +RefactoringAction 1476274934971 Spreadsheet.java REMOVE ERROR FIELD +RefactoringAction 1476274942987 Spreadsheet.java REMOVE Value(String, ValueType) METHOD +CompilationAction 1476274947318 Spreadsheet.java +CompilationAction 1476274947319 Spreadsheet.java +CompilationAction 1476274947320 Spreadsheet.java +CompilationAction 1476274947321 Spreadsheet.java +CompilationAction 1476274947322 Spreadsheet.java +CompilationAction 1476274947322 Spreadsheet.java +CompilationAction 1476274947323 Spreadsheet.java +CompilationAction 1476274947323 Spreadsheet.java +CompilationAction 1476274947323 Spreadsheet.java +EditAction 1476274963066 Spreadsheet.java 2617 3 6 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index ed0e5e9..014b76d 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -11,16 +11,22 @@ private class Value { ValueType type; } - HashMap mValues = new HashMap(); + HashMap mValues = new HashMap(); final public static String ERROR = "#Error"; final public static String CIRCULAR = "#Circular"; - public Value get(String cell) { - return (Value) mValues.get(cell); + public String get(String cell) { + return (String) mValues.get(cell); } public void set(String cell, String value) { + mValues.put(cell, value); + } + + public String evaluate(String cell) { + String value = get(cell); + if (value.length() > 0) { if (value.charAt(0) == '=' && value.length() > 1) { if (value.charAt(1) == '\'') { @@ -86,11 +92,6 @@ public void set(String cell, String value) { } } - mValues.put(cell, value); - } - - public String evaluate(String cell) { - String value = get(cell); if (value != null && value.length() > 0 && value.charAt(0) == '&') { String key = value.substring(1, value.length()); From 023f7a7af48838807ef0400b4348b5a10c829bce Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:22:58 +0300 Subject: [PATCH 123/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 2507 -> 2499 bytes src/Spreadsheet.java | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 9352eef..14bd205 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -461,3 +461,4 @@ CompilationAction 1476274947323 Spreadsheet.java CompilationAction 1476274947323 Spreadsheet.java CompilationAction 1476274947323 Spreadsheet.java EditAction 1476274963066 Spreadsheet.java 2617 3 6 0 +EditAction 1476274978231 Spreadsheet.java 2615 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f5fef91e82af5a2d8f7d86738396a66b02d116ab..564dba354de09c88ac4f1316c987a7372520698b 100644 GIT binary patch delta 1179 zcmZ9LUrbz85XOJA_wKTVOK3rhOABR@0J~heY!wt*kbkvMSpJtvX^gk*hJqVX5vnoK z^}!g8kJrRdBZWY0+7}@;>w~G$n5c;w(?k;=eDJ{-pG-`AGHrD3E|ApR zoNvA@`?731>mltHCpqO_^wry)LivJo)rqB@#kttT^3wd`T+hmU zI+CQUt21}o6SKV_Gr8+lc%FZYQro|`->u*K=-OO# zRUU4-PI=yH-eA@?4||o`Hkmd%%~taUar&zJmDdO;WPiniM`umh=Pt5to$3AB!`>q{Wf@wfd)EwqPHnpx(ylZo5;FIa zszT;IcYPj@bC%InEmE=_GPTcbdt2YtP#t98ciPlBs?S+Pu}WXXPlPaC)G)-OjHs-~ zsV7MTi;BELlvj0hUROD65Mz^OZW3pQ6MUuv^93#ZKr453Mt)T6SDlF8IK`i;_P^-l zZ@NY3kqY{xGQ(-9=8QDaFMSNiC}(AYL75^U(+tauYTaQ}<{6U}#^q%uc2DKL%%02xK0kSx zZ!*RNlX^WL(#|=iRO&l=59fIXzY^-rqw=iYTMkunHM{5?y|HN>7DEZdxuBNGjF#=^ i$UR01sP)(TEALYva*uK;{s;G^VA!}%(*5AT@&5o+r|Db( delta 1153 zcmY+DT~AzP5XXPB=dcTSOe@>kE*1)OyRgeyVHIeBvMr^xEU=W8mv&p5G~M} z7~>kFAAlT9L}Lrmq(*OQG^H@z{@_yKI9&N&B2$euizXJ($6|9|Gc zKSUoy?>2@i1Rh+z^2S+mO|Z^{R@Q6{~;Z$-9w4)eA|Y}4~J zuh3@uu8Zr}TJKhIn;N@f!=K6Dk<&Gno+Ddxn>LGV&F+x6pI#rt)3?|aSnaD61FL(D zf|)hD%sXW4ogNlyz{8(zq3PP4LoG(q4yA|J9(Gb^9WZN!ratY!AsVbsrPfQ0g0Et%~Q^ znXdqYr}Vr}M$g?ui0QAEed_IDk1n*19QBOQ$cr>_StE<8pEuago3!u=Nj@dTnriM# zY`!DSJr&(gwDUk~{;ILxR5PXD>EaI#@FxfPn_eDqNOq8wT^yEL`lXqpl4U@KI3{_H z%NQqQoI#l+C+8WGBE#|;BQnpZyu(R(moa%?V@piPhfK;x6y!6`DP(w_Do-m4yn*AgTbGf+#1oW*563k#n7@ zOiAmG(V%Bk>l<39LgNdm)-tE^_I<8;o4=_#@gSN}nOti8mk1}VLb)W9TNVJqvQt*QQM_$s!y{yY|bO9IWqo^yp$PBMA z#}%&esz0HQ0OZDmSRmmKD6H{dK>Kwh=hSCtjST12GJWDZF#csGLOl5XA*7$XTGjMF DUXbE^ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 014b76d..fef8be4 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -91,7 +91,6 @@ public String evaluate(String cell) { value = ERROR; } } - if (value != null && value.length() > 0 && value.charAt(0) == '&') { String key = value.substring(1, value.length()); From cb031a8cad5aa33787e565b8b02205dcd8db6e91 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:23:47 +0300 Subject: [PATCH 124/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2499 -> 2499 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 14bd205..8bf6933 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -462,3 +462,6 @@ CompilationAction 1476274947323 Spreadsheet.java CompilationAction 1476274947323 Spreadsheet.java EditAction 1476274963066 Spreadsheet.java 2617 3 6 0 EditAction 1476274978231 Spreadsheet.java 2615 3 6 0 +UnitTestCaseAction 1476274991475 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476274991476 SpreadsheetTest.java FAIL +EditAction 1476275027775 Spreadsheet.java 2640 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 564dba354de09c88ac4f1316c987a7372520698b..58f1c8183a20a055970686744758cf2f201fd1ca 100644 GIT binary patch delta 45 zcmX>sd{}tH9uCEL#?1@~jC&ap8BZ`IFsd{}tH9uCC>#?1_gjC&c97*8-HGhSs#VParNWnyMXXJTW>V&Y`Tn|zn!82~Ya B3|RmG diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index fef8be4..72a7188 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -62,7 +62,7 @@ public String evaluate(String cell) { value = ERROR; } - } else if (value.charAt(1) != '\'') { + } else if (value.charAt(1) >= 'A' && value.charAt(1) <= 'Z') { value = "&" + value.substring(1, value.length()); } else { From f0913c8e7d0cc080098a0be93dffd89ad7bf85de Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:23:53 +0300 Subject: [PATCH 125/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 2499 -> 2509 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 8bf6933..4b3b794 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -465,3 +465,4 @@ EditAction 1476274978231 Spreadsheet.java 2615 3 6 0 UnitTestCaseAction 1476274991475 SpreadsheetTest.java FAIL UnitTestSessionAction 1476274991476 SpreadsheetTest.java FAIL EditAction 1476275027775 Spreadsheet.java 2640 3 6 0 +EditAction 1476275033538 Spreadsheet.java 2634 3 6 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 58f1c8183a20a055970686744758cf2f201fd1ca..6588cf1e294fec847367d791b6d69b4bd89fea48 100644 GIT binary patch delta 312 zcmXAky)Q!n6vcn%wO+L)N*S795LBzt7(@&PUs0+)+oFj2s1Ru)F&diKY~sb*Xb?sT z=^!x~Oa?Yn;}4N|W&7QG&OImh)&K5)_^Rpoz=;V)OSrd8G!ZG&UsN&TC^O(2zEYsN zaNelVk{NZaH`OKXl(q)VpsVkXd#s$94?I_yr--w9HButSO1G|QASOlyO&=!p5f!b@RO$%IKo@~teH02?a@ZM@gPj2!TPD~3gsAMi6jo~Gen9sPP@E= YWmc%M<7Zg4{SH;ExI3z-b>fcw0?X4q=Kufz delta 302 zcmW-cJxf9X7=@p6)qA-a7}*pl5t)4$(h$+mQbtx<=2w|e*%vqnEkRpTQ8eD5A+UxZ zXc7dsriNM?9r_LZiSBKC-uImM9NzEnN4WJ982`kN2}W>oszWlH=rGgNeZtpawr}BC zA#dS-k>$utTKWFo?5i@)oEf)9|2gWMn2k`&W8M;e?<)S({xxrPDHb(IN)eVd%!;N- zE5)jEtf|1d%4AhxLsd3aBd0oBIw!9Sin^wx8_K$KwFh?fNL5Yt)#gC&)bz!nx*QpB zZ1^}eOzMVBgCXFIp!d%J5u)zsB4hL*Oe5e}c5I@`5(SF*w8uOp%J|*#5w_VO;KpaD QxPG6yPRULx=3Lq7KZT7ruK)l5 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 72a7188..7d0f48b 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -63,7 +63,7 @@ public String evaluate(String cell) { } } else if (value.charAt(1) >= 'A' && value.charAt(1) <= 'Z') { - value = "&" + value.substring(1, value.length()); + value = value.substring(1, value.length()); } else { value = ERROR; From 88eff6275959b25112d4cb21e0342770559afce2 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:24:25 +0300 Subject: [PATCH 126/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 2509 -> 2494 bytes src/Spreadsheet.java | 4 +++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 4b3b794..c942705 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -466,3 +466,4 @@ UnitTestCaseAction 1476274991475 SpreadsheetTest.java FAIL UnitTestSessionAction 1476274991476 SpreadsheetTest.java FAIL EditAction 1476275027775 Spreadsheet.java 2640 3 6 0 EditAction 1476275033538 Spreadsheet.java 2634 3 6 0 +EditAction 1476275065332 Spreadsheet.java 2725 3 2 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 6588cf1e294fec847367d791b6d69b4bd89fea48..afcd0414e667feae82b242ed83c2e94c510884ec 100644 GIT binary patch delta 447 zcmXAk-Afd47=@oRGtRiv5UXPJVIRb{uC*|D5wVErrsnE?*y`@oT2Nb-7%5WGRS*$% z8~B5unK6#XvXfI_kGWM4(EH{m%jJEEZ=7rCj-V9H*f8% z?QzQdwg!eLg|a?HP6zZbE&6kn>+L)3@J4%WIb67Xb7gILWGG4$GXb-dO~D@NE>aDs zF=y`DneGhrfO*D0{;*}`zT)75=;?PfW#u zr4AMI)7!Y$&!l!UrG0Uy93_o0qcXFqQC6L*8q^dqrwg3X5_PRJuUj;9pQauV=}~;! zU{OyvucutpJ1*%nZGGdiwz#4{Ea@-TEU{uatTF(svm+_aeh#GLF~KZ8!nH77>c~*U l1Pe5<)uKR?2qz9d%vsLS728*6#d=#?rkM(L$UIDy{sGzFS;GJT delta 462 zcmXYt%}Z2a6vlt&z1Mrk+pR_igJ3F%X+Cu5A`v1omH9R5eB{@tW08|hHkA?;ZiW7W z@Wrk8krd=YC~i>HwpEMV)XsJ5AX;{>wfmj(Jm-1fe2#sM?f+DU%@rLt;+@w7Njl`X z?$Sb^(3UPdsIAnzN44ceZ{pdL#`0oMrV=^^Tm~7^4WlQLW7uVcQN3p*BBv<2lql<8 zD(N^R7;_n?{Pu?-D*X);3shTshmTjx`gCr{M%M7T9L;UY>2P7blolcR2Tv+-&RB_w;7XFv_Rfr{5>9e_L;)pttSR ziT{S6|48_5udOENmlOli&X9DGmlDHLWkhZ= 'A' && value.charAt(1) <= 'Z') { - value = value.substring(1, value.length()); + String key = value.substring(1, value.length()); + if (mValues.containsKey() + value = "&" + value.substring(1, value.length()); } else { value = ERROR; From 506d80cfac25dec39a1059259a111fb7a3777096 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:24:49 +0300 Subject: [PATCH 127/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 4 ++++ bin/Spreadsheet.class | Bin 2494 -> 2526 bytes src/Spreadsheet.java | 21 +++++---------------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index c942705..0674a07 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -467,3 +467,7 @@ UnitTestSessionAction 1476274991476 SpreadsheetTest.java FAIL EditAction 1476275027775 Spreadsheet.java 2640 3 6 0 EditAction 1476275033538 Spreadsheet.java 2634 3 6 0 EditAction 1476275065332 Spreadsheet.java 2725 3 2 0 +CompilationAction 1476275065458 Spreadsheet.java +CompilationAction 1476275065458 Spreadsheet.java +CompilationAction 1476275084736 Spreadsheet.java +EditAction 1476275089825 Spreadsheet.java 2320 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index afcd0414e667feae82b242ed83c2e94c510884ec..65824e0b84917bc13cc0f2354389cc80d4abc0d7 100644 GIT binary patch delta 356 zcmXYt&ntrg7{@=)yVpC@Vr?S|iOjHB2rccP)k22smyMdV`5A{DCTUJm2s0Jm071$yIUPzSel(P|-kf_w^eDqCSJcE4lPp3`QKG zqBK_pwImK*w19QVX^)mAp^s@jR{t;e=y`2t=%LEo`PAyv#5LYO%G}WIQ>z;cg0p@1 zwD=7|7o0fl`lt47d1qYzudWR;lYh|3lU zDUg&yQgTdMPRYm_OLA^{MY2+2Matylk-R*!CNHc@g$>2VrebGXX<%1zQlJ$$zz$7{ zn>O0b(tHCR>JT)gUjM4?9&V(bw5eFk=rA$jCan`BK@!zGqmvYi)R;jt|9urbVhhNC IzGs{K0sFE@_5c6? delta 324 zcmXAk&ntrg9L7J-yLazwv}6~*Nq!8g=Tqc@|lo`3vWyDivv~m1a z0aq{|WZ1HzzEo2~>Pc~X%o^}@)wsppvkrToUFI=jx>u8TwEk1^p2mpjCX|WUrmyPx zai&psayqSMX4FPpVG^2PR!QcRCaDZ5Wl1Z~g4S8oE*TxMq+_x=Bd2rnx^TQJiYl?D zYc}-4rry}nC)=v9qbj@lW#147hRGrAz!CNCmvqnx!5a1xKv)KL(BC(hXNqOAcvK)p ejy$GQ-opy3c%Arp3eLVq6?@+wRkvO8C;kA`AV28< diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 0e52e28..09ca310 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -64,8 +64,11 @@ public String evaluate(String cell) { } else if (value.charAt(1) >= 'A' && value.charAt(1) <= 'Z') { String key = value.substring(1, value.length()); - if (mValues.containsKey() - value = "&" + value.substring(1, value.length()); + if (mValues.containsKey(key)) { + + } else { + value = ERROR; + } } else { value = ERROR; @@ -94,20 +97,6 @@ public String evaluate(String cell) { } } - if (value != null && value.length() > 0 && value.charAt(0) == '&') { - String key = value.substring(1, value.length()); - if (mValues.containsKey(key)) { - String refValue = (String) mValues.get(key); - if (refValue.length() > 0 && refValue.charAt(0) == '&' && refValue.equals("&" + cell)) { - return CIRCULAR; - } else { - return refValue; - } - } else { - return ERROR; - } - } - return value; } From 87a39d73bb16fbdb4ad364e735e33366bcf36211 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:25:46 +0300 Subject: [PATCH 128/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2526 -> 2141 bytes src/Spreadsheet.java | 5 +++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 0674a07..d8e8ea5 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -471,3 +471,6 @@ CompilationAction 1476275065458 Spreadsheet.java CompilationAction 1476275065458 Spreadsheet.java CompilationAction 1476275084736 Spreadsheet.java EditAction 1476275089825 Spreadsheet.java 2320 3 5 0 +UnitTestCaseAction 1476275092957 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476275092957 SpreadsheetTest.java FAIL +EditAction 1476275146316 Spreadsheet.java 2363 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 65824e0b84917bc13cc0f2354389cc80d4abc0d7..8e75684a637f76622f32ed581b1986f494ba3ef4 100644 GIT binary patch delta 265 zcmca7d{=<$)W2Q(7#J8#7=ku(@iR|;$gDA0gvDOLmytm*xS%LCF{L;oHMK+~EHS4v zm63rJOtUitY%XR=W8^epU}0cmU|?Li`4Q_1M&1oTgP0klf#f*`E55!UfiZC*;F)n7%1+thJ7Bd7gI5Ic^H7{eZVsK_~0h+s!L7Bmo!Ht2H zQIvs?!5yfMnK1<@2Uf?J&R_{q$5_Om1X0J}0W{o_LE;aCKRbg8t2(Rf-^q=fI!ZwE cJ%KVz3|*8$mb4 zXP8wtQV_&tN@WBUabp&CwX>V?hJqa_4WgB1ZN{0 z(HHueRP0)^AKRmKyHOpTUuo7F)yY<^UUr&6PAXI)OrFywJD64sCky|=xm3|7&X}C# zoFZT^FFTF0BI7<$2d8_baz1k2WR?qx;L3yTK8m4a>i>da;>?*`VnWI}4_kKqk!$J6 zP_XG#igvx_xF__yy5m06V`_18U9YInHw*%x4Q)pHUa8d%OKFena~9LO$I-#WI;FJX zKY5JJ9(s+H@i@Llz9;v6BtC9f#-E&&W&BNwS;jl^rRdZfP964`@hEs)Tq6*Tv@N3@ zHQVX7{HD%``0wPz?~ys&t-z;M^&UrcsHiVgRhN5Oh?-_{UyIPtqBMnsr?I~Q zUnK}5Yik2!L}|QWj(ILikC%*dg`#Y_!2zyvjXpKZ043pcRc30NQ&q-xIFyb1)W7(gS`-zMFKogU*;LpQNZb^)ax-Dbb67NbZPwf5;0H1kx diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 09ca310..467350f 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -64,8 +64,9 @@ public String evaluate(String cell) { } else if (value.charAt(1) >= 'A' && value.charAt(1) <= 'Z') { String key = value.substring(1, value.length()); - if (mValues.containsKey(key)) { - + String refValue = get(key); + if (refValue != null) { + value = get(cell); } else { value = ERROR; } From 443dbadbd60585db85d09d1428d5fd11b28886a2 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:26:14 +0300 Subject: [PATCH 129/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2141 -> 2147 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index d8e8ea5..f927aca 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -474,3 +474,6 @@ EditAction 1476275089825 Spreadsheet.java 2320 3 5 0 UnitTestCaseAction 1476275092957 SpreadsheetTest.java FAIL UnitTestSessionAction 1476275092957 SpreadsheetTest.java FAIL EditAction 1476275146316 Spreadsheet.java 2363 3 5 0 +UnitTestCaseAction 1476275151988 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476275151989 SpreadsheetTest.java FAIL +EditAction 1476275174324 Spreadsheet.java 2362 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 8e75684a637f76622f32ed581b1986f494ba3ef4..60a059f3c87182fdd3b0389b118e1a50e6a45a5f 100644 GIT binary patch delta 512 zcmX|;O>0w85Qd*O_uiz&3bEivN?Ndr2{AFYezs7Xn6%Z_Bo?)mD%7G02vt;cAqd5t z;Lhttgi@&(5EMco3qd!E3x9$jF8mdSR-D^_aA2M}Gw;ltIX`2+W6|$_KYj*|QEf(l zh5Wda+SYZyR-av5dRX(voPwtOCr-c0>#I&(sRdlZp!M{j7P)e!#o&q>8K=eZ*yyST zf(!SJdi}#*E>i31E;qE`-}I7^lUqFKKlg5*`VugoGH#$Myk@9F^J}CsZcw4ca3!6! z1|x3V{YH1ES;NnUUpPNF;eQQ3T24^XKE{<~LTM(IWlBew)=|pJQ_&n%-Qa@i%;**u zwZtXe;j$hutH;dgDOdE2dA;PSUU5w;7JJ8aePB^dY9wqaciA4il|K5-3+NzGL|E^a z$r^@OV}?;qm@(n(U{*89eP`FGb69lwc<%BiDu~b`-kDa7SSS4RjQYTb~l~ z4XP0icuB8slZdpz9_?u3hT3$++IX83hb(UA51yAZe=BMC|D?A4QiusF7GjdKW_ygz O+3eG1&zr5}d;bAyT4S{U delta 460 zcmXAl-Aj{U7{-6s-hJ4T7z4w^W+dobn@hA{h0SG|AA2`H3#Xv-lSVEm2_z``3nCtm zg2I?29*Xfo9rOou(0>pebksjlJ#Ra@e$Vw>&wby|{VVn(7X9|;%U58C*^}tcz||<{ zxz$RZ5pj0?aecS?u>N#vb5FD-i?!;rYW7jJzMUn z^trR8X<1zf!#KZf}cLvRIc<<#U#?;M(dYDun zMP0|0OG%5Awam0unAI9{+F)Ka7W9Psdcgy|Vo|TD=nYHSw|57u=#W(%u|cQZ(iTzw zS6n1vPd@cnM}*ZNV<|v`84Bav#^ED380C&##R=WqWsH#8ILAF3bZqNU3Vu%8 Date: Wed, 12 Oct 2016 15:26:41 +0300 Subject: [PATCH 130/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2147 -> 2144 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index f927aca..7168c9b 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -477,3 +477,6 @@ EditAction 1476275146316 Spreadsheet.java 2363 3 5 0 UnitTestCaseAction 1476275151988 SpreadsheetTest.java FAIL UnitTestSessionAction 1476275151989 SpreadsheetTest.java FAIL EditAction 1476275174324 Spreadsheet.java 2362 3 5 0 +UnitTestCaseAction 1476275175448 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476275175448 SpreadsheetTest.java FAIL +EditAction 1476275201481 Spreadsheet.java 2372 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 60a059f3c87182fdd3b0389b118e1a50e6a45a5f..9988c5a362ce598e3e5a7026c817e316e55589b8 100644 GIT binary patch delta 315 zcmXAkUn>M*6vm&&zB6NyCMB(wO<^=@T=R_mu8yF=lFVwBG5N=1vZ7Tc-Xq4FBciRj2YCNftYOFz(S;D1yzQ!jX^{{g zh$qCWsrT|?5R0_1L>tR=vBGf#^pR%)t1M%U2UzD3Hh7EzPq4{zY_W=MUSfw=DDoP+ zyg`Y#YSuuR&)DM&4v_?KhW6+$^r2s+h=$PyLgy1)MJ=ewMjG-{+NWujcJ+$xvfE2%}3 zl_FZ5J6FozL2msKzGv<}&*$xZpWZLy$9Vk~i82Jj09)3WkECb&aO-T^As>@Q=8hwQ z5D$#XE-k57`XgSGWtr7XeY(xAtZLP%kAU%Ri(qT+9;tsSHIT4HaKT5qU^%K_MhuEi zMA~Jo-f)zcCKhR7i4K-IjulS8V-5utvC2cN@d)cY#s*KY$y03c0^6*i$Sdsd8YSLf zm$%qsUCo}b&leo<4Hd)yoS`Rp4MT{l6woNTL4^4XM^OhF@=+f)2as1O#2EUpph&2u YJTjP7?i^`kkyEZFe|48B8Sk9`0~@wJ@&Et; diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 04ef66f..9fd8bb4 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -66,7 +66,7 @@ public String evaluate(String cell) { String key = value.substring(1, value.length()); String refValue = get(key); if (refValue != null) { - value = refValue; + value = evaluate(refValue); } else { value = ERROR; } From d367a712c2a3fed079f432f206d79e89ac6596a0 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:26:48 +0300 Subject: [PATCH 131/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 2144 -> 2158 bytes src/Spreadsheet.java | 3 +-- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 7168c9b..de520d1 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -480,3 +480,4 @@ EditAction 1476275174324 Spreadsheet.java 2362 3 5 0 UnitTestCaseAction 1476275175448 SpreadsheetTest.java FAIL UnitTestSessionAction 1476275175448 SpreadsheetTest.java FAIL EditAction 1476275201481 Spreadsheet.java 2372 3 5 0 +EditAction 1476275208392 Spreadsheet.java 2334 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 9988c5a362ce598e3e5a7026c817e316e55589b8..57bdfc23d2fca7ac567af71b0bbd8848cdc934ef 100644 GIT binary patch delta 428 zcmXAlOG{f(6otQ)dz09x5CRTjZCVS~BRskvQm|(5VxL4#j=VXnp6Lz4qE?Uq-K^k^i^K zqk|{jRbWdq-m;TW{^X;xu9gxmA<*AcTZPVSxVeuz{Xd9ZYyP;b!%CiJIi&*OnPzk}1=e(X>TpO>?G& Gk;Xf^NlxPc delta 397 zcmXAk+be@{9LAsLJXo<0v(=;zHH5b&J=CsYbP3920aL7s`+{l%ymHS^wDUoGG z$x^#;A=my1{sK4d@q4{j&*yu1`hK4;@2A)E{`2w*AcAz+^Pz}u<%kK9R|B-33u>O- zIcRVJdY6XMd=rx0OLo2dTH0Wm4W__(yVot>MP*vog`^2%n=YO*q zFNS8j#&2Lcw0et9@vHmP>L%^k?`r002c{Xq48usU7fJTRViYN6k>)xw+`>HbSl|w_ z+{GdfvBVQBvw#(zVU_1t;{|fOl(Q1n`G5^RVjC?o;sI*x9B4&ARyK9P1H#37^h#22 zo54Jy7=emA3}X~yGJF~B7{>&3`rt!ME~;!n9VR7d@`;$^;68>NhkU5babQYl?hs93 bxZ8u%@}`0r%u2176ql!yQs<= 'A' && value.charAt(1) <= 'Z') { String key = value.substring(1, value.length()); - String refValue = get(key); if (refValue != null) { - value = evaluate(refValue); + value = evaluate(key); } else { value = ERROR; } From d7a35b1185f0374507aab310b08c6a0f434ef5fb Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:27:01 +0300 Subject: [PATCH 132/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2158 -> 2157 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index de520d1..fe4a345 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -481,3 +481,6 @@ UnitTestCaseAction 1476275175448 SpreadsheetTest.java FAIL UnitTestSessionAction 1476275175448 SpreadsheetTest.java FAIL EditAction 1476275201481 Spreadsheet.java 2372 3 5 0 EditAction 1476275208392 Spreadsheet.java 2334 3 5 0 +CompilationAction 1476275208492 Spreadsheet.java +CompilationAction 1476275211673 Spreadsheet.java +EditAction 1476275221265 Spreadsheet.java 2342 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 57bdfc23d2fca7ac567af71b0bbd8848cdc934ef..354d748080d646dd8625be19cccfd89c6225e1a5 100644 GIT binary patch delta 299 zcmXBP-z!4_7{>AMW9RIMT@0zkM!B#xXU!(bg=~`v&5!(S)JRhbQOeEAt#Wy;q!vxB z6w$OhSNd^^>?WzI>b9@RXmH|I172a= ztHyd=37HZC`)gKKp?IxeXbdYytxR<7wB;$6cjFTnjb`|H_ KN-6Ewt+`(rT02Sr delta 300 zcmXBPyGz4h6b0~e?3YA*K&Xh6wmJy5HqjERUK&_ z;)4nbf{K-lPX0HdyOVy=?RU=Qa=D-8m-+l5(mn)qfUg-VK-RMZIG4P)BLPOtv1|5* zg}7y0c4%2+H`?ai(U&t?${79gkUY^U@%PYpvqiY&-XQm{avlBhN9z>rnV4vF=}DfZ zQKW@w4q}!L<~R(GF6LRn0=KcqJuGn_%dB992Uz7X)>y?l&ro6wWu9Y$7ue*Lnmxeh z6Snw*9V7r8qBVR3Np!0est+w7bUtE0sR?!2FnUrkOsN!M0#Ou|gt|0|aZIT02zj_D PsIDr%4Tm{tH5YyXM3OsX diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 5f4bbac..608726a 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -64,7 +64,7 @@ public String evaluate(String cell) { } else if (value.charAt(1) >= 'A' && value.charAt(1) <= 'Z') { String key = value.substring(1, value.length()); - if (refValue != null) { + if (mValues.containsKey(key)) { value = evaluate(key); } else { value = ERROR; From f5ee63f47bb6b045b48a7d1c42bea06e7b785f72 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:27:59 +0300 Subject: [PATCH 133/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 5 +++++ bin/Spreadsheet.class | Bin 2157 -> 2067 bytes src/Spreadsheet.java | 11 +---------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index fe4a345..7eaa1fc 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -484,3 +484,8 @@ EditAction 1476275208392 Spreadsheet.java 2334 3 5 0 CompilationAction 1476275208492 Spreadsheet.java CompilationAction 1476275211673 Spreadsheet.java EditAction 1476275221265 Spreadsheet.java 2342 3 5 0 +UnitTestCaseAction 1476275223743 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476275223743 SpreadsheetTest.java FAIL +RefactoringAction 1476275276108 Spreadsheet.java ADD HashMap mValues/2 FIELD +RefactoringAction 1476275277622 Spreadsheet.java RENAME mValues/2=>HashMap m FIELD +EditAction 1476275279468 Spreadsheet.java 2295 3 5 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 354d748080d646dd8625be19cccfd89c6225e1a5..80424a0c1f80d3f8cb3b990a8652e0938273d31b 100644 GIT binary patch delta 611 zcmXAmUr3W-6vlsN`#vXg*0464l)AF1^IKnYtx_|c^Z&M%L0;@4n18Y?SD+OYVRu2d zA4CO3vM>e(En-B3P?z0A5M38^n-Fw0EPB_j-se5fbI$vm=l$un+|G}G-);bhNEMym zZ4ocWT?{ZN)XiSXtz^&VmJ{>W1y4tEF?%&@Ud-ke%=FCS{On3!XU2&zWNq3)R=|G1 zD%h`xX0>Qz;h6Cc{z^f6Dn4t6 zZaU@~T&ZVr#+uOE9f$wpgVr^DDf*#;d1q*quGkvkD$3+(H?+!x5=L0Q;IJsw){(n%wO>>`PeG)vu*@(b^Nh+l#^nMNvc#k;laQMv+C(1yn_-k>|>u6B~&1v3?j3KA7AgrUW{nML<4pdgqNS;$PX3HP`BxU$kXH(9Fh>_gVN0Rq zg&+b+jHIAo2xbu^L=e#?f>y1H+O+5o+O#P8?#!}t4ty`?J?}a1`yHp?Yk}|e-={mk zQN~ifj~+wla4L*&?ye0U)LUh>WN^I`^&8j%pIhTqVeLYPi7>HmPNcIv!9@iUxLQ mValues = new HashMap(); + HashMap mVisited = new HashMap(); final public static String ERROR = "#Error"; final public static String CIRCULAR = "#Circular"; From e8fa7d5932b1338686f79741c71fbdf1bdb21e34 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:29:45 +0300 Subject: [PATCH 134/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2067 -> 2119 bytes src/Spreadsheet.java | 3 +++ 3 files changed, 6 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 7eaa1fc..c4af67c 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -489,3 +489,6 @@ UnitTestSessionAction 1476275223743 SpreadsheetTest.java FAIL RefactoringAction 1476275276108 Spreadsheet.java ADD HashMap mValues/2 FIELD RefactoringAction 1476275277622 Spreadsheet.java RENAME mValues/2=>HashMap m FIELD EditAction 1476275279468 Spreadsheet.java 2295 3 5 0 +RefactoringAction 1476275297632 Spreadsheet.java REMOVE mVisited FIELD +RefactoringAction 1476275299615 Spreadsheet.java ADD HashMap mVisited FIELD +EditAction 1476275385740 Spreadsheet.java 2330 3 2 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 80424a0c1f80d3f8cb3b990a8652e0938273d31b..b840da7d188c1bdddd117be8a7e54de282998f46 100644 GIT binary patch literal 2119 zcma)7-EUK682>%(Iqm3LS30|~;pAhouA`&lYcd#PvkWM-8+2L%CMIXyaXZj;OM6P9 zM&kvE34ei*s9Q!@NHhVXBT+-tOQSI+#%nLUHZk#P!H?g2P8o$_;>G*+d7t-re$UtM zJ^k+QFYW_4fU|yh1kF>6Wz(3c%$cU`hb9PLGOifOqEVVnPEKDk3%0;NpErtCvm$8C zIJZ^XDke`EmAS03cto&i%9<@1cC~B@h8it~U6lhlWtXke?2$&z2yvR`^H#;O%^86{ zp36<<1d&EdK`6CQs@O)!cG7CXGXh`tc)7e#CPpfqOTCgA%Qay$GwV)SUT zHp?#?(?!-E$t)C%V%{iQ>ReN5_MFAeg)()GX06^?lb!A9ZLBZes8U(%3SuXEo^Wv| zbfn&;rt+irv01u}XW0d_SY-H$3Lkq)_{Qk*yo%o+#2zH+xmcy=p?c3+$U4ve&WoeH zqR7NanMyEh4neSARo5Lr3S8E}!(iupg*l@<#vHWXbUdYQ zjs`J;W1M!SI$d!HCTQzTr|a8NBc7^cEQptoBJ~RkCEKt{l{4lWg6LB!ieFT@jR&z8 z-GsL)>5^^Enk184%Tc`qxR(3EWyF7sj3<{y|^sFn-n2}>~~Tt|XEifq`y z0A9XFjf({1$xq3HChnwJ-MIq+H1iyE?nCH6OWiq41Tqk<+@GbzIid=GxAxsbwC_u_ zU$}>k&(ZlveD1CT^gQ>76W+^RBdCr}I&Y&s=t5vS(*$LXs0KgE6g|qK?=y7nUc(Dt zBX);p4-}qC8%$1Nw7GUQ422nY(iZe#cMUDec&Z7_4q9RjiSv(=3pfBRtUl}jZg)*L z0Gn%oD&PQ@hoGF73+>IaBp-ACw2xWt%M$y*hjJ_7UBjX9(IwfT6xvPcNN7qETS7A7 zsAg)%PIc06B9hP_>W8zdG7|}Lf9-MGof{xeSPweZ1MYSIM`(AYfn^k2X=nu(v=MDk zTgBc)RHZVgM>TB;p{O42UxIHHZItK`;Lp%aG(Q;LjsHW0d{^$Fy>j)>D!y1?& zzEv^tm5V>NOkAhJiz|q2m`$jD_pf2}ItR(${fd3~4g2vs z{}umWtUqx`nlU6%9G30;m8(jLS4mh>4RjhqPSAX_?0v zsURb7AuI1;LayPgypMBo13CGCcejz3PjFuD;8lmsuanng=R-DAa-WA!KCZEOg>U%; zPO=xb_yIhHG#P!D{638{(3xX9d(aFoBd1(DS;UZQ$1HZbcF3}WW9WE*Nk3wGOz-*& nevt=gm(V&i&pMjI>(C!yFRv-+Nxf#!wqdaDyz2=9c`*4e08*|3 literal 2067 zcma)7-)~c87=GUNv>jW^N}(N_PBu2!Iy$-`47S03P=+hCn`|<}E=pc9{lx&w{SQxC{86u8vY-(z9N)V}5 z3qq--Ldnt#mYqutLIQu=Sh2WN6x5{BQ>lxY(Wx4QnNC~EEau92of`j1vtU|70&i!0 zMxdpZ=8al-5e;G&A^|iAc2$*Bix{FiAZQB02fv^`V-}2w^3^$`_=-N4XPJ@AQclm$ z=tWb>?xtofnru=iQ_)kF_gjAF3vCpD_z{J01iAcHmAod zHfQAX3|~^=JDw4~I(mFY#qSE@5EArUF4OZwrKcOR!t=lL;y|w{-f%vKTId#AFX&O# zwbY^=M}l|}M>(XtQCP4R?IER=qA!T!I6*~jQ7?`%2dy(5Pbtkn5Q8|$8JEg)C7Vlv zSZ6w2*%p^$s*<4~hA~2x=aveVZWc=CjW-0*XH*oQRk@uG;xJkWZufnld1r-O4~;s~mG9lOI86lMH{5j}d%C_v?9zSg{Tz+=Z13mz-s#5C=vmM8 z^V|zMK4``Zltj(I#T#J`9%a$>85$35qV;RE-=*wO={8`U3rKf#)5=3o4#a`>W?7D(xqsTlER$Jc z_kJk16W&c63!hq%R<)t6OJhP)I~^-XChVIcL?shD+Lz)~9WtHxX5-^!cKiwt`U97w%qxe*-bD=upc~ z|2k^CLmQ~Su1Qo=X|4YAee+F(6SlAkW{7W9Onl|wkFFBeu5fk@9ouFTs^8t4ICYbQ zDPj*-AKB4u=iX#q`#%`&Y6Smj5Hsn>6^gOQQ*8eZ$hvr-G6DOhQ z_t1uyFb*GcY(SbAUPewi zcCw6q$BtR-ckFPE9UMjDLrezH?(6V1|Am0aL;lP{ThKgPs0nYu_Yl2QbKy(+T!YxQ N!Ipil&lAXl%)gpHrC0y} diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 91b1ba9..213025d 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -56,6 +56,7 @@ public String evaluate(String cell) { } else if (value.charAt(1) >= 'A' && value.charAt(1) <= 'Z') { String key = value.substring(1, value.length()); if (mValues.containsKey(key)) { + if () value = evaluate(key); } else { value = ERROR; @@ -88,6 +89,8 @@ public String evaluate(String cell) { } } + mVisited.clear(); + return value; } From 51508d9e24e3472c4f08716e12b4775725f2822b Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:32:16 +0300 Subject: [PATCH 135/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 8 ++++++++ bin/Spreadsheet.class | Bin 2119 -> 2319 bytes src/Spreadsheet.java | 15 ++++++++++++--- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index c4af67c..d164906 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -492,3 +492,11 @@ EditAction 1476275279468 Spreadsheet.java 2295 3 5 0 RefactoringAction 1476275297632 Spreadsheet.java REMOVE mVisited FIELD RefactoringAction 1476275299615 Spreadsheet.java ADD HashMap mVisited FIELD EditAction 1476275385740 Spreadsheet.java 2330 3 2 0 +CompilationAction 1476275386240 Spreadsheet.java +RefactoringAction 1476275435199 Spreadsheet.java ADD import java.util.ArrayList IMPORT +CompilationAction 1476275450430 Spreadsheet.java +UnitTestCaseAction 1476275454063 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476275454064 SpreadsheetTest.java FAIL +RefactoringAction 1476275520029 Spreadsheet.java ADD boolean isCircular() METHOD +RefactoringAction 1476275524043 Spreadsheet.java RENAME isCircular()=>boolean isCircular(String) METHOD +EditAction 1476275536598 Spreadsheet.java 2520 4 7 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index b840da7d188c1bdddd117be8a7e54de282998f46..f7866bf28e88e1c15699de353411d231c79b0afb 100644 GIT binary patch literal 2319 zcma)7OKcNY6g|%#+le!29D@@G1oCM~;y52#ni4`xf=h_OPQV5SQm8bsr^$fhAbX5N zOFycRDzRh-3z{gXQCB4r1gTXKl`2(2{i@w`*G1K3rAl2z^mE>f35KLn7c;)^zI)F* z_uliy5C8u3K7c)V-2;a}Rq{e!*D{3}T{k^Y1bpYTi&{@s%T4!;Po2}#rhsQQrDcnH zL10tN+AW$!wr5l;%*3?|0|J#vV>+jq#k?-izdmBW?Xn<~X5Pq653KiuiBmC~G75&N zX9NOeFvI!0b}42QOonu9sE*9#3Z|AbtylG3XAI7!I#xDHmhYU_IlEo$>#Hv{v3wwsV^BpKI-g0gH84<~QgV6F^^{ud(XuIN zJ)7n61$lhi2FGteC?(H-QN>Hx!^{gsX6`M|EFD>v`QN-a_={4moTDxc&E$xPC#!4s zB7}V^2C$#Q%<8#mbH*BGRBnV-9KaAa(lc6qm>iV$Xh%fu98?j(tJFfFI90GDEKt`T zjh45iByCyAh>F7)<>gAxX?*MKceEOjIVecFA2w0^hv@yFs|a5 z+;(c2j9e#FBoSbp>8vhQS!ooaIa8n3X^Tld2A?ROG@l6b&dcMglcttF&l_8kjW;=0 z%%}AcLki1Rrk!r7O*E5&lOGC&4^_*Rhn52sd{dok>nhf(qMGaHto<6UYs=PtA_#dq z_^xBbaiR+TZVTQ+eeg4EJ$(<`?qWO59W@`cZ3w)8 zU0hLSXfMGJk)lIJ1n*#b=L$L=Aat8+2PB>>LuN~iIyuLa;^FKR8oCOdQuu&M;ebi7Px2SGVe8`^o9rMSuc`yg4q5+`>5P4Rii zxq?C8;Jnx?9m*}y8&agFZ5}-#%atiD8|2D$3;vMnv41$eB;NAZ@Lha5wq*_EndrC` zec0aa`VjTD)w_VSZS^nWv=UbOlqKvA1tgU|S3ptbQ5|sky5`|tLLDt8c=^+R3l+}r z5^Am}BA`fG3;%rGcpbiwwO9ce;%9j#ezft27cgpDlZyzig^kI6cdg*ib+poKrWw5s zx8Hv|NHZ2M`Nk%eaMgmlV!hw7+h;Y)Y9E@PZiL@HL17aml`$)8R0%s}fxS-(yz&3* z`=;>*iPcz?R&d-Bo6{28Z|J9VHgn2#oPIraVhcKWJBBFZ7`9;?+mWC*gC^v7-`+$E z-e%@|6!iiny-2Nm%#39OaUY%d0$uoyn)-nP{fT?O@N@Yq|Hyx*y8b{P{zSj1!afne zfN0_et`mcz8wbQ5e$xhVPz)g=A{Y@PI4q)wiWH8BSsWFY5EGXX7w=+RypLnz3XY4b zNQi4likmng7LXF3U_vb8l(@sa2RI|X#98qbH1RFcmiFJ^EufYkYoC^VncU)GN&Abu z`6qCacjP1NLkbhr|1zsRh0}16b2ld0B_~gh*m2?m_RoqVlNLJ;ud$;C(eMc49)w(N tuExLM5#kZ*MfEBa$0{m(t8hI+AGd31xq4ish`P0iRqHcwhDZ*a{TD4T>5c#Z literal 2119 zcma)7-EUK682>%(Iqm3LS30|~;pAhouA`&lYcd#PvkWM-8+2L%CMIXyaXZj;OM6P9 zM&kvE34ei*s9Q!@NHhVXBT+-tOQSI+#%nLUHZk#P!H?g2P8o$_;>G*+d7t-re$UtM zJ^k+QFYW_4fU|yh1kF>6Wz(3c%$cU`hb9PLGOifOqEVVnPEKDk3%0;NpErtCvm$8C zIJZ^XDke`EmAS03cto&i%9<@1cC~B@h8it~U6lhlWtXke?2$&z2yvR`^H#;O%^86{ zp36<<1d&EdK`6CQs@O)!cG7CXGXh`tc)7e#CPpfqOTCgA%Qay$GwV)SUT zHp?#?(?!-E$t)C%V%{iQ>ReN5_MFAeg)()GX06^?lb!A9ZLBZes8U(%3SuXEo^Wv| zbfn&;rt+irv01u}XW0d_SY-H$3Lkq)_{Qk*yo%o+#2zH+xmcy=p?c3+$U4ve&WoeH zqR7NanMyEh4neSARo5Lr3S8E}!(iupg*l@<#vHWXbUdYQ zjs`J;W1M!SI$d!HCTQzTr|a8NBc7^cEQptoBJ~RkCEKt{l{4lWg6LB!ieFT@jR&z8 z-GsL)>5^^Enk184%Tc`qxR(3EWyF7sj3<{y|^sFn-n2}>~~Tt|XEifq`y z0A9XFjf({1$xq3HChnwJ-MIq+H1iyE?nCH6OWiq41Tqk<+@GbzIid=GxAxsbwC_u_ zU$}>k&(ZlveD1CT^gQ>76W+^RBdCr}I&Y&s=t5vS(*$LXs0KgE6g|qK?=y7nUc(Dt zBX);p4-}qC8%$1Nw7GUQ422nY(iZe#cMUDec&Z7_4q9RjiSv(=3pfBRtUl}jZg)*L z0Gn%oD&PQ@hoGF73+>IaBp-ACw2xWt%M$y*hjJ_7UBjX9(IwfT6xvPcNN7qETS7A7 zsAg)%PIc06B9hP_>W8zdG7|}Lf9-MGof{xeSPweZ1MYSIM`(AYfn^k2X=nu(v=MDk zTgBc)RHZVgM>TB;p{O42UxIHHZItK`;Lp%aG(Q;LjsHW0d{^$Fy>j)>D!y1?& zzEv^tm5V>NOkAhJiz|q2m`$jD_pf2}ItR(${fd3~4g2vs z{}umWtUqx`nlU6%9G30;m8(jLS4mh>4RjhqPSAX_?0v zsURb7AuI1;LayPgypMBo13CGCcejz3PjFuD;8lmsuanng=R-DAa-WA!KCZEOg>U%; zPO=xb_yIhHG#P!D{638{(3xX9d(aFoBd1(DS;UZQ$1HZbcF3}WW9WE*Nk3wGOz-*& nevt=gm(V&i&pMjI>(C!yFRv-+Nxf#!wqdaDyz2=9c`*4e08*|3 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 213025d..d654b1d 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -1,8 +1,9 @@ +import java.util.ArrayList; import java.util.HashMap; public class Spreadsheet { HashMap mValues = new HashMap(); - HashMap mVisited = new HashMap(); + ArrayList mVisited = new ArrayList(); final public static String ERROR = "#Error"; final public static String CIRCULAR = "#Circular"; @@ -15,6 +16,10 @@ public void set(String cell, String value) { mValues.put(cell, value); } + private boolean isCircular(String key) { + ArrayList visited; + } + public String evaluate(String cell) { String value = get(cell); @@ -56,8 +61,12 @@ public String evaluate(String cell) { } else if (value.charAt(1) >= 'A' && value.charAt(1) <= 'Z') { String key = value.substring(1, value.length()); if (mValues.containsKey(key)) { - if () - value = evaluate(key); + if (mVisited.contains(key)) { + return CIRCULAR; + } else { + value = evaluate(key); + mVisited.add(key); + } } else { value = ERROR; } From a467ebe20e3c924483ff0fc16cb900597dc03309 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:38:19 +0300 Subject: [PATCH 136/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 37 +++++++++++++++++++++++++ bin/Spreadsheet.class | Bin 2319 -> 2673 bytes src/Spreadsheet.java | 25 ++++++++++++++--- 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index d164906..9f9c0f8 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -500,3 +500,40 @@ UnitTestSessionAction 1476275454064 SpreadsheetTest.java FAIL RefactoringAction 1476275520029 Spreadsheet.java ADD boolean isCircular() METHOD RefactoringAction 1476275524043 Spreadsheet.java RENAME isCircular()=>boolean isCircular(String) METHOD EditAction 1476275536598 Spreadsheet.java 2520 4 7 0 +CompilationAction 1476275536716 Spreadsheet.java +RefactoringAction 1476275549623 Spreadsheet.java ADD boolean isCircularRecursive(String) METHOD +RefactoringAction 1476275553639 Spreadsheet.java RENAME mValues=>ArrayList mVisited/2 FIELD +RefactoringAction 1476275556656 Spreadsheet.java RENAME mVisited/2=>HashMap mValues FIELD +CompilationAction 1476275584961 Spreadsheet.java +CompilationAction 1476275585157 Spreadsheet.java +CompilationAction 1476275585157 Spreadsheet.java +CompilationAction 1476275585158 Spreadsheet.java +CompilationAction 1476275585158 Spreadsheet.java +CompilationAction 1476275591270 Spreadsheet.java +CompilationAction 1476275591270 Spreadsheet.java +CompilationAction 1476275591271 Spreadsheet.java +CompilationAction 1476275591409 Spreadsheet.java +CompilationAction 1476275591410 Spreadsheet.java +CompilationAction 1476275591410 Spreadsheet.java +CompilationAction 1476275591410 Spreadsheet.java +CompilationAction 1476275729263 Spreadsheet.java +CompilationAction 1476275729264 Spreadsheet.java +CompilationAction 1476275729265 Spreadsheet.java +CompilationAction 1476275729436 Spreadsheet.java +CompilationAction 1476275729436 Spreadsheet.java +CompilationAction 1476275729437 Spreadsheet.java +CompilationAction 1476275729437 Spreadsheet.java +CompilationAction 1476275766579 Spreadsheet.java +CompilationAction 1476275766580 Spreadsheet.java +CompilationAction 1476275766581 Spreadsheet.java +CompilationAction 1476275766582 Spreadsheet.java +CompilationAction 1476275766766 Spreadsheet.java +CompilationAction 1476275766767 Spreadsheet.java +CompilationAction 1476275808378 Spreadsheet.java +CompilationAction 1476275808379 Spreadsheet.java +CompilationAction 1476275808525 Spreadsheet.java +CompilationAction 1476275808526 Spreadsheet.java +CompilationAction 1476275821184 Spreadsheet.java +CompilationAction 1476275821185 Spreadsheet.java +CompilationAction 1476275821362 Spreadsheet.java +EditAction 1476275899452 Spreadsheet.java 2920 5 8 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f7866bf28e88e1c15699de353411d231c79b0afb..7d665a8643c6385cd5538e2fb5e5959e4a965ecb 100644 GIT binary patch delta 1263 zcmZ8gZAe>Z6n;+bO`_?QmDDKhYS+fC#^n0dwJy$@>QXXna=H0IJJpJqb7J!p5H$6W)st=@c(Nxx4NE_L)q`8pIr52L}pYb zv=dzEWM(!$M^FOwF%js{5WyJ^m~%$9D^E}ZvHGY7N6@9=4MYiL=H*P@NM&+N7#N&4 z7LBH~k(q58o|#XY`SyC|KZtG(Jp#OM7d()>B1rnQBZ!HBVk8nC5C$~VAt0={hE}|0 zZ7T;`{#7r|jA=LrAHiv+lSY;WBo~eJf{{-Oy%QQH@s`!D)RhsYHH;%*Jy-lzxtb!^ zS2?wu3J$@`397h2Uqj&^7z~vVUPVtxDdF_~t|Cs`*7O=qgyO-wIHs4-xdNwpi#LaP zb9Mz)JO19uV30li_b_-%;h*^w)be^9<-AtnMfgy|`2wg$uz*82#jXerqmQrC4?kXJ z*il;uUg2Zn8)Q@k%d9~IhS+jon7ta5KM{08ula*x4vg$wrJHvSMpOt@C5#3`LJvC} zQj13hkHhWf0*icAHhM2#h0H?CI&Kx5RfYaI-zmIG-{`U?9XBW}9O^nX>#C?y-3>J9 z(v{fR9uhm}I=s4b*Z*dGgFf`W!0W<)vHm@h|Dod&-K*R2hU=)dt>z+3+iF|Glp0Z6 z)eW@hKB2|xbTt&h#lN4`tYE*cisU75YWyh3@V$MG+uCPa+}6k*Y)EvpL3XrO)Q(N= zw9D(g6J&ErcAt&j$qg(^x+S@OV%J4hLDc2cIuFV2wPkg@b_$itBeV?3V|{8w5z3o) zlpk~J6t;%k{z3>YZgmA3@e-O)k7jhDg~#9oH~v+Op%n>kb_QWwMH@cm2m2{HP~<^c z!x?QuGDpX%+8N5tryT zGPH@ybeCffk)y}R(-V9^-{Pt@S{91Fjdys`Z?gRJxB!(!*Wz7Vgp=ho${AFcHwuZP X&-tnn$2t5q4#U=ivY6YDqdoHv@FM}? delta 939 zcmZ9LTS!!K5XOJgIjgpvE^KOLH+QYPbTp&dTFdK}y1J{SrrqPTZWNkDSzxz~2!dXM z&XYY@o09dEl1KzeK@dcAptX1*Ebe9gY@^S=D?cnVn0 zfpPEjjHOwLGgj|ut3TmI*kn*hkr$H+gUxKQ{o4HeDuZfjgpBwR>tt=epch4o!w#v= zAk0?#yH=RHhBdWMvA{*;DdH{)4YOOX(u4XaYt0--i+v}vG#N_$e6@6td8Y0( zpG39hqf?CcZeDGQMi=cFrs^-PrDTF7rITzMq(DKxf{{Toe7>;~1*5UwzLu_0uBFRe zNxv7}y`;C`?4@D^|Gy*p+!nf8kE5j}oz|#VX^!%8S9#Erqu;deWfn@v9?J?Ov&kTr z*(_i=3n^w1HRKUxF|912O?kV?rw>1832=b|F0qP~y0u}7xUVwCDPfA$JfoC1l<|%= zd{D7ZtmCt~)h}$|D?z>yl37$p4x1&PEwY+QDN9l<>(zx;QYSTpB}~24(;yKd(n*sX zqge)s%6Vdvq*X4nU9PZ0uF)npXqO>6Bt@q@pi9QtB@-(4lzsA?{qh1!UK3}9`ehE| z1$oO#C0>0Bm8qcx`|Zp*;SP49ahD1@=|Wc%6|jrlc$C&M_9&vJnuba9 0 && value.charAt(0) >= 'A' && value.charAt(0) <= 'Z') { + String key = value; + if (mVisited.contains(key)) { + return true; + + } else { + if (mValues.containsKey(key)) { + mVisited.add(key); + return isCircularRecursive(get(key)); + } else { + return false; + } + } + } else { + return false; + } + } private boolean isCircular(String key) { - ArrayList visited; + mVisited.clear(); + return isCircularRecursive(key); } public String evaluate(String cell) { @@ -61,7 +80,7 @@ public String evaluate(String cell) { } else if (value.charAt(1) >= 'A' && value.charAt(1) <= 'Z') { String key = value.substring(1, value.length()); if (mValues.containsKey(key)) { - if (mVisited.contains(key)) { + if (isCircular(key)) { return CIRCULAR; } else { value = evaluate(key); @@ -98,8 +117,6 @@ public String evaluate(String cell) { } } - mVisited.clear(); - return value; } From eebfc27fed56abcf393af8c0f43e8761454a3528 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:38:47 +0300 Subject: [PATCH 137/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2673 -> 2669 bytes src/Spreadsheet.java | 1 - 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 9f9c0f8..c30717b 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -537,3 +537,6 @@ CompilationAction 1476275821184 Spreadsheet.java CompilationAction 1476275821185 Spreadsheet.java CompilationAction 1476275821362 Spreadsheet.java EditAction 1476275899452 Spreadsheet.java 2920 5 8 0 +UnitTestCaseAction 1476275901358 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476275901358 SpreadsheetTest.java FAIL +EditAction 1476275927385 Spreadsheet.java 2894 5 8 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 7d665a8643c6385cd5538e2fb5e5959e4a965ecb..f8b9efc13f90723c267dd009f3fef8dfb724f850 100644 GIT binary patch delta 415 zcmXAl%}Z2a6vltg%x&&)L6bpuO8Jq>%pF5aG*eLgKm`ZIQnWO`(o!_25Cug9!KI7q zMg&m|-H13SHxLR#Y2l_;{sHY<^bd&dbv7@*_nhaP=i&U%{g>-p-=6;fp7Ad2JhGzQ z)HsMYr)Ab-~-{uaxsr3Hnq?zv>uJ1A}U0NX-nZjS=-Ss%geF&$t$u&=Qkc zVM?pK*E%1x!L+uS(GIgZVot|=RNC~u^I1RnqAM0CF@BRc!3lUmsrdy|K^968(FN58 zL+sPT5W^4(#M~`y!j3Y=1Lct*WprU<-JH>BjprGiiBS~jyaFeoDzC#Sw8xE0 Gh>1G`kyriz delta 420 zcmXAl%}Z2a6vltg%yq6@2xZWPAc$EeGuKh@0}T~pvP>93DMNGo#!to;DpVRq1VKx0 z8#kgDxzs_q3qdgm1Q#Z_@*i;LqJKbqud{jiz2`jVJP+rl=zo!Oc6)dX)H9xS%B=l5 z>rbd^1&aviA{O`QO1VBw8#;2sJ}rfe&{ZIU3le&9#CJK5x2X2b5O(JYT26V7bBebt2K|Ud&*>SDpW}IH>#d zxO*mLmVM41+>MK+F z#Xbj~Lp8P7?a;2=Dv() Date: Wed, 12 Oct 2016 15:38:57 +0300 Subject: [PATCH 138/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2669 -> 2656 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index c30717b..dcf4dc1 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -540,3 +540,6 @@ EditAction 1476275899452 Spreadsheet.java 2920 5 8 0 UnitTestCaseAction 1476275901358 SpreadsheetTest.java FAIL UnitTestSessionAction 1476275901358 SpreadsheetTest.java FAIL EditAction 1476275927385 Spreadsheet.java 2894 5 8 0 +UnitTestCaseAction 1476275928456 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476275928457 SpreadsheetTest.java FAIL +EditAction 1476275937083 Spreadsheet.java 2893 5 8 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f8b9efc13f90723c267dd009f3fef8dfb724f850..d79e448e27826341a6384920b087c9f31ff8d709 100644 GIT binary patch delta 326 zcmXBPy-NZC7{~GNlgFJ2QJB!8OV|t7SrCc6=peNuC=>))nObBSS&>jdP))XXIJiV% zQKNyJK{Pi-b4&COwDkvcSKH_JJUq|C^X>ccHGb5=JPInvi#}wLNE#O7SMq4METUbp zYcZUHaw|d8uZ?JX-p=H`6wP^UK#Tu*$~@Of@i)i38j3R&zajdsr8=XA;%u;3Na;=d zA&Z$BJ$k4`x`yiYHgvnRoHQfus_T=8`R=|rTa+=<5@AIq$w-W>B*;mgyp&jzeb%MS zh8$9mV>acKEvZnHOSYxTj?^j19lP>i_nI8Y6J>ekh#*kF}U5tpqEDLMsq-QG{q{_JNk6K}8q@76dL`ytI%& zih?!~1~EYp6oj;F)jHa@>j(5s?VfuM_rm>jeY@H}>SzTDRDd1bXCj_3OoUo|G;Aiq zeUWnptw6b=U%0g~t?KMeTysavYa?3x&oObNmE#|l@op&A*7OBt{*}4Jq@h?BOe`k# zd$|23VoeO{{s*L+P@T@UE~BM{>^u^4DG{)r+P)AH9ecf&;snx+Aj2tS8AXn>$a4WJ zEMb-VSmOcKd58jQDDoH^tYec6lz4_Mwov8`D!j!u?_~FcUA|zCuc*Qcpa6&UH-<1Q tCrbhJfKd62pj4N5>-G%zkd(H`>rrHplRCjTmXU|ThEN?r_KUE?`wK#wO Date: Wed, 12 Oct 2016 15:39:03 +0300 Subject: [PATCH 139/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2656 -> 2656 bytes src/Spreadsheet.java | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index dcf4dc1..8d95f47 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -543,3 +543,6 @@ EditAction 1476275927385 Spreadsheet.java 2894 5 8 0 UnitTestCaseAction 1476275928456 SpreadsheetTest.java FAIL UnitTestSessionAction 1476275928457 SpreadsheetTest.java FAIL EditAction 1476275937083 Spreadsheet.java 2893 5 8 0 +UnitTestCaseAction 1476275938650 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476275938650 SpreadsheetTest.java FAIL +EditAction 1476275943683 Spreadsheet.java 2893 5 8 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index d79e448e27826341a6384920b087c9f31ff8d709..5c633d3416095b220fc1cc02bd3c25f0dffd44ad 100644 GIT binary patch delta 14 VcmaDL@<3#R1{)*GW=%G8762ve1L*(& delta 14 VcmaDL@<3#R1{)*uW=%G8762vY1Lyz% diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index cd97ea4..896d14f 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -27,11 +27,11 @@ private boolean isCircularRecursive(String value) { mVisited.add(key); return isCircularRecursive(get(key)); } else { - return true; + return false; } } } else { - return false; + return true; } } private boolean isCircular(String key) { From c8965bf9bc72679c344b575f9f7dd8833baa35a5 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:39:16 +0300 Subject: [PATCH 140/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2656 -> 2656 bytes src/Spreadsheet.java | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 8d95f47..1955321 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -546,3 +546,6 @@ EditAction 1476275937083 Spreadsheet.java 2893 5 8 0 UnitTestCaseAction 1476275938650 SpreadsheetTest.java FAIL UnitTestSessionAction 1476275938650 SpreadsheetTest.java FAIL EditAction 1476275943683 Spreadsheet.java 2893 5 8 0 +UnitTestCaseAction 1476275946742 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476275946742 SpreadsheetTest.java FAIL +EditAction 1476275956160 Spreadsheet.java 2899 5 8 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 5c633d3416095b220fc1cc02bd3c25f0dffd44ad..7f7567c65bd3fe483f454a7cd48dddd577ff1400 100644 GIT binary patch delta 16 XcmaDL@<3#R1{*W;8kWu4Y^E##FkS?j delta 16 XcmaDL@<3#R1{*WW8s^Q~Y^E##Fkl3l diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 896d14f..9d2efce 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -31,12 +31,12 @@ private boolean isCircularRecursive(String value) { } } } else { - return true; + return false; } } private boolean isCircular(String key) { mVisited.clear(); - return isCircularRecursive(key); + return isCircularRecursive(get(key)); } public String evaluate(String cell) { From 0bffea6ba6d68f631f37a15867ac73d44fcae37a Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:39:23 +0300 Subject: [PATCH 141/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2656 -> 2660 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 1955321..35ba505 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -549,3 +549,6 @@ EditAction 1476275943683 Spreadsheet.java 2893 5 8 0 UnitTestCaseAction 1476275946742 SpreadsheetTest.java FAIL UnitTestSessionAction 1476275946742 SpreadsheetTest.java FAIL EditAction 1476275956160 Spreadsheet.java 2899 5 8 0 +UnitTestCaseAction 1476275957555 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476275957555 SpreadsheetTest.java FAIL +EditAction 1476275963418 Spreadsheet.java 2898 5 8 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 7f7567c65bd3fe483f454a7cd48dddd577ff1400..6dbe2ba1ed01a7611d836176b7ece21f0aaadd64 100644 GIT binary patch delta 57 zcmaDL@ Date: Wed, 12 Oct 2016 15:40:35 +0300 Subject: [PATCH 142/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2660 -> 2660 bytes src/Spreadsheet.java | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 35ba505..5bfbe1c 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -552,3 +552,6 @@ EditAction 1476275956160 Spreadsheet.java 2899 5 8 0 UnitTestCaseAction 1476275957555 SpreadsheetTest.java FAIL UnitTestSessionAction 1476275957555 SpreadsheetTest.java FAIL EditAction 1476275963418 Spreadsheet.java 2898 5 8 0 +UnitTestCaseAction 1476275964935 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476275964936 SpreadsheetTest.java FAIL +EditAction 1476276035585 Spreadsheet.java 2899 5 8 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 6dbe2ba1ed01a7611d836176b7ece21f0aaadd64..1e01f0e5ea712c3bb07f2255b902de07d580b7bf 100644 GIT binary patch delta 14 VcmaDN@ 0 && value.charAt(0) >= 'A' && value.charAt(0) <= 'Z') { + if (value.length() > 0 && value.charAt(1) >= 'A' && value.charAt(1) <= 'Z') { String key = value; if (mVisited.contains(key)) { return true; @@ -31,7 +31,7 @@ private boolean isCircularRecursive(String value) { } } } else { - return true; + return false; } } private boolean isCircular(String key) { From 900426d8bb41bb7dba07308005160e0dbc3e1094 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:40:52 +0300 Subject: [PATCH 143/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 2660 -> 2660 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 5bfbe1c..84c594b 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -555,3 +555,4 @@ EditAction 1476275963418 Spreadsheet.java 2898 5 8 0 UnitTestCaseAction 1476275964935 SpreadsheetTest.java FAIL UnitTestSessionAction 1476275964936 SpreadsheetTest.java FAIL EditAction 1476276035585 Spreadsheet.java 2899 5 8 0 +EditAction 1476276052000 Spreadsheet.java 2925 5 8 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 1e01f0e5ea712c3bb07f2255b902de07d580b7bf..fc998f6185984d684f87060bf0cd403977289fc3 100644 GIT binary patch delta 30 mcmaDN@ 0 && value.charAt(1) >= 'A' && value.charAt(1) <= 'Z') { + if (value.length() > 1 && value.charAt(0) == '=' && value.charAt(1) >= 'A' && value.charAt(1) <= 'Z') { String key = value; if (mVisited.contains(key)) { return true; From f50c27d62dd3d3e7598e78c564bb5af1ac65a1dd Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:41:02 +0300 Subject: [PATCH 144/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2660 -> 2671 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 84c594b..4b21a7d 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -556,3 +556,6 @@ UnitTestCaseAction 1476275964935 SpreadsheetTest.java FAIL UnitTestSessionAction 1476275964936 SpreadsheetTest.java FAIL EditAction 1476276035585 Spreadsheet.java 2899 5 8 0 EditAction 1476276052000 Spreadsheet.java 2925 5 8 0 +UnitTestCaseAction 1476276053434 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476276053434 SpreadsheetTest.java FAIL +EditAction 1476276062554 Spreadsheet.java 2873 5 8 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index fc998f6185984d684f87060bf0cd403977289fc3..4875268d763c5d0e37e6d93c1deb7a2ce5851e7c 100644 GIT binary patch delta 123 zcmaDN@?K=abymsa49q~tz!0vzjlqIt2}6K3^EL(>0ow(WpRz^-s4<8#XfTK|7&C}7 zm@-H)I50>vcrwT^1T)Angfb{Gr~q{;K=d=HGN=K0K$Czfc^Mdi`g9rmfGj2kf1oH2 O1M?pS)6KnX*O>vLdlRMr delta 112 zcmaDa@pmL3|b6Q45kdy40a4M z3?2+}3| 1 && value.charAt(0) == '=' && value.charAt(1) >= 'A' && value.charAt(1) <= 'Z') { + if (value.length() > 1 && value.charAt(0) == '=') { String key = value; if (mVisited.contains(key)) { return true; From c99f6bed0376c10d86a5593de6cd10ea614f2c98 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:41:05 +0300 Subject: [PATCH 145/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2671 -> 2651 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 4b21a7d..a704947 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -559,3 +559,6 @@ EditAction 1476276052000 Spreadsheet.java 2925 5 8 0 UnitTestCaseAction 1476276053434 SpreadsheetTest.java FAIL UnitTestSessionAction 1476276053434 SpreadsheetTest.java FAIL EditAction 1476276062554 Spreadsheet.java 2873 5 8 0 +UnitTestCaseAction 1476276063768 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476276063768 SpreadsheetTest.java FAIL +EditAction 1476276065514 Spreadsheet.java 2925 5 8 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 4875268d763c5d0e37e6d93c1deb7a2ce5851e7c..6af6650abfc2fba181c808f4a3c1586d473e4e11 100644 GIT binary patch delta 123 zcmaDaa$97>bymsE49q~tz~HRCjlqIt34@I`^EL(>0ow(WS=d|xgcw8_L>R;vn z6d9x#bQq)=Oc`Vt>>1=392t}tRDe1aAo>|p8PtG0ph-X#ybO#$eYy;OKo%2&KTwp1 Of%y-E;^rA_*O>wP@DYdr delta 143 zcmcaD@?K=abynTu49q~tz!0vzjlqIt2}6K3^EL(>0ow%(ZrUs$mg7PO8we|E@#GJz zE&*x`q6``gVhqL%;tZw?QVb3Z(hQyqG7P~CatxsiN(?GM(-a_PGN>}B0eL{vfhu_! c7=ik98T^1OCI)|?C=Ubk9|qISEo|4B0WYK&VgLXD diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index f792e07..1aec155 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -17,7 +17,7 @@ public void set(String cell, String value) { } private boolean isCircularRecursive(String value) { - if (value.length() > 1 && value.charAt(0) == '=') { + if (value.length() > 1 && value.charAt(0) == '=' && value.charAt(1) >= 'A' && value.charAt(1) <= 'Z') { String key = value; if (mVisited.contains(key)) { return true; From 8932443a985e0efa51de77b0f11ee3e8b6699769 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:41:07 +0300 Subject: [PATCH 146/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 2651 -> 2671 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index a704947..232aa0f 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -562,3 +562,4 @@ EditAction 1476276062554 Spreadsheet.java 2873 5 8 0 UnitTestCaseAction 1476276063768 SpreadsheetTest.java FAIL UnitTestSessionAction 1476276063768 SpreadsheetTest.java FAIL EditAction 1476276065514 Spreadsheet.java 2925 5 8 0 +EditAction 1476276067471 Spreadsheet.java 2924 5 8 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 6af6650abfc2fba181c808f4a3c1586d473e4e11..4875268d763c5d0e37e6d93c1deb7a2ce5851e7c 100644 GIT binary patch delta 143 zcmcaD@?K=abynTu49q~tz!0vzjlqIt2}6K3^EL(>0ow%(ZrUs$mg7PO8we|E@#GJz zE&*x`q6``gVhqL%;tZw?QVb3Z(hQyqG7P~CatxsiN(?GM(-a_PGN>}B0eL{vfhu_! c7=ik98T^1OCI)|?C=Ubk9|qISEo|4B0WYK&VgLXD delta 123 zcmaDaa$97>bymsE49q~tz~HRCjlqIt34@I`^EL(>0ow(WS=d|xgcw8_L>R;vn z6d9x#bQq)=Oc`Vt>>1=392t}tRDe1aAo>|p8PtG0ph-X#ybO#$eYy;OKo%2&KTwp1 Of%y-E;^rA_*O>wP@DYdr diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 1aec155..4dd6197 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -31,7 +31,7 @@ private boolean isCircularRecursive(String value) { } } } else { - return false; + return true; } } private boolean isCircular(String key) { From ba1f0052244c74a3343dbabaaed1653058f4dc7a Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:41:11 +0300 Subject: [PATCH 147/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2671 -> 2671 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 232aa0f..ec94eec 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -563,3 +563,6 @@ UnitTestCaseAction 1476276063768 SpreadsheetTest.java FAIL UnitTestSessionAction 1476276063768 SpreadsheetTest.java FAIL EditAction 1476276065514 Spreadsheet.java 2925 5 8 0 EditAction 1476276067471 Spreadsheet.java 2924 5 8 0 +UnitTestCaseAction 1476276068846 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476276068846 SpreadsheetTest.java FAIL +EditAction 1476276071415 Spreadsheet.java 2925 5 8 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 4875268d763c5d0e37e6d93c1deb7a2ce5851e7c..f410644e05ed3ca07891fb5d638f1e745c0ac8cb 100644 GIT binary patch delta 14 VcmaDa@?K Date: Wed, 12 Oct 2016 15:41:42 +0300 Subject: [PATCH 148/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 2671 -> 2671 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index ec94eec..2cd07e9 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -566,3 +566,4 @@ EditAction 1476276067471 Spreadsheet.java 2924 5 8 0 UnitTestCaseAction 1476276068846 SpreadsheetTest.java FAIL UnitTestSessionAction 1476276068846 SpreadsheetTest.java FAIL EditAction 1476276071415 Spreadsheet.java 2925 5 8 0 +EditAction 1476276102260 Spreadsheet.java 2954 5 8 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f410644e05ed3ca07891fb5d638f1e745c0ac8cb..4875268d763c5d0e37e6d93c1deb7a2ce5851e7c 100644 GIT binary patch delta 14 VcmaDa@?K 1 && value.charAt(0) == '=' && value.charAt(1) >= 'A' && value.charAt(1) <= 'Z') { - String key = value; + String key = value.substring(1, value.length()); if (mVisited.contains(key)) { return true; From cabea2058245f5ebd548a48adea8bb4d0d36eaa5 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:42:09 +0300 Subject: [PATCH 149/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 6 ++++++ .../20161012141626179/besouroEpisodes.txt | 3 +++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012141626179/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 2671 -> 2679 bytes tests/SpreadsheetTest.java | 11 ++++++++++- 6 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 2cd07e9..e3b9509 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -567,3 +567,9 @@ UnitTestCaseAction 1476276068846 SpreadsheetTest.java FAIL UnitTestSessionAction 1476276068846 SpreadsheetTest.java FAIL EditAction 1476276071415 Spreadsheet.java 2925 5 8 0 EditAction 1476276102260 Spreadsheet.java 2954 5 8 0 +UnitTestCaseAction 1476276103615 SpreadsheetTest.java OK +UnitTestSessionAction 1476276103616 SpreadsheetTest.java OK +RefactoringAction 1476276110608 SpreadsheetTest.java ADD void testAssignment_Reference_Circular()/2 METHOD +RefactoringAction 1476276114120 SpreadsheetTest.java RENAME testAssignment_Reference_Circular()/2=>void testAssignment_Reference_Circular_Depth() METHOD +RefactoringAction 1476276115631 SpreadsheetTest.java RENAME testAssignment_Reference_Circular_Depth()=>void testAssignment_Reference_Circular_Depth_2() METHOD +EditAction 1476276129499 SpreadsheetTest.java 3281 18 57 17 diff --git a/.besouro/20161012141626179/besouroEpisodes.txt b/.besouro/20161012141626179/besouroEpisodes.txt index 2a63c19..5df3e9f 100644 --- a/.besouro/20161012141626179/besouroEpisodes.txt +++ b/.besouro/20161012141626179/besouroEpisodes.txt @@ -2562,3 +2562,6 @@ 1476274226840 test-first 3 325 true 1476274226841 test-first 3 325 true 1476274226842 test-first 3 325 true +1476276103616 refactoring 2A 1826 true +1476276103617 production 3 1826 false +1476276103618 production 1 1826 false diff --git a/.besouro/20161012141626179/randomHeuristicEpisodes.txt b/.besouro/20161012141626179/randomHeuristicEpisodes.txt index 8de2405..cbe4515 100644 --- a/.besouro/20161012141626179/randomHeuristicEpisodes.txt +++ b/.besouro/20161012141626179/randomHeuristicEpisodes.txt @@ -5,3 +5,4 @@ 1476273633109 test-first 3 1573 true 1476273876066 test-first 3 222 true 1476274226787 test-first 3 325 true +1476276103616 refactoring 2A 1826 false diff --git a/.besouro/20161012141626179/zorroEpisodes.txt b/.besouro/20161012141626179/zorroEpisodes.txt index 6b2d4bc..cfaad8e 100644 --- a/.besouro/20161012141626179/zorroEpisodes.txt +++ b/.besouro/20161012141626179/zorroEpisodes.txt @@ -5,3 +5,4 @@ 1476273633109 test-first 3 1596 true 1476273876066 test-first 3 242 true 1476274226787 test-first 3 350 true +1476276103616 refactoring 2A 1876 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 4875268d763c5d0e37e6d93c1deb7a2ce5851e7c..b64ebfeba29adf9c9e14225c3ca73d0f48e193b7 100644 GIT binary patch delta 469 zcmXYsOG}$U6o#M4eEP*WfQ5;B2mXaFi#PC$=^S{^nfIJC^S*!M|KitkI+|v}@SYF$NhhQ2Oc|!h z+ZCN0nlXGNuc+TX*#A=5+drJ$J&MuJoMGPay0WtqL-EOwq~BGG_DZL{RYS?%>Xt^u znqh?z*V-_YZ-%{db^He{0b8k%cisi%lnxnh%$`zAd9Io`W3pPUoim#9++0X*KKMar zI%M*M8t+mrt#T=xkoeEfmV!W-;!hSXwS;`3=@#sxPB1RHnL&;djL|}tR}^^7BCV{8 zsZF}*k+F`dHhN{;oh{zdAo>T%uq0K4Wnm5ak*rU;?Ou8jXHs%PIy15#k=*1|g?tVI zk^iDe$cX5%ziWFs+)GNLOn-GxSMaC>_3LHcHu+O3XG?xY@VkE~c<1-Uaz$r5Bev~8 Xw5W17U!&iYTCxvy-D=ssi7h+>_8(TX delta 437 zcmXX>JxfAi6nQasnnI3KirBx3wLCk{r+ix{Y0dD)wZVn_h;RKoJY7??9mZ zG_SSU{u?+MP>pu6s6C(<lx#A7s(d-v<@XfO4eHN z|MTlr%OYm;1$nvT9=?pgk2wSo$1su@p~r(Lk%kH;FhzGmf7daMFlF=ybq>&n5yapS za$$>D0se!y2lnVU)m%yjML$)tH1DD~sP1>MZCNBlUGEU-f_!&}LuwBrE7R8A6t6>r x8(^=!ZaL&hvx+?Q#K_-zn&g=tHY$#i7bAIcMt4}{=}Nz5%#qxfWLwfSioeDfPiO!D diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index a55ca5d..9f5219d 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -118,7 +118,7 @@ public void testAssignment_Reference_Invalid_Error() { String result = sheet.evaluate("A1"); assertEquals("#Error", result); } - + @Test public void testAssignment_Reference_Circular() { sheet.set("A1", "=A2"); @@ -126,4 +126,13 @@ public void testAssignment_Reference_Circular() { String result = sheet.evaluate("A1"); assertEquals("#Circular", result); } + + @Test + public void testAssignment_Reference_Circular_Depth_2() { + sheet.set("A1", "=A3"); + sheet.set("A2", "=A1"); + sheet.set("A3", "=A2"); + String result = sheet.evaluate("A1"); + assertEquals("#Circular", result); + } } From 5cd6ab7ec7e77fe46c4514176755c56bae97fa52 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:42:20 +0300 Subject: [PATCH 150/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ .../20161012141626179/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012141626179/zorroEpisodes.txt | 1 + bin/SpreadsheetTest.class | Bin 3628 -> 3837 bytes src/Spreadsheet.java | 3 ++- 6 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index e3b9509..4ee3aba 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -573,3 +573,6 @@ RefactoringAction 1476276110608 SpreadsheetTest.java ADD void testAssignment_Ref RefactoringAction 1476276114120 SpreadsheetTest.java RENAME testAssignment_Reference_Circular()/2=>void testAssignment_Reference_Circular_Depth() METHOD RefactoringAction 1476276115631 SpreadsheetTest.java RENAME testAssignment_Reference_Circular_Depth()=>void testAssignment_Reference_Circular_Depth_2() METHOD EditAction 1476276129499 SpreadsheetTest.java 3281 18 57 17 +UnitTestCaseAction 1476276131158 SpreadsheetTest.java OK +UnitTestSessionAction 1476276131158 SpreadsheetTest.java OK +EditAction 1476276140511 Spreadsheet.java 2958 5 8 0 diff --git a/.besouro/20161012141626179/besouroEpisodes.txt b/.besouro/20161012141626179/besouroEpisodes.txt index 5df3e9f..91af426 100644 --- a/.besouro/20161012141626179/besouroEpisodes.txt +++ b/.besouro/20161012141626179/besouroEpisodes.txt @@ -2565,3 +2565,5 @@ 1476276103616 refactoring 2A 1826 true 1476276103617 production 3 1826 false 1476276103618 production 1 1826 false +1476276131158 test-addition 1 20 true +1476276131159 test-addition 1 20 true diff --git a/.besouro/20161012141626179/randomHeuristicEpisodes.txt b/.besouro/20161012141626179/randomHeuristicEpisodes.txt index cbe4515..0a35218 100644 --- a/.besouro/20161012141626179/randomHeuristicEpisodes.txt +++ b/.besouro/20161012141626179/randomHeuristicEpisodes.txt @@ -6,3 +6,4 @@ 1476273876066 test-first 3 222 true 1476274226787 test-first 3 325 true 1476276103616 refactoring 2A 1826 false +1476276131158 test-addition 1 20 true diff --git a/.besouro/20161012141626179/zorroEpisodes.txt b/.besouro/20161012141626179/zorroEpisodes.txt index cfaad8e..f4abff6 100644 --- a/.besouro/20161012141626179/zorroEpisodes.txt +++ b/.besouro/20161012141626179/zorroEpisodes.txt @@ -6,3 +6,4 @@ 1476273876066 test-first 3 242 true 1476274226787 test-first 3 350 true 1476276103616 refactoring 2A 1876 true +1476276131158 test-addition 1 27 true diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 3db0cc745663a53df5fabe94ffdcb8bc1ebe15de..64503a2acbf78e4c35bd30105fde44a4877017f5 100644 GIT binary patch delta 205 zcmZ1@^H-MZ)W2Q(7#J8#7_v5U9bskEoSeuiIe85$hh)4yGDlV)W2Q(7#J8#7*aQK9bui!&1T9dwAqnOnS+&qfr%jn0O}bD#sB~S diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 5ba9159..7da3d84 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -17,7 +17,8 @@ public void set(String cell, String value) { } private boolean isCircularRecursive(String value) { - if (value.length() > 1 && value.charAt(0) == '=' && value.charAt(1) >= 'A' && value.charAt(1) <= 'Z') { + if (value.length() > 1 && value.charAt(0) == '=' + && value.charAt(1) >= 'A' && value.charAt(1) <= 'Z') { String key = value.substring(1, value.length()); if (mVisited.contains(key)) { return true; From 1626419a500a960a1b5d773377ecbbf6ec722a28 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:44:04 +0300 Subject: [PATCH 151/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2679 -> 2683 bytes src/Spreadsheet.java | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 4ee3aba..e5cf619 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -576,3 +576,6 @@ EditAction 1476276129499 SpreadsheetTest.java 3281 18 57 17 UnitTestCaseAction 1476276131158 SpreadsheetTest.java OK UnitTestSessionAction 1476276131158 SpreadsheetTest.java OK EditAction 1476276140511 Spreadsheet.java 2958 5 8 0 +RefactoringAction 1476276215254 Spreadsheet.java ADD void isVariable() METHOD +RefactoringAction 1476276219770 Spreadsheet.java RENAME isVariable()=>void isVariable(String) METHOD +EditAction 1476276244425 Spreadsheet.java 3088 6 9 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index b64ebfeba29adf9c9e14225c3ca73d0f48e193b7..3ba3cbefc24467a4334ae98e4136e1415b3d3038 100644 GIT binary patch delta 295 zcmWN}TPuSB0EhACf3XR<(S|~lVoYqT#x%zqa%@A|G#SgWy<1IM%Hhff@a6+(Dej01 zQY)W8qPUb?E2Ug0d9Qy@&yVBRaq(i)llf{(yPGHi9F*duo-#a?(?tbADjA`Q5Y^06 zLyS5zWjAaM6yUmgxBqFs89ObM&}y-VM!fXW#yIUv;UkQn1RWT3vO|DfYkNR9C-jiB z%5(a-q@O$k+%w1nLp(Cfvt@6L@nM}lnc#~_z6q(Au$)Y*mKnL2l{?CuyhP+9DnBs= zSWu8fjS^R!B_&x_nuIc}Xq#1KS<@ctI%GpfZ0eY#au_-#r8CQ}$>@eH-H|nK3-kYs C4LoE3 delta 291 zcmWNJO)JB30LMSy!+%-uqBy;#a;UageJ#tFEvanndK9h4BHltIb}Q_d_E#Hh}s z9ZAck0ME^b<4=cP9Mn-nJ(V<2Ytn9f4AaCY%|vKr2|r2N*rT0&0vws`8J%S5;?mgH z^pK;MNBYRq&l3YY8}>$scZT>hw=YKcW=w^I 0 && value.charAt(1) >= 'A' && value.charAt(1) <= 'Z'; + } + private boolean isCircularRecursive(String value) { if (value.length() > 1 && value.charAt(0) == '=' && value.charAt(1) >= 'A' && value.charAt(1) <= 'Z') { From f804825f1f141e20f87ecd559fd2f33eca7e7c01 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:46:41 +0300 Subject: [PATCH 152/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 6 +++++ bin/Spreadsheet.class | Bin 2683 -> 2802 bytes src/Spreadsheet.java | 30 ++++++++++++++++--------- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index e5cf619..7bf6d6c 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -579,3 +579,9 @@ EditAction 1476276140511 Spreadsheet.java 2958 5 8 0 RefactoringAction 1476276215254 Spreadsheet.java ADD void isVariable() METHOD RefactoringAction 1476276219770 Spreadsheet.java RENAME isVariable()=>void isVariable(String) METHOD EditAction 1476276244425 Spreadsheet.java 3088 6 9 0 +RefactoringAction 1476276270483 Spreadsheet.java ADD boolean isAssignment FIELD +RefactoringAction 1476276272496 Spreadsheet.java RENAME isAssignment=>boolean isAssignment() METHOD +RefactoringAction 1476276283026 Spreadsheet.java RENAME isAssignment()=>boolean isAssignment(String) METHOD +RefactoringAction 1476276321651 Spreadsheet.java ADD String get FIELD +RefactoringAction 1476276326167 Spreadsheet.java REMOVE get FIELD +EditAction 1476276401484 Spreadsheet.java 3252 7 10 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3ba3cbefc24467a4334ae98e4136e1415b3d3038..c1563db875b5bee861e815e8542b7f122896f080 100644 GIT binary patch delta 930 zcmYk4+iy%!6vlsR&UB`ZQ?#@crEXO-ZBmrFmA0ewj$XA@?di;5w2B$`dqTW<;KV~; zB+?L)CN!E>NSpBJfk^xTB%US26Vg~`ipWXU*?X;Tf9qS{-aqGk%QW9iy_f`wIW%H^ z@|b2U(Q3zIc5lBk<*6$Y(wa`$;l6tNM6>3i!rWLQ6pM#X_uKKtX!vwI5jzt#DIjFA zlS-%ASmWDmQAM?L-B{gJYf(qFFf)97;FKL3NYqBpn=GNhVvn0Q>`25!*k`ete0SAk zQBH|g`l9CrmGifod#uf3zmw+8p4Dm5LWzs-vS@dTy|={w?6o&j>;ri8gQdYSHr*pT z=pAF*obvn3o?dkfk>VXTh81G4LZeSfU>++qW=$Vu6?wW-5;l;g^)g)>NRF1vowq4v zS1alRqbw^JW7nWdr<=vPsTm~ePrkk_5YWutaT>MRf9(R8O16LuvbD)Vide)}7E`Lt zs>o#@%ji^LU22FcDOVdq_diM9t|aG{&%dZyrFoLlER0{2`YFiyp<+F>I8S^FT3Z7F z^&qK089d2hP5na<#r`*N`akw`TvpMqoqUa1I=78iO+qG;bWV=HQYxIVzfj|Ce?ntQ zYF?J&CEVnJ2s>2)fTlW)=qqL<<55n?>Tv6^Sbsg1AD&X(w-T-shb2fBxtE&v||Xe*4Y0f1kesB4kVE zrz$6D_zfZ8d=tOpGa{x*n0AXT#GO+{v%AA$8=cNAqv>*&#SS`!n)Hc$(az-y-PyAy z3+S=vEyoQzlQ9u?S~L+XpZYD<64lIT_N?Gb7VY$CuYGdBJ~WmU%v>R!8&6M++2duJ zJr;umgzEHI)*ctU+0*vegk8**nT9QD28foA`z?l?cGop=Kb~;~#OZTK!?E7bG>gJd z*g8qIYf7E@>TI8+?ti>{Fci{A-&1xuCAWX6pIQPeqmGr-vyr*9F^}!cr=JG)v5*u? zoGc85YOv$du)Sj7^xW(ClM zhoF=4)HjxCMZY0}vm}O%3pdEi%4O$0u2!b@K`BJi|KjtmhmXxTq7j z!X|FBnY)U7NINBc0 0 && value.charAt(1) >= 'A' && value.charAt(1) <= 'Z'; } + private boolean isAssignment(String value) { + return value.length() > 0 && value.charAt(0) == '='; + } + private boolean isCircularRecursive(String value) { - if (value.length() > 1 && value.charAt(0) == '=' - && value.charAt(1) >= 'A' && value.charAt(1) <= 'Z') { - String key = value.substring(1, value.length()); - if (mVisited.contains(key)) { - return true; - - } else { - if (mValues.containsKey(key)) { - mVisited.add(key); - return isCircularRecursive(get(key)); + if (isAssignment(value)) { + String assignment = value.substring(1, value.length()); + if (isVariable(assignment)) { + String key = value.substring(1, value.length()); + if (mVisited.contains(key)) { + return true; + } else { - return false; + if (mValues.containsKey(key)) { + mVisited.add(key); + return isCircularRecursive(get(key)); + } else { + return false; + } } + } else { + return false; } } else { return false; From 1fb875226ac29aa5366143e9bec718b963cc9300 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:47:37 +0300 Subject: [PATCH 153/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2802 -> 2960 bytes src/Spreadsheet.java | 7 +++---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 7bf6d6c..46340cf 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -585,3 +585,6 @@ RefactoringAction 1476276283026 Spreadsheet.java RENAME isAssignment()=>boolean RefactoringAction 1476276321651 Spreadsheet.java ADD String get FIELD RefactoringAction 1476276326167 Spreadsheet.java REMOVE get FIELD EditAction 1476276401484 Spreadsheet.java 3252 7 10 0 +UnitTestCaseAction 1476276404212 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476276404212 SpreadsheetTest.java FAIL +EditAction 1476276457670 Spreadsheet.java 3187 7 10 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index c1563db875b5bee861e815e8542b7f122896f080..eb2ee5b42a72da4bd2738111ce15cd22ad29c8b6 100644 GIT binary patch delta 994 zcmYL{Pi$0G6vlt2Z`zp*k0?Xh5<{gR(E6qgsaA`n6)FtSmJU*=<&UL(wgV2f12Uxu zsKdgzGci70%!WV+L=zS^k}1ImaqEVdxMC#ucxs*o89+7>AFm+5{U$_6)C+g@R??AmLyTARIP8kXY2qd}m^ z$O5Ax=SH=qBlsG==G7!EiiHXu?9o4NCTVzQOuhJ_WZ?lK3GGiOVY-frc6lBkNcJi5? z>_rB+!XQ_L`ay4Xo-B8S{#Dl9Q^oJH?+@kvWR!;-KV6YCajgv z(ubL}4szDXG3z34-JGyqrfq;33n|zPC+!rctjKAbqiCNnYoBw*zGTk6;jDefIlIbv zyT%3kUb&l;>=qa8XTFF!lj*Hfj7AgV&W-W$2e@!;qH$%6I``IiPcmoj%y+(-`OdkW`#s0|_V@EwKovvt z-mqZ}7(P!K4JM5=SvQRm&uUssb`!SV7$wzhCVL1AnS*1alhKo-6K(N}URKj#ve%9q z(OArju-~MFQrkOdvWuX#(VZLUGU+BqNE;lEN5=(E{CsryTy!#Sf_3i!z3d@o- zCrES8=}(^iv?lQVi??_A{TkV~$bmUSmzFSCtJaTK?Q*hNK{3-SsbCeg^3_E4JQHKMp#0`k(~vnoAJQg2Op z%GEyfOsHL%QJi1jVM|l)NR#U?U!*s|lI-j!ehnS5A{n)cOJwvY1T|S$#{7X=0vcUeUs99rzusyr+#%n)|E_ zU)aZ2751Al{ot@<(kVG~NdetbN{61-Fq>7^wBq}uwNQjuU5|=1LGQx2=!wH$- zl$__ZOff9i7?B%{${oh!E@x$yae2UmJks0(7vvdJ@`5YY2XA1 0 && value.charAt(1) >= 'A' && value.charAt(1) <= 'Z'; } @@ -26,9 +26,8 @@ private boolean isAssignment(String value) { private boolean isCircularRecursive(String value) { if (isAssignment(value)) { - String assignment = value.substring(1, value.length()); - if (isVariable(assignment)) { - String key = value.substring(1, value.length()); + String key = value.substring(1, value.length()); + if (isReference(key)) { if (mVisited.contains(key)) { return true; From 6a1fbf99f4aa95628c5af528045d26cd44b4f062 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:48:11 +0300 Subject: [PATCH 154/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 9 +++++++++ bin/Spreadsheet.class | Bin 2960 -> 2919 bytes src/Spreadsheet.java | 25 +++++++++++-------------- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 46340cf..474f53c 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -588,3 +588,12 @@ EditAction 1476276401484 Spreadsheet.java 3252 7 10 0 UnitTestCaseAction 1476276404212 SpreadsheetTest.java FAIL UnitTestSessionAction 1476276404212 SpreadsheetTest.java FAIL EditAction 1476276457670 Spreadsheet.java 3187 7 10 0 +UnitTestCaseAction 1476276459366 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476276459366 SpreadsheetTest.java FAIL +RefactoringAction 1476276476492 Spreadsheet.java RENAME isReference(String)=>boolean isVariable(String) METHOD +RefactoringAction 1476276480006 Spreadsheet.java RENAME isVariable(String)=>boolean isReference(String) METHOD +RefactoringAction 1476276488023 Spreadsheet.java REMOVE isAssignment(String) METHOD +RefactoringAction 1476276488024 Spreadsheet.java REMOVE isReference(String) METHOD +RefactoringAction 1476276491038 Spreadsheet.java ADD boolean isReference(String) METHOD +RefactoringAction 1476276491039 Spreadsheet.java ADD boolean isAssignment(String) METHOD +EditAction 1476276491341 Spreadsheet.java 3194 7 10 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index eb2ee5b42a72da4bd2738111ce15cd22ad29c8b6..bd8557cc206781e3841d9400e4382e3bc98c2dd0 100644 GIT binary patch delta 671 zcmX|-O-Phc6o#KOGdeaughMk@X_;o$_f3{&P5G0Nny8uOBFmi7as155(ef8F(jaIZ zeY6;86H*kkNR%-OgrHTMDB1=ELAxku6%ie$h`YG=J@2{aJm=gl_!9EG{{4InsAgoz z^U1N%o1E;jhO7x|EMW;j`ULR3{LQW!O#V3S3YbKtWj!#)0gnl1A zMAlyeK4Qz`u2DzJE1Y_u-7r^aOw(k#%nXM!GRH&)mY&d{DF$Mr--p^DBl zp?~qNZo>%M``n?03cOmWkUWYAu#GKjr;K9CDW!^?)T(M$)q+VY6&gX^Y2;(nd<+jLIlua)rw>$+*lgA+t=%JX3OuX}QCU z++|i4xhfBslSk^UFfY$okQdyv-+9c2gyK7SsN-1-;ZoRAE;3AxVw7Z;j Wt|FVK^-I?C>^g6UJE;qIaOn@bh}Hm!C?kn z48@up2XieKH>ouc##{_<_#8o7bO$>QeWuU!ZqXX2+w1TqsY}w2ziv+tZEWYLt|xKnTF4%Xa4V-n9N`$nM5`#F zTEhm8(?%IRlyij&u2Q90Ff;75TBaxE$!Yef0ypQmp^;5dl?-TPr$y^-9Dk^GQlYcx zH=*W6IZ5*^(^S1_%9^#M$r@?IDV%D4ii0O}W0yl-`aRK(!y7-H zXT&uUC)@3Ql@dQ1tJ(W3T1PhZ%ITcSY~Tcq%B_jZG^@TAdTC{x3xrhhA{V*OC6?*n zIi0L1YK<-ubhEAKck0Fmz41{U`J}ba^z()5d{gy5l*cayC5Iu&XIP3Ek#a2Y4lpLw z_@ssjsl_k#Oi3dF=^!W;AqjFvW|)x(VVNf)_n4Ij%*i9>9UTSTV zsJv!b-tsWEW_X*&@u`igDsh5I{h)-}b{jugN~1LM8QL=?QgO1x*$htmm!@#B{W)FE JskGhG{{Rh0jL851 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index d5cccce..8e1fec7 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -15,7 +15,7 @@ public String get(String cell) { public void set(String cell, String value) { mValues.put(cell, value); } - + private boolean isReference(String value) { return value.length() > 0 && value.charAt(1) >= 'A' && value.charAt(1) <= 'Z'; } @@ -25,22 +25,19 @@ private boolean isAssignment(String value) { } private boolean isCircularRecursive(String value) { - if (isAssignment(value)) { + if (value.length() > 1 && value.charAt(0) == '=' + && value.charAt(1) >= 'A' && value.charAt(1) <= 'Z') { String key = value.substring(1, value.length()); - if (isReference(key)) { - if (mVisited.contains(key)) { - return true; - + if (mVisited.contains(key)) { + return true; + + } else { + if (mValues.containsKey(key)) { + mVisited.add(key); + return isCircularRecursive(get(key)); } else { - if (mValues.containsKey(key)) { - mVisited.add(key); - return isCircularRecursive(get(key)); - } else { - return false; - } + return false; } - } else { - return false; } } else { return false; From e4c440c018bdc7d88a009f831fd51df5a6818d2f Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:49:04 +0300 Subject: [PATCH 155/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ .../20161012141626179/besouroEpisodes.txt | 2 ++ .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012141626179/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 2919 -> 2914 bytes src/Spreadsheet.java | 9 ++++++--- 6 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 474f53c..8699d47 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -597,3 +597,6 @@ RefactoringAction 1476276488024 Spreadsheet.java REMOVE isReference(String) METH RefactoringAction 1476276491038 Spreadsheet.java ADD boolean isReference(String) METHOD RefactoringAction 1476276491039 Spreadsheet.java ADD boolean isAssignment(String) METHOD EditAction 1476276491341 Spreadsheet.java 3194 7 10 0 +UnitTestCaseAction 1476276491868 SpreadsheetTest.java OK +UnitTestSessionAction 1476276491868 SpreadsheetTest.java OK +EditAction 1476276544509 Spreadsheet.java 3175 7 10 0 diff --git a/.besouro/20161012141626179/besouroEpisodes.txt b/.besouro/20161012141626179/besouroEpisodes.txt index 91af426..0ac08c3 100644 --- a/.besouro/20161012141626179/besouroEpisodes.txt +++ b/.besouro/20161012141626179/besouroEpisodes.txt @@ -2567,3 +2567,5 @@ 1476276103618 production 1 1826 false 1476276131158 test-addition 1 20 true 1476276131159 test-addition 1 20 true +1476276491868 refactoring 2A 351 true +1476276491869 production 3 351 false diff --git a/.besouro/20161012141626179/randomHeuristicEpisodes.txt b/.besouro/20161012141626179/randomHeuristicEpisodes.txt index 0a35218..09708ba 100644 --- a/.besouro/20161012141626179/randomHeuristicEpisodes.txt +++ b/.besouro/20161012141626179/randomHeuristicEpisodes.txt @@ -7,3 +7,4 @@ 1476274226787 test-first 3 325 true 1476276103616 refactoring 2A 1826 false 1476276131158 test-addition 1 20 true +1476276491868 refactoring 2A 351 false diff --git a/.besouro/20161012141626179/zorroEpisodes.txt b/.besouro/20161012141626179/zorroEpisodes.txt index f4abff6..eb707d4 100644 --- a/.besouro/20161012141626179/zorroEpisodes.txt +++ b/.besouro/20161012141626179/zorroEpisodes.txt @@ -7,3 +7,4 @@ 1476274226787 test-first 3 350 true 1476276103616 refactoring 2A 1876 true 1476276131158 test-addition 1 27 true +1476276491868 refactoring 2A 360 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index bd8557cc206781e3841d9400e4382e3bc98c2dd0..dfe95651e5c98fe91480ccf445de693ed7ca6411 100644 GIT binary patch delta 820 zcmX|<%}Z2a6vlt=+^de`Ez)Qr(8;XSW*jn_($vXp{2X=6k4i^PM;*(`(VDUkGhMZ5 z*QJHK#EJwLNis%}5VUF&QGY;0&@K>KMMURbBVIW7oadbPobx>I{qFwicD?`eY8?o0 ze#JGRIZLQDsH5JzuN65xG#WG!Hs5JQhg%F<2`jROClc3UV~J#Q{FVz3Z3d?-T#Jp2 zxKMN$6j5w>U8YCR)w>OP%;Wm5t$hY(D6QaPSy{qggNzpJ*n!YSSt_02Vxc}jivtF+t?Q3){YjR|S z#$K^rTw-&{A&)|4J(RMWO7aOxx{-afv!7mJ(2q|dBxCOX^K@GP#$qXUpsAqu&7Dcor zA-O`Bb((oAKgkCoe3YA?CHI9+zR|@Gp|Byc{G>-^5mh_rRr&O(V)~UY%78jVOa&NH zWyDnlqbkS+6=qDuxTwatq$atnk|fj=6Y3_D>MmE*J+7(;B-KN%t3{^N6K<$yl3Qh3 zz2uI1&78U9@>LHoD6jBTD8(2O-Bv{PVWE^JYZTbpYSJ?#Z!2|bTIkz#(!ao}Gq-28 LX2j)P9E|=2r-_wz delta 827 zcmXYv+e=hY6vlsR&Zy&f3>r`&w9I>Fw2NAnW>z|y_e-T_-bS6$yp=c9NQx-LNtbhzFksUA zywyAIS$>P51M02d7L`$|g5KaJ$2SQzTKQYlMmcP4us?s3`Y18pRZUVgX^xWoA8+fh zEJZGE(Xnc{L(3UtYCK4S##DTy5m5De*he<$DmjxvvM6IYn~5><165-#b=!)Zkm@%|w%1Gjq|=~jo*DaX`v>^j{?_^ z6sus1z9_MQz?!8{*gh0rro7Sk{^b%abwaNwRRhX6z)9_)oCZ$OOa*P6Wr#{9sA5t5 zxJ5O$wT*|=v7-GyQ|7vUjcuBELkl1DZ+z5KpLFjt?R=$!A9V6l{rN?=B+w&C^h!E? zl1IM;yBLro3`sE&DPdSj8If{ErH(NPGcMyy$aN-Vnj135l*}_NOU%eUX5~I}@_>0+ zVL=|VC{J~7gC%*vvb^H1{m37z7*zQNPqe)VSJbz4HTf#T#Hfr6_t6ZkS&7S&n`(v2 S)A|_>&)${L7&qcR&b5D`NSM9= diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 8e1fec7..9e6b48f 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -17,7 +17,7 @@ public void set(String cell, String value) { } private boolean isReference(String value) { - return value.length() > 0 && value.charAt(1) >= 'A' && value.charAt(1) <= 'Z'; + return value.length() > 0 && value.charAt(0) >= 'A' && value.charAt(0) <= 'Z'; } private boolean isAssignment(String value) { @@ -25,9 +25,9 @@ private boolean isAssignment(String value) { } private boolean isCircularRecursive(String value) { - if (value.length() > 1 && value.charAt(0) == '=' - && value.charAt(1) >= 'A' && value.charAt(1) <= 'Z') { + if (isAssignment(value)) { String key = value.substring(1, value.length()); + if (isReference(key)) { if (mVisited.contains(key)) { return true; @@ -39,6 +39,9 @@ private boolean isCircularRecursive(String value) { return false; } } + } else { + return false; + } } else { return false; } From 83f55d667c2a08209256497e6d0b0068b10e4f39 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:49:08 +0300 Subject: [PATCH 156/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ .../20161012141626179/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012141626179/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 2914 -> 2919 bytes src/Spreadsheet.java | 18 +++++++++--------- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 8699d47..28f1d7e 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -600,3 +600,6 @@ EditAction 1476276491341 Spreadsheet.java 3194 7 10 0 UnitTestCaseAction 1476276491868 SpreadsheetTest.java OK UnitTestSessionAction 1476276491868 SpreadsheetTest.java OK EditAction 1476276544509 Spreadsheet.java 3175 7 10 0 +UnitTestCaseAction 1476276545719 SpreadsheetTest.java OK +UnitTestSessionAction 1476276545720 SpreadsheetTest.java OK +EditAction 1476276548778 Spreadsheet.java 3186 7 10 0 diff --git a/.besouro/20161012141626179/besouroEpisodes.txt b/.besouro/20161012141626179/besouroEpisodes.txt index 0ac08c3..1a95f66 100644 --- a/.besouro/20161012141626179/besouroEpisodes.txt +++ b/.besouro/20161012141626179/besouroEpisodes.txt @@ -2569,3 +2569,4 @@ 1476276131159 test-addition 1 20 true 1476276491868 refactoring 2A 351 true 1476276491869 production 3 351 false +1476276545720 refactoring 2A 1 true diff --git a/.besouro/20161012141626179/randomHeuristicEpisodes.txt b/.besouro/20161012141626179/randomHeuristicEpisodes.txt index 09708ba..5630e53 100644 --- a/.besouro/20161012141626179/randomHeuristicEpisodes.txt +++ b/.besouro/20161012141626179/randomHeuristicEpisodes.txt @@ -8,3 +8,4 @@ 1476276103616 refactoring 2A 1826 false 1476276131158 test-addition 1 20 true 1476276491868 refactoring 2A 351 false +1476276545720 refactoring 2A 1 true diff --git a/.besouro/20161012141626179/zorroEpisodes.txt b/.besouro/20161012141626179/zorroEpisodes.txt index eb707d4..ed9d488 100644 --- a/.besouro/20161012141626179/zorroEpisodes.txt +++ b/.besouro/20161012141626179/zorroEpisodes.txt @@ -8,3 +8,4 @@ 1476276103616 refactoring 2A 1876 true 1476276131158 test-addition 1 27 true 1476276491868 refactoring 2A 360 true +1476276545720 refactoring 2A 53 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index dfe95651e5c98fe91480ccf445de693ed7ca6411..3787f8269dc8653dc4c74fd4a4611c73ed58c863 100644 GIT binary patch delta 843 zcmXYv+e=hY6vlsR&Zy(evCDu4p=H;xbF_K~F(M&>s*H^b$ePQ$)1RDK@OV*SEjD_WHiPKbL(i3%>pH{1vc? z!I|K&5f++Eb`uR!&0dpz?00S$5ryL>TU>Yv2TWQ?IMYUCW4p;g5<;kNI6aaaNM~A7 z6E5Yj$q^SflKuTbgkvTVs@&CaC+IJ?J59PM6$<)>Qpw9gAT^d88cmL*TuP70N%tn9 z*QERDLI13Tj6C%VcHd>bZ8!@GpJd-)=ztc>o})2GlkKZuCjpYQWAgpQ@vy@d-s)QBPvXVNo ztB7g351VGCuT*;FzkZasS~Km8&6KEyFi}qE%EvB6OYr|DQbcuy{L)RIt5oMQ-D=hX zKAji34dyvzS*pluPeGs8SkNQXQsiT!^R8%7rCV5ZbW`=Oijl-mA;?SbwBrxNB<92e zH5$hQ8I9ipt1Ds&*N+;{k409^9H(;>hQrgALP=*`ah>u8i+i$BEwxRr*sccDv4(op z(7*w9(8f*M z2j4l)5B29Kof4u;O6itLPD>R%VxOc}HqbAdNJ*4)vYi2GU{K-=Ns?#*&do{^Oo+;r{-?VWwvzQIG4m*R~2Hlrq= k`H=RY;V?=b&=~y3EnnY-=P3-D4lhcmA+XHO>?l>U#F&eENY+E$EdIZE(Xz7Y$w7!eF(R4NGG_!|JRn$#TPiV%SPtgoL>7*QF zgKEkphZDN*0bZi6%w+Wyg3@DyyF_zycsE>M#q{Q*P3mC zoE17}iA_p+7Eq|$&WkTn-dKF^be@(vq+;^bi~{y@SVa|5uf{Y{Obew9C^AABH#x=> zA!ev#jwKFMcL3K^0T&PpxA65*U&@5imafA9U9)|t^?c$kO diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 9e6b48f..5bb4a07 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -28,17 +28,17 @@ private boolean isCircularRecursive(String value) { if (isAssignment(value)) { String key = value.substring(1, value.length()); if (isReference(key)) { - if (mVisited.contains(key)) { - return true; - - } else { - if (mValues.containsKey(key)) { - mVisited.add(key); - return isCircularRecursive(get(key)); + if (mVisited.contains(key)) { + return true; + } else { - return false; + if (mValues.containsKey(key)) { + mVisited.add(key); + return isCircularRecursive(get(key)); + } else { + return false; + } } - } } else { return false; } From a90d39e8e23cbbaab8b0a8c7f77b5563bfcfbb46 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:50:41 +0300 Subject: [PATCH 157/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ src/Spreadsheet.java | 1 + 2 files changed, 4 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 28f1d7e..df5728e 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -603,3 +603,6 @@ EditAction 1476276544509 Spreadsheet.java 3175 7 10 0 UnitTestCaseAction 1476276545719 SpreadsheetTest.java OK UnitTestSessionAction 1476276545720 SpreadsheetTest.java OK EditAction 1476276548778 Spreadsheet.java 3186 7 10 0 +RefactoringAction 1476276630805 Spreadsheet.java ADD boolean isStringLiteral FIELD +RefactoringAction 1476276634320 Spreadsheet.java RENAME isStringLiteral=>boolean isStringLiteral(String) METHOD +EditAction 1476276641122 Spreadsheet.java 3188 7 10 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 5bb4a07..9eb4caa 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -46,6 +46,7 @@ private boolean isCircularRecursive(String value) { return false; } } + private boolean isCircular(String key) { mVisited.clear(); return isCircularRecursive(get(key)); From e0a8e231ad12c6d89ef7bdf429ee87461d1c52e1 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:51:19 +0300 Subject: [PATCH 158/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 2919 -> 2919 bytes src/Spreadsheet.java | 3 ++- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index df5728e..db16bd2 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -606,3 +606,4 @@ EditAction 1476276548778 Spreadsheet.java 3186 7 10 0 RefactoringAction 1476276630805 Spreadsheet.java ADD boolean isStringLiteral FIELD RefactoringAction 1476276634320 Spreadsheet.java RENAME isStringLiteral=>boolean isStringLiteral(String) METHOD EditAction 1476276641122 Spreadsheet.java 3188 7 10 0 +EditAction 1476276679486 Spreadsheet.java 3211 7 10 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3787f8269dc8653dc4c74fd4a4611c73ed58c863..b25dc5d9ddf8861779f408e94bf2681c38253ddb 100644 GIT binary patch delta 241 zcmWNIze>V!00-|g=noV}U2RO7L?N-XKr65`%ApeaBUX^8iI$mBIz$gp^Z+4&ZiNkj zAoKtcMGw#rxCMc8^xY2bZs-|$9$qb50E=Mn!}?P*gq<)hrtmV2j|j6wSz?A|L#xEt zB~FPs8q9Of0xc5Uu}IrgU6MSKVqoeQR(LbVJ83?R`(ll6*7;$BUowo?l#?yF+1404 z8YioX3_1DPQ;>a4a-cAIMJOmiQCUhVa;P$8RjH^(RdtSZ!LhEW>6#PWa;i2B-E*dn QaZfb$OiO((Z@P}bKiVia3;+NC delta 241 zcmWN|yGnuq07vojAM%63G1nT4rZf;OGqQrbWHy*dH^ZPP?P7@vY9ROkN)I3+ 0) { - if (value.charAt(0) == '=' && value.length() > 1) { + if (isAssignment(value)) { + value = value.substring(1, value.length()); if (value.charAt(1) == '\'') { if (value.charAt(value.length() - 1) == '\'' && value.length() > 2) { value = value.substring(2, value.length() - 1); From 912797a920c7632b3a9111a6daaad97c31ee1dff Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:51:42 +0300 Subject: [PATCH 159/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2919 -> 2923 bytes src/Spreadsheet.java | 8 ++++---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index db16bd2..f6b7cb3 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -607,3 +607,6 @@ RefactoringAction 1476276630805 Spreadsheet.java ADD boolean isStringLiteral FIE RefactoringAction 1476276634320 Spreadsheet.java RENAME isStringLiteral=>boolean isStringLiteral(String) METHOD EditAction 1476276641122 Spreadsheet.java 3188 7 10 0 EditAction 1476276679486 Spreadsheet.java 3211 7 10 0 +UnitTestCaseAction 1476276681178 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476276681178 SpreadsheetTest.java FAIL +EditAction 1476276702735 Spreadsheet.java 3211 7 10 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index b25dc5d9ddf8861779f408e94bf2681c38253ddb..e47bae0aa62c8afb6ae62f08fe2e615d70e7680d 100644 GIT binary patch delta 286 zcmWlP%`3xk0EeGXtr0nHSIT9!rIfP9yu=WG$V+)COhZ|lY0R3pIq(ONgNxD^RB1)J9-DK%un_hDCb7qP>76k?= znzF<&kEVWNlxN0xG47QK-kIc!DZZKJhZ$8eD;IN7)ew<~dHIN{fkid4q$ZXXB&HB? z^^s776~##^$*NMMlx9sC*0n=g2W;q&jE>1F&!*1V(xq`X 0) { if (isAssignment(value)) { value = value.substring(1, value.length()); - if (value.charAt(1) == '\'') { + if (value.charAt(0) == '\'') { if (value.charAt(value.length() - 1) == '\'' && value.length() > 2) { - value = value.substring(2, value.length() - 1); + value = value.substring(1, value.length() - 1); } else { value = ERROR; } } else if ((value.charAt(value.length() - 1) == '\'')) { - if (value.charAt(1) == '\'') { - value = value.substring(2, value.length() - 1); + if (value.charAt(0) == '\'') { + value = value.substring(1, value.length() - 1); } else { value = ERROR; } From 4cfd9b127933df5f9e2b0f1f59923c15931d47e5 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:52:03 +0300 Subject: [PATCH 160/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2923 -> 2923 bytes src/Spreadsheet.java | 8 +++----- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index f6b7cb3..ea523f4 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -610,3 +610,6 @@ EditAction 1476276679486 Spreadsheet.java 3211 7 10 0 UnitTestCaseAction 1476276681178 SpreadsheetTest.java FAIL UnitTestSessionAction 1476276681178 SpreadsheetTest.java FAIL EditAction 1476276702735 Spreadsheet.java 3211 7 10 0 +UnitTestCaseAction 1476276705694 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476276705695 SpreadsheetTest.java FAIL +EditAction 1476276723289 Spreadsheet.java 3148 7 10 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index e47bae0aa62c8afb6ae62f08fe2e615d70e7680d..7cd2781ade2802c4027fa02db0acfd6ee7148dec 100644 GIT binary patch delta 36 scmaDY_F8O%3I`+eWK|9YMwZEL9Ln6x+Zb#F)E6)a>9A}r;rPx30IrJ(4FCWD delta 36 scmaDY_F8O%3I`+0WK|9YM%Kx09Ln4*+Zb#F)E6)a>9B4t;rPx30It&s5dZ)H diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 7785a0a..1575e50 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -74,9 +74,9 @@ public String evaluate(String cell) { } else if (value.charAt(1) == '-' || (value.charAt(1) >= '0' && value.charAt(1) <= '9')) { boolean isInteger = true; - for (int i = 1; i < value.length(); i++) { + for (int i = 0; i < value.length(); i++) { char c = value.charAt(i); - if (i == 1 && c == '-') + if (i == 0 && c == '-') continue; if (c < '0' || c > '9') { @@ -85,9 +85,7 @@ public String evaluate(String cell) { } } - if (isInteger) { - value = value.substring(1, value.length()); - } else { + if (!isInteger) { value = ERROR; } From b6b071ecf7bbed6177251fb8f21023caf2e59ba3 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:52:30 +0300 Subject: [PATCH 161/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 2923 -> 2900 bytes src/Spreadsheet.java | 5 ++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index ea523f4..a26d9b7 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -613,3 +613,6 @@ EditAction 1476276702735 Spreadsheet.java 3211 7 10 0 UnitTestCaseAction 1476276705694 SpreadsheetTest.java FAIL UnitTestSessionAction 1476276705695 SpreadsheetTest.java FAIL EditAction 1476276723289 Spreadsheet.java 3148 7 10 0 +UnitTestCaseAction 1476276724623 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476276724624 SpreadsheetTest.java FAIL +EditAction 1476276750062 Spreadsheet.java 3098 7 10 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 7cd2781ade2802c4027fa02db0acfd6ee7148dec..905a4975042107e591edb2156d89dd39a8a860f8 100644 GIT binary patch delta 400 zcmXw!&r6d57{@=~{qWt2VeBxOpv6i@^PLKzIM_kiQQnf4pj6Iu)A?hjPQ`X;2ZR2A zmk2u)F;Eo5y3CW{KadDXhb|ogFI_t=g*eZ`zPJ@H@{WhXMh79b4Z#ap70%uUkve^VNQ6)8P8=fq97SHGO8xVbeF7J$>~0M znM|pJ86}xjnu0RSX^fZ3v7kJQnx?3EmbA*U-ms##tm+-F^q!JFP%LYM*V?A69oD!9 zOmO4;XIf}=rgLg1fT+_JT@JaZkYb!HZZ=4ea}plD5@C`&UZ-rtsUE=XoWAl@xb~bH lS0262@;+{dPkCfudZXT^GYsjJkODP4t{T1?e!KT(+kbeXR1E+C delta 446 zcmXAl%S)7D6vls#^M1~l3=YC53P#vPoB0$4Gsj9QaT9!$U7$(ulD9IvgjX_}T<9Or zM+-NV3^gqiViY8$eGq}rHlkKR5V#r@ddJ!Q4(B=NdCu9b_*3y=KX`l?Low)6ES}|# z=VobprS+J*LFcL({i;wRI9XoiW%STbhUyYmj`)IWvRsTbyr!~1O=}DmD3K;KSudVO}p-&`X{u&0= 'A' && value.charAt(1) <= 'Z') { - String key = value.substring(1, value.length()); - if (mValues.containsKey(key)) { - if (isCircular(key)) { + if (mValues.containsKey(value)) { + if (isCircular(value)) { return CIRCULAR; } else { value = evaluate(key); From 8e526701d976ede4705532ec67783a36f3f47e5c Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:53:12 +0300 Subject: [PATCH 162/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 7 +++++++ bin/Spreadsheet.class | Bin 2900 -> 2857 bytes src/Spreadsheet.java | 6 +++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index a26d9b7..ef022ff 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -616,3 +616,10 @@ EditAction 1476276723289 Spreadsheet.java 3148 7 10 0 UnitTestCaseAction 1476276724623 SpreadsheetTest.java FAIL UnitTestSessionAction 1476276724624 SpreadsheetTest.java FAIL EditAction 1476276750062 Spreadsheet.java 3098 7 10 0 +CompilationAction 1476276750157 Spreadsheet.java +CompilationAction 1476276759483 Spreadsheet.java +CompilationAction 1476276759630 Spreadsheet.java +CompilationAction 1476276766952 Spreadsheet.java +UnitTestCaseAction 1476276768584 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476276768584 SpreadsheetTest.java FAIL +EditAction 1476276792427 Spreadsheet.java 3070 7 10 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 905a4975042107e591edb2156d89dd39a8a860f8..751b75cf05954c9ae45569c458cf8708bb7b6820 100644 GIT binary patch delta 306 zcmW-cO-lk{6h_ZYb7mANCQyWo(A1cuMG#~V1kyrEgfOD0q|}s3$v&tSB}LFG2;LxO z(>B@}gf9CN(f?>&i)PxLd!OfAxSyfdQ0GS*iQ~lwVp|hkR`TgCGtY8wrF&#;@vDfQ z(H6~t{EIB8H9e(8|2eGg^irzlGH-4-XEScSGwkREo3Oho+4xMeW2IHxusvT)s}G~m z{$`V3w!}+GG`1y3Sq7=d5H$%=mk4{3WMAeukQ@zJqA3LqWto-~Ig)jbWrq`Kaw;v( zq|Lcpb0N1*_Q0h)awSjPFa~U3xQ~$_=}az7>I4ydqEyeHh!@FHrh-RS$xvk%uX8*` UjXM3zJI<^!0;7FVT}=gIfAj1=h5!Hn delta 357 zcmXAkT`Ple7{-5hwmsWeG)2S`HhDY`WhH8g9UMra5Z9*}#p&0#cdIdor2-n5<=$Vr2$ z@%9)q!SeWxOsFw$ixK@}Tb+0ly)Q-P*>X9=D*CU8{nL1!PRms+au^&kAE~n)hI3S# z_7jO5o?!67v{k^DD|w?!6?~b)A11|MN`fS$mT9SHR+>mkgp{UnWdME6Oys z6F~4tL0$O6wm~Cf`ck5+2bd$NDMJq_9d+rMMixlprcbB))w{nT@J-af@_yoWcevGu Kzfy%tOMd}4oJ~Fe diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 10c6277..e24358c 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -72,7 +72,7 @@ public String evaluate(String cell) { value = ERROR; } - } else if (value.charAt(1) == '-' || (value.charAt(1) >= '0' && value.charAt(1) <= '9')) { + } else if (value.charAt(0) == '-' || (value.charAt(0) >= '0' && value.charAt(0) <= '9')) { boolean isInteger = true; for (int i = 0; i < value.length(); i++) { char c = value.charAt(i); @@ -89,12 +89,12 @@ public String evaluate(String cell) { value = ERROR; } - } else if (value.charAt(1) >= 'A' && value.charAt(1) <= 'Z') { + } else if (isReference(value)) { if (mValues.containsKey(value)) { if (isCircular(value)) { return CIRCULAR; } else { - value = evaluate(key); + value = evaluate(value); } } else { value = ERROR; From 5973aea9a526ef507efabbcc01675a4246483cce Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:54:03 +0300 Subject: [PATCH 163/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 8 ++++++++ .../20161012141626179/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012141626179/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 2857 -> 2857 bytes src/Spreadsheet.java | 7 ++++++- 6 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index ef022ff..e05a56d 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -623,3 +623,11 @@ CompilationAction 1476276766952 Spreadsheet.java UnitTestCaseAction 1476276768584 SpreadsheetTest.java FAIL UnitTestSessionAction 1476276768584 SpreadsheetTest.java FAIL EditAction 1476276792427 Spreadsheet.java 3070 7 10 0 +UnitTestCaseAction 1476276794130 SpreadsheetTest.java OK +UnitTestSessionAction 1476276794130 SpreadsheetTest.java OK +RefactoringAction 1476276799727 Spreadsheet.java ADD boolean isReference(String)/2 METHOD +RefactoringAction 1476276808268 Spreadsheet.java RENAME isReference(String)/2=>boolean is(String) METHOD +RefactoringAction 1476276809783 Spreadsheet.java RENAME is(String)=>boolean isIn(String) METHOD +RefactoringAction 1476276818297 Spreadsheet.java RENAME isIn(String)=>boolean isIns(String) METHOD +RefactoringAction 1476276821313 Spreadsheet.java RENAME isIns(String)=>boolean isInsInteger(String) METHOD +EditAction 1476276843772 Spreadsheet.java 3157 8 7 0 diff --git a/.besouro/20161012141626179/besouroEpisodes.txt b/.besouro/20161012141626179/besouroEpisodes.txt index 1a95f66..0524b61 100644 --- a/.besouro/20161012141626179/besouroEpisodes.txt +++ b/.besouro/20161012141626179/besouroEpisodes.txt @@ -2570,3 +2570,4 @@ 1476276491868 refactoring 2A 351 true 1476276491869 production 3 351 false 1476276545720 refactoring 2A 1 true +1476276794130 refactoring 2A 245 true diff --git a/.besouro/20161012141626179/randomHeuristicEpisodes.txt b/.besouro/20161012141626179/randomHeuristicEpisodes.txt index 5630e53..273e0d7 100644 --- a/.besouro/20161012141626179/randomHeuristicEpisodes.txt +++ b/.besouro/20161012141626179/randomHeuristicEpisodes.txt @@ -9,3 +9,4 @@ 1476276131158 test-addition 1 20 true 1476276491868 refactoring 2A 351 false 1476276545720 refactoring 2A 1 true +1476276794130 refactoring 2A 245 true diff --git a/.besouro/20161012141626179/zorroEpisodes.txt b/.besouro/20161012141626179/zorroEpisodes.txt index ed9d488..d4012e3 100644 --- a/.besouro/20161012141626179/zorroEpisodes.txt +++ b/.besouro/20161012141626179/zorroEpisodes.txt @@ -9,3 +9,4 @@ 1476276131158 test-addition 1 27 true 1476276491868 refactoring 2A 360 true 1476276545720 refactoring 2A 53 true +1476276794130 refactoring 2A 248 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 751b75cf05954c9ae45569c458cf8708bb7b6820..3f8feddc775bd84ffc73400ef7e072f026c9e3a6 100644 GIT binary patch delta 34 mcmZ1}wo+_E2Zt#0HU=93-T4gSI$)N;LWWQs=FM|CdYAyG 0 && value.charAt(0) == '='; } + private boolean isInsInteger(String value) { + return value.length() > 0 && + value.charAt(0) == '-' || (value.charAt(0) >= '0' && value.charAt(0) <= '9') + } + private boolean isCircularRecursive(String value) { if (isAssignment(value)) { String key = value.substring(1, value.length()); @@ -72,7 +77,7 @@ public String evaluate(String cell) { value = ERROR; } - } else if (value.charAt(0) == '-' || (value.charAt(0) >= '0' && value.charAt(0) <= '9')) { + } else if () { boolean isInteger = true; for (int i = 0; i < value.length(); i++) { char c = value.charAt(i); From 8016c713230fcf48220f8470d292ac796d879422 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:55:18 +0300 Subject: [PATCH 164/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 11 +++++++++++ bin/Spreadsheet.class | Bin 2857 -> 2969 bytes src/Spreadsheet.java | 13 +++++++++---- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index e05a56d..554be2c 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -631,3 +631,14 @@ RefactoringAction 1476276809783 Spreadsheet.java RENAME is(String)=>boolean isIn RefactoringAction 1476276818297 Spreadsheet.java RENAME isIn(String)=>boolean isIns(String) METHOD RefactoringAction 1476276821313 Spreadsheet.java RENAME isIns(String)=>boolean isInsInteger(String) METHOD EditAction 1476276843772 Spreadsheet.java 3157 8 7 0 +CompilationAction 1476276843912 Spreadsheet.java +CompilationAction 1476276843913 Spreadsheet.java +CompilationAction 1476276847272 Spreadsheet.java +CompilationAction 1476276847413 Spreadsheet.java +CompilationAction 1476276854600 Spreadsheet.java +CompilationAction 1476276854782 Spreadsheet.java +RefactoringAction 1476276857956 Spreadsheet.java RENAME isInsInteger(String)=>boolean isInteger(String) METHOD +CompilationAction 1476276865360 Spreadsheet.java +RefactoringAction 1476276873997 Spreadsheet.java ADD boolean isInteger(String)/2 METHOD +RefactoringAction 1476276876512 Spreadsheet.java RENAME isInteger(String)/2=>boolean isString(String) METHOD +EditAction 1476276918594 Spreadsheet.java 3326 9 12 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3f8feddc775bd84ffc73400ef7e072f026c9e3a6..76d25f58dcf9f1fae337dbc6354bcfb4bae77f3a 100644 GIT binary patch delta 1019 zcmYk4OGs346vltYdv%=YmZQ;F(gQV9uTx16Q+jEdHI0+K)gIQQR`wVxdrCGv7A+(Q z?rI2%Xc0w=q8KBnRhxpKeT#N2gD421qVvCF4=&t$&UgOz{J-xz=YAwp8hZ2V`Ac94 z#~z1ztWa=pIF>p!aB$$Hm$b^lYaLox79z?zhxNp~F{?HlcW5x+Y!VI|>GWP%)eV~+ zw$Ld|>KjU(N)D!m;{)f-k!=p!4Q?g-`$Gs_4%O6{sK=qzE4OFZdmMVbRrZXsq{AB1 zSm<-um5T-(_EO^w+i3|t`C@;N^bmRaKy6)?##>a@Sy@(u=ijC@7uDaPC>J%|CEtE% zJ=DV%mHM8dUzkaNSybqEu4a*3Gpd-UnYLvqla)fV#x{9XqV-mmDH2iS6>-aN5_jvy zY0J=7XB!?_+7oVcoDCW3-KUgCvvg$4?V8NgWK)L71irP)brsn$PPaEF5UDMvP|1`i z!7?ROrH>lKA|WQ(~>kX94PVZ8nEUo5D5Q-@q<3_RRo@KY|Djn0?sLu0M zhx`MLs=Dbv#l?RW7qin>EXL_vTgy@H1t3@bb_wO%cuUS2g{t{$Flrk_MSB&6(Mj!z zd$P2oNZ$*+p2EthCJ*?zm_PPqhFP5k*HyaEVQfv6<^y_1MZy zwsB84@c~^tqnqdS@Iq^^*~43Uc}J4>?B^qWe9~^8Ilwm#@jcBTKRGIJOe}^Z%yFsa zge>NyG%zepoR$@wkyV_PHqJ>0=cStw*~JAJWK@oDQBqnP;fh@3s$AxpKZM-`jlF+{ zpwR+<2n90gFJPWhZ&k6e13KUvI=O?&##S8_O6V~8dZ8(6Ra*X3_40|Tzr9UN|3PPf UXnuA6Pl~*+p#^~>{#G3Q4JdxMzW@LL delta 956 zcmYL{+e_3@5XV2Wzu&qSf07xk8QD!sT{nrYn%YgRw)Ik4nPr#F-ORGB)UIG#(Q6R= zg4mZLf;Oswv*rhrSqZ-SZBL8a7bwcMCMzv_K z0tJ0u?ywiIo`BAyQqjol1I@TvEq#i~BzlyT*>9~1>`Dqia^8O(+E)D|xo3!I$w@e7 z8$hXXCxWrUwvOkLD4D0S&HWmzs4;fAXP3sTJWa)G9y6z{eZs+6tl=pM_d{q$bjn0B zImdDJe_BfobRtJVNy$sYYtp?PYSa{OLnpKKTHF?`x{-x6DVNREuvNL*M!U)`UA1mn zNhzlpc5y>_9cK@>Nbp1>p6aem(8;7mzGWZpHTn}heAWf~qP}Sk^G#X#K|eorqh>fR zHYX%NQi>Rm;w&jyz@S7pBW0YG)tr-Nh9%B>2%~a}G0AXQE^$?| zT$9^em%Hk_&$v9`raa`1H=2GzhVy@;QLWA!O@X*eBMdjEMf`JC6=r7e`r(51WNukx4wCg7$D>jFc%20qUI1+{p!v;Y7A diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index b73ab32..94657b6 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -23,10 +23,15 @@ private boolean isReference(String value) { private boolean isAssignment(String value) { return value.length() > 0 && value.charAt(0) == '='; } + + private boolean isInteger(String value) { + return value.length() > 0 && ( + value.charAt(0) == '-' || (value.charAt(0) >= '0' && value.charAt(0) <= '9')); + } - private boolean isInsInteger(String value) { - return value.length() > 0 && - value.charAt(0) == '-' || (value.charAt(0) >= '0' && value.charAt(0) <= '9') + private boolean isString(String value) { + return value.length() > 0 && (value.charAt(0) == '\'' || + value.charAt(value.length() - 1) == '\''); } private boolean isCircularRecursive(String value) { @@ -77,7 +82,7 @@ public String evaluate(String cell) { value = ERROR; } - } else if () { + } else if (isInteger(value)) { boolean isInteger = true; for (int i = 0; i < value.length(); i++) { char c = value.charAt(i); From 301d43154b136492df83c2abe0ccce6e944c1605 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:55:36 +0300 Subject: [PATCH 165/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 2969 -> 3100 bytes src/Spreadsheet.java | 9 +-------- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 554be2c..db2e39f 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -642,3 +642,4 @@ CompilationAction 1476276865360 Spreadsheet.java RefactoringAction 1476276873997 Spreadsheet.java ADD boolean isInteger(String)/2 METHOD RefactoringAction 1476276876512 Spreadsheet.java RENAME isInteger(String)/2=>boolean isString(String) METHOD EditAction 1476276918594 Spreadsheet.java 3326 9 12 0 +EditAction 1476276936084 Spreadsheet.java 3119 9 12 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 76d25f58dcf9f1fae337dbc6354bcfb4bae77f3a..5559d78042170625cf2c76e43b99b171c6342a2f 100644 GIT binary patch delta 994 zcmYk5TWkz*6vlsNXWHFv2knZw#I2NVw_A5rafz~3)r+c2>)zE}wX`d$ZgpAZfdq+U z9%MuCCd30FTaoZ25fX_fFP?dnNF)+Lod2{gnPldi@0@(!H{bjxJO1W`;G191UI2?o zKME$Tf!Tb(_N` zT7|-{L+So_Dt)9edD5(GaoB2bE1pOM5jq^gl$&b1L(HwRCobOYu!nI%URO^t-X{c- z$KpLlr$0YamnBwd8@U|y&5`I3jalYJo=_Ui(VR8f+Dz7FW0sN;d~7&y z*iUqdd{?tRliY~u1{E-26&nvZc10p;+H;_w&r2rgEv&%L%KuU+{+miMMoIMQRA*im zmV;eJKF9@+uUTKK=9U~cL1;8zqqYGw8uwlxD)sLBK-Jj#=DXq#jnTW9wRo0B_f55Vh(x=n;~0@qMmNpT(sA-y-qUHEYI3q1(^671p`ZwY z^E4Da^df{0MWG?oQ!fQUz2f4yXc}<|e4pPCaQVz2qvLFsRBdtzqFI8)U(yi)she zkL8-vv%2uzAM!Ye+F*zLA!)FC{FMa_(M8G0U#Gh`_l7b=>?X6;{_GDFsZnMBz1ir* z&t}NZ&wu8aGi-azgUV844$U1_*`r!c4TU;2MfyhN`ocAYX;v>6` z3{h^<%01e+uTh&09@5F8&dgJ~cttm>^zd3^?-<~N4#h`etZ|kv#QCah-#Et)F7UIR zB)>=rToQxJlE)P(WlX9_%Ra{C026YENjbtb33FYVnUZd%rH>nuWJX4ql~IjNb4zAf yka_OdV}Z)5bNWmV)c^A;;?eR-ROcdI<*CyaH7d3LqRQz;?N5Pl&WOHG7O6iiT& 0) { if (isAssignment(value)) { value = value.substring(1, value.length()); - if (value.charAt(0) == '\'') { + if (isString(value)) { if (value.charAt(value.length() - 1) == '\'' && value.length() > 2) { value = value.substring(1, value.length() - 1); } else { value = ERROR; } - } else if ((value.charAt(value.length() - 1) == '\'')) { - if (value.charAt(0) == '\'') { - value = value.substring(1, value.length() - 1); - } else { - value = ERROR; - } - } else if (isInteger(value)) { boolean isInteger = true; for (int i = 0; i < value.length(); i++) { From c1e36e15fc9eb48de90216335ca703269e37b146 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:56:06 +0300 Subject: [PATCH 166/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 3100 -> 3040 bytes src/Spreadsheet.java | 3 ++- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index db2e39f..f2d86ec 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -643,3 +643,4 @@ RefactoringAction 1476276873997 Spreadsheet.java ADD boolean isInteger(String)/2 RefactoringAction 1476276876512 Spreadsheet.java RENAME isInteger(String)/2=>boolean isString(String) METHOD EditAction 1476276918594 Spreadsheet.java 3326 9 12 0 EditAction 1476276936084 Spreadsheet.java 3119 9 12 0 +EditAction 1476276966687 Spreadsheet.java 3131 9 12 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 5559d78042170625cf2c76e43b99b171c6342a2f..634a6be3371530f9e9830731dfb57e2440a35c37 100644 GIT binary patch delta 461 zcmXw#-)mBF7{))Zo*d_BK~k*?SrFAir6MLy0%@~lDaU4Gd9g*UEnS&EqOA=Vm_!hR zt_}nTYINUC5g2qKG-3lG7zuFj9%H|d-Hss=jC~y=Y4y;H)wTtzjlBT>YuEV z5lRua5EcTA@1bIV**&!Q`GwIk&U>~n@PSN)BW((Hw9V*-q{GoKOt^fH8hxTo+U_%R zt`jqdopsZ1%)4Zrj5X%`GKT{9U3|gd$FRtyuVWSJz#3^%x~Xr4S}ZnDA@4W@a;E!HXUS~XXv-f8mp+~EUvX){NMdwgSoZHja$ z@q>r#sKZYxO?p)MLruKY#m8eYc_IOpMb5G+5gL+UO)l|FlB#8RE;(9~ z=Ow4K!YpS0Hk{^+{`%;g77~176I0~T=qWAw0I$YMXoRxfGgjs#kEn1!7w*e)_`j^n Z_f;;dXPjeyu?L7czx@{ns>*n%{R67GSM>k@ delta 521 zcmXw$T}YE*6vuzZy>4txk{2ZJ0;xvp#jvzgOv;aD>HG*vD;3n`oXe478Oynr7Ya29 zUI@ex?*?5J!W5zI3j(jY3B)TegCGc`#Pd46JJ0`jzW(RgIrYBW_icak3s6nslP_wR zO>b4W<@Jcrrh^c=FEc!&KXOSnz*V^GT<+1uWC=^xbS zu1&f~3njEt#!XHW;yi6!=N28@ri*s&&`Ct21l=U*A*ISo?(&*@Wa-7Gk7e$Y;{hMk z=>`LAGRS9TUm4~*BWy9sPonHH#xG+0CZ6Um6YOc*|4a%@iHm6|<*5XCCYPC!D?FDv zlG4BnX=GMfNJ$5C(nnezl93p%B+k4flqFe^ITj_u8_uY$e!R|oImsW6x@BMD;$XTK 2) { + if (value.charAt(0) == '\'' && + value.charAt(value.length() - 1) == '\'') { value = value.substring(1, value.length() - 1); } else { value = ERROR; From 77f3e872924d24d659122b56a489cdcb97ebdb22 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:56:10 +0300 Subject: [PATCH 167/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 3040 -> 3046 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index f2d86ec..26cd70b 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -644,3 +644,4 @@ RefactoringAction 1476276876512 Spreadsheet.java RENAME isInteger(String)/2=>boo EditAction 1476276918594 Spreadsheet.java 3326 9 12 0 EditAction 1476276936084 Spreadsheet.java 3119 9 12 0 EditAction 1476276966687 Spreadsheet.java 3131 9 12 0 +EditAction 1476276970175 Spreadsheet.java 3130 9 12 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 634a6be3371530f9e9830731dfb57e2440a35c37..0ad8fb729359f7398260bf163ad7f7c003f6dad4 100644 GIT binary patch delta 388 zcmXYt+baWb6vsaYTh_uP^EM@{X4D?sGPT^t*2XXo6C=57bIUa(9y~~S*wa!-UX@bg zQK^+$Ddk-r{0~ZUCNJO4IiKI}T)yuWpB1+yrj{%P7(qrHb!ozWXPTCC@j9IMbf?HT z3vz`tz5ZM!n!@GGPvf@OFOxqe+ugLORQ5BtfDY}_MG@VU(?cb_*y&T^#X~(o{E1P0tOB`%VJv-9IuC%i!9%VibB*>wJIHFq5h+xW@ zK@GK<<)Q{XN-#=*Mvd}x^-eu@o_t-Yl?9q&>R^H@;;IH6_>ZOR4=dH-|5UwzW~|=? IlGkSUFQj2fQ2+n{ delta 393 zcmXw#ODlwN7{z}NW9rSlFeOEDiwP+qnuIZoUf0Ylj2I?jTyq%>H7t~rmDMb07FKMO zdhHa6QcC#(R=$Fbh3Bo&e{-I5{+;KX=iBw=y3IGdFF0_5Ow>161WmU^`=$8m-S>Et zJi8q>Vc|1vCY+?nZ4-`&MOQ&>ic)*Zy1EM(6_R+O8R${FK63F=Oh4uLsAT{TgZTBC z3^B?uQ;aaJXr3{mj1yymIFpib<=Y42|BaMVH9bSREQ6s#k1@QppOdWa+}REQSBFE>Ej;t7jV} KznJIO* Date: Wed, 12 Oct 2016 15:57:49 +0300 Subject: [PATCH 168/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 9 +++++++++ .besouro/20161012141626179/besouroEpisodes.txt | 4 ++++ .besouro/20161012141626179/randomHeuristicEpisodes.txt | 2 ++ .besouro/20161012141626179/zorroEpisodes.txt | 2 ++ src/Spreadsheet.java | 1 + 5 files changed, 18 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 26cd70b..46a9ae7 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -645,3 +645,12 @@ EditAction 1476276918594 Spreadsheet.java 3326 9 12 0 EditAction 1476276936084 Spreadsheet.java 3119 9 12 0 EditAction 1476276966687 Spreadsheet.java 3131 9 12 0 EditAction 1476276970175 Spreadsheet.java 3130 9 12 0 +UnitTestCaseAction 1476276971476 SpreadsheetTest.java OK +UnitTestSessionAction 1476276971477 SpreadsheetTest.java OK +UnitTestCaseAction 1476277028088 SpreadsheetTest.java OK +UnitTestSessionAction 1476277028088 SpreadsheetTest.java OK +RefactoringAction 1476277058552 Spreadsheet.java RENAME isInteger(String)=>boolean isIntegerLiteral(String) METHOD +RefactoringAction 1476277063567 Spreadsheet.java RENAME isString(String)=>boolean isStringLiteral(String) METHOD +RefactoringAction 1476277068581 Spreadsheet.java ADD boolean isInteger(String) METHOD +RefactoringAction 1476277068582 Spreadsheet.java ADD boolean isString(String) METHOD +EditAction 1476277069073 Spreadsheet.java 3135 9 12 0 diff --git a/.besouro/20161012141626179/besouroEpisodes.txt b/.besouro/20161012141626179/besouroEpisodes.txt index 0524b61..f2fcc84 100644 --- a/.besouro/20161012141626179/besouroEpisodes.txt +++ b/.besouro/20161012141626179/besouroEpisodes.txt @@ -2571,3 +2571,7 @@ 1476276491869 production 3 351 false 1476276545720 refactoring 2A 1 true 1476276794130 refactoring 2A 245 true +1476276971477 refactoring 2A 171 true +1476276971478 production 3 171 false +1476276971479 production 2 171 false +1476277028088 regression 1 0 true diff --git a/.besouro/20161012141626179/randomHeuristicEpisodes.txt b/.besouro/20161012141626179/randomHeuristicEpisodes.txt index 273e0d7..622dd73 100644 --- a/.besouro/20161012141626179/randomHeuristicEpisodes.txt +++ b/.besouro/20161012141626179/randomHeuristicEpisodes.txt @@ -10,3 +10,5 @@ 1476276491868 refactoring 2A 351 false 1476276545720 refactoring 2A 1 true 1476276794130 refactoring 2A 245 true +1476276971477 refactoring 2A 171 true +1476277028088 regression 1 0 true diff --git a/.besouro/20161012141626179/zorroEpisodes.txt b/.besouro/20161012141626179/zorroEpisodes.txt index d4012e3..d4665ec 100644 --- a/.besouro/20161012141626179/zorroEpisodes.txt +++ b/.besouro/20161012141626179/zorroEpisodes.txt @@ -10,3 +10,5 @@ 1476276491868 refactoring 2A 360 true 1476276545720 refactoring 2A 53 true 1476276794130 refactoring 2A 248 true +1476276971477 refactoring 2A 177 true +1476277028088 regression 1 56 true diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 3575073..a1421f7 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -107,6 +107,7 @@ public String evaluate(String cell) { } else { value = ERROR; } + } else if (value.charAt(0) == '\'') { if (value.length() > 1 && value.charAt(value.length() - 1) == '\'') { value = value.substring(1, value.length() - 1); From 9095f6e7bb318d532708b62c4b8426c2f5cb6e5a Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 15:59:24 +0300 Subject: [PATCH 169/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 2 ++ bin/Spreadsheet.class | Bin 3046 -> 3046 bytes src/Spreadsheet.java | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 46a9ae7..49f1d55 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -654,3 +654,5 @@ RefactoringAction 1476277063567 Spreadsheet.java RENAME isString(String)=>boolea RefactoringAction 1476277068581 Spreadsheet.java ADD boolean isInteger(String) METHOD RefactoringAction 1476277068582 Spreadsheet.java ADD boolean isString(String) METHOD EditAction 1476277069073 Spreadsheet.java 3135 9 12 0 +RefactoringAction 1476277160639 Spreadsheet.java ADD String evaluateString(String) METHOD +EditAction 1476277164894 Spreadsheet.java 3263 10 12 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 0ad8fb729359f7398260bf163ad7f7c003f6dad4..44395227d68860baffd0d28f377f11823e5bf86b 100644 GIT binary patch delta 81 zcmaDR{!Dzs4=&eyhDQtq3_lqP8Ce;M7&#b<8Mzrs8TlB>7zG&08O0bX808o$8MPRy k717{wUM8RZx%7_}HG k8Fd+|8Lb&=7;PD986ALfJ`9bF0Srxy!3=GaZMjzh05RbbG5`Po diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index a1421f7..80ec8c0 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -34,6 +34,10 @@ private boolean isString(String value) { value.charAt(value.length() - 1) == '\''); } + private String evaluateString(String value) {value.charAt(0) == '\'' && + value.charAt(value.length() - 1) == '\'') + } + private boolean isCircularRecursive(String value) { if (isAssignment(value)) { String key = value.substring(1, value.length()); @@ -68,6 +72,7 @@ public String evaluate(String cell) { if (value.length() > 0) { if (isAssignment(value)) { value = value.substring(1, value.length()); + if (isString(value)) { if (value.charAt(0) == '\'' && value.charAt(value.length() - 1) == '\'') { From 4a8e4979bc24596f3fae121af0f272324375c9e3 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:00:39 +0300 Subject: [PATCH 170/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 15 ++++++++ bin/Spreadsheet.class | Bin 3046 -> 3188 bytes src/Spreadsheet.java | 50 +++++++++++++------------ 3 files changed, 42 insertions(+), 23 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 49f1d55..92fa096 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -656,3 +656,18 @@ RefactoringAction 1476277068582 Spreadsheet.java ADD boolean isString(String) ME EditAction 1476277069073 Spreadsheet.java 3135 9 12 0 RefactoringAction 1476277160639 Spreadsheet.java ADD String evaluateString(String) METHOD EditAction 1476277164894 Spreadsheet.java 3263 10 12 0 +CompilationAction 1476277165039 Spreadsheet.java +CompilationAction 1476277165039 Spreadsheet.java +CompilationAction 1476277165039 Spreadsheet.java +CompilationAction 1476277167926 Spreadsheet.java +CompilationAction 1476277168055 Spreadsheet.java +CompilationAction 1476277168055 Spreadsheet.java +CompilationAction 1476277168056 Spreadsheet.java +CompilationAction 1476277181691 Spreadsheet.java +CompilationAction 1476277181874 Spreadsheet.java +RefactoringAction 1476277204847 Spreadsheet.java ADD String evaluateString(String)/2 METHOD +RefactoringAction 1476277206361 Spreadsheet.java RENAME evaluateString(String)/2=>String eva(String) METHOD +RefactoringAction 1476277208377 Spreadsheet.java RENAME eva(String)=>String evaluateInteger(String) METHOD +CompilationAction 1476277238289 Spreadsheet.java +CompilationAction 1476277238446 Spreadsheet.java +EditAction 1476277239661 Spreadsheet.java 3206 11 16 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 44395227d68860baffd0d28f377f11823e5bf86b..8d41fa9fdc7205b04213db63fcf9367eb0183f15 100644 GIT binary patch delta 1282 zcmYk5PfT1@6vlsd{xHMqL&{iaHMI^{92_Ram?E__jV;hh>D0L(ZUAQ7>Jnzj6HIv+T?>YB;-*>)q z=g+-=?=x=y`_(tVVODM!I#{gNOP0N8xw=2+>S^sn=u_0sSW8xiZRMsr`Wz?kL^-V( z8_7AkkhhogR6LWPo6p*oo6YCq^G<%!)^kVWM(xl_&b5}~+N(*$v$=wH+;~fOOWe)- zCAM~T{G^@F%nrFiIj3{G-GX7zOTWn;&L|p7f2lo*QAIRc7;>F#Zd!3qRbn|{km8)l z)0{7T7HmDNxHntq$vT-u+j0hVX3;5Rm$ZRm$m9fF-fqO?ac_5kF_UK*FZ~)!6fc-O z$GBowCNHW*?0{bJuDoD!(TfMIsVT46GD*XL8ct)sr{T<=}!zwsbXgNtrie;o-oEHYsWHhZH0rU*l_f$7829 zdFop^1$ao-8o2|9I4G;>?+sdc*v}7?bfmAglLl!!PG{+6w+2dIb%`@M=|K;K8^|Bai71bj91}Dm^!HwO;7rj zs#VfOajw$UcY+p_%s{ezlfhMb%XAy0)5+8(!>c@+yhU?rgV9yOq3d$kFNcX$nkw<< z$C62jytv8a^`QUri9A~lu}jt-qVlL>^l?9@MAm7B6P)2OnL;;bC45dogY+}v>yMZ9 z?C2k;=#Po!Dd{BOcTz`an?!`v18PfJ37|_~ME4b6N+!iEUyCr8hhxYWCWvt1e+D(| z5H$F(N>H-Zv8X@9+#0F67s@Sr@z1k-egoGxbMh0cmwHfeGU zG0!LqjN{7xWl<`ZC9}diyvhf>#)rJlN4&|$6j|dfu5pRad7E2uW0QCJp3D5e6>dxJ zC*FI5UwEJ2xa#|Iyxj4QFLz{q-ovTkXMY3%f$R}EjtuA%o}eHiLIU3+LY4^oV`-*t ho3xB28V+}a{~@B(HchH-i%?*T=$3#fUhzk>{2!1u{YC%) delta 967 zcmYL{%S%*o6vscmnL9dj=UO(^m{OKjj$J3sD7CEUF*@34KFglI&CF8EUPdL=B8VX9 zu7;qZjT?ia7^6i5gh0CZhb=-BYVD{+#QAPy8|@Yyj^)YD@3z>d z3oCjp_AY2AEsif}rz|?1sOP3KU(R@1T~3EL;>%+R`K%$&ne=WLk5DeTL1FX(w>*g1 zMN?G8i4++{2`Umq>+SFqu{fLTSLB5g)W`7{lVYqCqbW`>q|aLKUS%*(!spaK8ES)G^00b1H;N>W8&b%q3-( z=za-K*tUEy*-f0TWFIpbu#z@@sD#?oYJs6!H&$(6Jf3)qc>#+7DBZht)EcofyE+~uG14IX6$m8851}q{_XaZ zhIo-0V&VU}WocJmoU}mTxgK1#VW#3hx= '0' && value.charAt(0) <= '9')); } + private String evaluateInteger(String value) { + boolean isInteger = true; + for (int i = 0; i < value.length(); i++) { + char c = value.charAt(i); + if (i == 0 && c == '-') + continue; + + if (c < '0' || c > '9') { + isInteger = false; + break; + } + } + + if (isInteger) { + return value; + } else { + return ERROR; + } + } + private boolean isString(String value) { return value.length() > 0 && (value.charAt(0) == '\'' || value.charAt(value.length() - 1) == '\''); } - private String evaluateString(String value) {value.charAt(0) == '\'' && - value.charAt(value.length() - 1) == '\'') + private String evaluateString(String value) { + if (value.charAt(0) == '\'' && + value.charAt(value.length() - 1) == '\'') { + return value.substring(1, value.length() - 1); + } else { + return ERROR; + } } private boolean isCircularRecursive(String value) { @@ -74,29 +99,8 @@ public String evaluate(String cell) { value = value.substring(1, value.length()); if (isString(value)) { - if (value.charAt(0) == '\'' && - value.charAt(value.length() - 1) == '\'') { - value = value.substring(1, value.length() - 1); - } else { - value = ERROR; - } } else if (isInteger(value)) { - boolean isInteger = true; - for (int i = 0; i < value.length(); i++) { - char c = value.charAt(i); - if (i == 0 && c == '-') - continue; - - if (c < '0' || c > '9') { - isInteger = false; - break; - } - } - - if (!isInteger) { - value = ERROR; - } } else if (isReference(value)) { if (mValues.containsKey(value)) { From f8552203bca82da7d38d605fb49d8aef56b2aca0 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:01:56 +0300 Subject: [PATCH 171/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 6 ++++++ bin/Spreadsheet.class | Bin 3188 -> 3310 bytes src/Spreadsheet.java | 10 +++++++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 92fa096..a284f8d 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -671,3 +671,9 @@ RefactoringAction 1476277208377 Spreadsheet.java RENAME eva(String)=>String eval CompilationAction 1476277238289 Spreadsheet.java CompilationAction 1476277238446 Spreadsheet.java EditAction 1476277239661 Spreadsheet.java 3206 11 16 0 +RefactoringAction 1476277258525 Spreadsheet.java ADD boolean isAssignment(String)/2 METHOD +RefactoringAction 1476277260039 Spreadsheet.java RENAME isAssignment(String)/2=>boolean eva(String) METHOD +RefactoringAction 1476277264554 Spreadsheet.java RENAME eva(String)=>boolean evaluateAssignment(String) METHOD +CompilationAction 1476277283129 Spreadsheet.java +CompilationAction 1476277310209 Spreadsheet.java +EditAction 1476277316750 Spreadsheet.java 3289 12 17 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 8d41fa9fdc7205b04213db63fcf9367eb0183f15..e6baee83188a1fc6565e0de18fc4d0743502ad53 100644 GIT binary patch delta 1202 zcmY*YU2hXd6g}%*$IfQ#f(1@f#WaC@IJQYs1Oc~vB)AZgkPrxkhJu4}Olp!iG5f~_)YG|Hr2 z-J(I;$C2jf|Y`YeK_rfz1f2)gFOXWm|@? z1O~8AUNRb6_X`{V<5widGr2@MlkH9&S1yAB2bEn<3=OHvhXfk!Fhc@;@=v46_(mWt zg|n(|RG`;RmJ#T%S4Ra7+p7tIBM8a^&JoRX?^ovwtvkqge)6ypIvkwMun{g|T@kTa z?i^Ube;Iv%YSi)Xx4lr02JYyOHSqAwwh6)!orPhEUJ^O>|$x%WU?3e zX6zt>J}Pw=V%S5~4_Hjq*jN^r>L@YgrFV**cUY`=V7$Q!7a{>|-Vy`#Rw}2H0UXS` zSOF|zI22+#EqFBA`ZD2ga}#F|2W8x>ELVZ~v~Wb8GX1@Y9u~CjI(}0WkdVHJp$wF$ zMasw&9;lPCDcmiQ6#So;N@W@^pv>o+Rm6NNe>XqZVscr8r|=W=_MA6f;%B^e;Ie#M5w28%({T+^OK=7+E?0t+?IPmJS|sKE E1Iq)}n*aa+ delta 1126 zcmYL{O>7%g6otRBr*S-)QpL1sgHmuq!LDO9P?07y2tk~*xT#AU=Le^ScH#_X630%* z6E_Bg3kbRZ0b+zyM*_hPK^Lj0VnHR?fDqjxfrLOvtXLrytPn!n8M{TJH}Af4|IR!2 z{n7i^9_{A8UwjEXMD3cE3)aI{C0%mNf@v%4Fsnv!&2Y>%5@JHYC8KH#7L8J2aKg6B zb|=Ra=4MK^St%E*=3+EoURkw@hGUgW(N(*=P&8MLM740XR&tE>sOjY-qgJV6+D^28 zv_I;U{gk5Vn9;GmVmZH@b)@HtS#m0x#yDx6og7!#<^HMcjLj-^T9vG0Tcv`+9k(d9 z0F5Lkb)Mvudnp(@bf;BGS$2M{XxLL`e$B2}RZ~MDtMfR+o;9O$*t70tPUk6d?t^OV z@EM)6_fd7ablTWYUb(0R`NRP7yE)|qUz zSkW14S!ErwWnIv*h$|@bvMgC?S$SD0_jh$!(LbBs_M_rn45h<;gxE_zeeQRm1E~~o z>DJ@VD@Z_g?FQqy$k8TGd?lv<_sYLRV&EYA<*)m;#(muH`zPI>J14?Jbj!V?47rK$ z0p)}{9Uj`3*^KPil$fAjBZ4aS5i~~WRa2`aTy4Y6+>y4)ZdCGk${}|J;4MLAPI4#^z14C5!T#2-hK5 zzxw4ea=(!e_})`QG&+@3J>Zr`OB;Odd5RnCzt$El{=ZJUJ*d>6BNEy4gj#jac8w|- z_e$6K`Z;N0$XyoLMV@=)VZ|sgC`5)?k_WdeIu*%KBFieXTp))d&w5Rs@VaxmRutoIu Xd6 0 && value.charAt(0) >= 'A' && value.charAt(0) <= 'Z'; } - + private boolean isAssignment(String value) { return value.length() > 0 && value.charAt(0) == '='; } + + private String evaluateAssignment(String value) { + return value.substring(1, value.length()); + } private boolean isInteger(String value) { return value.length() > 0 && ( @@ -65,7 +69,7 @@ private String evaluateString(String value) { private boolean isCircularRecursive(String value) { if (isAssignment(value)) { - String key = value.substring(1, value.length()); + String key = evaluateAssignment(value); if (isReference(key)) { if (mVisited.contains(key)) { return true; @@ -96,7 +100,7 @@ public String evaluate(String cell) { if (value.length() > 0) { if (isAssignment(value)) { - value = value.substring(1, value.length()); + value = evaluateAssignment(value); if (isString(value)) { From da9dff6ae6185ed539e6722491104b7b6b40d70a Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:02:05 +0300 Subject: [PATCH 172/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 3310 -> 3306 bytes src/Spreadsheet.java | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index a284f8d..ebc8712 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -677,3 +677,4 @@ RefactoringAction 1476277264554 Spreadsheet.java RENAME eva(String)=>boolean eva CompilationAction 1476277283129 Spreadsheet.java CompilationAction 1476277310209 Spreadsheet.java EditAction 1476277316750 Spreadsheet.java 3289 12 17 0 +EditAction 1476277325745 Spreadsheet.java 3314 12 17 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index e6baee83188a1fc6565e0de18fc4d0743502ad53..dc6267e3acb76bb07c3cd13df730fc28795229ed 100644 GIT binary patch delta 247 zcmXBP%PItL7{=jeoHoM+$jWKb%w!|QW>Ql$%p|0gl^w|;Q4~gwp&S~iDOt@0OsTP! zlAThN)LejtE3ojF&3Am?uiy9G{MB5JMBA(CG~hFysF=wmEBbD|#FO{Nin4!sqR2MgHIvp&*)VO>tSx!lPD4Di%faiHW-*^xWP z9-Md#%BQeVa*$+V#WQmd%nu#xamNt>*k QdIQ1Js_93j@Z1>t1ukDUumAu6 delta 251 zcmXBPODhC$6o&ENFl@$rfLV!{sWGt6y=s{SdgJmWI0O<&3pk; zwn|YbOADXC!e4ghJa6ymIbVtI#7!iY`V>`(k90%PST0l4dgUpdDH%A|pNal~qHMk{ z_P$naT*`zdQ(8>xG^59?oH>K$4OuX3(TF9ZmQ7l*Y1N@M$JU+Na2CjgE!Vac?6|e7 zWY4{Q4-Pzr>^U@E9eH!2F1WS-8)nr@hBe4)6c-8jMRSI-O62R3sSw|t%6#8 RL9Rka=+ub+$mQ> 0) { if (isAssignment(value)) { - value = evaluateAssignment(value); + value = evaluateAssignment(value); if (isString(value)) { } else if (isInteger(value)) { - + value = evaluateInteger(); } else if (isReference(value)) { if (mValues.containsKey(value)) { if (isCircular(value)) { From 0b19b7bd6f3079a4f8f52b4c4cf6ca273f4f9e6d Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:02:18 +0300 Subject: [PATCH 173/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 3306 -> 3354 bytes src/Spreadsheet.java | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index ebc8712..4f0b549 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -678,3 +678,6 @@ CompilationAction 1476277283129 Spreadsheet.java CompilationAction 1476277310209 Spreadsheet.java EditAction 1476277316750 Spreadsheet.java 3289 12 17 0 EditAction 1476277325745 Spreadsheet.java 3314 12 17 0 +CompilationAction 1476277325861 Spreadsheet.java +CompilationAction 1476277333872 Spreadsheet.java +EditAction 1476277338464 Spreadsheet.java 3349 12 17 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index dc6267e3acb76bb07c3cd13df730fc28795229ed..3011860b75f960b540045f15e489fa23539840c0 100644 GIT binary patch delta 441 zcmXYtODIHf6vlsdUNkcr&4LIEuNXHrrIaX)_q!PKY)B-Ft4Jx7646x_ z7E@BTQnsRqENmy_Tx`B`{=fhEPMz;HW;51)^L=p%WHWYRzqX{-kY-1r*GU<%E3{YB-JR^X?Ngnx22q zC*Z^Y4H{{lGvZ`LlSZ_G1~hDL_pwLNkcx+yGe7uuFsyrnQGKrAnY&?@Aok>=fNSqazIV7J- xsw6m_M5^&(rC2;kxIR(CP$T2Rt=25-7h#I>Nt6;HA)7*khh&|?h>V&T{Q*dRW`O_z delta 389 zcmXAlT`R+37{-79*;`{LE950LZ)sZ`Ae=0vtYHZ)%8}%)HJjOrvQ1tll$U7rUvlIF zOf+$zq$np!QBppDFQ683|J%uZ-Ou%0_w`)&ld1fwusr?U+yZUH&Ml96n}-ey3gHr_ z3ti;mTVG=w{X~yZbRQ09jtQSDN9QTe4%Zb!Dgzph__P|xaIIl5!?}ijl_tj})iN-y zQm#=U6{F3TbqKX^lqgOoQ`p6MQv9c|%Dbh^P{kZ|1aK0hm3iER=p~Go2!li!CWfCS z##m;Y6=sQ(B*CuKJytnnjbqkHv%v|QoRK2S78h)D#}4 Date: Wed, 12 Oct 2016 16:02:25 +0300 Subject: [PATCH 174/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 5 +++++ .../20161012141626179/besouroEpisodes.txt | 4 ++++ .../randomHeuristicEpisodes.txt | 2 ++ .besouro/20161012141626179/zorroEpisodes.txt | 2 ++ bin/Spreadsheet.class | Bin 3354 -> 3354 bytes src/Spreadsheet.java | 2 +- 6 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 4f0b549..98a0163 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -681,3 +681,8 @@ EditAction 1476277325745 Spreadsheet.java 3314 12 17 0 CompilationAction 1476277325861 Spreadsheet.java CompilationAction 1476277333872 Spreadsheet.java EditAction 1476277338464 Spreadsheet.java 3349 12 17 0 +UnitTestCaseAction 1476277341965 SpreadsheetTest.java OK +UnitTestSessionAction 1476277341966 SpreadsheetTest.java OK +UnitTestCaseAction 1476277342518 SpreadsheetTest.java OK +UnitTestSessionAction 1476277342518 SpreadsheetTest.java OK +EditAction 1476277345908 Spreadsheet.java 3350 12 17 0 diff --git a/.besouro/20161012141626179/besouroEpisodes.txt b/.besouro/20161012141626179/besouroEpisodes.txt index f2fcc84..3322e35 100644 --- a/.besouro/20161012141626179/besouroEpisodes.txt +++ b/.besouro/20161012141626179/besouroEpisodes.txt @@ -2575,3 +2575,7 @@ 1476276971478 production 3 171 false 1476276971479 production 2 171 false 1476277028088 regression 1 0 true +1476277341966 refactoring 2A 283 true +1476277341967 production 2 283 false +1476277341968 production 3 283 false +1476277342518 regression 1 0 true diff --git a/.besouro/20161012141626179/randomHeuristicEpisodes.txt b/.besouro/20161012141626179/randomHeuristicEpisodes.txt index 622dd73..403fdc9 100644 --- a/.besouro/20161012141626179/randomHeuristicEpisodes.txt +++ b/.besouro/20161012141626179/randomHeuristicEpisodes.txt @@ -12,3 +12,5 @@ 1476276794130 refactoring 2A 245 true 1476276971477 refactoring 2A 171 true 1476277028088 regression 1 0 true +1476277341966 refactoring 2A 283 true +1476277342518 regression 1 0 false diff --git a/.besouro/20161012141626179/zorroEpisodes.txt b/.besouro/20161012141626179/zorroEpisodes.txt index d4665ec..2c41420 100644 --- a/.besouro/20161012141626179/zorroEpisodes.txt +++ b/.besouro/20161012141626179/zorroEpisodes.txt @@ -12,3 +12,5 @@ 1476276794130 refactoring 2A 248 true 1476276971477 refactoring 2A 177 true 1476277028088 regression 1 56 true +1476277341966 refactoring 2A 313 true +1476277342518 regression 1 0 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3011860b75f960b540045f15e489fa23539840c0..6a5706bb4f68bcc39630dcc559b78ca75aa80a35 100644 GIT binary patch delta 139 zcmWN`zp8-&06_8IWby=NJcPk^ccU^XrPSw2S0VrMHw@R!os?2aCYh8~c>*a9V7Mjk zaKGi8Q)d-h#g3_HH}Ih><5N~ePF3EQf|{bbl7>J_Q`?V@wXThxt-hUsy`h7Vld+45 gtErorySYdBp1%EAc=;7aS|sFKLNat%%X2jU596C8HUIzs delta 139 zcmWN|y{Z9l0EY43WO4;&$3>jsY<8nMlTzxGuS7ZJE1x+Al0_+{WRgi)Pq_jq7hq6w z5B|&ZKK1r2W6Rj#GukRhDoQCyEBjWFQI%DbQ}^RnUL&w+re&pVtz)BWt7oTgZ{TR? i-^kh6#h Date: Wed, 12 Oct 2016 16:02:28 +0300 Subject: [PATCH 175/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 3354 -> 3344 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 98a0163..5d92d3d 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -686,3 +686,6 @@ UnitTestSessionAction 1476277341966 SpreadsheetTest.java OK UnitTestCaseAction 1476277342518 SpreadsheetTest.java OK UnitTestSessionAction 1476277342518 SpreadsheetTest.java OK EditAction 1476277345908 Spreadsheet.java 3350 12 17 0 +UnitTestCaseAction 1476277347213 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476277347214 SpreadsheetTest.java FAIL +EditAction 1476277348572 Spreadsheet.java 3349 12 17 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 6a5706bb4f68bcc39630dcc559b78ca75aa80a35..450d952a17f149b4bd86b21b17b597d809a360c3 100644 GIT binary patch delta 107 zcmbOwH9?B&)W2Q(7#J8#7|J(t9cPj8V9?-VU}PxZVQ^);@LEE zeU~$A)Y93`5IU1VLu(6zjLtTO=$Q=SAfdvU3~WL|8?=Bz#hdH6r!uma0?lS(C<6ev CR2rQC delta 95 zcmbOrHA{-?)W2Q(7#J8#7%De%9cNMVXVBncU}PxZVQ^ Date: Wed, 12 Oct 2016 16:02:49 +0300 Subject: [PATCH 176/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 3344 -> 3354 bytes src/Spreadsheet.java | 23 +++-------------------- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 5d92d3d..704b890 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -689,3 +689,4 @@ EditAction 1476277345908 Spreadsheet.java 3350 12 17 0 UnitTestCaseAction 1476277347213 SpreadsheetTest.java FAIL UnitTestSessionAction 1476277347214 SpreadsheetTest.java FAIL EditAction 1476277348572 Spreadsheet.java 3349 12 17 0 +EditAction 1476277369199 Spreadsheet.java 2959 12 17 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 450d952a17f149b4bd86b21b17b597d809a360c3..6a5706bb4f68bcc39630dcc559b78ca75aa80a35 100644 GIT binary patch delta 95 zcmbOrHA{-?)W2Q(7#J8#7%De%9cNMVXVBncU}PxZVQ^);@LEE zeU~$A)Y93`5IU1VLu(6zjLtTO=$Q=SAfdvU3~WL|8?=Bz#hdH6r!uma0?lS(C<6ev CR2rQC diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 7b308ca..d8f2f11 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -121,27 +121,10 @@ public String evaluate(String cell) { value = ERROR; } - } else if (value.charAt(0) == '\'') { - if (value.length() > 1 && value.charAt(value.length() - 1) == '\'') { - value = value.substring(1, value.length() - 1); - } else { - value = ERROR; - } + } else if (isString(value)) { + value = evaluateString(value); } else { - boolean isInteger = true; - for (int i = 0; i < value.length(); i++) { - char c = value.charAt(i); - if (i == 0 && c == '-') - continue; - - if (c < '0' || c > '9') { - isInteger = false; - break; - } - } - - if (!isInteger) - value = ERROR; + value = evaluateString(value); } } From 67ab12a3e3253ecb19816062aeea91f42502f317 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:02:54 +0300 Subject: [PATCH 177/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 3354 -> 3152 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 704b890..e6181a6 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -690,3 +690,4 @@ UnitTestCaseAction 1476277347213 SpreadsheetTest.java FAIL UnitTestSessionAction 1476277347214 SpreadsheetTest.java FAIL EditAction 1476277348572 Spreadsheet.java 3349 12 17 0 EditAction 1476277369199 Spreadsheet.java 2959 12 17 0 +EditAction 1476277373943 Spreadsheet.java 2960 12 17 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 6a5706bb4f68bcc39630dcc559b78ca75aa80a35..357d9e2ae990b0f795f6ff5ec870d6540d90af7a 100644 GIT binary patch delta 197 zcmbOwbwOf-D7Tma0}}%?0|P^+mi9J=L|>h43>NbkYA0)R%L&D4>1=1npUJ=jq6>YO zGx$!9=2kOO6XFN56~LqvNGcnuBo`>m2@=Tl)!6_vl9@pnNJcS;O%~_z45?tKWvBzf zMuvKZc7|pK6`-5~#A*gr1~niL=m-Wq23`h61~#C)DUij)-~bfmXW;n5pu^6fBOuGc Q$|}GLR8S5SW@4xS0I_Z)0RR91 delta 401 zcmXw#-z$T06vjXA_P(>s+FHFMHN}|Xi``fjEwu}V`3GDn_i{ywi6K*dG&feXWtmc% z)azckR7%RNQk47yi#Qu@&Uwy{=Q*e6zA4vSHeLP-Iu78YtJ`8asVoMLdCqpbT6{NM z>YCX@8mf6NS>iG~BF!R^;DgD2W3v05*8r5U= zh+ZPBOkMUOhNN!kSfdHc7hUj z2xhNbiPR!X?6b@fDe|mv!YZe%aYmX8*0I>&hD~nS;(-j0Z1W_u7j}7Lk9Q7e7rof8 zCv*^!O5C9rH=1-`=@(=Z#W*7* Date: Wed, 12 Oct 2016 16:04:36 +0300 Subject: [PATCH 178/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 14 ++++++++++++++ .../20161012141626179/besouroEpisodes.txt | 1 + .../randomHeuristicEpisodes.txt | 1 + .besouro/20161012141626179/zorroEpisodes.txt | 1 + bin/Spreadsheet.class | Bin 3152 -> 3152 bytes tests/SpreadsheetTest.java | 9 ++++++++- 6 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index e6181a6..ffa247d 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -691,3 +691,17 @@ UnitTestSessionAction 1476277347214 SpreadsheetTest.java FAIL EditAction 1476277348572 Spreadsheet.java 3349 12 17 0 EditAction 1476277369199 Spreadsheet.java 2959 12 17 0 EditAction 1476277373943 Spreadsheet.java 2960 12 17 0 +UnitTestCaseAction 1476277376747 SpreadsheetTest.java OK +UnitTestSessionAction 1476277376748 SpreadsheetTest.java OK +RefactoringAction 1476277404460 Spreadsheet.java ADD boolean isReference(String)/2 METHOD +RefactoringAction 1476277406474 Spreadsheet.java RENAME isReference(String)/2=>boolean isMath(String) METHOD +RefactoringAction 1476277408488 Spreadsheet.java RENAME isMath(String)=>boolean isMathFormula(String) METHOD +RefactoringAction 1476277445314 SpreadsheetTest.java ADD void testAssignment_Reference_Circular_Depth_2()/2 METHOD +RefactoringAction 1476277451836 SpreadsheetTest.java RENAME testAssignment_Reference_Circular_Depth_2()/2=>void testAssignment_Integer() METHOD +RefactoringAction 1476277455347 SpreadsheetTest.java RENAME testAssignment_Integer()=>void testAssignment_1() METHOD +RefactoringAction 1476277458860 SpreadsheetTest.java RENAME testAssignment_1()=>void testAssignment_Add_1() METHOD +RefactoringAction 1476277460371 SpreadsheetTest.java RENAME testAssignment_Add_1()=>void testAssignment_Add_1_2() METHOD +RefactoringAction 1476277461382 SpreadsheetTest.java RENAME testAssignment_Add_1_2()=>void testAssignment_Add_1_2_() METHOD +RefactoringAction 1476277462891 SpreadsheetTest.java RENAME testAssignment_Add_1_2_()=>void testAssignment_Add_1_2_Result() METHOD +RefactoringAction 1476277463902 SpreadsheetTest.java RENAME testAssignment_Add_1_2_Result()=>void testAssignment_Add_1_2_Result_3() METHOD +EditAction 1476277476593 SpreadsheetTest.java 3437 19 60 18 diff --git a/.besouro/20161012141626179/besouroEpisodes.txt b/.besouro/20161012141626179/besouroEpisodes.txt index 3322e35..9ca2e73 100644 --- a/.besouro/20161012141626179/besouroEpisodes.txt +++ b/.besouro/20161012141626179/besouroEpisodes.txt @@ -2579,3 +2579,4 @@ 1476277341967 production 2 283 false 1476277341968 production 3 283 false 1476277342518 regression 1 0 true +1476277376748 refactoring 2A 30 true diff --git a/.besouro/20161012141626179/randomHeuristicEpisodes.txt b/.besouro/20161012141626179/randomHeuristicEpisodes.txt index 403fdc9..e887430 100644 --- a/.besouro/20161012141626179/randomHeuristicEpisodes.txt +++ b/.besouro/20161012141626179/randomHeuristicEpisodes.txt @@ -14,3 +14,4 @@ 1476277028088 regression 1 0 true 1476277341966 refactoring 2A 283 true 1476277342518 regression 1 0 false +1476277376748 refactoring 2A 30 true diff --git a/.besouro/20161012141626179/zorroEpisodes.txt b/.besouro/20161012141626179/zorroEpisodes.txt index 2c41420..5e149d4 100644 --- a/.besouro/20161012141626179/zorroEpisodes.txt +++ b/.besouro/20161012141626179/zorroEpisodes.txt @@ -14,3 +14,4 @@ 1476277028088 regression 1 56 true 1476277341966 refactoring 2A 313 true 1476277342518 regression 1 0 true +1476277376748 refactoring 2A 34 true diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 357d9e2ae990b0f795f6ff5ec870d6540d90af7a..3e1a8424370d82b6fd062c260651af543587e36b 100644 GIT binary patch delta 13 Vcmca0aY16kVs6I5$xFD`001aw1&;s# delta 13 Vcmca0aY16kVs6IV$xFD`001ac1&aUx diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 9f5219d..b3c26bc 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -126,7 +126,7 @@ public void testAssignment_Reference_Circular() { String result = sheet.evaluate("A1"); assertEquals("#Circular", result); } - + @Test public void testAssignment_Reference_Circular_Depth_2() { sheet.set("A1", "=A3"); @@ -135,4 +135,11 @@ public void testAssignment_Reference_Circular_Depth_2() { String result = sheet.evaluate("A1"); assertEquals("#Circular", result); } + + @Test + public void testAssignment_Add_1_2_Result_3() { + sheet.set("A1", "=1+2"); + String result = sheet.evaluate("A1"); + assertEquals("3", result); + } } From 19370b32191e5206e9bcc1ca28b898ec3802a6ea Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:04:42 +0300 Subject: [PATCH 179/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/SpreadsheetTest.class | Bin 3837 -> 4006 bytes src/Spreadsheet.java | 3 +++ 3 files changed, 4 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index ffa247d..0030970 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -705,3 +705,4 @@ RefactoringAction 1476277461382 SpreadsheetTest.java RENAME testAssignment_Add_1 RefactoringAction 1476277462891 SpreadsheetTest.java RENAME testAssignment_Add_1_2_()=>void testAssignment_Add_1_2_Result() METHOD RefactoringAction 1476277463902 SpreadsheetTest.java RENAME testAssignment_Add_1_2_Result()=>void testAssignment_Add_1_2_Result_3() METHOD EditAction 1476277476593 SpreadsheetTest.java 3437 19 60 18 +EditAction 1476277482102 Spreadsheet.java 3012 13 17 0 diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class index 64503a2acbf78e4c35bd30105fde44a4877017f5..3d645df8b94370a99a59b05ac5b3286e24a0e320 100644 GIT binary patch delta 130 zcmew>yG)+z)W2Q(7#J8#81grAF|rxRm!uY#I2IRYrsw6R=9R=drliCh#v8>4r52aw zl*AizFk~?@u-F=E8*wn?FfuSs=3uj66xr;^ww+_LAeV|j<~9a7tt|{lplzfD; iCpWT-@b)rrGxRZtGW0V@GfbHLfm5D67ic9DLmmL@ks>bu delta 36 scmZ1`|5ujl)W2Q(7#J8#7_v5UF|tjzV>4wG-dw`Aor9Hufr%j#0Oafn1^@s6 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 5979f99..90c0944 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -16,6 +16,9 @@ public void set(String cell, String value) { mValues.put(cell, value); } + private boolean isMathFormula(String value) { + } + private boolean isReference(String value) { return value.length() > 0 && value.charAt(0) >= 'A' && value.charAt(0) <= 'Z'; } From 5545b1793526204441a9221ea4e8225d5b18e039 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:05:04 +0300 Subject: [PATCH 180/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 5 +++++ bin/Spreadsheet.class | Bin 3152 -> 3152 bytes src/Spreadsheet.java | 5 +++++ 3 files changed, 10 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 0030970..8b261fc 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -706,3 +706,8 @@ RefactoringAction 1476277462891 SpreadsheetTest.java RENAME testAssignment_Add_1 RefactoringAction 1476277463902 SpreadsheetTest.java RENAME testAssignment_Add_1_2_Result()=>void testAssignment_Add_1_2_Result_3() METHOD EditAction 1476277476593 SpreadsheetTest.java 3437 19 60 18 EditAction 1476277482102 Spreadsheet.java 3012 13 17 0 +CompilationAction 1476277482225 Spreadsheet.java +UnitTestCaseAction 1476277487772 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476277487772 SpreadsheetTest.java FAIL +RefactoringAction 1476277491220 Spreadsheet.java ADD boolean isMathFormula(String) METHOD +EditAction 1476277504448 Spreadsheet.java 3116 13 18 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3e1a8424370d82b6fd062c260651af543587e36b..f0c11bbb723cd85659bf1d961f64434868a9bc24 100644 GIT binary patch delta 267 zcmWNLNlL?T7{z}POq$dRE+P$DFp5LPDmWlSXq8fM0u>cS7p+iK;!vens^A2IJ3;;% zH{QX8ZasjjUcei82p19lu6OS_?En<>9Q_M4C-V*O_L>F`P5t+POPZjW_1S~K}(R{nF*+mj8 zsco5VRtQ;TfHifkGs}j2n-tlh#GYw-wf3@pSInRHvt7mJkQ7Jw9MeOr+=(`wGR>J* noGVjP%LTh!vQM1@uBg&b;#%$-xo&B4C*1SM1J68}WJl>Ara>@% delta 267 zcmWNL%Sr+P6o$VEnsFu-f|Q9|jD?kzMj?bPCQGCnXhcOJB%u{e7o!Uplo2i31#vcR zdWROZ?EzZ(0=+>G(c#}5{`23uZrArlIGHZq_F>A|6NMHrFheeWMJo&X=Gbwr) zRc4GR;|!7}!6Xw*DKbp!Z=M-^W+{-9PUzjv)32OIUVQsH;^VNOz5*$h|UU!Z$V$#JHQ n=jyr8geJROQss&RZfJ0;>Xs_+RB^A@18v0 Date: Wed, 12 Oct 2016 16:05:07 +0300 Subject: [PATCH 181/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 2 ++ bin/Spreadsheet.class | Bin 3152 -> 3378 bytes src/Spreadsheet.java | 1 + 3 files changed, 3 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 8b261fc..da9c3c3 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -711,3 +711,5 @@ UnitTestCaseAction 1476277487772 SpreadsheetTest.java FAIL UnitTestSessionAction 1476277487772 SpreadsheetTest.java FAIL RefactoringAction 1476277491220 Spreadsheet.java ADD boolean isMathFormula(String) METHOD EditAction 1476277504448 Spreadsheet.java 3116 13 18 0 +CompilationAction 1476277504582 Spreadsheet.java +EditAction 1476277507111 Spreadsheet.java 3132 13 19 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f0c11bbb723cd85659bf1d961f64434868a9bc24..280c67e5a62b474551310aa733f579b75b036ed6 100644 GIT binary patch delta 1585 zcmY*ZTTdHT5dPM;wU-5K2XjdgyBq4#Mv5j_IRm(*3YBdul^I|dCy zH@tXVz|GrPL(A#uRV|^+>zUwAb7?Kpt4O|E$y83sX!)d`P%?#FUNN+M z!N@8q3AsW#ujmU(etlU}=5#%+saZ+FC0vnFfj&wga$|}8Ed(x12`EYBCbb34(6aNI zgct^7yosvG~et?3{<3blEag*37Lp^TcHfeaI3W)ze6oi+k5K0f= zavVT(ll>HX;SE(&7wW8}o3{~cRr>}Ipm|m>!1{dQc{^=|r%m%?bFsop zp)e5}Wry&NQ2fn1)LPf!eQY;a&bf7(BNHS~&{{|sqB4i6HKXjgFT82DxQSrz9#Q@q zIXTIEDB8M@=_301@4a|5wvTs;=#2h^`q&=cEyC@3MweQ;%okB<>lf}sqohggRIy3R zVpB0f8FDHDJnA0wXp{;!W0KNZ6Uj7Kp!P1F7|X!XSO&nM1^SFbhJ{Y@;iZ3K!o{f$ zYT5>`oOqbsj$*|Jn<|-&~XMU#GXMDpQEYG)1(%Nxm6$z^2GOvEB|IhX59sAXJi$kF`;xtWK zno4b`REZO(IUsXr(-W5-!VftT2k4mtD*Oi=xgaDCNKv4?*>xMxNV_v{-uKP>-Z#5n zKl`XX_~Sp{eGlLzY7h zufdz?9a9^}1zy7m`HOed|GK~%cvB|z&$`bF4B?d^G`uTt5*amnU!Y%M37ix707dz; zp6;I#_z*=6p_!HHdTF7$HeT6Kl#2q>3ip=EWflC9K-x`H7C0^Yd~tnVU_p-i;{8hk zZ@Y(81>SL4mjy;#?25psi>(XHy4W>=MfrtqSqpz-`eRz>6g(V2XSR-kyNGAKbsUQf z-AA)Cledg^EhaxVERiS63(X>ZNIo=Tf^?S@Ild)t8!;^||Jvt0L*7Z5G}~eWbqsGa z*n=)U{VWNv-8I_-DHwR3BPD+@t#F=k zIy^lZGmOgLOiMc^jetEiaR2e6jv9Q~?P#+)-|L)z7=rT`$W1d#22JQi95y=GQ5y&O z?8A%P8^mF@_XzTMS>6bw$|D$KjLt^Bg>mL;LJFr)AfnE1f$=vCP1{3@7T$&K*@fXF zpWSIxxX2h)VYgdh!mTTP57Deb^fG;yj|1(2K^(wQBrzzHL2E`OXK_hY92?w7wyH4h zWExqvkl4=>NpG<+`jf1~|0_SrNZGd=0G){KBMd6DjRr=7HB4&Kc?w^dZFO zC`_8#L_=E>^i=uT#UlG01!pL30>hZ(msOO-P->!rFxBN57>2%wE(1AB+odBOb-5eP zj8U+1=717W$DD1`2S)-y_XY+X!bNs}TK*Jj3#hyr$D;f_)H+ovP&2RgO;sgpzM$T2 z&6jErYPDSW(uG$Vz$$?!u4ML&XjA018vN1dwsPXCoE9yc|IHFmjMYMJ|9Tdk&!NoE zWR|k#5W_s4!y=8j#EZJb-_$FDgP9yM4q!|n0v_4#E513d=VcV_}KC2`o9i2=3)Q< diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 92b92d3..737bbd4 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -22,6 +22,7 @@ private boolean isMathFormula(String value) { return true; } } + return false; } private boolean isReference(String value) { From 97dbf7d3703b73f76a17dea953d7120cf2acfc91 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:05:47 +0300 Subject: [PATCH 182/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 5 +++++ bin/Spreadsheet.class | Bin 3378 -> 3304 bytes 2 files changed, 5 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index da9c3c3..3763dd8 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -713,3 +713,8 @@ RefactoringAction 1476277491220 Spreadsheet.java ADD boolean isMathFormula(Strin EditAction 1476277504448 Spreadsheet.java 3116 13 18 0 CompilationAction 1476277504582 Spreadsheet.java EditAction 1476277507111 Spreadsheet.java 3132 13 19 0 +RefactoringAction 1476277520826 Spreadsheet.java ADD String evaluateMathFormula() METHOD +RefactoringAction 1476277525340 Spreadsheet.java RENAME evaluateMathFormula()=>String evaluateMathFormula(String) METHOD +RefactoringAction 1476277544461 SpreadsheetTest.java ADD void testAssignment_Add_1_2_Result_3()/2 METHOD +RefactoringAction 1476277546472 SpreadsheetTest.java REMOVE testAssignment_Add_1_2_Result_3()/2 METHOD +EditAction 1476277547032 SpreadsheetTest.java 3437 19 60 18 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 280c67e5a62b474551310aa733f579b75b036ed6..b88f3e4ff82378e1e9180fde05aa6f1abb1fca2c 100644 GIT binary patch delta 1478 zcmY*ZTT@$A6#h=mIh41?Bh=cGj^lYRNt+H0@%t#6;N4*ueI z|M1VZ-vKy^wJ+V4KJG>wuL+z)r-q93Y%1SV&|riUkv?VV5_lbN(6X4#%@k%e=;260 zgEq%M=gN^nD!q_QEsv(A7qc2Xb1TEyE7^QDmzIC%k&1qSH<6Hy#(>Nloy{Wxr*Yg3 z4etn?L0GNE1o{*f#07x~Ov;~)){gfCE@G1L(o4BQYA&}jm|ayamjzM^*Hf8{I-C}0 zwZmiuhGd)RH|7N9<)G>BxGM0rec6)0dE4unz<`ad2n^cTb%7ZhyD6~n^%v#`+WHzC z&`DBI?|KAZtYI4`ys-_K#^#3(ts%CJQxBi~rfjD))}V^J16()2k7lBc zb|kdmCGHp#$56@K9XNV&=rQ}Z~u?+fEN9cl?raqHlGNZolK{+O;(>3N8% z(n{X3>a~FU+zJR4M28lj`)T>usu6UzoxEKe@~%~*h2&rRe$UhIjBIq))tuVK*)1M+ zlq#v<#XyTZ=REW(sVb+jM5{_8VyDq$r}6Rw)Y+@{X9?YR*1ICG5XFm#$nTwjN|l%a zM~kX>Q2y!+XeXrQiY7?mPYp$wu`OSfy5DB<2n5${^gYZd?RXBakjEor^C)8;qa-_M zIZVBtq%u3vjV`(73S|axj%N&76{kASg^OXnX?v*FDtBQxc43+Hr$EXT z&hw0ep3QcJLA$Qj2kgE=j0|~~Ph9n`UN*OnP3@J9?m$`vXK{_HIBKjM?3%)8374a6 zAh;jJ+q%KV7*C^~{a^V$o&@^g=DYDDLD3A#4R>H&-NWv-FznE?oF5ZXD(#QPb}(E- zx0*+j(fAJDEuua84MOp4jFV$ylbZ%^ri!R7 zNaQeTgBT&7qg2QkjpNMV0$H9U5tsOmr{#nvG;)QiwzXUdV-HOh;sI@!j5yT$Dl?N{ z!it##Dv52(Mx*4RlmbCpf$oyS47)!ofArM3R9t>-upoc;)J{z&nKPw*TUE)LFRIzD zd9etgcDdvu8(uC0c>+&a3GWk8r<@B#RQP;biisQYvZ!AFZxomE$S33b@|-BW%0*Nl z$F!FC+?VkJ@+4*j5fmuW>lEeb6ZwS5 jryM`CKNj*&5elkqSHZc5I7##doTlkD$-u1=N2~t=NwxiF delta 1708 zcmZux-BTM?6#s3qAz`^CA(gb04;Kj~UoEJW7NkfDSUwtQfl^8YH&#`7PSFFN=P8dZ~^@SDsrl}U@i)9N20@g zW02upT%?WkqGBXX0b*o0N{&Y+OeMXXQdTFGxtx`CM=LHdr0|~grF+Da6(9^-f4Foggr>|pB**KDsl3}d$KF2iNpc8@``ZTA_B?4I> zQ5SdbVjz%w0>3?*c?yrX?cOFAcNuI$3Dz3-9`7G2Z3&G8L!vpb;|^@C4eNlN|LT9i zWa}GmW5K~WN+(Hj2d8(RU|i%#yBOV}aODKUrA$I(BN-fmeD)TO5QdBE=wRuz;$BfZ zrxu&wsVyAiv#EhV#{uiEmswX+9-yqeh~hQ+b5ZS>(Sw*#CnhH%!qv*7U$(YnF^&nsszx&=ag{7XR<5$XKsDv?UUD=H+q|1>-fde5#<@kz@EdP? z`D$#&Nz_n_$w-zl4j(WMA7(6b##F&Pu2mrgvL)E2!%_V9P4cLthlB`H>Y%ojaFGNU zq97w>K_dr2BV|F|5Lzkbv{jHoJ=crqi^cbFBNa>R;r${yVn3icv5OB#ba9&&4YWuX z5pwMF*J3fUWcRRa{Vs)~WAIV4Rg^;B zxhPN2Uwn=hFA|Ny-^ASo%}P}rFX*ut>C4f1_t-Tn(I1$nn_eg*S93tF1{{_iA{hHU zAau|fUVWdJ;8K(^HR>kkNQ`Is-)5XIg7MW_>T7N;?BTX!*&xflD3KRB9OK>}6;Tlk z?r Date: Wed, 12 Oct 2016 16:06:22 +0300 Subject: [PATCH 183/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + src/Spreadsheet.java | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 3763dd8..47afd8a 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -718,3 +718,4 @@ RefactoringAction 1476277525340 Spreadsheet.java RENAME evaluateMathFormula()=>S RefactoringAction 1476277544461 SpreadsheetTest.java ADD void testAssignment_Add_1_2_Result_3()/2 METHOD RefactoringAction 1476277546472 SpreadsheetTest.java REMOVE testAssignment_Add_1_2_Result_3()/2 METHOD EditAction 1476277547032 SpreadsheetTest.java 3437 19 60 18 +EditAction 1476277582457 Spreadsheet.java 3272 14 19 0 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 737bbd4..789dcfe 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -25,6 +25,10 @@ private boolean isMathFormula(String value) { return false; } + private String evaluateMathFormula(String value) { + + } + private boolean isReference(String value) { return value.length() > 0 && value.charAt(0) >= 'A' && value.charAt(0) <= 'Z'; } @@ -111,7 +115,9 @@ public String evaluate(String cell) { if (isAssignment(value)) { value = evaluateAssignment(value); - if (isString(value)) { + if (isMathFormula(value)) { + value = evaluateMathFormula(value); + } else if (isString(value)) { value = evaluateString(value); } else if (isInteger(value)) { value = evaluateInteger(value); From e6e6c499b048474d980292f7962aa08ae47ea946 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:06:33 +0300 Subject: [PATCH 184/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 2 ++ bin/Spreadsheet.class | Bin 3304 -> 3581 bytes src/Spreadsheet.java | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 47afd8a..a626c03 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -719,3 +719,5 @@ RefactoringAction 1476277544461 SpreadsheetTest.java ADD void testAssignment_Add RefactoringAction 1476277546472 SpreadsheetTest.java REMOVE testAssignment_Add_1_2_Result_3()/2 METHOD EditAction 1476277547032 SpreadsheetTest.java 3437 19 60 18 EditAction 1476277582457 Spreadsheet.java 3272 14 19 0 +CompilationAction 1476277582607 Spreadsheet.java +EditAction 1476277593268 Spreadsheet.java 3285 14 20 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index b88f3e4ff82378e1e9180fde05aa6f1abb1fca2c..3003f9356ea5530deffb6e37deec6b2b7aae741f 100644 GIT binary patch delta 1279 zcmYjQ-*XdH7(JUGO?G=}(g=Y_s~ez@q^V^Tigr5KDlOU)(6;o46mXkto4_U;H=EG% zqY(jxL2-twGlU0x^rg2t%dY^A;PW4qX>a`{y`~ve&DJxTogXu;V%5+B7?lvZq}8;3Ln|%!k6M;#1#wcs zn>ut=Oui+f}QiYBZ@- z4O=yrRC~3ot5ddBD20|41t;)6!%mD#*v0>rc1kmR!8_1)hT#Kz$RBy{95}~t3da;k zIM0wlLd-5QObF~1Xbg+U@)6&m0i9t9Sqbe~vt(<9Qe{G46)Aa!g2266E+>jFGaPbh ziVXAoi7)2+gu&uZeX;Q>!+^Wl6^3`+tW}0t7rVwV=VCV)CS9z~Fy&%58B7HV;E&i~BfQ+`YcuO$=?~^oCQr&7E|(qizQ+Zt4X`v4c1~ znB@C{<8mJYcn$l|$E(4lG{wIQ=K5Zz=o^F|K?h~WNTM#hi4@*K8iVMk*dUJ6_cn$x z!Vk;w-IJK68Xsj6LY;LWjPBvg#?Kjow}_fR<+KfMtNiKe}d zAQ37D*{qQLF*3dfXZVbgkmh+^i4J|#z;LR!iG@rm-Nc0k4yS%bJiUpJ8}R$qY0*WC zTm#V-zC4>s5pt;sga4sKlhX)NM;(|UXJ)CpIok9boqPeuaGrX;NcLwjiX|Ryk9U%MN{MY@ zc8i=(8)%C}HiR;tQQE;sh(^^JUl#EfNo4`7WzyRgEn*L~TBf^Ox9B7l?1GKGsF9Rc zki-gIm{qzOS4qZe7OJ>SnO{)GU5ebtJ$#9;@f9B80UpsP t9)#*@vZdT(GD;}dhHsqf>rowV!jPXKP2PmV-9f)U?5C95RPMo@{{h*f@>~D_ delta 1015 zcmYjQNl#Nz7(JIxudf%B;*g>!RnhiQ3K#|Bh$teh6%dq3fl3h&DA+PsjS@9ZiMtyY zb>UVQE;JfRTo@B~?)($R-=JbVx35O?l6&uWzWIFLTifzIV1D`i;Uj>3xbep9bts2( zpSxY+G&tF_jrxoJnT1+mysrHR=j9%}R9I z1_Aw}d&45Go_SMsQCim%Z$KFu5x`z- zC3P0|BZ4Ms>T!_YQ5-@Gj;LBQ*c`(d`Z%d=!Erd~7eoSQiL^4`26)!s5#kp%h|(W$ zmi&OnMf*;5&usIyqMTG$qg8!1!=g+5H1~^Bs?k?b+76R53ZMfuh^ua2XoXy|gH4S2 ziCG-H+pXGFoXev{-@OSdvWg3NG+6HtjJ!vG9xmrA3R@{$%wtm#AL+9!B9~W@dgUm5 z4CN?L6orrPE*KnK8O||T51Z+wt`8Ma^s|Bi_Bh0vN4PAPl}`r66;&rI4{$cc>N*&# zgkj2czW124tlDBWg7zrPg24o7o>VJx^U4*J(pg{{Av=g@poMPnaltvkdJjLxE!`pe z9oDzq?@S(2OX8svo>DH!|nIK)+{X1Z1;+P9k1%bS*Z>FkLuMx zCK1t#WV19_7{Uw}D$Tm*uo3gvf(%*8B8&yD%OY1~i3BZ^%j={qN6K#UH@SrrZgY+A z;41E77Wb)rfZLsTNazvIC)mX_)pqNg{BBAl0nq|MZrtM@mXaF1S?gf@Ld1i}`YOZa NTJIur*9n&(_XnxqxKjWC diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 789dcfe..968e9b8 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -26,7 +26,7 @@ private boolean isMathFormula(String value) { } private String evaluateMathFormula(String value) { - + return ERROR; } private boolean isReference(String value) { From 826e478763109ecdb9e9ea8646aa8b3f71cf2309 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:07:13 +0300 Subject: [PATCH 185/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 3581 -> 3441 bytes src/Spreadsheet.java | 6 +++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index a626c03..085993f 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -721,3 +721,6 @@ EditAction 1476277547032 SpreadsheetTest.java 3437 19 60 18 EditAction 1476277582457 Spreadsheet.java 3272 14 19 0 CompilationAction 1476277582607 Spreadsheet.java EditAction 1476277593268 Spreadsheet.java 3285 14 20 0 +UnitTestCaseAction 1476277594785 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476277594785 SpreadsheetTest.java FAIL +EditAction 1476277633453 Spreadsheet.java 3373 14 20 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3003f9356ea5530deffb6e37deec6b2b7aae741f..d58590c37a77d22dd7ad81d7827383484ef44b7d 100644 GIT binary patch delta 719 zcmYk2%TH556vn@4Z(p~k5}T&RDnV`wsw4V(YcJ z?3BV7bjJykn3AWA$6Xf)V~Cj$xI`F7ull-77**^Dt`e?cUVbxrQVWDd%nSIl<Kb+wWq+)&(^$>o$dN9fTuHwotvJdXm*z{t=T=ovSyov;@eLyzhfxI8613HXRvLXn**I(-3)G2lCm|XKNigEeX8xa%oySHB?WV>%uOv|UfH?ahgtT#CG zFix{}A3AUr=a`&fuMj+Y@Cfk>AraVx;n;=8#rrezky#V7@~1h#o+teA6u%7rGt8Qg z?Be7;Vf8hTvN5ds#iSK&V9rLr^$s1;9bB>DGG6jEtF+uF*;_rwezm`Yf@Sr!wpS?XTWa21peUbHcq^M^r=e$fqW;ZE%Bt%mw``D_ z%E=cRueCsx!Gb#3Xn`7ozu|lTNecL;I;~UpVzvBZCsBwYs89%8u;JUrxZ0A N54`d`;0rkL@DF%|kr&UKc4LNI>vuQ1J zN|u77DczPcnv*hPD;&e-$9;Ky-s}ZHOh^YeFmA9yG-NH-(<^C6x)KQWwpn8YT#}$RhLJ?`v6PjU$cp9o@ zrq~W0kg|$G-b$sfq1JT+d&oS4y}JY(B!50y=5eVnLOR_~@X)=Pe3EZe?``tP$9?-u%yP4fPzy?E)&o;g_!8yVTbhuA(THVy!FkziQA0Yhs&k K2JV-B!^U42Hopx3 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 968e9b8..d7ba487 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -26,7 +26,11 @@ private boolean isMathFormula(String value) { } private String evaluateMathFormula(String value) { - return ERROR; + for (int i = 0; i < value.length(); i++) { + if (value.charAt(i) == '+') { + return true; + } + } } private boolean isReference(String value) { From cdce8244b0331543982ff11749945b31fe63693b Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:08:12 +0300 Subject: [PATCH 186/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 6 ++++++ bin/Spreadsheet.class | Bin 3441 -> 3586 bytes src/Spreadsheet.java | 3 +++ 3 files changed, 9 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 085993f..847cb7d 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -724,3 +724,9 @@ EditAction 1476277593268 Spreadsheet.java 3285 14 20 0 UnitTestCaseAction 1476277594785 SpreadsheetTest.java FAIL UnitTestSessionAction 1476277594785 SpreadsheetTest.java FAIL EditAction 1476277633453 Spreadsheet.java 3373 14 20 0 +CompilationAction 1476277633597 Spreadsheet.java +RefactoringAction 1476277673648 Spreadsheet.java ADD boolean isd FIELD +RefactoringAction 1476277675163 Spreadsheet.java RENAME isd=>boolean is FIELD +RefactoringAction 1476277677179 Spreadsheet.java RENAME is=>boolean isDigit() METHOD +RefactoringAction 1476277680699 Spreadsheet.java RENAME isDigit()=>boolean isDigit(char) METHOD +EditAction 1476277692472 Spreadsheet.java 3442 15 21 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index d58590c37a77d22dd7ad81d7827383484ef44b7d..863b1f0f7044ef8108e7526684a28113ae5e2eff 100644 GIT binary patch delta 1164 zcmYjRO>Yxd6g@9Cu|0ky!U97=+Khoh>?93TX;PxJbsJ2E?#H|LoU#9H zU1(E&d-d~E0KNG92W84r^&!E~JgrrcY^s-r~=s7iO7EAep zX6H>qEm`J7K`#!dO5oURNmq;ca#6FhQv+&NGYr$FWTT>6wtCJoi|T}F7Ie)}ZBtF# zR^FIY6zs!6j*Un%Y!d&ljcim{p1#H-9G~K-_};U)<0Qu+^ebTaj3b2(c{;-}EU`DC zaZDg9GTvQjo#Py`3_-fn*78PqSf7s2h#jbLUxLB1V?PAwCOc%SsQU0-a zU9e$qFFa@<)|FqdZ#=ZWjswrgYruB0jWi$7jvZvVb5`&cb~^E4G3Semt$r?E_}*ZL z#9zKX78Py&j&5Rwa>JDM!D{bLZ|5=wmvMN>sa@;cEiU-m*@(F3PX_kDhj*|Id&Hmq zC`*f`K(4!wCg~^qJv3o2S}=e%3?hd2(M8>RC^mqP=`@5m65_i+Wb+7)QH_^KisK`? zzX=f>$Ef%t(9SaAWgrnqVgu==A}JC|l#K~fc{g%+Dby@y^Ei8ls2(^1g=BBRQQA2z zo+}+}T>Pzs2T#-xk9F2@Di!Oh<8%$XV?QC%wT!bhtn)r0r;VIk4dE4hG82mtGF?YO z#Dn4J82qGk6HX9GCuzJ>bmKEf!7bHNEJj4i zMo<1HQgP%niKLPvRM_!1tOx~K*1&oagrU4D3`paj+x4SH|ML68Cjc$Tz0sp) zS!`)7J|u7$z4D;t-sVApF8Fk47#8S8gZdj4=v3HxoD?{Parxa+pF1OP7ULT1p{dDK zFgBU&i)0lgC@`ULb1)oM!C`@VL*~4|ark(1DU#Ko$C4efL?|5(CREr(flH{+P!x(s zf(Z@QNG2Fh2U8KHF)7e$BsDG2QBd0g6B&U%1G_5FZ(!F1q6T(dApZ7q zk=^9?QPe~e%#N}}ZYFHvT1*hA#b&Nf;~HDAl_wIh8>NMyPARPInp*~}4O*AXSX*Vk zRmk_&S~uMy!%6mj@|C>aWNBK0e+fN>SL91;Wre<~sjq7G$&I#NTQf?q4I9xc)3!#f zU%s$~n|D%Y7x5OXA-kG3xUdHv?1dNmu$_1N_}YH7p&bY04&7bZhX7+NWD;Q>Yv9Ha z9F~Jh9XJ$#;>L}w{S6FM* z{r{pi1eN5X4Qy rkYmlakiZ?JahJ^dWX$pAAs*lnp5QSSFpsBLkRMCiN^bBO6K?(i$X3BU diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index d7ba487..2e4ce55 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -33,6 +33,9 @@ private String evaluateMathFormula(String value) { } } + private boolean isDigit(char c) { + return c >= '0' && c <= '9'; + } private boolean isReference(String value) { return value.length() > 0 && value.charAt(0) >= 'A' && value.charAt(0) <= 'Z'; } From c993be838e37b9cda917a90cbf319a9e30658ba4 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:08:13 +0300 Subject: [PATCH 187/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 2 ++ bin/Spreadsheet.class | Bin 3586 -> 3694 bytes src/Spreadsheet.java | 1 + 3 files changed, 3 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 847cb7d..e7cac46 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -730,3 +730,5 @@ RefactoringAction 1476277675163 Spreadsheet.java RENAME isd=>boolean is FIELD RefactoringAction 1476277677179 Spreadsheet.java RENAME is=>boolean isDigit() METHOD RefactoringAction 1476277680699 Spreadsheet.java RENAME isDigit()=>boolean isDigit(char) METHOD EditAction 1476277692472 Spreadsheet.java 3442 15 21 0 +CompilationAction 1476277692586 Spreadsheet.java +EditAction 1476277693578 Spreadsheet.java 3444 15 21 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 863b1f0f7044ef8108e7526684a28113ae5e2eff..43b55c639d30bf765c2ee2145c830ea7f417e34f 100644 GIT binary patch delta 1133 zcmYjROHWfl7(GKTrM(@rG_feuNAcB`sw}WXMMY8L>-s<~0t%K=wNgM^isGw?FVsX6 zM-%Hp)Ho zB=&1;5t0&pNU86}%EBp$(?|(;l0$>TiS%G@Pijz+()5!x8D{Yw}i7qrT z(w`a?Fw?o#bT*mKB(gd!Cozn90_Dj}Dv=d%rA88&d}27IHO@=K?4m{`T1#q8xFpeG zgI6Rv?JWutaT~iP(QaecCC=H{O^LkvR6ZcQZ)47HqGm6p{j|wK8GnGc*4yv`o?7oZ z6?4@s@?tqw5N3dseI#$?+yOC%?EOl*T0}@$u8=sOMqDuwRj*wkis&$O6 zC%yr5(2NDxhyXStf)+%v1#1{vkL}om9Yl7j1~XV4$5G}O^s$8u2lIluDRtUhEIQPL zx!rA{icKzorM{YB(fQD`HrO`lo2!d*1!oSdAo_ccxDPdY<>IW0aj-#5`O=Ew0eYs|cgOFTxnF#x>eFjy<@}x8(*BxQR4wA%h8e kbCx@1h^ z4Cv>Lb|?BGor&H(u|aKeR-#kmj!1jEc0MPu&JJ^4;s`>#ITsrgFgtr|JA0!2@koz$ zyC~6vMFQE;cr4N*;EoMM;{B1nn2ymeQEnG?Nuo9#Erdad78|@G(Q2o-D$!(PNr`3~ z8T~vak@u?J`AMijca>^%OZCCMOzc%(-Q}W06?y_?Y@12*$=6Oekj2$3 zHA<&ZIgQ3Cp0cotvy(PJnM!z8h$eO4)8N?z7dB%hHmNV3649)@W_wvVtwY4OAs5?G zhzb;;5*BtK$mkn*SAiPtYEg|k_005#nsAUl20O0CF6PgLABS+5NDcEXgzG0I z$eD$aH49fZ?OW6jv(D3i`IM>{4XValB3f14yVc(~<;&AmJJMDA7zfw~lj0ZR0M?*c zz4r!^R3_8&J6bwuQ*V{d;AjffdOa4lf-^Xg!ba;g{K09QN+H{r$O=%X!Xtvgu$GJE? zFR_Bj8T=pBqdi8#!G8js#$tBT$LBS`x-Vf7E@LT%$kG**V3=R{Dxb^<2})AxYkU}^ vq-~6!?mFTa=P$a2e%z+lU3%Q3^A+#S<0Ct#aK+6E^-EwQSA! diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 2e4ce55..a40bd38 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -36,6 +36,7 @@ private String evaluateMathFormula(String value) { private boolean isDigit(char c) { return c >= '0' && c <= '9'; } + private boolean isReference(String value) { return value.length() > 0 && value.charAt(0) >= 'A' && value.charAt(0) <= 'Z'; } From 2b7375f4f1472a73ecee5d7870cab7824032fdc3 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:11:04 +0300 Subject: [PATCH 188/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 9 +++++++++ bin/Spreadsheet.class | Bin 3694 -> 3550 bytes src/Spreadsheet.java | 12 +++++------- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index e7cac46..a593bef 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -732,3 +732,12 @@ RefactoringAction 1476277680699 Spreadsheet.java RENAME isDigit()=>boolean isDig EditAction 1476277692472 Spreadsheet.java 3442 15 21 0 CompilationAction 1476277692586 Spreadsheet.java EditAction 1476277693578 Spreadsheet.java 3444 15 21 0 +CompilationAction 1476277693694 Spreadsheet.java +CompilationAction 1476277725127 Spreadsheet.java +CompilationAction 1476277725305 Spreadsheet.java +CompilationAction 1476277746484 Spreadsheet.java +RefactoringAction 1476277801501 Spreadsheet.java ADD String evaluate FIELD +RefactoringAction 1476277805016 Spreadsheet.java RENAME evaluate=>String evaluateMathFormula() METHOD +RefactoringAction 1476277812075 Spreadsheet.java RENAME evaluateMathFormula()=>String evaluateMathFormula(String) METHOD +CompilationAction 1476277815723 Spreadsheet.java +EditAction 1476277864426 Spreadsheet.java 3393 15 23 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 43b55c639d30bf765c2ee2145c830ea7f417e34f..46d6e4fcf02cd86ef5b9d8538f37da382bc5e001 100644 GIT binary patch delta 1250 zcmZ8hSx*yD7(LStw4Gi+D}oBB6Sp!H6{8f53ofXD755DnYN=SMpk)yRtzwKCjoVF( zO^iPJ;sZw0CO#NreDWXo;)6fH_~4UK>m9}01Y+1OJM{*`fQFp{o6sU}>D%TX5NJhIfrkXz5LUCp0$UX}8%G6> zp-X<(7iEtNB+#WHnCR~tjHmhr+LNP-k`y?haBsZ3TLqsKSmdNRC9n@s?(`-{H5jRZ zjj2pxC>_tJus(r)OxIA9NGIbN4gTbCJUtX2OsX6ifkvmOL4l2SwkU=L_Bh~(z+UHw z^8y_XHZHKs!7d7<9qf|8nHL|5f}S;vOzNR09&J*Mn8&f07*K=x94nk%EWkpp6k`QS z>=@R7_PRg}M$O=+evj|?-~f!&PJ*|27;XAz|^p={D^o66z)0iULQN4Zw=4Z7zWd`0B% zkzb9LKpUo_9dpqpHw0_7y)qqKVYW|(%9KA|yGbGD0efs<2dmjhDZAy{U^vT*<(B=1 zOeKAbRae0N9GcbpV9bgX(3!(h>m|%c9!G4yxTxkLoB0UA9=%#x99K9Gp z&JVzkgA{d$t?Z<1XVeA82>f;={MUp^#kr6}aVRvYT*#8PFjU5Iu077OBH04|%^FY^+jhFpVxT}lDN4DOwa}KM#-z%hogvzC)C*x7}2N>AFkd?sra zGq$DY9XpXt=X!N5II@^e>$yxJXBLyQy?WBLEW1d?)eG&$(-XFxO`DcpwDsYl zld)zr4M%W-qX{P&){CdCiH! z5l6TjINl=5H^@c- ztEWJN;;FxnMa8Z_l${n6fgTnUACr7WJPx#lhnC%FYuUQRUx7^}DxIP&>i>}%ZdC0abG`zthf(*Cbeqdrm|xv6EqdMZJ#j~{#R3f;1eW-r)k!5yTl zs}`)nx0R884B}caxnnimCM_(R(h z8CniENPZM|8exhI3_-&%RWm{@jEYx7(bD89SHF;@Z26ecS;4t7`s6(oH)0iBETh}_ z0g>1W5@pE~J=*CpT}E>i&x{!cA=wHnVo`ppsdpko@+1N{M@^k47N@AS3shDDFYQE< zDo9bs)3lIt#7Ry(2}M|5)bqA|v~bl)o}k*~B-hD&D{u^hM(SoG&|5goHE@XZg1E?A zf_Zl~4D(`%H#@qj!(BCk*IJ_JdhlJuF1 QhbW7Ob%*@-T*BV_7cP+g2mk;8 diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index a40bd38..999b568 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -26,13 +26,11 @@ private boolean isMathFormula(String value) { } private String evaluateMathFormula(String value) { - for (int i = 0; i < value.length(); i++) { - if (value.charAt(i) == '+') { - return true; - } - } + ArrayList integers; + ArrayList operators; + return null; } - + private boolean isDigit(char c) { return c >= '0' && c <= '9'; } @@ -51,7 +49,7 @@ private String evaluateAssignment(String value) { private boolean isInteger(String value) { return value.length() > 0 && ( - value.charAt(0) == '-' || (value.charAt(0) >= '0' && value.charAt(0) <= '9')); + value.charAt(0) == '-' || isDigit(value.charAt(0))); } private String evaluateInteger(String value) { From 8b495a1485d98878f4725ff4fadbc4e7c91b2e30 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:23:00 +0300 Subject: [PATCH 189/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 25 +++++++++++++++++++ bin/Spreadsheet.class | Bin 3550 -> 3691 bytes src/Spreadsheet.java | 32 ++++++++++++++++++++++++- 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index a593bef..83ae5c4 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -741,3 +741,28 @@ RefactoringAction 1476277805016 Spreadsheet.java RENAME evaluate=>String evaluat RefactoringAction 1476277812075 Spreadsheet.java RENAME evaluateMathFormula()=>String evaluateMathFormula(String) METHOD CompilationAction 1476277815723 Spreadsheet.java EditAction 1476277864426 Spreadsheet.java 3393 15 23 0 +RefactoringAction 1476278137237 Spreadsheet.java REMOVE isAssignment(String) METHOD +RefactoringAction 1476278137237 Spreadsheet.java REMOVE isInteger(String) METHOD +RefactoringAction 1476278137238 Spreadsheet.java REMOVE isReference(String) METHOD +RefactoringAction 1476278137238 Spreadsheet.java REMOVE isCircularRecursive(String) METHOD +RefactoringAction 1476278137238 Spreadsheet.java REMOVE evaluateMathFormula(String) METHOD +RefactoringAction 1476278137238 Spreadsheet.java REMOVE isString(String) METHOD +RefactoringAction 1476278137239 Spreadsheet.java REMOVE evaluateAssignment(String) METHOD +RefactoringAction 1476278137239 Spreadsheet.java REMOVE isCircular(String) METHOD +RefactoringAction 1476278137239 Spreadsheet.java REMOVE evaluateString(String) METHOD +RefactoringAction 1476278137239 Spreadsheet.java REMOVE isDigit(char) METHOD +RefactoringAction 1476278137240 Spreadsheet.java REMOVE evaluateInteger(String) METHOD +RefactoringAction 1476278137240 Spreadsheet.java REMOVE evaluate(String) METHOD +CompilationAction 1476278142081 Spreadsheet.java +RefactoringAction 1476278148295 Spreadsheet.java ADD String evaluateMathFormula(String) METHOD +CompilationAction 1476278152962 Spreadsheet.java +CompilationAction 1476278153150 Spreadsheet.java +RefactoringAction 1476278245448 Spreadsheet.java ADD import java.util.Scanner IMPORT +CompilationAction 1476278283144 Spreadsheet.java +CompilationAction 1476278283328 Spreadsheet.java +CompilationAction 1476278307775 Spreadsheet.java +CompilationAction 1476278307957 Spreadsheet.java +CompilationAction 1476278531555 Spreadsheet.java +CompilationAction 1476278531736 Spreadsheet.java +CompilationAction 1476278579251 Spreadsheet.java +EditAction 1476278580271 Spreadsheet.java 4038 15 24 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 46d6e4fcf02cd86ef5b9d8538f37da382bc5e001..f0a281e90c020650e75439cf2a41f8034ad06971 100644 GIT binary patch delta 1304 zcmYjR+jA3D82@duxouAx8r#%{Dw`1@-A1Yov<^C2E(Iw~OH*hm&_ddzZD^7Wn@yz@ zNGT|wGa#OEAR`xV<7K8g1syVjGwPc&zW5I~KKddLzWBnZ<9BwWb#~_LIlu3BzRU0X zc7Iv>TdVTp-w(b8uo-XORc4%J4|*g7jwk1m9ob}lx}(Q1bi<3?5)udUM!KkH=h7*4 zQqL7K*`%4#^J>A+C$j0>R#oxspUD)}T-uz`Q);eMG*u&QmW;fbq)oAuHC25|HRlUy zb;vX_`DsPLPV8Z5M6ZOVXdgx8e@Fpom>bRk_YlK=9N<4Vx3~{7>_s1U$bIXNGVDW_ z0trcmK}5xFl3_q#Pa@4Qg=ucc8#^-$$1yFTZc@*i$xObuH$5*XS%#dzoyk;6T-F&j z+HOuTjPal37P-VQ#~;cqz4Hv6cCZD89X9I>!(kgMGaRw8a}2{acAjC>#$IPA+So;g z*Z6?zOTP;;+z7yfFkD=5?~wew-`(eGfPx^uNrcs&chK*LqbZV%-q#-l;RyAM;- z+H27Ww5LR|2yc_<*Z48k>@(n}%M#7yA`6xCaZ2x{+qfbMqVja{w#z$N0TZWF@lS2| zbPYI5z__q1)_^4f{#7KpDnhg1T&Tbu46XVNoNa5(Hcj7#MM3Q8oWLIeM4Q5zQMW+V~TP?;G)7EUA?_3__DxGdz&i)&9dE@rS}Q+%L!*z=%zr> zPBtWP#Ab~MG}_oLfhHRp7ih4tNr6)~HZ5??#%2Tt{9!sx zVg`xjq$)8+Ko2aUY!P+;iz-}`%vecgtcYrm(i2EHVM(8NgJ(Aqv4?f+mdl=e?UZyI zy@f$0*hhRnl5qf8D5Vo+FmVtCOkd2kQfe+|M=DvLW%x21aGEhXyH$xp6qpR3s!e_~ zwrY*?w^8K@(a}0=Lr7M5^R*@!@s{}N7Sh%!@s60IX^aQ^Xy62Mo}}>8^0U_;ZDu~Z z^e<#O$f-61OK7oBsorP8X2BBLEbKBrz*n${^A?=?JSRDvbXmxVznDA*=`yEkLHp1cF+xAB9gx37X7p<8m}nUI*Ig|{hAQ!8EI3TPWv}sARmgh# z)!VN3h6SN!gW)$eJRAo`3AC$~u{bb6;GaeQRaY{}Ny3x`S6bSF@+B&tCZ$K$ZsSqg zOoR(oThxt>)HcM!KSJfByehYljdA)kfqYEz_c6tzF-?o2Z1xPAaht}?B7!@-jCXMp k_b`n6jC#n3M`S+113cw8hi80VB;dKsORh+~9kXoqFC2f#mH+?% diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 999b568..a070de6 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -1,5 +1,6 @@ import java.util.ArrayList; import java.util.HashMap; +import java.util.Scanner; public class Spreadsheet { HashMap mValues = new HashMap(); @@ -26,9 +27,38 @@ private boolean isMathFormula(String value) { } private String evaluateMathFormula(String value) { + Scanner scanner = new Scanner(value); + + ArrayList integers = new ArrayList(); + ArrayList operators = new ArrayList(); + + while (true) { + if (scanner.hasNextInt()) { + integers.add(scanner.nextInt()); + + String next = scanner.next(); + if (next.equals('+')) { + operators.add('+'); + + } else { + break; + } + } + } + /* ArrayList integers; ArrayList operators; - return null; + + for (int i = 0; i < value.length(); i++) { + + if (value.charAt(i) == '-' || isDigit(value.charAt(i))) + for (int d = i; d < value.length(); d++) { + if (value.charAt(i) == '-' || isDigit(value.charAt(i))) { + + } + } + } + */ } private boolean isDigit(char c) { From 2c53d8c023be5d3d801e73ba916e800aa41748d6 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:23:02 +0300 Subject: [PATCH 190/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 2 ++ bin/Spreadsheet.class | Bin 3691 -> 3691 bytes src/Spreadsheet.java | 1 + 3 files changed, 3 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 83ae5c4..9672eae 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -766,3 +766,5 @@ CompilationAction 1476278531555 Spreadsheet.java CompilationAction 1476278531736 Spreadsheet.java CompilationAction 1476278579251 Spreadsheet.java EditAction 1476278580271 Spreadsheet.java 4038 15 24 0 +CompilationAction 1476278580378 Spreadsheet.java +EditAction 1476278581987 Spreadsheet.java 4043 15 24 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f0a281e90c020650e75439cf2a41f8034ad06971..15474c970ad82274f9299ac7e8cd7b1a56e5981d 100644 GIT binary patch delta 281 zcmWNLODjYH7>1vtjC1Bz7L*(^X%-`wjZzkvG)l4r?BbtojXN(%gv6-NW1kFs+rd=mVx|pGdSvhwXtTdI((Lh?dJ&rGfn+4?-3F64N z=P;DTB&W6&s#zt#8jWnw$|fCb5oViSc8IViId7&suiFRm=lw|>mN z65@(>3i{$&nHvVUCC(kw+>_#gc^+BfiDjP2@}i5ctnehTMkx!|%!0C*nOqx_OKO@am!XVX$buBcFEKIh ziJ}GzJ3ff=1t#CYZ+lM9c}~G8IQg(`^+?2yTS57 Date: Wed, 12 Oct 2016 16:23:42 +0300 Subject: [PATCH 191/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 2 ++ bin/Spreadsheet.class | Bin 3691 -> 3691 bytes src/Spreadsheet.java | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 9672eae..bfad3ca 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -768,3 +768,5 @@ CompilationAction 1476278579251 Spreadsheet.java EditAction 1476278580271 Spreadsheet.java 4038 15 24 0 CompilationAction 1476278580378 Spreadsheet.java EditAction 1476278581987 Spreadsheet.java 4043 15 24 0 +CompilationAction 1476278582109 Spreadsheet.java +EditAction 1476278622116 Spreadsheet.java 4104 15 20 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 15474c970ad82274f9299ac7e8cd7b1a56e5981d..f0a281e90c020650e75439cf2a41f8034ad06971 100644 GIT binary patch delta 281 zcmWNLODlwN9EG1(;r-98EGT)2G>ehTMkx!|%!0C*nOqx_OKO@am!XVX$buBcFEKIh ziJ}GzJ3ff=1t#CYZ+lM9c}~G8IQg(`^+?2yTS571vtjC1Bz7L*(^X%-`wjZzkvG)l4r?BbtojXN(%gv6-NW1kFs+rd=mVx|pGdSvhwXtTdI((Lh?dJ&rGfn+4?-3F64N z=P;DTB&W6&s#zt#8jWnw$|fCb5oViSc8IViId7&suiFRm=lw|>mN z65@(>3i{$&nHvVUCC(kw+>_#gc^+BfiDjP2@}i5ctn integers; ArrayList operators; From 9f93c423486adf2b32df9e4bb618d1ffe24dbc3d Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:26:49 +0300 Subject: [PATCH 192/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 33 +++++++++++++++++++++++++ bin/Spreadsheet.class | Bin 3691 -> 3706 bytes src/Spreadsheet.java | 23 ++++++++--------- 3 files changed, 43 insertions(+), 13 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index bfad3ca..cc0c5d0 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -770,3 +770,36 @@ CompilationAction 1476278580378 Spreadsheet.java EditAction 1476278581987 Spreadsheet.java 4043 15 24 0 CompilationAction 1476278582109 Spreadsheet.java EditAction 1476278622116 Spreadsheet.java 4104 15 20 0 +CompilationAction 1476278622261 Spreadsheet.java +CompilationAction 1476278705218 Spreadsheet.java +CompilationAction 1476278705218 Spreadsheet.java +CompilationAction 1476278705218 Spreadsheet.java +CompilationAction 1476278705218 Spreadsheet.java +CompilationAction 1476278721156 Spreadsheet.java +CompilationAction 1476278721157 Spreadsheet.java +CompilationAction 1476278721158 Spreadsheet.java +CompilationAction 1476278721159 Spreadsheet.java +CompilationAction 1476278721348 Spreadsheet.java +CompilationAction 1476278721349 Spreadsheet.java +CompilationAction 1476278721349 Spreadsheet.java +CompilationAction 1476278721350 Spreadsheet.java +CompilationAction 1476278755812 Spreadsheet.java +CompilationAction 1476278755813 Spreadsheet.java +CompilationAction 1476278755814 Spreadsheet.java +CompilationAction 1476278755815 Spreadsheet.java +CompilationAction 1476278755999 Spreadsheet.java +CompilationAction 1476278755999 Spreadsheet.java +CompilationAction 1476278755999 Spreadsheet.java +CompilationAction 1476278755999 Spreadsheet.java +CompilationAction 1476278778964 Spreadsheet.java +CompilationAction 1476278778965 Spreadsheet.java +CompilationAction 1476278778966 Spreadsheet.java +CompilationAction 1476278778967 Spreadsheet.java +CompilationAction 1476278778999 Spreadsheet.java +CompilationAction 1476278786857 Spreadsheet.java +CompilationAction 1476278786996 Spreadsheet.java +CompilationAction 1476278786997 Spreadsheet.java +CompilationAction 1476278802337 Spreadsheet.java +CompilationAction 1476278802338 Spreadsheet.java +CompilationAction 1476278802531 Spreadsheet.java +EditAction 1476278809136 Spreadsheet.java 4003 15 25 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f0a281e90c020650e75439cf2a41f8034ad06971..6745487f6fac87c05b671914a0fa8d3b990a6b36 100644 GIT binary patch delta 359 zcmWNLODjZS9EYD{T;?#81tmkTP)05rr6iYxg@wgTa%XhjF{j21bIz1|Aq(XaZwa|y z5=CwcD?W(w1>_4@d3XPQzna9fiwNZxn?ft;gUYC2y>0i4KZ%D|Be**%<`bkkJ|XG S4KM8Q${ufe^<7owb^Qajt6Uub delta 344 zcmWNLTPuTc9LGP8IqaEj<${u}9^rzF8>L*xAyd>YHaUi{VcE&{JmnnA#pF2ugqU-h zqOc3Ef;ZqLXm3C+{O^8!e|^56@2}&>@w#VHykg%}>k1~ca6q4r`n9l;(6x9#H{ua( zN*)O#q-)VxO<#@$G@l+1M&@#PldDj1iYjxj(j{ihLB%aT&67%>aH#`|M}V>lS6fe9L!q*?yjn4uj%9n6ZXC8I7-MhJ}s;VDhnVpv#| zT%0;|@l~3xU&hReY+I#*HL6*shE1B-qLn0_Y|~AO9(F~_8ZA1K?zH%`evh9}%qcd` zDCe9iE+ltJJsDcKk}Iwyb3;G3406X5_XK&6OCF^=i@_61JWJ~f8@#f^8;87eOing_ Ih!(s1AB8Gc3IG5A diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index f5c5e67..ddec61f 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -47,23 +47,20 @@ private String evaluateMathFormula(String value) { } } - for (int i = 0; i < operators.size(); i++) { - if - } - /* - ArrayList integers; - ArrayList operators; - - for (int i = 0; i < value.length(); i++) { + if (integers.size() > 0) { + int result = integers.get(0); - if (value.charAt(i) == '-' || isDigit(value.charAt(i))) - for (int d = i; d < value.length(); d++) { - if (value.charAt(i) == '-' || isDigit(value.charAt(i))) { - + for (int i = 0; i < operators.size(); i++) { + if (operators.get(i) == '+') { + result += integers.get(i * 2); } } + + return Integer.toString(result); + + } else { + return ERROR; } - */ } private boolean isDigit(char c) { From 0f44a9580edfd8b9a0998415a291f7379246fd9b Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:27:25 +0300 Subject: [PATCH 193/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 3706 -> 4515 bytes src/Spreadsheet.java | 3 ++- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index cc0c5d0..57d9014 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -803,3 +803,4 @@ CompilationAction 1476278802337 Spreadsheet.java CompilationAction 1476278802338 Spreadsheet.java CompilationAction 1476278802531 Spreadsheet.java EditAction 1476278809136 Spreadsheet.java 4003 15 25 0 +EditAction 1476278845803 Spreadsheet.java 4023 15 25 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 6745487f6fac87c05b671914a0fa8d3b990a6b36..7c3af1cb76f8c08de61cf923becb7925a8784d84 100644 GIT binary patch delta 1686 zcmY*YTTfh76#h1I&Rh=Zz;p3J?TU0xLP_E_WDZOJgVQX1r^kxo+A@S80`9=EHly}prahe z(8!<+s-b3WBHZ8)GnfjCP6}r;M+=^0u=ov+f>yLyaGb%&?^FE)rNqz%v>-=2PEhE$ z>KoHq`WYOB4MmOdHg<+pDab`9$Fs0>Q6aUjPk&U-j@02fj_2_LgCuG(WESouw}pdV z{{V5jp<2+x@W^)J+Cep_dcsBry$rhxYj;w&+{7+MABP4iY}Q7{R9{FmGr%zz5mQPb z?-@-XLmZFeMUv^^30iuGG*6h)v|^aUFDO>8KinY(7M+c7j3UTj^H4`|G_GW=AcQ%_ zFiwPUz?kLX?ER!;Vn&iMWZW1{Y3R4}8mo+=Lh%rl3XEt$H5?GOIjDukd?cNtG2l^s z9cs|4_WHE;$q}tx7!0nNAM#QX*Hu+bnTiSE+X7Wr>1k4n`2xpVxTtGVh4~Uk1h47y zQe&6SaSjI*Fucq0CJKf1KF3*snCNM_=w|U0VZ#P$Fxa7`$Xs) zPjH=MMjw`)1D|nx4m*SF@o6e)Xw}3!Qo|%H!bl%(INWp(xm|0>YfkJ3rQ#SGq8tB~ z(B8C;XJY8+B=h7!*(s;F*KsNaPZa4+DRJoNT-x}#B!>PuG?$oS@ZLvj48BU)RB2v< z+bP-2aj-jvKqSpQ4~JbYv76<=tA%}$B3T;KS`F0UiBl99SXeM-ou^)S+D z&4mqlWbH*Z3TS-{C8TCKickX={mc1i#(tb2q!$$!B<0TF0I5+y7gU9LR3lPAX^z86 z>mt$j(JrhCq>$D&3OkJnBvFZ3OhSQ)3SFcm3bj#=-Sn5HK&Ir?cnMFDr4h4+EHhrF zJdQ2qD_hK0iTO17oG?E?w#A7$3v%fz{|`>a3X=XtDzU^vE4S8XypA`h4-szy+eMDE z`X#HEozwracIVK;Bd3F$)#Og1U2#k97!Jj7ULUoUu_=AQ=1zJ$s+T3(_1|p!*=0RT zSwxHkO+4=Mw z6WJRQBczM?7(R8mXp(sJ@4Ps&5Wf$GrOlDqQ5r#Xb1fd%M5zzWVOlgptp&txwDv_5 zT%2w+EgA651h7oNDdAa30ILLSPE)u&Ko-T6<4zRjjEogALX6_}Wu(%Y7hkhQlAT#? R0$A05Oj)+9Q-?|T?tg7Oj;83^?F~&QI8hzJ4!2g2yW5lb{^Upj6u^DX)CcLV)~4gOvMw16Sqt~Wn0q;kvyVn`2+Jp zPYP$=is^CF5p%*$hiOr#$J6?v856T{lZt08TX#t5tfYkApR$D!OV118Xd2pZilaCe zoeU-NCo5({((mi>^>YkhP>%VUeCIe$qf0*abu~_cRNQOCV#>+l*zbB?lrI(4|U@V?HnWK z1q)DNk9=PcXT7qDPqIF_$}8Aexy~Euj=%GIHY|Vf4mKiN3*VFt;XLVcXrNXcrSbr( zL3T1fP{l@NU0|7w$)|xPs{aw_VB=B`mbOe}&>E@Vz*Ki6x`F8o8YAye9sPh<2Dv#e zD5<1mK7-P2eqlHgA!2SICGFr;rHw*5RP|ekoZqPNBf6Vy(Fh)-`^Oh%gq}rk8EcJJryOaS}+2!u%F21@At`nG0J2$q$ y8iAd8!v97nBh3Na&cGK6y;4KmC0%VONKwzm3T5)YYrX<&a integers = new ArrayList(); ArrayList operators = new ArrayList(); - while (true) { + while (scanner.hasNextInt()) { if (scanner.hasNextInt()) { integers.add(scanner.nextInt()); @@ -45,6 +45,7 @@ private String evaluateMathFormula(String value) { break; } } + } if (integers.size() > 0) { From 360448f8203d823e28efd61b98502bf903a09d1e Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:27:26 +0300 Subject: [PATCH 194/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 4515 -> 4527 bytes src/Spreadsheet.java | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 57d9014..6b51b7a 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -804,3 +804,4 @@ CompilationAction 1476278802338 Spreadsheet.java CompilationAction 1476278802531 Spreadsheet.java EditAction 1476278809136 Spreadsheet.java 4003 15 25 0 EditAction 1476278845803 Spreadsheet.java 4023 15 25 0 +EditAction 1476278846915 Spreadsheet.java 3992 15 24 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 7c3af1cb76f8c08de61cf923becb7925a8784d84..740adb90cf7d4b2301d36a80acd9b379f49e6c6d 100644 GIT binary patch delta 553 zcmX|->q}E{9L7JVrt@r`<%Nl^9K}+xGzGOHBD+|0k%*WRFY^XUgG|uMN}Y5eD7yL! zY74VvsU)JfGQ6I`r|IZ6|Tz2Hu+=cEB@F zebq9j5>%VtcCgT2;>z2-Lf0~p*33S+_T2nIB?|BbqKsdRS97<1#ARkWT!UN*R~(sQv|T|D)7RlbfL4+HBM8 zZM2%q18>YaY5sV-t!5L+4O{2TVs4)u7Nr)I44We7QFWVq+qLPyrvxQL*+#bt_fSPI zHTrjeeq|a^mJ8;mGi?v5!X@DvG^4%|XIS}1q`R!jSIuAF)5#+2p#iauAcCIHCRN6m_MVW3&9M1 zAe>}b7E)lQ#oCS6UDmz$pNM*d5MJKrywCHTbH3-itAVA!k3Y6OO$JV2$^5hZWu-~3 zCw8}kS{qX|B?-3+c2zojj@*(IktFvMczqfFKf>+HyMIlgEAqS^uS5#4IWBYpKd1CA zB*GGMBhO1dALgdk{iw=obGeWIUpQtrLnT$&4$N_cifI2SbWu5uR+`;eUijx98 zA=8m{$*MDRSuyLHNptsD4JPVtvu>K-?x@|W%Gx+at2ybJ4t7YkQ#)N`b6Y~) operators = new ArrayList(); while (scanner.hasNextInt()) { - if (scanner.hasNextInt()) { integers.add(scanner.nextInt()); String next = scanner.next(); From 201d3d279a5c7ff41b02754b4eb17225e1e6a50a Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:27:41 +0300 Subject: [PATCH 195/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 19 +++++++++++++++++++ bin/Spreadsheet.class | Bin 4527 -> 4516 bytes src/Spreadsheet.java | 16 +++++++--------- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 6b51b7a..e5bffe9 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -805,3 +805,22 @@ CompilationAction 1476278802531 Spreadsheet.java EditAction 1476278809136 Spreadsheet.java 4003 15 25 0 EditAction 1476278845803 Spreadsheet.java 4023 15 25 0 EditAction 1476278846915 Spreadsheet.java 3992 15 24 0 +CompilationAction 1476278847047 Spreadsheet.java +CompilationAction 1476278847048 Spreadsheet.java +CompilationAction 1476278847048 Spreadsheet.java +CompilationAction 1476278847048 Spreadsheet.java +CompilationAction 1476278847048 Spreadsheet.java +CompilationAction 1476278847048 Spreadsheet.java +CompilationAction 1476278847048 Spreadsheet.java +CompilationAction 1476278847048 Spreadsheet.java +CompilationAction 1476278848508 Spreadsheet.java +CompilationAction 1476278848508 Spreadsheet.java +CompilationAction 1476278848509 Spreadsheet.java +CompilationAction 1476278848509 Spreadsheet.java +CompilationAction 1476278848509 Spreadsheet.java +CompilationAction 1476278848509 Spreadsheet.java +CompilationAction 1476278848509 Spreadsheet.java +CompilationAction 1476278848510 Spreadsheet.java +UnitTestCaseAction 1476278849855 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476278849855 SpreadsheetTest.java FAIL +EditAction 1476278861034 Spreadsheet.java 3974 15 25 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 740adb90cf7d4b2301d36a80acd9b379f49e6c6d..c68de0dc5f3fcc11c3016d05b7ef2804e0cdfab6 100644 GIT binary patch delta 849 zcmYLH*-jHt82%3Jw6siFf^FC|2%;@eD@HIuR20RaP_-;&5wL{Q`W1}M)j$87Z$0xSdog?Iy)J*hfKdw!g)6kM8C5uL zgj*o#jPIP!74m7FF75-JfqoSya8mx#Z8KD>s6nmF)n~c9D(cZ7ppOy=Y_K~j{{yST z{XwmBj~Pv9HsX{(vizwe$3=-+1XAo}4*5f|?l2=Cr&ah+D_{up4f;X@W*kDBigpA9 z%w4_#_qsg+o!!wWKj{l?RXD3c1HH!vwQ!v;G#H?cRF!m5wQN_u3me&D+j_LHFQ}0( z6*DSkQM;UBd>Lb!fF4Ew3-Yrmquc4skDy`|l@WNn9P5geR3$NQ6^#+JPQjY0|NFA` z)j$3Fi!*|bIk=s=2!bC`6+x&-(G?k;MFno&G5%W~W4B||+o4Twi0 zFQ5q-Xhtqtc;BsbP|p}`RBxwhhx}%lHFeW$h^2JPtMLPtUYhPBuAkw;QkT#xJTjb+ z=@@3@5ps^w;~483XH}Q59hb2iSLpv5%5WWraZ`Rs=uz&_!ChI9__g^ylRaSONmwz3 zbUY+(hE>n9(m8s0M9e&n;W6s)gumkgf>@-Vr*!ZfgLuI@Us3fnE?|jOzQqLIvD{@c JuE=0g`5)|zv}^zX delta 830 zcmX|9O-~b16g`i2rgS>xLo$^DCP)#eP{9b*5W`16V-+jKQY;8%fC4q8Ray`QY*b>R z32JyIS`-9DF=E63Hn`KZ8{^i*_!D%cJG}+N>fO2bopaAQZyWzdvZ+a)x@DdP-k8FZoTi3AtU>d?ZFc|jdj%Y$lYpqvo?0spWJH(L1*O|jS} z;~c!)s4WmXWSmDQuhQo0eNc7iX2{~dge*hyb`L{#NrRRD6qGCpW$2UPhnGS0Um8(^ z5&lVAWpZIiMkuKvH4ut=)ZmC;f{)8WE_1Dy2;Z5B0I9vc39DX{cys9Rve98kNAQ5^MI6O4YEei|T9BIbL+Bzp zlT{UrV9?X8%NRonG7-lWNYEe$_i>dfEpcQMvk?Mu*I*p=1ylwJT8Dawm>?q44s>!G z$`2ZHSOsq~)UifBZ3wUv{I|i!ns}S+X3hMK+@p6>xUJX&H{Wf%Yx5FAJ9RpcM$63T zL>_!(t(%@!MLEr?>3wU^Pg@81SL2+1h{T4Fk0Cym7BLQ!)Cl3CWNwuINxR5AJdmDm z9Vg2Z#5qYCuVF7@6x9tJz)gy1iuB*20Po-!rukZWSePLNoEK$$>wHMg;$(Uj3LYbu z{t64`Dek8f@d9aCB+N6M!gF}AL<(O}I4>!cR~V*PN3cS1zNN5MY3mwpV;%Rfff>BV LBYfapnaBSDW{0!? diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 10f1cd0..a2cb519 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -33,18 +33,16 @@ private String evaluateMathFormula(String value) { ArrayList operators = new ArrayList(); while (scanner.hasNextInt()) { - integers.add(scanner.nextInt()); + integers.add(scanner.nextInt()); - String next = scanner.next(); + String next = scanner.next(); + + if (next.equals('+')) { + operators.add('+'); - if (next.equals('+')) { - operators.add('+'); - - } else { - break; - } + } else { + break; } - } if (integers.size() > 0) { From 613e60b789555b67e5b6e8fb6e555cfeffbdf2df Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:28:05 +0300 Subject: [PATCH 196/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 4516 -> 4516 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index e5bffe9..5e69f08 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -824,3 +824,4 @@ CompilationAction 1476278848510 Spreadsheet.java UnitTestCaseAction 1476278849855 SpreadsheetTest.java FAIL UnitTestSessionAction 1476278849855 SpreadsheetTest.java FAIL EditAction 1476278861034 Spreadsheet.java 3974 15 25 0 +EditAction 1476278885504 Spreadsheet.java 3977 15 25 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index c68de0dc5f3fcc11c3016d05b7ef2804e0cdfab6..4c830bcd14ea56fd711746ecbfc463a6ab38306e 100644 GIT binary patch delta 315 zcmWNM+bhFy7>A#qa@gTFc7eo-eo>QSNF-UBl3Yw|h{>dE)Uecy9C9IQhOZFjIES(_ zyYLUVa_iO~!ln1_?S1=vp7%)^DI@b_b~G_UGXYwdqm>wK#AUvqgIl`Pr};~BskkMm zxz(>_O6ylX>##Pc($;{A#qa@gVbV;4xQXi<|xICoonQYkHH2-Y*N7%4tA(xmsa-ZWS?#h z=;26Z^5?Tpg&kE@1wX!Xa=1X}l0vR1=T=DWSfyO`1dAI3dFs@AC0OP1xN38k0y? diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index a2cb519..c0e77d4 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -57,7 +57,7 @@ private String evaluateMathFormula(String value) { return Integer.toString(result); } else { - return ERROR; + return "asfasf"; } } From 56b68372f4c118ea14adc5ade4438fa18d7faab1 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:28:08 +0300 Subject: [PATCH 197/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 4516 -> 4528 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 5e69f08..8412614 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -825,3 +825,6 @@ UnitTestCaseAction 1476278849855 SpreadsheetTest.java FAIL UnitTestSessionAction 1476278849855 SpreadsheetTest.java FAIL EditAction 1476278861034 Spreadsheet.java 3974 15 25 0 EditAction 1476278885504 Spreadsheet.java 3977 15 25 0 +UnitTestCaseAction 1476278886430 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476278886431 SpreadsheetTest.java FAIL +EditAction 1476278888376 Spreadsheet.java 3974 15 25 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 4c830bcd14ea56fd711746ecbfc463a6ab38306e..8b9f0472b922b765a7d85ab6f11782a17599be3f 100644 GIT binary patch delta 778 zcmYk2YflqV5Qg8=%NDo87MfTtL4^>NY@0};)i1<=ey~ydK@y`T-YThvgg{bI#2a`4 zL=l9e;)0?gh$v#ArBx*U0OJqvU+~o!W1PblG`pFddG?(-^Pb7dWTpP?&(c=_yRba3 zN8FT$%K}=g^*q0+dbdkxeS~|sFHdS=ZGdnSx8#U+_{3vE5BBH~7$NkcN@W(ITd~a; zBRs=VfxL#6=C)X4bE}RLj1yic=v{+{;vK5(6=AzQ;59+Y8c)fEX~J7<6mT~*#bXJc z6TcK|x)^JVEB$-IZu{sDg#C8sN5YWJ<_W_#OA-2Qwn!MXS(Y$mv(JQ?)Us#MA=+g^ zPaNsM6*y4H%~zqriBk088fPx-KrxOZA8wq(UR*~VXK{p4%bA87e0hQO&d&ADE*bW2 zb*k$+AxjJHwr$Z|R(dSw@tio0@*szty2PC@ZN{-lT)ly&(F zMg4fldKY_E2RdP(0z6LY#uhOoO`}~5%LyaQ{XdL|kg~!TsCi_e)(mFxBx;7Tcxs{A zOrs){!KekdYnF>LE}mNmbOC91|v6;K-P)$T4cNC5~B>l{vD- zZ&gbc<`Vr%@@O9}!h%{%A_WCjcrlDi6xpyF8*viVu;VQD<1$(((h)*4MGjn{C3@B} zudZeGix%e&tK4DS+2+2E8`Sv$(pte(k`IWl&Nv$sL4KMIi4pE)H$|2=u#EV@1MH5l zRfpNAh*THqG8iMhjb@ewtx!=9vJ)P48ygpmY9E^rIWx)LUwT=^0uVqc01;sb_~sExVao(M8C5-!#T#Gt^p_yv^2L z8{qQwHj*{*d Date: Wed, 12 Oct 2016 16:28:45 +0300 Subject: [PATCH 198/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 4528 -> 4516 bytes src/Spreadsheet.java | 1 + 3 files changed, 2 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 8412614..48377c6 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -828,3 +828,4 @@ EditAction 1476278885504 Spreadsheet.java 3977 15 25 0 UnitTestCaseAction 1476278886430 SpreadsheetTest.java FAIL UnitTestSessionAction 1476278886431 SpreadsheetTest.java FAIL EditAction 1476278888376 Spreadsheet.java 3974 15 25 0 +EditAction 1476278925121 Spreadsheet.java 3990 15 26 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 8b9f0472b922b765a7d85ab6f11782a17599be3f..4c830bcd14ea56fd711746ecbfc463a6ab38306e 100644 GIT binary patch delta 801 zcmYk2*-sNu6vn^X4V_-5(8QvR8)?*L+C&m9ych%WKwbKv#$bFvYcq+B4I~A`x=
bOC91|v6;K-P)$T4cNC5~B>l{vD- zZ&gbc<`Vr%@@O9}!h%{%A_WCjcrlDi6xpyF8*viVu;VQD<1$(((h)*4MGjn{C3@B} zudZeGix%e&tK4DS+2+2E8`Sv$(pte(k`IWl&Nv$sL4KMIi4pE)H$|2=u#EV@1MH5l zRfpNAh*THqG8iMhjb@ewtx!=9vJ)P48ygpmY9E^rIWx)LUwT=^0uVqc01;sb_~sExVao(M8C5-!#T#Gt^p_yv^2L z8{qQwHj*{*dNY@0};)i1<=ey~ydK@y`T-YThvgg{bI#2a`4 zL=l9e;)0?gh$v#ArBx*U0OJqvU+~o!W1PblG`pFddG?(-^Pb7dWTpP?&(c=_yRba3 zN8FT$%K}=g^*q0+dbdkxeS~|sFHdS=ZGdnSx8#U+_{3vE5BBH~7$NkcN@W(ITd~a; zBRs=VfxL#6=C)X4bE}RLj1yic=v{+{;vK5(6=AzQ;59+Y8c)fEX~J7<6mT~*#bXJc z6TcK|x)^JVEB$-IZu{sDg#C8sN5YWJ<_W_#OA-2Qwn!MXS(Y$mv(JQ?)Us#MA=+g^ zPaNsM6*y4H%~zqriBk088fPx-KrxOZA8wq(UR*~VXK{p4%bA87e0hQO&d&ADE*bW2 zb*k$+AxjJHwr$Z|R(dSw@tio0@*szty2PC@ZN{-lT)ly&(F zMg4fldKY_E2RdP(0z6LY#uhOoO`}~5%LyaQ{XdL|kg~!TsCi_e)(mFxBx;7Tcxs{A zOrs){!KekdYnF>LE}mNm integers = new ArrayList(); ArrayList operators = new ArrayList(); + return value; while (scanner.hasNextInt()) { integers.add(scanner.nextInt()); From 4d430ab85a534fa7f024bdeb574abcb3e56e9131 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:28:53 +0300 Subject: [PATCH 199/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 4 ++++ bin/Spreadsheet.class | Bin 4516 -> 3875 bytes 2 files changed, 4 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 48377c6..543badb 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -829,3 +829,7 @@ UnitTestCaseAction 1476278886430 SpreadsheetTest.java FAIL UnitTestSessionAction 1476278886431 SpreadsheetTest.java FAIL EditAction 1476278888376 Spreadsheet.java 3974 15 25 0 EditAction 1476278925121 Spreadsheet.java 3990 15 26 0 +CompilationAction 1476278925212 Spreadsheet.java +UnitTestCaseAction 1476278930066 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476278930066 SpreadsheetTest.java FAIL +EditAction 1476278933490 Spreadsheet.java 3990 15 26 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 4c830bcd14ea56fd711746ecbfc463a6ab38306e..3664eb49ef33de87f67a8b644880f8449edab2ba 100644 GIT binary patch delta 1289 zcmZ8hU2hXd6g{*4!t2RKF^U5QLaY?(Y%Ib90a7TKrU(IXAt}U=Kw#~dkYJnwNeJb` ze232=ght5-r3)pe{D41 z{qyG=0PFDJh56j0dVC$~C*NED0f~d?Q-}QR{=*V`(XAf)yNZJn`?0}S9oy8>XJRP|5~DgeG#|V> zcTSU>k~pn#k25%^>Bl6#bPt-41~O`MVCm4066aAb;LGN7&S@T)n{e{u&R9-wxFoUO z&GE8Cr@Qs4#8DT!F5$S?O^JRNyCpH;Vs|7aUF@F3g_o}breWd{Jn&JX5^ zNY(dU)whQ}LwA4-5vWYa7IAey)DZ5$_k_OTHV=fwn0@M1C@B)^uTWgW z(HuZxh4{qw7?@NaYnK$y*>-Cs7m~Q`Gx-K4*n_iWef89UD$UPZU71#ph!9MJCILmQu@$x2 zdOcQ+7X;Cwl~%koP@U=c(5Jq&4}IvgFMa7x=(N*nznw(1W0KitpYN>o?X|wO*2!?; zjS~Hbr;ok^P=QDH^dVDJ$8xNaSdFCu)}U`sq%IiI;lWxf>IJg9yuIG?fH&AtPTbew z3rW0-2AcMI13kXA+XZqRb(h;FRpMIMzt^XLE{Qj>L&f^Pq*Bo;T|STq zDwlMBFw&$nP;u>)Shfox0b5(AH z5#x8$_m-m)pWv7=s#RJ(lZfJ=@rSl1YDn~BfewMsB@V-(b{8ZLDXb7NiAzd?^tSF` z#On`Iggji4xT?U6=iq8zpK`mV(oGNyNu0p~2ED`AN3s0jT7RgmC*Tb!&YKcnz%F2J z3;4XoFXpUOwgwj6$pQmQ6+6c=Tz?wK3o4IXTWX>~ZxhJqOj`w4* z=V_^%#M9PG&weV4WBUN=%S>_jpTHAGpvr8jvW&o;r`atDa8n%J(Jc2Ma_#0ayT#l& zX}Yb-+;0(fOP)rSp=UqZ%@YWZ!K}$BosxyXeyx%-X1FG(o1sokCKefo;)9 zQ5%f&x>KAmp6KmmO(bb1zJWF^Z10VjiOq0f3ts_SsYo*xCDdr63O=JDqj>spoTQJ& zrd7I_=vS z6WTv0v7)p<{7t3PFl+=fXGCwfT<+A7JRn&KomX&jt(@5xRnDHQayAsL;CF-_&G$VZ zR?$Zl=Td^s!!(u*;G{~NGIXnJQifYGNOkw6XGFo#ag3&ruZe6`kH%8KeFD#=bG%S% zy0Uo~gC!?tOvx3e*_@oIT#FKGzIy&LsZ9a*J*BGEl67n4gaGF_4K3%H$pzSP5wCNo zN^qI;d4=EDsdmPC7 RWQ!ZWO<8K4;4x|V_CM>Dk?;Tj From 048629a5dd1ecf46e44fcd075e16ab377740a548 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:29:22 +0300 Subject: [PATCH 200/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 3875 -> 4516 bytes src/Spreadsheet.java | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 543badb..6f23d4d 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -833,3 +833,6 @@ CompilationAction 1476278925212 Spreadsheet.java UnitTestCaseAction 1476278930066 SpreadsheetTest.java FAIL UnitTestSessionAction 1476278930066 SpreadsheetTest.java FAIL EditAction 1476278933490 Spreadsheet.java 3990 15 26 0 +CompilationAction 1476278933584 Spreadsheet.java +CompilationAction 1476278939304 Spreadsheet.java +EditAction 1476278962765 Spreadsheet.java 4007 15 26 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 3664eb49ef33de87f67a8b644880f8449edab2ba..4c830bcd14ea56fd711746ecbfc463a6ab38306e 100644 GIT binary patch delta 1894 zcmZWqTT@e46#h0jNyuTNfDH;2gu&WeKh!9MJCILmQu@$x2 zdOcQ+7X;Cwl~%koP@U=c(5Jq&4}IvgFMa7x=(N*nznw(1W0KitpYN>o?X|wO*2!?; zjS~Hbr;ok^P=QDH^dVDJ$8xNaSdFCu)}U`sq%IiI;lWxf>IJg9yuIG?fH&AtPTbew z3rW0-2AcMI13kXA+XZqRb(h;FRpMIMzt^XLE{Qj>L&f^Pq*Bo;T|STq zDwlMBFw&$nP;u>)Shfox0b5(AH z5#x8$_m-m)pWv7=s#RJ(lZfJ=@rSl1YDn~BfewMsB@V-(b{8ZLDXb7NiAzd?^tSF` z#On`Iggji4xT?U6=iq8zpK`mV(oGNyNu0p~2ED`AN3s0jT7RgmC*Tb!&YKcnz%F2J z3;4XoFXpUOwgwj6$pQmQ6+6c=Tz?wK3o4IXTWX>~ZxhJqOj`w4* z=V_^%#M9PG&weV4WBUN=%S>_jpTHAGpvr8jvW&o;r`atDa8n%J(Jc2Ma_#0ayT#l& zX}Yb-+;0(fOP)rSp=UqZ%@YWZ!K}$BosxyXeyx%-X1FG(o1sokCKefo;)9 zQ5%f&x>KAmp6KmmO(bb1zJWF^Z10VjiOq0f3ts_SsYo*xCDdr63O=JDqj>spoTQJ& zrd7I_=vS z6WTv0v7)p<{7t3PFl+=fXGCwfT<+A7JRn&KomX&jt(@5xRnDHQayAsL;CF-_&G$VZ zR?$Zl=Td^s!!(u*;G{~NGIXnJQifYGNOkw6XGFo#ag3&ruZe6`kH%8KeFD#=bG%S% zy0Uo~gC!?tOvx3e*_@oIT#FKGzIy&LsZ9a*J*BGEl67n4gaGF_4K3%H$pzSP5wCNo zN^qI;d4=EDsdmPC7 RWQ!ZWO<8K4;4x|V_CM>Dk?;Tj delta 1289 zcmZ8hU2hXd6g{*4!t2RKF^U5QLaY?(Y%Ib90a7TKrU(IXAt}U=Kw#~dkYJnwNeJb` ze232=ght5-r3)pe{D41 z{qyG=0PFDJh56j0dVC$~C*NED0f~d?Q-}QR{=*V`(XAf)yNZJn`?0}S9oy8>XJRP|5~DgeG#|V> zcTSU>k~pn#k25%^>Bl6#bPt-41~O`MVCm4066aAb;LGN7&S@T)n{e{u&R9-wxFoUO z&GE8Cr@Qs4#8DT!F5$S?O^JRNyCpH;Vs|7aUF@F3g_o}breWd{Jn&JX5^ zNY(dU)whQ}LwA4-5vWYa7IAey)DZ5$_k_OTHV=fwn0@M1C@B)^uTWgW z(HuZxh4{qw7?@NaYnK$y*>-Cs7m~Q`Gx-K4*n_iWef89UD$UPZU71#p integers = new ArrayList(); ArrayList operators = new ArrayList(); - - return value; + + integers.add(scanner.nextInt()); while (scanner.hasNextInt()) { integers.add(scanner.nextInt()); From 27ba0b4f42269d8fc33631dc4fc8e518ae0a67ad Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:29:28 +0300 Subject: [PATCH 201/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 4516 -> 4532 bytes src/Spreadsheet.java | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 6f23d4d..1301d08 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -836,3 +836,6 @@ EditAction 1476278933490 Spreadsheet.java 3990 15 26 0 CompilationAction 1476278933584 Spreadsheet.java CompilationAction 1476278939304 Spreadsheet.java EditAction 1476278962765 Spreadsheet.java 4007 15 26 0 +UnitTestCaseAction 1476278963843 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476278963843 SpreadsheetTest.java FAIL +EditAction 1476278968438 Spreadsheet.java 3990 15 26 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 4c830bcd14ea56fd711746ecbfc463a6ab38306e..6b48136a513f5c8d0318c472f1aa0552a63af2ae 100644 GIT binary patch delta 520 zcmX|-SxZ!59L9ggwbLwVpyp_iOihevVq}4mS{fmVXz7bo zl)DTHBe{h24Z0O?`v!giy%HZ0ygCo(|32%w_qTWZpKUJ@MDP6FM|>BKP)L*~ zdI2G>oSTX5)At+|;KGuAgtrV3BbP-6xk{|O<|`QzjFZg`>h&;Q;>8S8BGf19Q=tS# zB$Rqd9lfB6`A*D$ZXOa(@tc4nXa&r)qr)mU$Bt$zXu{4~tJ*}Jt#(Kw)NqrKNpsEQ zh9y?7KhJTiRXQ)oq){!K$f21$-3n<_kah)lX%1ZrcBgW8X`@av;C}7uRp>tPUa4ol zIdRYW2i1E>YQqXTq8&%I;~4iD=P@5t;v=PeqKqlCd#xw_i@axzFX?~dyy|^b@o%JP z%M5;q_fwlMXxBxhSQ2NMN>-?2RqL#DRAVrBnu5GH8PWE>e>GiAjQ*1|)6PbeOn|juoUY z3(|y?ExPmK*vDr=&Kp+HWSxUnn{l}ATi4A)*KO;j*>UyTUFsZCt1ffS{rY@ZW)Yo4 z@o integers = new ArrayList(); ArrayList operators = new ArrayList(); - - integers.add(scanner.nextInt()); + + return value; while (scanner.hasNextInt()) { integers.add(scanner.nextInt()); From ddc28b5070480c507e26691a751b8fd1826dee08 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:29:52 +0300 Subject: [PATCH 202/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 4532 -> 4516 bytes src/Spreadsheet.java | 5 ++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 1301d08..9e1a9e4 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -839,3 +839,6 @@ EditAction 1476278962765 Spreadsheet.java 4007 15 26 0 UnitTestCaseAction 1476278963843 SpreadsheetTest.java FAIL UnitTestSessionAction 1476278963843 SpreadsheetTest.java FAIL EditAction 1476278968438 Spreadsheet.java 3990 15 26 0 +CompilationAction 1476278968532 Spreadsheet.java +CompilationAction 1476278969903 Spreadsheet.java +EditAction 1476278992760 Spreadsheet.java 3981 15 25 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 6b48136a513f5c8d0318c472f1aa0552a63af2ae..4c830bcd14ea56fd711746ecbfc463a6ab38306e 100644 GIT binary patch delta 503 zcmX|--Aj{U7{-5ZW%G3(=0Q=bg)uWHmPS@6Ax=>#DRAVrBnu5GH8PWE>e>GiAjQ*1|)6PbeOn|juoUY z3(|y?ExPmK*vDr=&Kp+HWSxUnn{l}ATi4A)*KO;j*>UyTUFsZCt1ffS{rY@ZW)Yo4 z@oS{fmVXz7bo zl)DTHBe{h24Z0O?`v!giy%HZ0ygCo(|32%w_qTWZpKUJ@MDP6FM|>BKP)L*~ zdI2G>oSTX5)At+|;KGuAgtrV3BbP-6xk{|O<|`QzjFZg`>h&;Q;>8S8BGf19Q=tS# zB$Rqd9lfB6`A*D$ZXOa(@tc4nXa&r)qr)mU$Bt$zXu{4~tJ*}Jt#(Kw)NqrKNpsEQ zh9y?7KhJTiRXQ)oq){!K$f21$-3n<_kah)lX%1ZrcBgW8X`@av;C}7uRp>tPUa4ol zIdRYW2i1E>YQqXTq8&%I;~4iD=P@5t;v=PeqKqlCd#xw_i@axzFX?~dyy|^b@o%JP z%M5;q_fwlMXxBxhSQ2NMN>-?2RqL integers = new ArrayList(); ArrayList operators = new ArrayList(); - return value; - while (scanner.hasNextInt()) { - integers.add(scanner.nextInt()); + while (scanner.hasNextShort()) { + integers.add(scanner.getNextShort()); String next = scanner.next(); From 6ec227072e6454d7c83511aa01d2631e655d0691 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:30:17 +0300 Subject: [PATCH 203/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 11 +++++++++++ bin/Spreadsheet.class | Bin 4516 -> 4545 bytes 2 files changed, 11 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 9e1a9e4..45e8fb6 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -842,3 +842,14 @@ EditAction 1476278968438 Spreadsheet.java 3990 15 26 0 CompilationAction 1476278968532 Spreadsheet.java CompilationAction 1476278969903 Spreadsheet.java EditAction 1476278992760 Spreadsheet.java 3981 15 25 0 +CompilationAction 1476278992858 Spreadsheet.java +CompilationAction 1476278997472 Spreadsheet.java +CompilationAction 1476278997634 Spreadsheet.java +CompilationAction 1476279009016 Spreadsheet.java +CompilationAction 1476279009140 Spreadsheet.java +CompilationAction 1476279009140 Spreadsheet.java +CompilationAction 1476279011741 Spreadsheet.java +CompilationAction 1476279011742 Spreadsheet.java +UnitTestCaseAction 1476279014344 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476279014344 SpreadsheetTest.java FAIL +EditAction 1476279017912 Spreadsheet.java 3981 15 25 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 4c830bcd14ea56fd711746ecbfc463a6ab38306e..837fe36cd0033a40da188e15adc95530e3f08ed3 100644 GIT binary patch delta 1217 zcmZ9K>vK~@7{;H?xx}7qlQx*pbP!uRVw$8=W;E5Y9R%x)C`}N8tw0Ms)?-tQsZG*y zQ7I~N(*k8tOwn?cYDFx!(~2ni)$xmd@`L{a`pr>Cd^aZ)buzQr{q6HU`#yX2Y{PdA z#`k|;`v$;6`1+zTt@Ly-RAjAfg;aVlS71=WjVS|3Jmbb{2HzHQ#B9!(+5YCzKF1oY zWpIy}nPF@7iwt*%Q;i+}6SW#xjCCB(qEl3=_vz1Ztj7isSL-UevB`}dh6Um`ZGlI+ zZDyzmw>OGkwLro^3?|3(=w#5Xp)+?t zi-!#`e88~}VL6-N*dy6ue8};U%zIbgV76cmWGQh7Cpb<@=(!D7S=(jVX_>5KaF*k! zXmf}9KjHWk0S2uvW0^VfvE;Wg3zU-KJV%Rj^aYM~r*eklh{G;%2!~za7;~7-aoAyV z9OoQ%jbr-qb@wB#(S(guSIkD&qgqI-iq2u9jou;xA+@|H?e9j2oiM!jvLhnm-O7YG?Tu6Y&)${nsHpb^+ukc;c_ccE zV~I#?7R4f#My{ZqZuoc+ntGlVi)b-fM6k?LU6BZpQ?ocD^1j|hA5&gesozSdf1$yR z*gfnIir~UIano00OhqEmvc9@1HY)Xue$xok7zEhUBvmNyL`jz*^R`JGlraFM_!xpTP;t`fMNCwwQuLee~l*&=kme@2G*l5|V_J{s#vW34p# Uw`+w2SH;b$3+}I|Ll>_91CFvN6aWAK delta 1200 zcmZXS-B(mq7{;H?`4~NHW?dv*JBf#O)qC!LbX?6gp(Z z2JNPO48Fk5^$q_Et2M9^Z*aVc-J(QYqqlOrg}vfMwOntkp zVPQ9eZVwDvv7~`l5#e|jHiOY?B^w=E3`$^qn-uQh=mi;8lhF}dfxFBKSQ~0_)EYrS`)#U^(aZF$ndE9RgQ*WZl`e-6D7_$;m z^IMMZU@~Ztm~FKsNZgjUWTmK9h95X;96vvD)H`xNah!A5&m7|pyU8);uv;8w9QF&x z6^G4pOy7FwdZ8fQkVQ*tMHYKr()?O+XaQ|mbY@`s)%+s2+dcW@eq|Q>rqEcaWD&iK za2Bx|O{vkR5%R01o`daK^cRON!e?rgrmpoaMt0R`qdGHnze*yPp8R2I3rNm*Ju_n5 z7-&9#gD5}=&SMw`6qMlt+%p;oJ!Wn(x?@hWv(9;m>L)gU>s&b^AA6WiSf*todkuBQCI+&kEWsPp(XpU+@xFf@-( z!@-Jqe4fFE;2c&{hri4~Q?Juv1ueeHz?bJOt-&CXsd-!!dS^ViKV^;((E;X(O zgQ5J^bHx?u%hU=+-!uX=`T+JC`BSL0$y{8RbT&`ntUQ@~^vl2F Date: Wed, 12 Oct 2016 16:30:20 +0300 Subject: [PATCH 204/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 2 ++ bin/Spreadsheet.class | Bin 4545 -> 3703 bytes src/Spreadsheet.java | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 45e8fb6..9a52b46 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -853,3 +853,5 @@ CompilationAction 1476279011742 Spreadsheet.java UnitTestCaseAction 1476279014344 SpreadsheetTest.java FAIL UnitTestSessionAction 1476279014344 SpreadsheetTest.java FAIL EditAction 1476279017912 Spreadsheet.java 3981 15 25 0 +CompilationAction 1476279018022 Spreadsheet.java +EditAction 1476279020211 Spreadsheet.java 3981 15 25 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 837fe36cd0033a40da188e15adc95530e3f08ed3..97dc9582a55dd64995c460a14efd559f42e95fd6 100644 GIT binary patch delta 907 zcmYk3%TE(g6vn^XN|oW#Vnb00(J}a_g{X<5iK0PKK^`LVk~c$pfx&hLr^BQ8sN&m& zF}bUn=+=!fzG96g8nh#*w^O2-P7pL6WVq(~jowbI@h zp{Im9V<+@!;hqsoZqJPExY1p@nbzm6gqSidnx3*9-KADHGbi+(xM5ks(KMXEX^u*? zF&`rG2diZLa$BG)(8JM-KA8zL1kQ7`qeH$4bY#al&f=g327{v;QS}w)=u&Jm1jiJn z8P>&Z%QZ|Z%@B!p{M)K)a#qCM!@GtwY=X%#tD4JJo7+W3i6l8viu;X3Ldn}4JH3N0 z@+?MikV+RshCwsa&88EdPa2Mzo99?SgrOv!6ox}4#DbBWH(a4aG8_jy-nF;5sHGU7 z6M=2?0KD+6VLNsd>grD}m$igDafT|#iTS~TG}tA-mYM9VJi^CWw|va2**W=+@1^Vb z&gi9VoZK1Q!iHr_aFLD3Pr(M7{}pUyqw;8| zs&OobrdVAb6P>a8JSKD48+(JT^>2~Lp=8Z7N@^&X$)T#qFAT(DM65jK6$u!tzdDuA_-KR>PZsLu3F{|NZM%zgnvwty-z=bMNr5W@epx&bRme_TJywcm6E+ zu2}xz?#*ujJdAIy$Op_DvIdo5r6L{+1S@=gB@|L4G8)jtk%MLir}jI`NpuNlJI4;R zGB`r&;h1kA9EmZQ-K9Pm?Rdh54u(vfDyW3|D|9=@li0~%8&-mGwc|O49JjBu^*>HE zGF<57cnV#_r|jEDN!=@)I{F3^sy|j!+AE59nxhB343a295Z=cZiv&XbM7RsPZFrX9 zf#qEF14=~k$JB@@Y7fIYcm2xHB{M~rLE-2Vghkm#5G_h4ylD3WK-Np2C4@i@Dl518<(>wCdol6owLOyyuYX zw3IuomVqVLz15bZR_3(kNyKvg-cL@;JYuuinX^=FDrM+r)? z5fyNwmUc~qwWE?=--qa(*^B}DV>yB<(q%Iy@d#Z~EfOU}vlDh&r|}>Ki_bJUWsuem zayx?OVWJchcmXoZlxP$$(oUi@>*$5gfQ88G@Dd)Qol240XlF%&cygB_UtWrQg(4p( zTRv=evEG)C1{+-TE4AK19%Ch@zmQ2`V*D!YP1#5BIu#-U%wVg@a7-Ju2iS4#5Br`1 z8b>nblCh4=CVI+V$(urL3Zq)cQOU-%vkosisr~3^W~a3r`Rdv+jFY28GbGA1V>M|< zIkaEo4QxWYBOhX#7GG7xMzxEpnte2+=>)gQ*GvhTJTxNjB(Y6A-)r-f%^{gYrRO?| zXe>TR!XjOwLjfJ8lE_WtzHX0)kn?kx)*AWVx=%IsL)m)vH>EO(0ZpfD zN%xc`NK%;bc&Ig<;#Xdl5EP8Q7Zx>O+bLRyOyb;l*7pE`U zW(@etG;oE0-NJG$4cs7Lu|@ZCS8K^ operators = new ArrayList(); while (scanner.hasNextShort()) { - integers.add(scanner.getNextShort()); + integers.add(scanner.hasNextShort()); String next = scanner.next(); From bf96563491cab597ac6be7006e8a6322c94d20f1 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:30:36 +0300 Subject: [PATCH 205/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 5 +++++ bin/Spreadsheet.class | Bin 3703 -> 4516 bytes src/Spreadsheet.java | 6 +++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 9a52b46..b7f6449 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -855,3 +855,8 @@ UnitTestSessionAction 1476279014344 SpreadsheetTest.java FAIL EditAction 1476279017912 Spreadsheet.java 3981 15 25 0 CompilationAction 1476279018022 Spreadsheet.java EditAction 1476279020211 Spreadsheet.java 3981 15 25 0 +CompilationAction 1476279020308 Spreadsheet.java +CompilationAction 1476279025585 Spreadsheet.java +CompilationAction 1476279025774 Spreadsheet.java +CompilationAction 1476279027299 Spreadsheet.java +EditAction 1476279036215 Spreadsheet.java 3983 15 25 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 97dc9582a55dd64995c460a14efd559f42e95fd6..4c830bcd14ea56fd711746ecbfc463a6ab38306e 100644 GIT binary patch delta 1747 zcmZWoTTok76kR8|d0h^rAfbhUlnz)!0s{_(j)lQ043Cz80tKPkatXH(nkF<4TIwTe zu@$tX?e!J3lu8w~wNhFGwlmuCQ@`}zKfnBP#t%oww(gS~9*#-o+;i92d+oK?+4(d7 zYLWcIgFD{>*oiwg<)g-JnIp=WQXY-?{Nr z^=kFQN=WfWbXf-(wmR!Krmh`Rb}9Nf6d}i~9*ZjeuqYh!atuOckcX9Uo8CR?bqZMy z3~>w#U!<__q$+?Bj>m9BwDO;xQ_Tq5j&cM`{(m2r<~aBsYmBYt+k# zc@W`r3CPG`|4`6bgA8ZhT~04Y6DW0`E8CE zUezv1tuc*b0=r}|yvy+hoMQJr$0>n15a*Z?u3NpqKt%Bc$oE`)#BoW0X{+EqbzG!f z76vB?u5etyF7oM!I!@Q)3)lNX-l$)p8Ft_kj!$7{FnRr|(nro(RWXlBgzRScoTFOT zbB&{3r~8s)TF1WPIIm+jIi_^%7ROl~`ufvOYigqex?xCF-FA-19TIS1ZnXgdh({z>x%L5cx^3Y&`gMKCE`^aUi*zgxJ zC{2uCg|#W`HM~wjM1m1)6CIq=Capd;q5WY!luzSGhdFduN5=+w%5KS>Ky3o2wScXH zO=*{HZuXY;qpg{p)w1QKEmJs0ffCJ-kZHsw@{Vd~zsTFzw02)U&dzJmv?_L5yO!46 zNkf_{aF1e*RG`U4BXTj0J>vO}$5pzF_u{B<-Ntqrix1*3N!RHmpI$zUBPWG-^tfDv z%r0Y2YvlcPACql{WLN2s{y~uir3LJ7DrFD@nkw0n>M2u@ByiQ`qSlfWzw*+UpkVY} zSoMJIrEDQ_CK>0UdbP7SClr$2pm^$fKZ}Elw=X;kI($6^+#ukfI9W^qO9ZU8=v?n= s3&m98b{yuctVPjRg5q{$WzbrfT=N9UMpl~umbCBFZ&+4Hp#k6g3*a}Hs{jB1 delta 907 zcmYk3Sx-|z6vzM5LJOCn#fC))>Ln%ntqhZchNY*>#G)Qi!)9_mp3v;LX{hs-Ig`+nCsZYOAf~HH z-Hw?NHLBa)`m)_0Gc7wXu&y-LbNj% zio_3A$cBX1)8pyq7{H(y_cVAeaCD$kJo0p|PI2_&xB>=^qYpuO3Ul;GwjVmjETRlK zVbid+xRGKg3U=;J)iX1vhwYQqqY6q9=a`e?yd80ez9N$(IFgdPwMay!H#rVFg)VUy zCPbsRG`hgCh$4pUa6;ECDyT1Ni3QEpWxxu@F{j5X9H*VoYaC+^Tjdyc*bR;$hu!2D zaoBB+l*8_FEWP{WRa}kqKW@0_pOlYi83~--MB5kgT&N`Lp@P6cS^&?S6&ylU=3YM9 zL|$v43*B^cikKVBM}a+JBQMT+h03Q`pIGB%?7Vow>*?jc@ftQPe(^RoBAWBxmJDH( z^jS1e6PhX9hYC#eQj()RQQV{^fk+zJSue>cCnuIh@ixCW910OJHZd integers = new ArrayList(); ArrayList operators = new ArrayList(); - while (scanner.hasNextShort()) { - integers.add(scanner.hasNextShort()); + while (scanner.hasNextInt()) { + integers.add(scanner.nextInt()); String next = scanner.next(); @@ -57,7 +57,7 @@ private String evaluateMathFormula(String value) { return Integer.toString(result); } else { - return ERROR; + return scanner.next(); } } From 0bbef5e887232ac5ba147eccc72754f92bf6b2dc Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:30:41 +0300 Subject: [PATCH 206/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 4516 -> 4518 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index b7f6449..9df18ab 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -860,3 +860,6 @@ CompilationAction 1476279025585 Spreadsheet.java CompilationAction 1476279025774 Spreadsheet.java CompilationAction 1476279027299 Spreadsheet.java EditAction 1476279036215 Spreadsheet.java 3983 15 25 0 +UnitTestCaseAction 1476279037520 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476279037520 SpreadsheetTest.java FAIL +EditAction 1476279041195 Spreadsheet.java 3986 15 25 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 4c830bcd14ea56fd711746ecbfc463a6ab38306e..a05aa3a4f2f5385543a9c59f7c31cb5099f4421c 100644 GIT binary patch delta 93 zcmZ3Yyi9q+aZb*O3@i-n3=9lQCtu)Pz@oE_A#8FHSB&OT22}<%pfFH^!IXiQfsuie pVGct%Lj?m9gCN5chDru524)5+hVIGVx%9a~{8|Wqvmtje8vyXu6Wss+ delta 91 zcmZ3cyhM4!aZb*D1{MZ(1_p-3lP_>CU=re=T*4KjxtKwfK@BJf6lO4G;ALQB;AEJ^ nP|i@nz{DWPFo~g(fs28eL5iVs@=q>(ZV Date: Wed, 12 Oct 2016 16:31:11 +0300 Subject: [PATCH 207/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 7 +++++++ bin/Spreadsheet.class | Bin 4518 -> 4521 bytes src/Spreadsheet.java | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 9df18ab..fb55fd3 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -863,3 +863,10 @@ EditAction 1476279036215 Spreadsheet.java 3983 15 25 0 UnitTestCaseAction 1476279037520 SpreadsheetTest.java FAIL UnitTestSessionAction 1476279037520 SpreadsheetTest.java FAIL EditAction 1476279041195 Spreadsheet.java 3986 15 25 0 +CompilationAction 1476279041444 Spreadsheet.java +CompilationAction 1476279048985 Spreadsheet.java +CompilationAction 1476279049149 Spreadsheet.java +CompilationAction 1476279059766 Spreadsheet.java +UnitTestCaseAction 1476279061561 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476279061561 SpreadsheetTest.java FAIL +EditAction 1476279071877 Spreadsheet.java 3974 15 25 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index a05aa3a4f2f5385543a9c59f7c31cb5099f4421c..fefb4d74faf02248273720cf64dd1c0df0dc55d7 100644 GIT binary patch delta 93 zcmZ3cyi$3?aZb)D3@i-n3=9k_CSTxO%;LF&p?Go$SB&Ng22}<%pfFH^!IXiQfsuie pVLn4SLj?m9gCN6nhDru524)5+hQ7%^x%9a~{8|WqvoUuu8vqF?6hZ(1 delta 90 zcmZ3fyi9q+aZb*O3@i-n3=9lQCtu)P%osMgoGV6iDT6A58c+-<%3#XC%fQIM$uNhZ moS}k&i9wKI3PU9W7Xvec6hrsqKV16UAbu@`zuAntm<<4 Date: Wed, 12 Oct 2016 16:33:03 +0300 Subject: [PATCH 208/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 4521 -> 4516 bytes src/Spreadsheet.java | 1 + 3 files changed, 2 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index fb55fd3..a14ca5f 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -870,3 +870,4 @@ CompilationAction 1476279059766 Spreadsheet.java UnitTestCaseAction 1476279061561 SpreadsheetTest.java FAIL UnitTestSessionAction 1476279061561 SpreadsheetTest.java FAIL EditAction 1476279071877 Spreadsheet.java 3974 15 25 0 +EditAction 1476279183300 Spreadsheet.java 4002 15 20 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index fefb4d74faf02248273720cf64dd1c0df0dc55d7..4c830bcd14ea56fd711746ecbfc463a6ab38306e 100644 GIT binary patch delta 91 zcmZ3fyhM4!aZb*D1{MZ(1_p-3lP_>CU=re=T+S7vxtKwfK@BJf6lO4G;ALQB;AEJ^ nP|i@nz{DWPFo~g(fs28eL5iVs@*ggJZVv{3I-+yL5ArJl?+@A%nVWteUra)>2rhlwGjShL+)ZW09(2h8~^|S diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index a2cb519..b0d548d 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -28,6 +28,7 @@ private boolean isMathFormula(String value) { private String evaluateMathFormula(String value) { Scanner scanner = new Scanner(value); + scanner.useDelimiter("+") ArrayList integers = new ArrayList(); ArrayList operators = new ArrayList(); From 9f4216636c63c01519026406818aac141e798536 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:33:07 +0300 Subject: [PATCH 209/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 2 ++ bin/Spreadsheet.class | Bin 4516 -> 3690 bytes src/Spreadsheet.java | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index a14ca5f..dd97b25 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -871,3 +871,5 @@ UnitTestCaseAction 1476279061561 SpreadsheetTest.java FAIL UnitTestSessionAction 1476279061561 SpreadsheetTest.java FAIL EditAction 1476279071877 Spreadsheet.java 3974 15 25 0 EditAction 1476279183300 Spreadsheet.java 4002 15 20 0 +CompilationAction 1476279183393 Spreadsheet.java +EditAction 1476279187387 Spreadsheet.java 4003 15 26 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 4c830bcd14ea56fd711746ecbfc463a6ab38306e..882bd5b3174c1979ff3405e925ad321ab04dd967 100644 GIT binary patch delta 1337 zcmY*Z{clrM7=BK>wcG7kn>DTj9PW-Gc6SZ+2L=%q9Uo&lR>n4AbYFPaUT3%4-f?#~ zHoiJ03P=$2#9&cTk@%6!WQd`O8vWh)m-vf6YSb9tb8p!+P0q)2-t)Zg^StNwe(SGI z%Fq9N_alH^cb8B`RL63!n1*AhLyqnkd86Pc3J&2VjwjH| z&=BuiPb&Umwd{ll2Koa-953Uz7z=a+PI4SUpST_9E1u#whCK=xbdCYUXHWJ|P8%6#U)zX+&B$>~%iz%C;3LM8Br!Si68G!btfaR%p79c$ z=01#z&fw;$d5#4%FjQwuL$@iRv7nptq)uK~;@Iugc#h+scl83tsD~9f#ysp2#|aO6 zog?jGZ*a_c*cFa54}SZo)d_LE^FG*^+qU9|HPXA4M} zP{Pe@RA}Mu+8NZtgo+ul7;a-@;$FC;WpFJTk#hX5Wl_2h%tFCws>h~0j`$-SXXBzJ z5-U!W(51DP@k&ZdlrdStv)Z?4NjyT<)l8cv+Pqdmtb)%BYZ@ViGG@sU`CHGl6CqkJ zp$2EE(sPL6Jk@)Fs#wNOT*4l#kc!Ks@G81-U8;YMN|#pltjq7I$PZJvO-A_K9@e4i zZ?p!H*vkHNy_plgMK%>3O>3{zLL}Z3QD_EkQ4ij6{f)W%`t=0$E-fRLGlN5~&b&YnMuC2+YroBBe+#WK!Ukc)&&$fM;7utLCNPvaXlHp-aG zB?O|;HRU;Dpq;Hc!@1p@FJc$p;=MT|_ zkLX3+rC0VbdHf0elYC0A=pJ-@h8*tGTlt*ye~Ec~g+;7Vm%heDtl=6S;3mGoyLd>9 PWie6zLh!2V>9v0WO?3*D delta 2100 zcmZWqTUZoj7=DL6vBU2HbWunV9?X^nL{sree8}zEgaUPDpp{%z*Kyoz+=2nrUvUJv_@bp-c{fV>s_&` za7=|CwJy{suv~<+a7!6+y+w}-e28^a-K&K<_1c{Zvb|MB)n=seY85K-uwGyTHY%`b z&CN!JBR9SR4Fa3csK72mDVXXVZ@WGg4Tf82x&_-@*s5U4nBV2CT2u?ftOT|znC@LZ z-gNXatxK>&K$C%;`kqcL)FEpO2sFo`D^OdtjvA{@X67y0EHiBpXq61uJA(Uk3A72k zgu?oHsD7Ql26k|6_N=r+Us2V|a5_Js} z>z6ok9FvPjusMm367b~MQ#a<*rk+>7mnN~Z7d54}B!bW2Pa;(Au$4OpP@H4;I8AU% z5|Q}i;yz@19HkzoqjgkuN4evuQ}H-+?DTTu)o&ih2s(zcCJix9I|_NOLMG2VxRFn( z0J%hGVm68}2W9YLDW%oKYA_EQF&|A>z``7O+9@ppRPd*>qEfbe{cqlg9GX zPo)Xu+D)~O(SDCx9ZM#+f-^pibm`N^o| zL0Z1gXSr~_#7tK%R=AMIUy<`~|0_b~Ae<7tLBeh!OMr9Y!*8+BIuIN;|K zSSGI*{JxT5Tufk|?-2?()Rz-**avwtgEvwW2Q{fD$Jv**PnWH_*#7%Qz6%4%Yx3Y#dvgjVuou3sf?Zs(XGZ~1)rC?ET zCjlYvzV#0vB89;e@I8U;5*SJW4+y+w%{xZaG^z6_0cTd$kYp-JwK-Xnc;=gD?th)S zeI@Z>Jn)yu3AC7O;x+*nxH%VD$t8Gj8E integers = new ArrayList(); ArrayList operators = new ArrayList(); From e3047de16290228f38d0835e29985b678c8458ca Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:33:14 +0300 Subject: [PATCH 210/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 3690 -> 4601 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index dd97b25..42ed76b 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -873,3 +873,6 @@ EditAction 1476279071877 Spreadsheet.java 3974 15 25 0 EditAction 1476279183300 Spreadsheet.java 4002 15 20 0 CompilationAction 1476279183393 Spreadsheet.java EditAction 1476279187387 Spreadsheet.java 4003 15 26 0 +UnitTestCaseAction 1476279188454 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476279188455 SpreadsheetTest.java FAIL +EditAction 1476279194318 Spreadsheet.java 4005 15 26 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 882bd5b3174c1979ff3405e925ad321ab04dd967..f9982b471edeb6787e577be159ebbdb3a12e73a5 100644 GIT binary patch delta 1761 zcmZWqTTok76kUhhn-_;dBcX(0fC_Cx0s~f|BUG%yNTEEmyh`nZOL_~zkkBO1QmgS% zAJkeYw-1Ag#TOOZN?#W&YWem{9cTRV*AKt?+Yej!$qkQ=lgv5$tiAT$YwvRc|K#2; zwEyzp&d&gz!qRp7pecX-fHI<#4M+WfvNoR*460!}>QK*-iJc5i?Ha?Pffq8|e ziK7`U4174E)~Nyipg*dH8MY8HC$=_CwP3%<@e-b8umsg((S~5ujy7~y(9U4g4Jg6B zGQ!n9HO$e8E~1Vofnl}vFhiERp|~j_Z!L}T=AoNoFJ5LaDTfY`O1DANoN`924*NL{ z;2?t}iZW!n*Jf#phW)`lN}|ALK`+B&s}*Ydm9XNYeuNato9(V$8@l4A=n@>}=o1pm z>XBh35E0$_IR;{Qg~8shL|TlFNu#@Xuh2Zm5frnKBL3s50ERfW;E0g_NT02}1FA1d zHQEs2h>8%aKN#&4V-d1PIF8~NgUv^B6KJAFtq3^IV|W!OC?Xm%I{jbzU5#zpT z1jhItxjmz(xR(f(3Js}YB^na8Ijly812osHrjSnwbSh!L(i>3QM~BpQG9;D3bM|gQ zTJlz_YpNMa2;i&ZtErxlTFoDFoWVz0hg4yn;CKh`YU5Hdn7o zdrFK=LV|^UYqN`}>-Ns$h2|1RgN|KYi^%JqM?p(+uaag^T3Vu`bpg9|?CBzNUzO~V zGrSAv(V@oSbVnw$Drd?PSNTada zi1iv?M+%jgKn!-6sL&YRAWNb|+4O5pgG|Y5DDiV-1t@X{S!TRNd9qd_-(HD4Ns*hL zCua^U4^U)5odtRHEjIrP7h^>!_mNIv;?Wga>mBdmeG(%0Ca`tn7}HKz{p^(XxAkBy zJwkG3k+X)}DYV_^!Jtv|Jboz|vOceY)`wq%th;+m*Ry@#I6$8qcs`((4HWFDW! zQSP~gjr2aI;*g~)bjYQ{bR1bpd{39hL&#V2_(pr0_pr;_B+n_Nx0%e|knCZ-;Om(6 zc&L>G`%hjHyPUWYhO5gxvqtJcsF_Ugnkn`6DVz~vNLonjhO}#OaB-Szo-yDXN#GU% z2ZTpY0t*BzcjI1dU;}ZU#GN?I4#%8m;YZ?acBIolC@cF0$9*)r(Ls%|7a<= F`yc~%QLbBv;nGIRPWgA!e6idvCHL$hStBF7T) z88RYy+hGDPa|}CRf@8#yxW+NyVAnZ@9PB2?f`i@W zSbpWrQe5@)Hg34+jg+@&9txb?MC*IHxlm5gOXNTac2nf3vw}USNaf|u)^l0{T{uOV z8>rtvpZLma=ru}xRj$FLc<#>^5#N3` zBp&$I3kPtPm^?IVBaTt0AEh86G43y6!y@5dW+UR8zn1lheYve++GSeh1J$}ottD8s ziLoRa<$t0p7}~^S5;eisC=G33Dv1owQ@Rw> integers = new ArrayList(); ArrayList operators = new ArrayList(); From bfe47160e79a8c3845e66d2d89946b985dc154ea Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:33:32 +0300 Subject: [PATCH 211/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 4601 -> 4603 bytes src/Spreadsheet.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 42ed76b..532154c 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -876,3 +876,6 @@ EditAction 1476279187387 Spreadsheet.java 4003 15 26 0 UnitTestCaseAction 1476279188454 SpreadsheetTest.java FAIL UnitTestSessionAction 1476279188455 SpreadsheetTest.java FAIL EditAction 1476279194318 Spreadsheet.java 4005 15 26 0 +UnitTestCaseAction 1476279195307 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476279195308 SpreadsheetTest.java FAIL +EditAction 1476279212682 Spreadsheet.java 4006 15 26 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index f9982b471edeb6787e577be159ebbdb3a12e73a5..5f77ea6e09015b57f5f0bc9bef52af7cc906e28d 100644 GIT binary patch delta 17 YcmeyV{9Ad$24)s!eQo{Co0#4C06(Y&>i_@% delta 15 WcmeyZ{8M?u24*Hk?af=5-T44Dj|GbW diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index a33880a..0ac872f 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -28,7 +28,7 @@ private boolean isMathFormula(String value) { private String evaluateMathFormula(String value) { Scanner scanner = new Scanner(value); - scanner.useDelimiter("/+/"); + scanner.useDelimiter("\\+/"); ArrayList integers = new ArrayList(); ArrayList operators = new ArrayList(); From fce45a95e569ba0ece3d06214f650b78bed771f4 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:33:33 +0300 Subject: [PATCH 212/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 1 + bin/Spreadsheet.class | Bin 4603 -> 4603 bytes src/Spreadsheet.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 532154c..77d3a5c 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -879,3 +879,4 @@ EditAction 1476279194318 Spreadsheet.java 4005 15 26 0 UnitTestCaseAction 1476279195307 SpreadsheetTest.java FAIL UnitTestSessionAction 1476279195308 SpreadsheetTest.java FAIL EditAction 1476279212682 Spreadsheet.java 4006 15 26 0 +EditAction 1476279213748 Spreadsheet.java 4005 15 26 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 5f77ea6e09015b57f5f0bc9bef52af7cc906e28d..eba403a9ed4cfe9f4f1e564affc2010ee5aa1bda 100644 GIT binary patch delta 14 VcmeyZ{9Ad$MrOvC&6}7#`2aH{1-$?O delta 14 VcmeyZ{9Ad$MrKC+&6}7#`2aE&1&{y$ diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 0ac872f..f50c021 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -28,7 +28,7 @@ private boolean isMathFormula(String value) { private String evaluateMathFormula(String value) { Scanner scanner = new Scanner(value); - scanner.useDelimiter("\\+/"); + scanner.useDelimiter("\\+"); ArrayList integers = new ArrayList(); ArrayList operators = new ArrayList(); From 0467e077e98c3426bc5259c5012c2341f29bf94b Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:34:26 +0300 Subject: [PATCH 213/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 4603 -> 4602 bytes src/Spreadsheet.java | 2 -- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 77d3a5c..79d3334 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -880,3 +880,6 @@ UnitTestCaseAction 1476279195307 SpreadsheetTest.java FAIL UnitTestSessionAction 1476279195308 SpreadsheetTest.java FAIL EditAction 1476279212682 Spreadsheet.java 4006 15 26 0 EditAction 1476279213748 Spreadsheet.java 4005 15 26 0 +UnitTestCaseAction 1476279215009 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476279215009 SpreadsheetTest.java FAIL +EditAction 1476279266001 Spreadsheet.java 3982 15 26 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index eba403a9ed4cfe9f4f1e564affc2010ee5aa1bda..40bf2edb80b102bdb78ea76ee5aaa4ba8a4618ab 100644 GIT binary patch delta 16 XcmeyZ{7ZSm24-fa812nlnBDmRJJSW~ delta 17 YcmeyR{9Ad$24)uK7;XK{o0;AD06`@N8UO$Q diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index f50c021..2790c9b 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -41,8 +41,6 @@ private String evaluateMathFormula(String value) { if (next.equals('+')) { operators.add('+'); - } else { - break; } } From 8593bea5db9b3cd5a3a275e76c1db81d6492d738 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:34:31 +0300 Subject: [PATCH 214/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 3 +++ bin/Spreadsheet.class | Bin 4602 -> 4601 bytes src/Spreadsheet.java | 1 - 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 79d3334..7588b61 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -883,3 +883,6 @@ EditAction 1476279213748 Spreadsheet.java 4005 15 26 0 UnitTestCaseAction 1476279215009 SpreadsheetTest.java FAIL UnitTestSessionAction 1476279215009 SpreadsheetTest.java FAIL EditAction 1476279266001 Spreadsheet.java 3982 15 26 0 +UnitTestCaseAction 1476279266927 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476279266928 SpreadsheetTest.java FAIL +EditAction 1476279271832 Spreadsheet.java 3977 15 26 0 diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 40bf2edb80b102bdb78ea76ee5aaa4ba8a4618ab..a02618f1b2293af97eaae57d88fb72d91aca0ec3 100644 GIT binary patch delta 351 zcmWNNSu2Eb6vltAV$3_<*B150h=ww)ovV|v6{#t7y3sbG#ucBtY=`Y1Kr zQKu}&YPvIKyZ6VxtEqUNvI` zO8SVSUnT>X3}P`vHp3JNwU|-LWLL`s4fyadsS3@o-A^i0a3Vl`>2PBUCb~GA(D3UTln!idTJDrp*%=nH1g>8O*4r z=zz;d1oNWiC!Ph;Sj5RPxe~sFRjOE{hIQ)LRJwIMd`G+k%5VMb+sD8GW)87)L?S1` zJH^GB6h4;}7s9!uLCUvt%^)}OmRm`3FW!&L^28iLaeZcq5F5O(%`3aSiQ>C@v(^6t D*33>t diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index 2790c9b..a122b39 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -40,7 +40,6 @@ private String evaluateMathFormula(String value) { if (next.equals('+')) { operators.add('+'); - } } From 518026124405c434cbf8ac1e5fba6d49fbc069a3 Mon Sep 17 00:00:00 2001 From: somename Date: Wed, 12 Oct 2016 16:36:01 +0300 Subject: [PATCH 215/215] besouro automatic message --- .besouro/20161012141626179/actions.txt | 2 ++ bin/Spreadsheet.class | Bin 4601 -> 4601 bytes 2 files changed, 2 insertions(+) diff --git a/.besouro/20161012141626179/actions.txt b/.besouro/20161012141626179/actions.txt index 7588b61..192aae2 100644 --- a/.besouro/20161012141626179/actions.txt +++ b/.besouro/20161012141626179/actions.txt @@ -886,3 +886,5 @@ EditAction 1476279266001 Spreadsheet.java 3982 15 26 0 UnitTestCaseAction 1476279266927 SpreadsheetTest.java FAIL UnitTestSessionAction 1476279266928 SpreadsheetTest.java FAIL EditAction 1476279271832 Spreadsheet.java 3977 15 26 0 +UnitTestCaseAction 1476279334353 SpreadsheetTest.java FAIL +UnitTestSessionAction 1476279334353 SpreadsheetTest.java FAIL diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index a02618f1b2293af97eaae57d88fb72d91aca0ec3..92ae6b886ff208483539399e16fc25e6d565c021 100644 GIT binary patch delta 315 zcmW-c+be@{7{@=aVs?0EyPy^;dXpw5hf=$6XyIZs7aMYjakJHULyil%P+XYohn$8b zL=G$d2si!$cm9i&3s3HzzV-cnK2O0Y82MkD*UvajBxuH@g>70nk~>E`4+NCQ{;74U zAA3Rzs(#0$)~B8w5iO)NecBqv!XRG4DygR%BNP#pWC$n2co?CIQR*3^;hzvCz!V+C z=we3IIkVO{ZsArFS6|LWeHI&Y(le=LUJaBT`j#nWMb=iSV2v8qG1$P*rnqggd$3lmz1d~ud!q~d9+NEjFqEKB2JY77}qrA>9EvSB- zmNuY5u6b=(y|~7;kka(1J&cVpe1ug@&ooa^!lWou7);}3h8kvRl=LPd1mxGv0=+~D zvZxx2oZZ61617