From 4335e1b119b9b259a9cfe7639498b842f9ef5ae4 Mon Sep 17 00:00:00 2001
From: gvalgerist <gvalgerist@users.noreply.github.com>
Date: Mon, 19 Jun 2017 03:16:05 +0300
Subject: [PATCH 1/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 12b2d85af55a0b5b223f0d9929bf0a82733c5011 Mon Sep 17 00:00:00 2001
From: gvalgerist <gvalgerist@users.noreply.github.com>
Date: Mon, 19 Jun 2017 03:16:26 +0300
Subject: [PATCH 2/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 fa412b447cec45f11d08a5eef824226f07aeb08e Mon Sep 17 00:00:00 2001
From: gvalgerist <gvalgerist@users.noreply.github.com>
Date: Mon, 19 Jun 2017 03:17:32 +0300
Subject: [PATCH 3/3] =?UTF-8?q?kodut=C3=B6=C3=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Proov1.class | Bin 0 -> 832 bytes
 Proov1.java  |  16 ++++++++++++++++
 Ring.class   | Bin 0 -> 908 bytes
 Ring.java    |  18 ++++++++++++++++++
 4 files changed, 34 insertions(+)
 create mode 100644 Proov1.class
 create mode 100644 Proov1.java
 create mode 100644 Ring.class
 create mode 100644 Ring.java

diff --git a/Proov1.class b/Proov1.class
new file mode 100644
index 0000000000000000000000000000000000000000..2e1ede0170ab117ad5cc69d96c9d26910477efb8
GIT binary patch
literal 832
zcmaJ<+fEZv6kVs6nRYq~LR-901VkOK74Nl32oj$v5^G3^zD(&zhRmf-XGr`UKS2|w
zi5Oq{=0_RV>6jF(@jRTp&faUEz4kum=dW)+06fH|h9W8|W|XZW9b6hxxT$O{B&R%P
zF{ff)Lmm|wx+T#<4!5PfBRzK|GBhk=NgkI~tf*KOP&RDO4mSnT#^Sy}=7rz31jZV+
zXYEFA%L?9_Er*_rYucVb*?8ADHc!l|V|qu`W*FGsQC%i#O+N|_t(UeW7xn_*KUrUs
zOdTbZng51NiPuzAb=<?cz|`M2ZAZ4#wgMgZ@jz$aj|9Z51dnw*k*=qxsd%QNjtw2p
zQKSB(l)(7#ve&I+>o8<ZV@FCm7ioU#hL+1_{fO~W(u(a@_t;0sZY<NS3#c92YnzTa
z7|IT7n4OO0wFRbm;Yj;`L^E&I7zx(@$JhJc<%He-Y5$aRa-p9LRG?^#=CQ!!pvQ}P
zrCh1r;p>$CC4du9_RVe>buouYek8e4ARA@wQ#@5@1#Nbz2l0hK;3{`z;1v8g*KnO!
zQa>YuH0{STqz;Nm_mFKQP$7Kv6}dCy4|>p+V-#ZO6PIFKCLSY>F&^W}kg{@)LVSV3
ml!=7Qh(tqKGf*iYjRK{VkwuL{-_!R2Idmvi;0EI<O#cSbuCo~c

literal 0
HcmV?d00001

diff --git a/Proov1.java b/Proov1.java
new file mode 100644
index 0000000..f30a3b6
--- /dev/null
+++ b/Proov1.java
@@ -0,0 +1,16 @@
+public class Proov1{
+	public static void main(String[] args){
+		Ring Ratas1=new Ring(5);
+		Ring Ratas2=new Ring(10);
+		System.out.println(Ratas1.pindala()+" "+Ratas1.ümbermõõt());
+		System.out.println(Ratas2.pindala()+" "+Ratas2.ümbermõõt());
+		System.out.println(Ratas1.Vastus());
+		System.out.println(Ratas2.Vastus());
+	}
+}
+
+//[georvalg@greeny t02klass]$ java Proov1
+//78.5 31.400000000000002
+//314.0 62.800000000000004
+//Ringi raadiusega 5.0 ümbermõõt on 31.400000000000002 ja pindala on 78.5.
+//Ringi raadiusega 10.0 ümbermõõt on 62.800000000000004 ja pindala on 314.0.
\ No newline at end of file
diff --git a/Ring.class b/Ring.class
new file mode 100644
index 0000000000000000000000000000000000000000..7be72fa8642d17c119603a0e1f46154dbbb2f767
GIT binary patch
literal 908
zcmaJ<+int36kUhQFpR@hu!6OnTIHq%wRo?l(dtvxv@}incz_8xTxKRPWBdXC!56<l
zO$3ZJ`oNpN;y<YS01=ZmW-|Niv-a9+UuJ&%`tl7x6%RF>LoS58ih>3oieaQtQnte@
zpZ9*gSyi?(Gbe<r8Z_ioT$AU9G-VYPjp)}^+>qx@6`K;ThHxu{+YGEv?+$~qB`o1S
zVh9v=iidPOv707CY*$$33$Ir<`v<(<B_vXFd86~3JJUPKFoYaoHF=ja_zOkS(kEYK
zLT@sh3|*2w<OA0mFr*5_-8O&4D_w52DmAw+tkwett!8`uhWSiL`S3o0Wy#W!!5xO|
zB4gjPT+uV1zHXR~D{PC}tJ!tY<F02oqSNsPGUu+2C7fqiS|rX&J@!PmY0|t2Swk3o
z&YQv;m@RJTxQF}FP&*0Z-}VjLqUah7DrU4f)tQbugI6WY$~v~NPAikL4Dm(Xm-V*U
zpbgMkXr<}G$>}AoaK|yNCd0;QgcCXQF{smJ`c(f3tFAp8oZ3&*F9a}pX*Xm8<Y$m2
zdx36ybobMlEseqQ(YNmqIfm~j=^rETy_6p!_>rPMER#(V7sL+GlR}VG6kH@E0`{8#
zUkEEwih-6hm(LMZmX4;Nls+NYnVR=gmXuVcQI#z1d7iU2&k3iXo=Vq=cnRxs`T=z$
zOH_}c9gT4&sgDqmc_T!VG3k#GmwsaAC#8Ru{1H+g{x%YwZXrf9#j%MPDPE?S4_E#G
Dtp~X;

literal 0
HcmV?d00001

diff --git a/Ring.java b/Ring.java
new file mode 100644
index 0000000..0902685
--- /dev/null
+++ b/Ring.java
@@ -0,0 +1,18 @@
+public class Ring{
+	double r;
+	public Ring(double raadius){
+		if(raadius<=0){throw new RuntimeException("Sobimatu pikkus");}
+		r=raadius;
+	}
+	public double pindala(){
+		return (3.14*r*r);
+	}
+
+	public double ümbermõõt(){
+		return 2*3.14*r;
+	}
+	public String Vastus(){
+		return "Ringi raadiusega "+r+" ümbermõõt on "+
+		       ümbermõõt()+" ja pindala on "+pindala()+".";
+	}
+}
\ No newline at end of file