Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Practice1, Practice2, Lab1_var4 and lab2_var 3 are ready Zheludkov #3

Open
wants to merge 92 commits into
base: ikbo-01-19
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
38f8349
Add files
kimoror Sep 3, 2020
54c1e22
delete files
kimoror Sep 3, 2020
217c41a
Add files in lab_1-Желудков
kimoror Sep 3, 2020
9784f42
Rename catalog
kimoror Sep 5, 2020
ddb64ef
Delete catalog lab_1-Желудков
kimoror Sep 5, 2020
3e9df76
add catalog lab1_var4-Zheludkov
kimoror Sep 5, 2020
8ee702f
add files
kimoror Sep 5, 2020
7e2a8b9
The lab1 is ready. Zheludkov Danila.
kimoror Sep 5, 2020
29a25b9
Lab2var3 is ready
kimoror Sep 5, 2020
13692ef
practice2.task1 is readygit status!
kimoror Sep 7, 2020
d3a970f
practice2.task2 is readygit status!
kimoror Sep 7, 2020
91f3669
lab3_var3 is ready!
kimoror Sep 8, 2020
f51afd0
Practice 3 is ready
kimoror Sep 11, 2020
f580c24
Rename catalog
kimoror Sep 12, 2020
edb26a8
Delete catalog practice3
kimoror Sep 12, 2020
355930d
Lab4 is ready!
kimoror Sep 13, 2020
4d1c386
Rename package
kimoror Sep 14, 2020
544bf17
Lab4 is ready!
kimoror Sep 15, 2020
52adbcb
practice4 is ready!
kimoror Sep 15, 2020
153e74e
Merge branch 'ikbo-01-19' of https://github.com/kimoror/ikbo-01-19 in…
kimoror Sep 15, 2020
97a6c20
Add lab5
kimoror Sep 27, 2020
3b545a3
Lab5 is ready
kimoror Sep 29, 2020
012a4e9
Practice 5 task 8 is ready!
kimoror Sep 30, 2020
9314f3f
task7 in practice 5 is ready
kimoror Oct 1, 2020
823fde8
practice5 is ready!
kimoror Oct 1, 2020
e20d570
Start work at lab6. Added the main window.
kimoror Oct 1, 2020
392d3e0
Add text area, button and some dialog message
kimoror Oct 6, 2020
5f57778
add check for input in LAb6
kimoror Oct 7, 2020
6208f67
Lab 6 is readygit add *
kimoror Oct 7, 2020
b222d69
Practice 6 is readygit add *
kimoror Oct 12, 2020
df26355
practice 7 is almost ready!
kimoror Oct 13, 2020
f859c7e
create project
kimoror Oct 14, 2020
e21cd48
add arrayList
kimoror Oct 14, 2020
6f4ff48
add remove and contain or doesnt contain num
kimoror Oct 14, 2020
dfbc70b
add methods:get, set. Lab 7 is readygit add *
kimoror Oct 14, 2020
839d5e0
lab 8 var 1 is ready
kimoror Oct 14, 2020
b24d980
lab 8 var 2 is ready!
kimoror Oct 14, 2020
4318513
add lab7 and lab 8
kimoror Oct 17, 2020
b9d427f
Start work on practice 8
kimoror Oct 19, 2020
33fbc4c
update git ignore
kimoror Oct 27, 2020
cbca23d
update gitignore
kimoror Oct 27, 2020
5a8fb8d
add WaitList Class
kimoror Oct 27, 2020
321e9e8
improve WaitList Class
kimoror Oct 27, 2020
888ffbd
add BoundedWaitList class
kimoror Oct 27, 2020
46b151b
add UnfairWaitList class
kimoror Oct 27, 2020
1a71ac9
add Main class
kimoror Oct 27, 2020
7fdc21d
update gitignore
kimoror Oct 27, 2020
0be51b1
Task1 is ready
kimoror Oct 28, 2020
40061a9
Task2 is ready
kimoror Oct 28, 2020
19b2540
Task3 is ready
kimoror Oct 28, 2020
ab364a0
Task3 is ready
kimoror Oct 28, 2020
1577c95
Task5 is ready
kimoror Oct 28, 2020
b3d05c2
Task6 and Task 7 is ready
kimoror Oct 28, 2020
a406cd5
Task8 is ready
kimoror Oct 28, 2020
df2484d
rename practice9 to lab9
kimoror Oct 29, 2020
df80400
delete practice9
kimoror Oct 29, 2020
38d3a14
Task1 from practice 9 is ready
kimoror Oct 29, 2020
9171036
Add Task2 ftom practice 9.Practice 9 is ready
kimoror Oct 30, 2020
7ae4d87
start dev
kimoror Nov 2, 2020
fd53293
lab 10 is ready
kimoror Nov 2, 2020
a66220b
Merge branch 'dev' into ikbo-01-19
kimoror Nov 2, 2020
a8f9a99
start pracitce10
kimoror Nov 2, 2020
08da956
Pracitce 10 task1 is ready
kimoror Nov 2, 2020
8f515fd
Merge branch 'dev' into ikbo-01-19
kimoror Nov 2, 2020
c87c644
Practice 10 task2 is ready!
kimoror Nov 2, 2020
dfc2843
practice 11 is ready!
kimoror Nov 6, 2020
15453c2
practice 12 task3 is readygit add *
kimoror Nov 9, 2020
6cdceae
lab12 is Ready!
kimoror Nov 10, 2020
9e98b23
hide gitignore files
kimoror Nov 10, 2020
60531df
Add Drink.java
kimoror Nov 16, 2020
a41d251
Add Drink.java, Dish.java
kimoror Nov 16, 2020
658c3ad
add Order.java
kimoror Nov 16, 2020
4db1be1
add Linkedlist.java
kimoror Nov 16, 2020
a78ee4b
Add setFirst, getFirst, getLast Methods;
kimoror Nov 16, 2020
1c96c88
improve bug
kimoror Nov 16, 2020
847a753
make Item abstract class and make Dish and Drink classes extends Item…
kimoror Nov 16, 2020
9ad1178
make Item interface again and add toArray method into LinkedList.java
kimoror Nov 16, 2020
f2ba253
Inteface orader is ready! Table order manager include all methods fro…
kimoror Nov 17, 2020
27b2b7f
make linked list Two-linked and add new Test for new list
kimoror Nov 17, 2020
e081552
Add to LinkedList.java addAll methods and constructors. Add tests in …
kimoror Nov 17, 2020
946edb6
Add constructors with arrays and collections in TablesOrderManager
kimoror Nov 17, 2020
5aed112
Rename TablesOrderManager.java to OrderManager.java. Add some methosd…
kimoror Nov 17, 2020
3a3cb25
Add RestaurantOrder class
kimoror Nov 17, 2020
fbf18ee
Add some methods to Order interface
kimoror Nov 17, 2020
c7d9bce
InternetOrder is ready!!!
kimoror Nov 17, 2020
9771346
Bug fixed in Method costTotal in OrderManager.java
kimoror Nov 17, 2020
ee76b71
Bug fixed all Methods in OrderManager.java
kimoror Nov 17, 2020
2d7b5f6
pracitce 16 is readygit add *!
kimoror Nov 17, 2020
f5b5b2f
test
kimoror Nov 21, 2020
0ca5a54
init
kimoror Nov 24, 2020
bf9f476
init
kimoror Nov 25, 2020
76846c0
lab16 is ready!!
kimoror Nov 25, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
### Folders ###
HELP.md
target/
out/
!**/src/ru/mirea/**
!**/src/**


### IntelliJ IDEA ###
*.idea
.idea
*.iws
*.iml
*.ipr

### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/

### VS Code ###
.vscode/

### Text files ###
*.txt


### macOS ###
.DS_Store
3 changes: 3 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Lab4_var1-Zheludkov/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions Lab4_var1-Zheludkov/.idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions Lab4_var1-Zheludkov/.idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Lab4_var1-Zheludkov/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Lab4_var1-Zheludkov/.idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Lab4_var1-Zheludkov/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions Lab4_var1-Zheludkov/Lab4_var1-Zheludkov.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
19 changes: 19 additions & 0 deletions Lab4_var1-Zheludkov/src/lab4/var1/Car.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package lab4.var1;

public class Car implements Nameable{
private String name;
private final double speed = 102;

public Car(String name){
this.name = name;
}
public Car(){};

public String getName() {
return name;
}

public double getSpeed() {
return speed;
}
}
18 changes: 18 additions & 0 deletions Lab4_var1-Zheludkov/src/lab4/var1/Main.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package lab4.var1;


public class Main {
public static void main(String[] args) {
Planet saturn = new Planet("Saturn");
Car car = new Car("Honda");
System.out.println("Name of planet: " + saturn.getName());
System.out.println("Name of car: " + car.getName());

Nameable obj = new Planet("Earth"); //Мы можем использовать только поля класса Planet,но не его методы.
//Методы, мы можем использовать только те, которые прописаны в интерфейсе.
System.out.println("Name of planet: " + obj.getName());
obj = new Car("Ford");
System.out.println("Name of car: " + obj.getName());

}
}
5 changes: 5 additions & 0 deletions Lab4_var1-Zheludkov/src/lab4/var1/Nameable.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package lab4.var1;

public interface Nameable {
String getName();
}
18 changes: 18 additions & 0 deletions Lab4_var1-Zheludkov/src/lab4/var1/Planet.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package lab4.var1;

public class Planet implements Nameable{
private String name;
private final double radius = 10;
public Planet(String name){
this.name = name;
}
public Planet(){};

public String getName() {
return name;
}

public double getRadius(){
return radius;
}
}
1 change: 0 additions & 1 deletion README.md

This file was deleted.

31 changes: 31 additions & 0 deletions lab10-Zheludkov/src/lab10/Task1/Main.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package lab10.Task1;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.lang.String;

public class Main {

public static <E> void arrayToList(E[] array, List<E> list){
list.addAll(Arrays.asList(array));
}

public static <E> void print(E[] array){
for(E it:array){
System.out.print(it + " ");
}
}

public static void main(String[] args) {
String[] array = new String []{"First", "Second", "Third", "Fouth", "Fifth"};
List<String> list = new ArrayList<>();

System.out.println("Array:");
print(array);
System.out.println();
arrayToList(array, list);
System.out.println("List:");
print(array);
}
}
Binary file added lab10_pr10.zip
Binary file not shown.
21 changes: 21 additions & 0 deletions lab12-zheludkov/src/lab12/task3/lab12.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package lab12.task3;

import java.util.regex.Matcher;
import java.util.regex.Pattern;

public class lab12 {
public static void main(String[] args) {
//String regex = "([0-31]){2}/([1-12]){2}/([1900-9999])";
Pattern mailPattern = Pattern.compile("([3][0-1]|[1-2][0-9]|[0][1-9])[/]([0][1-9]|[1][0-2])[/]([1][9][0-9][0-9]" +
"|[2-9][0-9][0-9][0-9])");
String date = new String("01/10/2343");
Matcher matcher = mailPattern.matcher(date);
if(matcher.matches()){
System.out.println("It is right date");
}
else
System.out.println("It is not right date");
}


}
Binary file added lab12_pr12.zip
Binary file not shown.
37 changes: 37 additions & 0 deletions lab16-Zheludkov/src/lab16/Address.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package lab16;

public final class Address {
private String cityName;
private int zipCode;
private String streetName;
private String StreetName;
private int buildingNumber;
private char buildingLetter;
private int apartmentNumber;

public Address EMPTY_ADDRESS;

public String getCityName() {
return cityName;
}

public int getZipCode() {
return zipCode;
}

public String getStreetName() {
return streetName;
}

public int getBuildingNumber() {
return buildingNumber;
}

public char getBuildingLetter() {
return buildingLetter;
}

public int getApartmentNumber() {
return apartmentNumber;
}
}
6 changes: 6 additions & 0 deletions lab16-Zheludkov/src/lab16/Alcoholable.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package lab16;

public interface Alcoholable {
boolean isAlcoholDrink();
double getAlcoholvol();
}
26 changes: 26 additions & 0 deletions lab16-Zheludkov/src/lab16/Customer.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package lab16;

public final class Customer {
private String firstName;
private String secondName ;
private int age;
private Address address;
private Customer MATURE_UNKNOWN_CUSTOMPER;
private Customer NOT_MATURE_UNKNOWN_COSTUMER;

public String getFirstName() {
return firstName;
}

public String getSecondName() {
return secondName;
}

public int getAge() {
return age;
}

public Address getAddress() {
return address;
}
}
4 changes: 4 additions & 0 deletions lab16-Zheludkov/src/lab16/Dish.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package lab16;

public final class Dish extends MenuItem {
}
32 changes: 32 additions & 0 deletions lab16-Zheludkov/src/lab16/Drink.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package lab16;

public final class Drink extends MenuItem implements Alcoholable{

private DrinkTypeEnum type;
private double alcoholVol;

// public Drink(int cost, String name, String description) {
// super(cost, name, description);
// if(name.equals(""))
// throw new IllegalArgumentException();
// if(description.equals(""))
// throw new IllegalArgumentException();
//
// }


public Drink(DrinkTypeEnum type, Double alcoholVol) {
this.type = type;
this.alcoholVol = alcoholVol;
}

@Override
public boolean isAlcoholDrink() {
return type.isAlcohol();
}

@Override
public double getAlcoholvol() {
return alcoholVol;
}
}
Loading