From 4a6ce345cb5d74e929959116714cddcdd0f464a3 Mon Sep 17 00:00:00 2001
From: Stiv0 <stivo.sirel@gmail.com>
Date: Mon, 22 May 2017 21:06:47 +0300
Subject: [PATCH] Stivo Sirel silinder

---
 Rakendus.class | Bin 0 -> 545 bytes
 Rakendus.java  |  15 +++++++++++++++
 Silinder.class | Bin 0 -> 1071 bytes
 Silinder.java  |  18 ++++++++++++++++++
 4 files changed, 33 insertions(+)
 create mode 100644 Rakendus.class
 create mode 100644 Rakendus.java
 create mode 100644 Silinder.class
 create mode 100644 Silinder.java

diff --git a/Rakendus.class b/Rakendus.class
new file mode 100644
index 0000000000000000000000000000000000000000..5a21e143d04295ed9fa5a2187deaf9a03146577b
GIT binary patch
literal 545
zcmY*VO;5r=5Pe&qg<1p@P*G6)te?FYFDN0ActSK{OpK=j8?x9I1I5Ijr3Xng@dx;$
zjI%Tb+{3;%GjI0I?Dx;d7l31!Iucmau%uQfmPf5b1ENDgPOZ!Zky=RyB!*?I=*Xj>
zVO7H#gL*1F;g=ag=I$Ls_`KKV42hcXczx(LdH>dKI+O{!w(uCT=0mM(KiigLdmXFc
z_l4If$ws}=8}?iLLP&A^#(v~pdpJ0fS_4U>7@`f~2(QiiGA?RZH?V<C4O<4bu|xI0
zCWhq1;;Px@EuSG`R;$uys?>NH_}rz*dqWarg1JP`x~8Fg8jag-iD7>H*8env_9R6P
zZIm&m77E;GArvu7pDT|7az%=6`I~t{Mi|)}fxQwT2fEd9k|BmPGQ_3SqimS4{0Zeg
zjZhkq5wuzmMH9p?1Fln%qWT+*{ddF(4gxqNn0OSR(Q6SJOht~kNp2Q&oL~lLh?8rU
I>IxQq0oJHw+W-In

literal 0
HcmV?d00001

diff --git a/Rakendus.java b/Rakendus.java
new file mode 100644
index 0000000..47dffe3
--- /dev/null
+++ b/Rakendus.java
@@ -0,0 +1,15 @@
+public class Rakendus{
+	
+	public static void main(String[] args){
+	
+		Silinder s1 = new Silinder(2, 3);
+		Silinder s2 = new Silinder(4.5, 1);
+		Silinder s3 = new Silinder(5, 2);
+		
+		System.out.println(s1);
+		System.out.println(s2);
+		System.out.println(s3);
+		
+	}
+	
+}
\ No newline at end of file
diff --git a/Silinder.class b/Silinder.class
new file mode 100644
index 0000000000000000000000000000000000000000..ce368ffca604fc50f04f7a1b7eb6de3d5f438509
GIT binary patch
literal 1071
zcmZuvZBNrs6n^eH+EO=|qsWUWLs8ZV8!Em5;)H>3poS46AMdtilx|&9TJ@*+#owSN
zGK?hp-M?g_oVylhz$W+H^Y%RF^ql+i_qXo==I~6z1>_YJRLp9K;kt?&y%@tyA?6g^
zl8Yk~zqU#<!*Y=T;?tnwwp{ED-3sn#NFlG{uDI_BF|T4l#iB+O_f;&3`+<t02t8D=
ztYC$K?a(RF@fhSq%dz|=hMsJxWV~XCue53=L;t$vn9qY|#q_p#r9qx#+2>VzgS#D@
zxEK`Ia%#N68KkU1go+mg&5o`5t+MY~PMtx|8tc3K4KFmfQ!j+x1qQ9$3cRYhW`*2V
zgQ!d|FESID0I`jBQJaC|TTOHIUDb4btL0FC<yOUNazDtpmTd=n0<+4{_t)LvmhfK0
zcmf%WQ>aU~!Tp^C*6@g7sOt?|TMn!SHNr4Zj(W=2Ew3KznRT8?;4z*E@s#F~+2xr|
z6%k=bXSh>qnzecDWjK|2N}ocOepTBH=OR3Y@Gvcb9Ii2_$3+-Y-A-OqcFn5anJR5$
zFnfA_VpEdadK>MHrX_RNHJuv6%>U9)F+{&fix|t6PA}*<Oj8}BR|<Nb5VI7IP>hpg
z9E_ruNM0t(CA)|2Lhb-;s_*>=Bo7hWPD=-f|1i3CkFax7`;c?SK9tV{iD8oDC}ffn
z(Zrz>)g;*l6y)j2U!h1pVt*(gDYz<0!enB&QT16$W|TCnqc`^jijFg1k+efgwyPg0
z#yVxfJdG?`M1-D>(7KMkf6%1L_DN)tFtoV{`I;IQb&H2cZ6DxlI^D*Az_p>L2SZ&E
f`Z=MuF(mZiP#+QcDCupS|8%0i6tPZ|FNT>TjiA**

literal 0
HcmV?d00001

diff --git a/Silinder.java b/Silinder.java
new file mode 100644
index 0000000..45dd531
--- /dev/null
+++ b/Silinder.java
@@ -0,0 +1,18 @@
+public class Silinder{
+	double h, r;
+	public Silinder(double korgus, double laius){
+		if(korgus<=0){throw new RuntimeException("Sobimatu pikkus");}
+		if(laius <=0){throw new RuntimeException("Sobimatu laius");}
+		h = korgus;
+		r = laius;
+	}
+	public double pindala(){
+		return (2*Math.PI*Math.pow(r,2)) + (2*Math.PI*h);
+	}
+	public double ruumala(){
+		return Math.PI*Math.pow(r,2)*h;
+	}
+	public String toString(){
+		return "Silinder korgusega "+h+" ja laiusega "+r+" andmed:\nPindala: "+pindala()+"\nRuumala: "+ruumala()+"\n";
+	}
+}
\ No newline at end of file