From 671005bfdcb2eda50fa9762df3216b6dbe35e1f3 Mon Sep 17 00:00:00 2001
From: tima297 <66067646+tima297@users.noreply.github.com>
Date: Mon, 8 Dec 2025 14:00:07 +0300
Subject: [PATCH 1/2] Programm for maximum
---
.idea/.gitignore | 3 ++
.idea/compiler.xml | 13 +++++++
.idea/encodings.xml | 7 ++++
.idea/jarRepositories.xml | 20 +++++++++++
.idea/java-first-project.iml | 9 +++++
.idea/misc.xml | 14 ++++++++
.idea/modules.xml | 8 +++++
.idea/vcs.xml | 6 ++++
.../src/main/java/org/example/Main.java | 36 ++++---------------
9 files changed, 87 insertions(+), 29 deletions(-)
create mode 100644 .idea/.gitignore
create mode 100644 .idea/compiler.xml
create mode 100644 .idea/encodings.xml
create mode 100644 .idea/jarRepositories.xml
create mode 100644 .idea/java-first-project.iml
create mode 100644 .idea/misc.xml
create mode 100644 .idea/modules.xml
create mode 100644 .idea/vcs.xml
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/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..8313af2
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..f307345
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..712ab9d
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/java-first-project.iml b/.idea/java-first-project.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/java-first-project.iml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..fe9e47f
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..0314a68
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/first-project/src/main/java/org/example/Main.java b/first-project/src/main/java/org/example/Main.java
index b150994..a0b3b09 100644
--- a/first-project/src/main/java/org/example/Main.java
+++ b/first-project/src/main/java/org/example/Main.java
@@ -1,33 +1,11 @@
-package org.example;
-
public class Main {
public static void main(String[] args) {
- int a = -1;
- int b = 2;
- double d = 2.2;
- float f = 2.2f;
- String s = "just-string";
- boolean l = true;
-// System.out.println(a + b);
-
-// if (a > 0) {
-// System.out.println(a);
-// }else{
-// System.out.println("a<=0");
-// }
-// int i = 0;
-// while(i < 10){
-// System.out.println(i);
-// i++;
-// }
-
- Human human = new Human(30, 180);
- Human human1 = new Human(29, 179);
- Human baby1 = new Human(55);
-
-
- System.out.println(baby1.olderThan18());
- System.out.println(human.getAge());
+ int a = 10;
+ int b = 25;
+ int c = 15;
+ int d = 30;
+ int max = Math.max(Math.max(a, b), Math.max(c, d));
+ System.out.println("Максимальное число: " + max);
}
-}
\ No newline at end of file
+}
From e477d9821a1d5253b2512c1a737b7993a97c255d Mon Sep 17 00:00:00 2001
From: Timofey Leonchik <66067646+tima297@users.noreply.github.com>
Date: Sun, 11 Jan 2026 16:23:44 +0300
Subject: [PATCH 2/2] Update Main.java
---
first-project/src/main/java/org/example/Main.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/first-project/src/main/java/org/example/Main.java b/first-project/src/main/java/org/example/Main.java
index a0b3b09..a5d0324 100644
--- a/first-project/src/main/java/org/example/Main.java
+++ b/first-project/src/main/java/org/example/Main.java
@@ -1,9 +1,9 @@
public class Main {
public static void main(String[] args) {
- int a = 10;
- int b = 25;
- int c = 15;
- int d = 30;
+ int a = 52;
+ int b = 76;
+ int c = 2025;
+ int d = 2026;
int max = Math.max(Math.max(a, b), Math.max(c, d));
System.out.println("Максимальное число: " + max);