Merge branch 'main' into feuters/lab1

Author: DNLdmitrylavrischev

.editorconfig

@@ -0,0 +1,20 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# http://editorconfig.org
+
+root = true
+
+[*]
+
+# Change these settings to your own preference
+indent_style = space
+indent_size = 4
+
+# We recommend you to keep these unchanged
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

SECURITY.md

@@ -0,0 +1,18 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| < 4.0   | :x:                |
+
+## Reporting a Vulnerability
+
+Use this section to tell people how to report a vulnerability.
+
+Tell them where to go, how often they can expect to get an update on a
+reported vulnerability, what to expect if the vulnerability is accepted or
+declined, etc.

pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>ru.mirea.practice</groupId>
@@ -13,8 +13,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
-        <version.junit>1.11.1</version.junit>
-        <version.jupiter>5.11.1</version.jupiter>
+        <version.junit>1.11.2</version.junit>
+        <version.jupiter>5.11.2</version.jupiter>
         <version.pmd>6.52.0</version.pmd>
     </properties>
 
@@ -27,6 +27,7 @@
     </scm>
 
     <modules>
+        <module>students/23K0623</module>
         <module>students/0000001</module>
         <module>students/23K0093</module>
         <module>students/23K0690</module>
@@ -44,6 +45,7 @@
         <module>students/23K0364</module>
         <module>students/23K0155</module>
         <module>students/23K0114</module>
+        <module>students/23K0815</module>
         <module>students/23K0341</module>
         <module>students/23K0823</module>
         <module>students/23K0087</module>
@@ -54,7 +56,6 @@
         <module>students/23K0116</module>
         <module>students/23K0339</module>
         <module>students/23K0691</module>
-        <module>students/23K0815</module>
         <module>students/23K0089</module>
         <module>students/23K0375</module>
         <module>students/23K0340</module>
@@ -68,9 +69,18 @@
         <module>students/23K0130</module>
         <module>students/23K0164</module>
         <module>students/23K0140</module>
+        <module>students/23K0505</module>
         <module>students/23K0359</module>
         <module>students/23K0688</module>
         <module>students/23K0355</module>
+        <module>students/23K0215</module>
+        <module>students/23K1167</module>
+        <module>students/23K1226</module>
+        <module>students/23K9901</module>
+        <module>students/23K0145</module>
+        <module>students/23K0186</module>
+        <module>students/23K0755</module>
+        <module>students/23K0362</module>
     </modules>
     <dependencies>
         <dependency>

students/23F0011/23F0011-p04_1/pom.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>23F0011</artifactId>
+        <groupId>ru.mirea.practice</groupId>
+        <version>2024.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>23F0011-p04_1</artifactId>
+    <description>Массивы</description>
+</project>

students/23F0011/23F0011-p04_1/src/main/java/ru/mirea/practice/s23f0011/Task2.java

@@ -0,0 +1,68 @@
+package ru.mirea.practice.s23f0011;
+
+public class Task2 {
+    private final String number;
+    private final String model;
+    private final double weight;
+
+    public Task2(String number, String model, double weight) {
+        this.number = number;
+        this.model = model;
+        this.weight = weight;
+    }
+
+    // Конструктор с двумя параметрами
+    public Task2(String number, String model) {
+        this(number, model, 0.0);
+    }
+
+    public Task2() {
+        this("", "");
+    }
+
+    public static void main(String[] args) {
+        Task2 phone1 = new Task2("123-456-7890", "iPhone 13", 200.0);
+        Task2 phone2 = new Task2("987-654-3210", "Samsung Galaxy S22");
+        phone1.printInfo();
+        System.out.println();
+        phone2.printInfo();
+        System.out.println();
+        Task2 phone3 = new Task2();
+        phone3.printInfo();
+        System.out.println();
+
+        phone1.receiveCall("Роман");
+        System.out.println("Номер: " + phone1.getNumber());
+        System.out.println();
+        phone2.receiveCall("Аня", "111-222-3333");
+        System.out.println("Номер: " + phone2.getNumber());
+        System.out.println();
+
+        phone3.sendMessage("123-456-7890", "987-654-3210", "111-222-3333");
+    }
+
+    public void receiveCall(String name) {
+        System.out.println("Звонит " + name);
+    }
+
+    public void receiveCall(String name, String phoneNumber) {
+        System.out.println("Звонит " + name + " с номера " + phoneNumber);
+    }
+
+    public String getNumber() {
+        return number;
+    }
+
+    public void sendMessage(String... numbers) {
+        System.out.println("Отправка сообщения на номера:");
+        for (String number : numbers) {
+            System.out.println(number);
+        }
+    }
+
+    public void printInfo() {
+        System.out.println("Номер: " + number);
+        System.out.println("Модель: " + model);
+        System.out.println("Вес: " + weight);
+    }
+}

students/23F0011/23F0011-p04_1/src/main/java/ru/mirea/practice/s23f0011/Task3.java

@@ -0,0 +1,35 @@
+package ru.mirea.practice.s23f0011;
+
+public class Task3 {
+    String fullName;
+    int age;
+
+    public Task3() {
+        fullName = "Человек без имени";
+        age = 0;
+    }
+
+    public Task3(String fullName, int age) {
+        this.fullName = fullName;
+        this.age = age;
+    }
+
+    public static void main(String[] args) {
+
+        Task3 person1 = new Task3();
+        person1.move();
+        person1.talk();
+
+        Task3 person2 = new Task3("Наиль Маратович", 30);
+        person2.move();
+        person2.talk();
+    }
+
+    public void move() {
+        System.out.println(fullName + " идет.");
+    }
+
+    public void talk() {
+        System.out.println(fullName + " говорит.");
+    }
+}

students/23F0011/23F0011-p04_1/src/main/java/ru/mirea/practice/s23f0011/Task4.java

@@ -0,0 +1,75 @@
+package ru.mirea.practice.s23f0011;
+
+public class Task4 {
+    private final double[][] matrix;
+    private final int rows;
+    private final int cols;
+
+    public Task4(int rows, int cols) {
+        this.rows = rows;
+        this.cols = cols;
+        matrix = new double[rows][cols];
+    }
+
+    public static void main(String[] args) {
+        Task4 matrix1 = new Task4(2, 3);
+        matrix1.set(0, 0, 1);
+        matrix1.set(0, 1, 2);
+        matrix1.set(0, 2, 3);
+        matrix1.set(1, 0, 4);
+        matrix1.set(1, 1, 5);
+        matrix1.set(1, 2, 6);
+
+        Task4 matrix2 = new Task4(2, 3);
+        matrix2.set(0, 0, 7);
+        matrix2.set(0, 1, 8);
+        matrix2.set(0, 2, 9);
+        matrix2.set(1, 0, 10);
+        matrix2.set(1, 1, 11);
+        matrix2.set(1, 2, 12);
+
+        Task4 sum = matrix1.add(matrix2);
+        System.out.println("Сумма матриц:");
+        sum.print();
+
+        Task4 multiplied = matrix1.multiply(2);
+        System.out.println("Матрица, умноженная на 2:");
+        multiplied.print();
+    }
+
+    public Task4 add(Task4 other) {
+        if (rows != other.rows || cols != other.cols) {
+            throw new IllegalArgumentException("Матрицы должны иметь одинаковые размеры");
+        }
+        Task4 result = new Task4(rows, cols);
+        for (int i = 0; i < rows; i++) {
+            for (int j = 0; j < cols; j++) {
+                result.matrix[i][j] = matrix[i][j] + other.matrix[i][j];
+            }
+        }
+        return result;
+    }
+
+    public Task4 multiply(double scalar) {
+        Task4 result = new Task4(rows, cols);
+        for (int i = 0; i < rows; i++) {
+            for (int j = 0; j < cols; j++) {
+                result.matrix[i][j] = matrix[i][j] * scalar;
+            }
+        }
+        return result;
+    }
+
+    public void print() {
+        for (int i = 0; i < rows; i++) {
+            for (int j = 0; j < cols; j++) {
+                System.out.print(matrix[i][j] + " ");
+            }
+            System.out.println();
+        }
+    }
+
+    public void set(int row, int col, double value) {
+        matrix[row][col] = value;
+    }
+}

students/23F0011/23F0011-p04_1/src/main/java/ru/mirea/practice/s23f0011/task9/Chair.java

@@ -0,0 +1,11 @@
+package ru.mirea.practice.s23f0011.task9;
+
+class Chair extends Furniture {
+    public Chair(String name, String material, double price) {
+        super(name, material, price);
+    }
+
+    public double calculatePrice() {
+        return price * 1.1; // Дополнительная наценка 10% на стулья
+    }
+}