From 23df219cb2706769c731f6449ddcbcf15e2a42b6 Mon Sep 17 00:00:00 2001
From: kacheniuk <59092380+kacheniuk@users.noreply.github.com>
Date: Mon, 20 Jan 2020 22:22:17 +0200
Subject: [PATCH 1/3] Add Math
---
Math/src/MAIN.java | 9 +++++++++
Math/src/Math.java | 18 ++++++++++++++++++
2 files changed, 27 insertions(+)
create mode 100644 Math/src/MAIN.java
create mode 100644 Math/src/Math.java
diff --git a/Math/src/MAIN.java b/Math/src/MAIN.java
new file mode 100644
index 0000000..52602d6
--- /dev/null
+++ b/Math/src/MAIN.java
@@ -0,0 +1,9 @@
+public class MAIN {
+
+ public static void main(String[] args){
+ System.out.println(Math.lenght(5,3.14));
+ System.out.println(Math.square(5,3.14));
+ System.out.println(Math.squareR(5,3.14,12,5));
+ }
+
+}
diff --git a/Math/src/Math.java b/Math/src/Math.java
new file mode 100644
index 0000000..376d09d
--- /dev/null
+++ b/Math/src/Math.java
@@ -0,0 +1,18 @@
+public class Math {
+
+ public static final double PI = 3.14;
+ public static final int R = 178;
+ public static final int H = 126;
+ public static final int K = 360;
+
+ public static double lenght ( int R, double PI) {
+ return (2*PI*R*R);
+ }
+ public static double square ( int R, double PI) {
+ return (PI*R*R);
+ }
+ public static double squareR (int R, double Pi, int H, int K) {
+ return ((Pi*R*R*H)/K);
+ }
+
+}
From 7232d2dbf211f43ec37e63a31508cae3dd70f7aa Mon Sep 17 00:00:00 2001
From: kacheniuk <59092380+kacheniuk@users.noreply.github.com>
Date: Mon, 20 Jan 2020 22:28:36 +0200
Subject: [PATCH 2/3] Add Math
---
Math/Math.iml | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 Math/Math.iml
diff --git a/Math/Math.iml b/Math/Math.iml
new file mode 100644
index 0000000..37cc804
--- /dev/null
+++ b/Math/Math.iml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 9fc0f2999711efb4097ba559867002bb74014741 Mon Sep 17 00:00:00 2001
From: kacheniuk <59092380+kacheniuk@users.noreply.github.com>
Date: Mon, 20 Jan 2020 22:59:31 +0200
Subject: [PATCH 3/3] Add Math
---
Math/Math.iml | 11 -----------
Math/src/MAIN.java | 3 +++
Math/src/Math.java | 3 +--
3 files changed, 4 insertions(+), 13 deletions(-)
delete mode 100644 Math/Math.iml
diff --git a/Math/Math.iml b/Math/Math.iml
deleted file mode 100644
index 37cc804..0000000
--- a/Math/Math.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Math/src/MAIN.java b/Math/src/MAIN.java
index 52602d6..25e81de 100644
--- a/Math/src/MAIN.java
+++ b/Math/src/MAIN.java
@@ -4,6 +4,9 @@ public static void main(String[] args){
System.out.println(Math.lenght(5,3.14));
System.out.println(Math.square(5,3.14));
System.out.println(Math.squareR(5,3.14,12,5));
+ System.out.println(Math.R);
+ System.out.println(Math.H);
+ System.out.println(Math.K);
}
}
diff --git a/Math/src/Math.java b/Math/src/Math.java
index 376d09d..0ddcb2b 100644
--- a/Math/src/Math.java
+++ b/Math/src/Math.java
@@ -1,7 +1,6 @@
public class Math {
- public static final double PI = 3.14;
- public static final int R = 178;
+ public static final int R = 12;
public static final int H = 126;
public static final int K = 360;