From ff526c705b0b7903ac140534e1122456465f998f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D0=B0=D1=82=D0=BE=D0=B2=20=D0=9C=D0=B0?= =?UTF-8?q?=D0=BA=D1=81=D0=B8=D0=BC?= <999099917@mail.ru> Date: Mon, 3 Jun 2024 20:14:49 +0300 Subject: [PATCH 1/5] add task --- .gitignore | 38 ++++++++++++++++++ .idea/.gitignore | 3 ++ pom.xml | 31 +++++++++++++++ src/main/java/org/example/Program.java | 12 ++++++ src/main/java/org/example/Sqrt.java | 29 ++++++++++++++ src/test/java/org/example/SqrtTests.java | 49 ++++++++++++++++++++++++ 6 files changed, 162 insertions(+) create mode 100644 .gitignore create mode 100644 .idea/.gitignore create mode 100644 pom.xml create mode 100644 src/main/java/org/example/Program.java create mode 100644 src/main/java/org/example/Sqrt.java create mode 100644 src/test/java/org/example/SqrtTests.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..00f686a --- /dev/null +++ b/pom.xml @@ -0,0 +1,31 @@ + + 4.0.0 + + org.example + ST-5-new + 1.0-SNAPSHOT + jar + + ST-5-new + http://maven.apache.org + + + UTF-8 + + + + + junit + junit + 4.13.1 + test + + + org.junit.jupiter + junit-jupiter-api + 5.11.0-M2 + test + + + diff --git a/src/main/java/org/example/Program.java b/src/main/java/org/example/Program.java new file mode 100644 index 0000000..979577c --- /dev/null +++ b/src/main/java/org/example/Program.java @@ -0,0 +1,12 @@ +package org.example; + +class Program +{ + public static void main(String[] args) + { + double val=Double.parseDouble("2.0"); + Sqrt sqrt=new Sqrt(val); + double result=sqrt.calc(); + System.out.println("Sqrt of " + val + " = " + result); + } +} diff --git a/src/main/java/org/example/Sqrt.java b/src/main/java/org/example/Sqrt.java new file mode 100644 index 0000000..e0faee9 --- /dev/null +++ b/src/main/java/org/example/Sqrt.java @@ -0,0 +1,29 @@ +package org.example; + +class Sqrt +{ + double delta=0.00000001; + double arg; + + public Sqrt(double arg) { + this.arg=arg; + } + public double average(double x,double y) { + return (x+y)/2.0; + } + public boolean good(double guess,double x) { + return Math.abs(guess*guess-x) Date: Mon, 3 Jun 2024 20:49:56 +0300 Subject: [PATCH 2/5] update pom.xml --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 00f686a..ea66f97 100644 --- a/pom.xml +++ b/pom.xml @@ -12,6 +12,8 @@ UTF-8 + 1.8 + 1.8 From 9893fccbb99f8729cf70d7a076a3c5483f459edf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D0=B0=D1=82=D0=BE=D0=B2=20=D0=9C=D0=B0?= =?UTF-8?q?=D0=BA=D1=81=D0=B8=D0=BC?= <999099917@mail.ru> Date: Mon, 3 Jun 2024 20:54:38 +0300 Subject: [PATCH 3/5] fix --- pom.xml | 10 +++++----- src/test/java/org/example/SqrtTests.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index ea66f97..0d399c7 100644 --- a/pom.xml +++ b/pom.xml @@ -18,15 +18,15 @@ - junit - junit - 4.13.1 + org.junit.jupiter + junit-jupiter-api + 5.10.2 test org.junit.jupiter - junit-jupiter-api - 5.11.0-M2 + junit-jupiter-engine + 5.10.2 test diff --git a/src/test/java/org/example/SqrtTests.java b/src/test/java/org/example/SqrtTests.java index 434b497..1e43459 100644 --- a/src/test/java/org/example/SqrtTests.java +++ b/src/test/java/org/example/SqrtTests.java @@ -1,7 +1,7 @@ package org.example; -import org.junit.Test; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class SqrtTests { private Sqrt sqrt; From 0491248053b7b749c5e75912e507fec5723b624f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D0=B0=D1=82=D0=BE=D0=B2=20=D0=9C=D0=B0?= =?UTF-8?q?=D0=BA=D1=81=D0=B8=D0=BC?= <999099917@mail.ru> Date: Mon, 3 Jun 2024 21:00:27 +0300 Subject: [PATCH 4/5] fix --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 0d399c7..3f7ba9d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,13 +1,13 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.example - ST-5-new + ST-5 1.0-SNAPSHOT jar - ST-5-new + ST-5 http://maven.apache.org @@ -30,4 +30,4 @@ test - + \ No newline at end of file From 87be9d48b2855bcb43d9d2c481167b9aa7cc68eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D0=B0=D1=82=D0=BE=D0=B2=20=D0=9C=D0=B0?= =?UTF-8?q?=D0=BA=D1=81=D0=B8=D0=BC?= <999099917@mail.ru> Date: Mon, 3 Jun 2024 21:08:22 +0300 Subject: [PATCH 5/5] add fix --- src/test/java/org/example/{SqrtTests.java => SqrtTest.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/test/java/org/example/{SqrtTests.java => SqrtTest.java} (97%) diff --git a/src/test/java/org/example/SqrtTests.java b/src/test/java/org/example/SqrtTest.java similarity index 97% rename from src/test/java/org/example/SqrtTests.java rename to src/test/java/org/example/SqrtTest.java index 1e43459..bea9319 100644 --- a/src/test/java/org/example/SqrtTests.java +++ b/src/test/java/org/example/SqrtTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class SqrtTests { +public class SqrtTest { private Sqrt sqrt; @Test