From 25f1ec9c36bea3d7ba96977b8b7eed107b0b165c Mon Sep 17 00:00:00 2001
From: sahelttu <sahelttu@10.30.7.16>
Date: Fri, 14 Oct 2016 16:48:16 +0300
Subject: [PATCH] Samuli Helttunen

---
 bin/.gitignore             |   3 +++
 bin/Spreadsheet.class      | Bin 613 -> 1302 bytes
 bin/SpreadsheetTest.class  | Bin 490 -> 1023 bytes
 src/Cell.java              |  18 ++++++++++++++++++
 src/Spreadsheet.java       |  28 ++++++++++++++++++++--------
 tests/SpreadsheetTest.java |  21 ++++++++++++++++++---
 6 files changed, 59 insertions(+), 11 deletions(-)
 create mode 100644 bin/.gitignore
 create mode 100644 src/Cell.java

diff --git a/bin/.gitignore b/bin/.gitignore
new file mode 100644
index 0000000..6f06ffe
--- /dev/null
+++ b/bin/.gitignore
@@ -0,0 +1,3 @@
+/Spreadsheet.class
+/SpreadsheetTest.class
+/Cell.class
diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class
index 92b411f05752a6cee6d06c9769e1b70d40aa0840..fb8ddb495f202ae3d464380436555ed35d07b97d 100644
GIT binary patch
literal 1302
zcmZuwZBNrs6n^eD>?j>C<3)iXMHCogAc`+AL}7wrCVrUCfbqj!cLT+)on1%bPvKu+
zq9c(+zx$(%=eEt5vNXB9=k}cEJkN7afB*UM6Tk{yDTpxi6l<>FmHLqoo`M)d|1m$|
zOBS~em)?|*h2b%D8N#ya48sNgTf;N0rA^o6UkYa3%Q18p%|n}e4OcKsbjn#T<Ow0S
zLAlq~P22P~7@~9O5<@KSRD_Bs5*oUpD(GVv?9fF;FB08gNNVW9HHN-|X^Xu^wJhAX
zylheDWWh1GRpPEG<M1%%9ht;DQD~D%ETVNmx@PABvcA}&=bH9m?&?Xpq+m=kB?&4<
zk&w%ThMSlqYY1q!Le_MEN|$8jl!jX}GftT$ZZ$}4FK%nNgBjw%EB_Y<rsvWJ)KdB`
zg<W1r$dVeLNGt}HCr<-=3GPtJn(4&lDu#k3vhfmn+jSi`j%9|OceX3)j&&j`y5Ur7
zro}zevGtnkkh9e_UF|mM3%6~@)5}6{C3}v}^^@=hR27T3FRxXq7m_dcNc}@RR`BSb
zK?_uASj8GmQ@v5H`<EeY-A!L*9>+R~{;-@~{g{z>8ycSC88tB++vBE97e3zZLH>xl
zMe(^IY(tQ-vSdp`9?uz+D))>dA&0xYBD6Vu5XTO+n)bb+F)Di8`1G3B!s$|rPQx|C
zjw$D_ziq@8rLCBvd5zM)#t@N1OK*ju2;zv*p2nTl9y-~gEJpAC`EzLV7wFwTNB?&W
zeD$*jY3=oKqEy#~KH3k_nHJPw7$X!hT*r+N&!ZkOI!j$(l%U4<vY94Q*@Y(b`EMA=
zHZlGF5_^O&L7d{mC_$W(#A%$+Wsms)C+tCpn8lpmH-$9qq?RGd%J>QvkPR8EP#mFp
z^#Y6g$-C#c_lu$kq!#G|Fwmw!ZE09(Ayg<^B1~qYO*}~Ens{=GWGmP_MOWr5xqU_{
jQ6Dz2XcS}gr09|KM*@fz{mGF23%`n`h{;RZMzH%Aq8tvD

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(iaZJmb<c+8cJVMY(Y+o9Mq%5V`8pWr$V#0(y79!$6>8p!
zWsjm`LyzN@_ifydBO8u;?e!<R`z8p)VQrjJbCEjvMQVLoF3B%-u;98SBS6Q5<^F6D
z`R2yT8I6@qPsI;MpbNhbaEW+5W06&tSuy83FDN||I4CnpTX2Q3nhr46SSf6x&M4$_
zW=H1Klf)HfAz?PtZpM^}2DZrIFJLFrxFS;)Q$NisiNs;r{F2~piG(b&OXM)`{bQl}
L9}6{;1NJ`w6*Odv

diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class
index e7086bd9ef1b6a8b7afcfb717afbaddbf99a7876..da3bcdaaf842eaeb7937c824def8551974287643 100644
GIT binary patch
literal 1023
zcmaJ<-A)rh6#k|y?6xe@uFxNlQbeHzq$+q}YD^k}R|^_Tns{ZVWm2|TW_5R##K-am
zj3z#S4`n>lZs?{o-ptH7bLRUwXa4;C`5V9yjtrz2mO5Vo!7su~A=J4Dm4OUHe#ozR
z)8lf`eBT?2zG9ev<4RY(Wk}Z>U53oDe<5;6BWqy}^MvELQk+FsJrSJqo+lV=$M18m
z%L7-(aWbPW-H@T+OwqO|r-=UZ$u;*PuEYl(QeEX^B$az5x^CzaNLxx@apn4w?(&Ww
z44T7;WHq(&mI0e#Apx920a+6(45{{^i4p^QrE?Vvt5_o|p&(~Fb!TF?qXJhBTK6-J
zu70_0p^6O#Q^YbEwr4zV+<$LklVRo9mx{YGtohRWR+FQ4g*j~DsevbCY2v6Ih9XcF
zwz0!tQ8Oqy`5JMLoWGtynP41`Ea@T6=)o-}J5ODo4@4Mw)CN0&5O;xmj%Gq_(&nF8
zIMC+P108SSxmNdLs)7F{&vpDL=!<u*{vXSUN$L3==qX?mL_q%&v@-p*Xf-Hm(#~j~
z+r5SPoenAFXw}!Cf(2TwaRKd%6fr!Y+Z2}Ks{E)9kOZs=YQIqUbc=`1p1o`rZ&0TF
z29HkdnqA!gfyWb$BFO+Tn1q}s>=GewP(L(hZHyIjnkdu%s1tVySv0Uq{0w_Db$GFk
r>P#K`ry~{3X%!_>Q6?1?VpzpG))FeJcPff>H&$WXsd!0hQ#kwwv_95x

delta 173
zcmey*{)(CF)W2Q(7#J8#7^Ek1^|P{+q!yP<T&?fS!63xQAncc4qEMMyqL7(ekdvC5
znpcvV!o?uMAjZxh%E%y)UzDz&RhpMsqVHH-oLW@E!ywKe!N|apmYA8t$RIj7kWplE
zC6fUo)8ti5VfH2rj6lf1z$PTPgF$#Bkj2En1thtEGy?-S11keBkYr%sfv5t~yg(i!
LgCvk-Vvqs=4Co-!

diff --git a/src/Cell.java b/src/Cell.java
new file mode 100644
index 0000000..da4d1cf
--- /dev/null
+++ b/src/Cell.java
@@ -0,0 +1,18 @@
+
+public class Cell {
+	private String id;
+	private String value;
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getValue() {
+		return value;
+	}
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+}
diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java
index e4f120b..7d34d05 100644
--- a/src/Spreadsheet.java
+++ b/src/Spreadsheet.java
@@ -1,18 +1,30 @@
+import java.util.ArrayList;
 
 public class Spreadsheet {
 
-	public String get(String cell) {
-		// to be implemented
-		return null;
-	}
+	private ArrayList<Cell> cells =  new ArrayList<Cell>();
 	
 	public void set(String cell, String value) {
-		// to be implemented
+		Cell C = new Cell();
+		C.setId(cell);
+		C.setValue(value);
+		cells.add(C);
 	}
 	
-	public String evaluate(String cell) {
-		// to be implemented
-		return null;
+	
+	public String get(String cell) {
+		
+		cell.get(id);
+		return cell;
 	}
 	
+
+	
+	public String evaluate(String cell) {
+	
+		if (cell.substring(0).contains("[1-9]+") && (cell.substring(0).matches("[1-9]+"))){
+			return cell;	
+		}		
+		return "#Error";
+	}	
 }
diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java
index 9e0936a..4822ad7 100644
--- a/tests/SpreadsheetTest.java
+++ b/tests/SpreadsheetTest.java
@@ -7,9 +7,24 @@
 public class SpreadsheetTest {
 
 	@Test
-	public void test() {
-		fail("Not yet implemented");
+	public void test_EvaluatePass() {
+		Spreadsheet evaluate = new Spreadsheet();
+		evaluate.set("A3", "5");
+		String result = evaluate.evaluate("A3");
+		assertEquals("Contains only numbers", "5", result);
 		
+		
+	}
+
+
+
+	@Test
+	public void test_set(){
+		Spreadsheet set = new Spreadsheet();
+		set.set("A3", "5");
+		String result = set.get("A3");
+		assertEquals("5", result);
 	}
 
-}
+	
+	}
\ No newline at end of file