From d979e5c01f5b4d12eded936252092e771dcd6f60 Mon Sep 17 00:00:00 2001
From: GittanKaus <GittanKaus@users.noreply.github.com>
Date: Tue, 28 Feb 2017 16:44:45 +0200
Subject: [PATCH 1/3] Delete Proov1.java

---
 Proov1.java | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 Proov1.java

diff --git a/Proov1.java b/Proov1.java
deleted file mode 100644
index 2a89609..0000000
--- a/Proov1.java
+++ /dev/null
@@ -1,12 +0,0 @@
-public class Proov1{
-	public static void main(String[] args){
-		Ristkylik laud1=new Ristkylik(2, 1);
-		Ristkylik laud2=new Ristkylik(1.5, 1);
-		Ristkylik laud3=new Ristkylik(2, 1.5);
-		System.out.println(laud1.pindala()+" "+laud1.ymberm66t());
-		System.out.println(laud2.pindala());
-		System.out.println(laud3.pindala());
-		System.out.println(laud1);
-		System.out.println(laud2.toString());
-	}
-}
\ No newline at end of file

From 4d0407e7c7829580dbcbbaa3334930404b54c9da Mon Sep 17 00:00:00 2001
From: GittanKaus <GittanKaus@users.noreply.github.com>
Date: Tue, 28 Feb 2017 16:44:58 +0200
Subject: [PATCH 2/3] Delete Ristkylik.java

---
 Ristkylik.java | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 Ristkylik.java

diff --git a/Ristkylik.java b/Ristkylik.java
deleted file mode 100644
index 9da2e76..0000000
--- a/Ristkylik.java
+++ /dev/null
@@ -1,20 +0,0 @@
-public class Ristkylik{
-	double a, b;
-	public Ristkylik(double pikkus, double laius){
-		if(pikkus<=0){throw new RuntimeException("Sobimatu pikkus");}
-		if(laius <=0){throw new RuntimeException("Sobimatu laius");}
-		a=pikkus;
-		b=laius;
-	}
-	public double pindala(){
-		return a*b;
-	}
-	//lisage funktsioon ristkyliku ymberm66du arvutamiseks
-	public double ymberm66t(){
-		return a+b+a+b;
-	}
-	public String toString(){
-		return "Ristkylik "+a+"x"+b+"m, ymberm66t "+
-		       ymberm66t()+"m, pindala "+pindala()+" ruutmeetrit.";
-	}
-}
\ No newline at end of file

From 8add9e2789884f044019173e83c582867e90b338 Mon Sep 17 00:00:00 2001
From: gittkaus <gittkaus@greeny.cs.tlu.ee>
Date: Tue, 28 Feb 2017 17:03:32 +0200
Subject: [PATCH 3/3] homework

---
 Main.class        | Bin 0 -> 588 bytes
 Main.java         |  15 +++++++++++++++
 risttahukas.class | Bin 0 -> 819 bytes
 risttahukas.java  |  33 +++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 Main.class
 create mode 100644 Main.java
 create mode 100644 risttahukas.class
 create mode 100644 risttahukas.java

diff --git a/Main.class b/Main.class
new file mode 100644
index 0000000000000000000000000000000000000000..4a07dba76ce3d022dd8765460bb0770f182e176b
GIT binary patch
literal 588
zcmY*V+e!ja6kW&5jE+`TqnVkh-Nt*=TSgd36sQG85Iv1H*qDx?Gl8E~4+#Z*K-4cq
z`#6Yp9?n{`_Bwm*Jzu}?p8)o;Ct(F~5ecCbAc2lh3QtJfCK4P-3MKiQpC6&*nbeaL
z5}lBU?eSt0TN1XhBVt#C!XO;!hHf4+IF-~5gX^?+uQ4oCbVI9I-G<h`RvR5sTwPT+
z7(&WjrL8`zg^p^p3U#xu8?7RLDAjvbzp0(+-0ZEAInRB5gt5xt>+1v4R3EHIb-<;R
zh_oLWWJTos$fH03{0&23+WoT8)|w`bsFcfPo-tFa4+o~!rKx)sIfC{~darOr1DQ0I
zrgn=A%j0JMWd`wyn>rL0RA!d3<7gQq5Tc*Yj{}S^KzD?`)(IJ*J3Rt>A;Pdmw=foI
zYedHuZXLn{7vaSR9Jex@GTbu65xf;!kYxB}%#%>Hg}~UfL_+Nqa^?*|f~*ZWf@xd~
dA~kknk%E)N4=DH$5>DX5Ip%1X7}Xuv_ye-AaAN=f

literal 0
HcmV?d00001

diff --git a/Main.java b/Main.java
new file mode 100644
index 0000000..d8bdbb7
--- /dev/null
+++ b/Main.java
@@ -0,0 +1,15 @@
+public class Main{
+	
+	public static void main(String[] args){
+	
+		risttahukas r1 = new risttahukas(4, 6, 8);
+		risttahukas r2 = new risttahukas(5.2, 3, 9);
+		risttahukas r3 = new risttahukas(7, 4, 6.7);
+		
+		System.out.println(r1);
+		System.out.println(r2);
+		System.out.println(r3);
+		
+	}
+	
+}
\ No newline at end of file
diff --git a/risttahukas.class b/risttahukas.class
new file mode 100644
index 0000000000000000000000000000000000000000..ff2e144d1cb639250c613f85142d91f70280ca37
GIT binary patch
literal 819
zcmZ`$+iuf95Iq|^w&S`@o2D1q0#3QaHf_WGf!hN_@KOP4t4chfO=7i9Qzvq5ehZMA
zR04?);G+;{lPFY;c$k^9vomMU%>MrK;}?L3cw%D#l>+9msoX8)ZkxDcBae!OyDC<d
z^DOul0-N{uENrQ`t@1l2Y9{Ur2uZ8c8nmW>@gj<&^c8_uuh;!U0sT$46$%u0qd0t@
zoi@VcKsGweIK8LGZTT^ZTe3qI&GX4)?q%8O@NA{s{WOW<BZ0E#@3!R^S?kF7s5Z(z
z7qIucS<(#OMv84diO$kg9%m==Y)2J4SjGbfB`i89E4PG2ft9N~ud}Gr3KM~uy$ONm
za7T}ndn}OKa;e@QitUZWK64$cVO?O>ZA&*9DOSl1tUI`l8)UmAhvNRd`k~Pdo9S>|
zF2|6)UKqCow!P^Ir-vSk<?I_?{r}gf@Shg=(;AHnpoiMQFmeryIt2H#Lchw>OIDhU
zOTh(1Q0*fZ_<d->YQ7KsJ1+#T(J%AoRjUpI1vbpVBCX9^ZevWfIiv>c;G8Vy&`!Qi
z`VH2AU6enmua4`BlX?Pus;SH-E_VFLXX;f{?|vfx=>kT{9Kccp0~AX32y2(HuJDY?
Z58x;~JHm6s0~EhqQMg9(o6P0l{soG0ldS*%

literal 0
HcmV?d00001

diff --git a/risttahukas.java b/risttahukas.java
new file mode 100644
index 0000000..059a755
--- /dev/null
+++ b/risttahukas.java
@@ -0,0 +1,33 @@
+public class risttahukas{
+
+	double a, b, c;
+	public risttahukas(double pikkus, double laius, double k6rgus){
+	
+		a = pikkus;
+		b = laius;
+		c = k6rgus;
+		
+	}
+	
+	public double p6hjaPindala(){
+	
+		return a*b;
+		
+	}
+	
+	public double Ruumala(){
+
+		return a*b*c;
+	
+	}
+	
+	public String toString(){
+	
+		return "Risttahuka("+a+", "+b+", "+c+
+			")p6hjapindala: "+p6hjaPindala()+
+			" ja ruumala: "+Ruumala();
+	
+	}
+	
+
+}
\ No newline at end of file