From 36ddae97fb615b579116ae3fc0e429a969a4f115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A4rjestelm=C3=A4nvalvoja?= Date: Thu, 13 Oct 2016 16:58:25 +0300 Subject: [PATCH] something, barely any tests --- bin/Spreadsheet.class | Bin 613 -> 1564 bytes bin/SpreadsheetTest.class | Bin 490 -> 733 bytes src/Spreadsheet.java | 40 +++++++++++++++++++++++++++++++++++-- tests/SpreadsheetTest.java | 10 ++++++++++ 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class index 92b411f05752a6cee6d06c9769e1b70d40aa0840..d7c8762ccba05b6e6a91703c124ad59307d36480 100644 GIT binary patch literal 1564 zcmaJ=-**#L5dQA&W^cM#=(bV>D?<6vCTSolSZ#xqkWvy&sSr}n+6T_<_S!Bko4UK{ z(Q|n7Mg9c;0$=q(T0wc^#XpMU+)ZfHAIFC~dw1^4H#6VN{QKs`D*!j}4Tr{%Yi&hR ztjC*DCL9KX^H^+)av;Ku^77ha=_L%A^p)Y%>T2`wYlXqQ>4$zY&!FcED-1@hvo0;@ z$l2h?a+pJ4IB6pTlVP~&hw@(c$(oEFinTy8j5a%-2v$VotN*^zNH+bL;Y4#FJqo37 zNXln2KafT%iTrS*QaGxjR6H33D#Cu&eRG0}71Y!*P)Dr`D;D0v`yAs3_~~KUIEN32 z1#eSCRf06~jY5s%0)w_%vv3iYIWE2R>n46su11mgDYkJ1ljJAjrXQ2vmHaX6_RC7$ zlv%|>9z~7-P7}%8JWyZ#*_>3Xzb;3mWA@yy1&_@Mr$sf8h^kk** zEyo4Cmp?(tZoURjvMO*J;3GhECcX#VkC`2tmrTMQ%nWHiD=ZYU~lqee+>i71w& zJ5&>y3%ILtsT2IcTpDW5Gbzaome&coPeRpxVuV84Jw+fB>WCVQ z^qt-sbOa4`D-quJOJb`(>shIgL_)h@wL0C%lZ(Du3}+yzYpOniZiJzXYJrGjNi_3* zs>(541C=)>Xx(&LaYl!Bj-)|%T1ApW^jD=<^)_7GfmP($*RZueapDhBX&5GXGIiI< z%}DPK>Fk~hMlec$#28NX;b!QoDc|Yel}r)L)OsAs^K|dE@2M=tNJmuQU7R6FDX|L_ zDNDA`ruFAIJMZNF&bYc$ZM%kZyX|J2TH7_9g|^F`J8d`XEVf<8bncSmPMu`dX^H|KPlTKk5IrSiil~|wo$@UT*WUar=`}3Wh!E?)Mx!t zm9CKzVd7_eiLVH|PJL)X75<3OmT-@H^^|B{rkjbc2`2~b4YnD_c{V~k-9O4WJIwg? b|7Bdm1A^7i!bAFw(rtlo+jM5>tbqLoP8ddf literal 613 zcma)2%T5A85Ug32hdcyd=us~U9OPoWVDw<(X`=@W_hFg9kaaQ3!guM(#DgE;M;WVk zH%i1rFWuGCT~*!l{_*+-;0y;vI0}{iV`TJbJ~1XP!c}NY^-^~O9ge$q!>RFOg~Ejm zZG5SaYqbXo?)7YB%E)1(iaZJmb8p! zWsjm`LyzN@_ifydBO8u;?e!$?^eBqh&Szs_WDo$->|n1j19=P#T)P>hB86nOGsx`+@|YO7fFwvA1A{OFH<09kr~=Zw OKprE50+3{4Py_%(lR>xu delta 35 rcmcc1`ihzB)W2Q(7#J8#7^F9H$udqp!>G&1H2D|f1XczHCI%@0-Gd4d diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java index e4f120b..f3a2e3d 100644 --- a/src/Spreadsheet.java +++ b/src/Spreadsheet.java @@ -1,13 +1,49 @@ +import java.util.Arrays; public class Spreadsheet { + Object [ ] [ ] sheet = new Object [ 4 ] [ 5 ] ; + + + public class IntCell { + public int Integer; + + public IntCell (int a){ + a = Integer; + + } + } + + public class StringCell{ + public String Stringy; + + public StringCell (String a){ + a = Stringy; + } + } + public String get(String cell) { // to be implemented - return null; + return cell; } public void set(String cell, String value) { - // to be implemented + //A1 must be interpreted as [1] [A] = [1] [1] + + char columnchar = cell.charAt(0); + + char columnletter [] ={'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'L', 'M' }; + //int column [] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }; + + int column = Arrays.asList(columnletter).indexOf(columnchar); + + + if (value.contains("'")){ + StringCell s = new StringCell(value); + }else{ + int a = Integer.parseInt(value); + IntCell i = new IntCell(a); + } } public String evaluate(String cell) { diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java index 9e0936a..78a3164 100644 --- a/tests/SpreadsheetTest.java +++ b/tests/SpreadsheetTest.java @@ -11,5 +11,15 @@ public void test() { fail("Not yet implemented"); } + @Test + public void SetGetIntCell() { + + Spreadsheet spread = new Spreadsheet(); + spread.set("A1", "5"); + spread.get(cell); + + assertEquals("return value incorrect", "5", cell); + + } }