From e5a6619c4b436b2e03608c69ef597ccfbba622ec Mon Sep 17 00:00:00 2001
From: KristerTarnamaa <krister.tarnamaa@gmail.com>
Date: Mon, 29 May 2017 01:24:45 +0300
Subject: [PATCH] =?UTF-8?q?Lisasin=20ristk=C3=BCliku=20pindala=20ja=20?=
 =?UTF-8?q?=C3=BCmberm=C3=B5=C3=B5du=20arvutamise=20funktsioonid=20ning=20?=
 =?UTF-8?q?kommentaarid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Proov1.class    | Bin 0 -> 901 bytes
 Proov1.java     |  19 +++++++++++--------
 Ristkylik.class | Bin 0 -> 1006 bytes
 Ristkylik.java  |  13 ++++++++++---
 4 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 Proov1.class
 create mode 100644 Ristkylik.class

diff --git a/Proov1.class b/Proov1.class
new file mode 100644
index 0000000000000000000000000000000000000000..d5c05a9f25d5bd4710d5311797fa29767bd1ca96
GIT binary patch
literal 901
zcmaJ=ZBNrs6n^er+OC!t#|DU?RZu%#HbI=q5GFK!nn;`>A%5y;vy^r1>{^oj8UKSO
zY>5!R?3+Kzc<#Dn;*9;!``qU~=iKL<)BgPR{Re<;=rR_tEMi3{&l5q9P+p0Ej2IpX
zWhvST<wOKhc#J0^G#L|E=9(Nws}k1uy3Uymj`A`Jcq(C2!WJj<BA$uZW)OC5*ADg=
z;#%&6A#v!L7Q<A<cCDkZS+o3)M$I86(KKwAVOIN8IX5nhf@8S#LN)Mhw_f6ba@7m{
zGwZF*#kY=q&%4;nbESg2SY$|ju-ieS<Jb*OJQq<^@B%Lx=KfB15ZaDu`3hcPM?nd@
z3{2(VwSqlP?V~K>je-LlGTa;F?O#*kP<4#Z+)`V%YZ{KBdhU)&`PC!xsP?aUG0pyE
z|I!Q_ZGIv|E*Yjr7T(v+t+Rk3sp&c|>yM*qryW>LYLpj}ARD#8_6o<;gMd0=8O;)d
zIJ|w(P@OI@S}n^p85T7?H`cmgtrWMRjUAT$r%!bT^%RTbMGCxV5)2t_JczQ-3@W^7
zmV4#a9U5!)U$>v&0q)QT$)6Y)pCi4OXtzWwqcyqO1N%yV=0I;@K+>#nA1Yxk{X%S<
zR{sjI(+uJnBzq7m(N4-hrro=5P_8g>+QZ~p7gJqKr*C(WCOkv9i%b{Ukt97!XX``V
mT!e4vC~lr2M!puv1CYQZl2n37ACQbX{S=>xVN@h9@8NIZHO689

literal 0
HcmV?d00001

diff --git a/Proov1.java b/Proov1.java
index 2a89609..fc6509e 100644
--- a/Proov1.java
+++ b/Proov1.java
@@ -1,12 +1,15 @@
 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());
+		
+		Ristkylik laud1=new Ristkylik(6, 10);  //teeb uue ristküliku
+		Ristkylik laud2=new Ristkylik(3, 2.5);
+		
+		System.out.println(laud1.pindala()+" "+laud1.ymberm66t());  //arvutab ja prindib pindala ja ümbermõõdu
+		
+		//Manuaalselt lisatud tekstiga
+		System.out.println("Ristküliku laud2 pindala on: "+ laud2.pindala()+" Ning ümbermõõduks: "+laud2.ymberm66t());
+		
+		//toString funktsiooni kasutades
+		System.out.println(laud1.toString());
 	}
 }
\ No newline at end of file
diff --git a/Ristkylik.class b/Ristkylik.class
new file mode 100644
index 0000000000000000000000000000000000000000..ae5bfff295cbad783995c71e551b6320a0c8160e
GIT binary patch
literal 1006
zcmZuvT~E_c7=F$MYge{`bBH2pMS*p~<_Dr8iqYv6YQl^OcXnGt4r{w+v<Ci(H~t1S
zVIvWu7rXOEsn6L4OT>#l=ly)n`#z_?et-V~U>WNMCNZyJK}X&|43>^U5;@#bu&80l
zfR1?`MRk@G+}3eN$6bT@dpefYd0)qhN<Gl<P{ShuVe>2Vs|qC6q%Xs#0;BnI*?KQ9
z@}gOH1jaX{@4Sh;s?&OBS6xQZmC&v=UfV&>CzpU0NWX5oq>JY*5+?Umy|=Ow3g}_8
z61JqjEs)Dw8$0$#yX4ybcBvnIEMQccQLE;>l8QaEDR;xhzAGC=Rhq&jtO`sI+cqOV
zl%Df)ujT}yZ2BCr(yU6)4kI&=jYhPqdPti&4ZF5f(F>SL;UcC4riOI=DV|5ttvfA&
zvEKFFW8QD3u!biJsEXL*5Z<EcN!NAE?s0FwZoAtK&8EM~((5n<vaImADhKK5(b#3?
zn#!cjRuqMv<4}sQn8GY>P^Qye1tx|gy{+yzH7Z9f`3{r$vzn=R!VUt*uL~^wui#A2
zU_<IMlP{lrhLbe+$njSL|1l`Rh)|jlM<6KdH1RUMfc_}YQsEF{A@k`o(npAGW#fk!
z`DqRPQRNpF+DH_vHneYSiD8B~jRY}48l6`raT8;(kU|k@Tw!J$u|G`2HC&Cyl`E8z
zgWG3&(*Q={fW!yT8eiDL-FlRQI6;qZGN@l1)aOp>Ysyfd)&A|AWDlQb(D?yzTEMd-
z=v#+KW{nQURC5QZY`Sl2%FZaegK=d~^zC!X&eHDS{MXa@GGtVm&QZ;Eo`S0@QRe;v
Dv3|_)

literal 0
HcmV?d00001

diff --git a/Ristkylik.java b/Ristkylik.java
index 9da2e76..72b9bfc 100644
--- a/Ristkylik.java
+++ b/Ristkylik.java
@@ -1,20 +1,27 @@
 public class Ristkylik{
+	
+	//Tekitab muutujad a ja b double andmetüübiga
 	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;
 	}
+	//Arvutab Pindala
 	public double pindala(){
 		return a*b;
 	}
-	//lisage funktsioon ristkyliku ymberm66du arvutamiseks
+	
+	//Arvutab ümbermõõdu
 	public double ymberm66t(){
 		return a+b+a+b;
 	}
 	public String toString(){
-		return "Ristkylik "+a+"x"+b+"m, ymberm66t "+
-		       ymberm66t()+"m, pindala "+pindala()+" ruutmeetrit.";
+		return "Ristkülik "+a+"x"+b+"m, mille ümbermõõt on: "+
+		       ymberm66t()+"m, ning pindalaks "+pindala()+" ruutmeetrit.";
 	}
 }
\ No newline at end of file