From 70b184d6493643d14c86f7ce6ca8da034057e3f4 Mon Sep 17 00:00:00 2001 From: Vladymyr Vynnyk Date: Thu, 8 Dec 2016 11:16:22 +0200 Subject: [PATCH] 1.Employees-done 2.Fraction_Number->halfway -you can divide by 0 -no objects ONE/TEN --- .../java/Employees/Accountant.java | 24 +++ .../java/Employees/Employees.java | 40 +++++ .../changerequest/java/Employees/Manager.java | 27 ++++ .../java/Employees/Programmer.java | 30 ++++ .../changerequest/java/Employees/Test.java | 24 +++ .../java/Fraction_Number/FractionNumber.java | 139 ++++++++++++++++++ .../java/Fraction_Number/Test.java | 34 +++++ 7 files changed, 318 insertions(+) create mode 100644 src/main/java/school/lemon/changerequest/java/Employees/Accountant.java create mode 100644 src/main/java/school/lemon/changerequest/java/Employees/Employees.java create mode 100644 src/main/java/school/lemon/changerequest/java/Employees/Manager.java create mode 100644 src/main/java/school/lemon/changerequest/java/Employees/Programmer.java create mode 100644 src/main/java/school/lemon/changerequest/java/Employees/Test.java create mode 100644 src/main/java/school/lemon/changerequest/java/Fraction_Number/FractionNumber.java create mode 100644 src/main/java/school/lemon/changerequest/java/Fraction_Number/Test.java diff --git a/src/main/java/school/lemon/changerequest/java/Employees/Accountant.java b/src/main/java/school/lemon/changerequest/java/Employees/Accountant.java new file mode 100644 index 0000000..fd26330 --- /dev/null +++ b/src/main/java/school/lemon/changerequest/java/Employees/Accountant.java @@ -0,0 +1,24 @@ +package school.lemon.changerequest.java.Employees; + +/** + * Created by User on 05.12.2016. + */ +public class Accountant extends Employees { + private static int countAccountant; + public Accountant(String nameE, int workHoursE) { + super(nameE, workHoursE); + countAccountant++; + Manager.SalaryOverAll=Manager.SalaryOverAll+getSalary(); + } + @Override + public double getSalary() { + if (getRatio()<=1){return getRatio()*salaryPer160;} + else return salaryPer160; + + } + public static int getCount() { + return countAccountant; + } + + +} diff --git a/src/main/java/school/lemon/changerequest/java/Employees/Employees.java b/src/main/java/school/lemon/changerequest/java/Employees/Employees.java new file mode 100644 index 0000000..c864033 --- /dev/null +++ b/src/main/java/school/lemon/changerequest/java/Employees/Employees.java @@ -0,0 +1,40 @@ +package school.lemon.changerequest.java.Employees; + +/** + * Created by User on 05.12.2016. + */ +public class Employees { + public Employees(String nameE,int workHoursE){ + name=nameE; + workHours=workHoursE; + + } + +public String getName(){ + return name;} + + public double getSalary(){ + return salary; + } + public void SetSalary(int salarySet){ + salary=salarySet; + } + public double getRatio(){ + return (double)(workHours)/(double)(workHoursPerMonth); +} + public void setCount(){ + + } + public String getJob(){ + return job;} + + + + protected String name; + protected String job; + protected double salary; + protected int workHours; + final int workHoursPerMonth= 160; + protected int salaryPer160= 100; + +} \ No newline at end of file diff --git a/src/main/java/school/lemon/changerequest/java/Employees/Manager.java b/src/main/java/school/lemon/changerequest/java/Employees/Manager.java new file mode 100644 index 0000000..d808364 --- /dev/null +++ b/src/main/java/school/lemon/changerequest/java/Employees/Manager.java @@ -0,0 +1,27 @@ +package school.lemon.changerequest.java.Employees; + +/** + * Created by User on 05.12.2016. + */ +public class Manager extends Employees{ + protected static double SalaryOverAll; + public Manager(String nameE, int salaryE) { + super(nameE,salaryE); + Manager.SalaryOverAll=Manager.SalaryOverAll+getSalary(); + } + @Override + public double getSalary() { + if (getRatio()<=1){return getRatio()*salaryPer160;} + else return salaryPer160; + + } + public void setSalaryPer160(int n){ + salaryPer160=n; + } + public double SalaryOverAll(){ + + + + return SalaryOverAll; + } +} \ No newline at end of file diff --git a/src/main/java/school/lemon/changerequest/java/Employees/Programmer.java b/src/main/java/school/lemon/changerequest/java/Employees/Programmer.java new file mode 100644 index 0000000..5e4ff85 --- /dev/null +++ b/src/main/java/school/lemon/changerequest/java/Employees/Programmer.java @@ -0,0 +1,30 @@ +package school.lemon.changerequest.java.Employees; + +/** + * Created by User on 05.12.2016. + */ +public class Programmer extends Employees { + + private static int countProgrammer; + public Programmer(String nameE,int workHoursE) { + super(nameE, workHoursE); + countProgrammer++; + Manager.SalaryOverAll=Manager.SalaryOverAll+getSalary(); + } + + @Override + public double getSalary() { + + return getRatio()*salaryPer160; + + + } + public void setSalaryPer160(int n){ + salaryPer160=n; +} + public static int getCount() { + return countProgrammer; +} +} + + diff --git a/src/main/java/school/lemon/changerequest/java/Employees/Test.java b/src/main/java/school/lemon/changerequest/java/Employees/Test.java new file mode 100644 index 0000000..b726e4c --- /dev/null +++ b/src/main/java/school/lemon/changerequest/java/Employees/Test.java @@ -0,0 +1,24 @@ +package school.lemon.changerequest.java.Employees; + +/** + * Created by User on 07.12.2016. + */ +public class Test { + public static void main(String[] args) { + + Programmer c1= new Programmer("Petro",160); + System.out.println(c1.getName()+" "+c1.getSalary()); + Programmer c2= new Programmer("Pavlo", 320); + System.out.println(c2.getName()+" "+c2.getSalary()); + Manager c3= new Manager("Colya",100); + System.out.println(c3.getName()+" "+c3.getSalary()); + Manager c4=new Manager("Kolya", 999); + System.out.println(c4.getName()+" "+c4.getSalary()); + Accountant c5=new Accountant("Colya",160); + System.out.println(c5.getName()+" "+c5.getSalary()); + Accountant c6= new Accountant("Kolya",999); + System.out.println(c6.getName()+" "+c6.getSalary()); + + System.out.println("salary for all accountable employees " + Manager.SalaryOverAll); + } +} diff --git a/src/main/java/school/lemon/changerequest/java/Fraction_Number/FractionNumber.java b/src/main/java/school/lemon/changerequest/java/Fraction_Number/FractionNumber.java new file mode 100644 index 0000000..3f4ee77 --- /dev/null +++ b/src/main/java/school/lemon/changerequest/java/Fraction_Number/FractionNumber.java @@ -0,0 +1,139 @@ +package school.lemon.changerequest.java.Fraction_Number; + +/** + * Created by User on 07.12.2016. + */ +public class FractionNumber { + public FractionNumber() { + } + + public FractionNumber(int Numerator, int Denominator) { + this.Numerator = Numerator; + + if(Denominator==0){System.out.println("WRONG");} + else this.Denominator = Denominator; + } + + public FractionNumber(int NumeratorF) { + this(NumeratorF, 1); + } + + public int Get() { + int m = getNumerator(); + int n = getDenominator(); + int r = 0; + while (n != 0) { + r = m % n; + m = n; + n = r; + } + return m; + } + + public void Normalized() { + int div = Get(); + Numerator = Numerator / div; + Denominator = Denominator / div; + } + + + + public int getNumerator() { + return Numerator; + } + + public int getDenominator() { + return Denominator; + } + + public double getDecimalValue() { + return (double) Numerator / (double) Denominator; + } + public String toString() { + return Numerator + "/" + Denominator; + } + + + public FractionNumber add(FractionNumber a) { + int aN = a.getNumerator(); + int aD = a.getDenominator(); + int An = this.Numerator; + int Ad = this.Denominator; + if (this.Denominator == aD) { + aN = An + aN; + } else { + aN = aN * Ad; + An = An * aD; + aN = An + aN; + aD = Ad * aD; + } + FractionNumber b = new FractionNumber(aN, aD); + b.Normalized(); + return b; + } + public FractionNumber multiply(FractionNumber a) { + int aN = a.getNumerator(); + int aD = a.getDenominator(); + aN = aN * this.Numerator; + aD = aD * this.Denominator; + + FractionNumber b = new FractionNumber(aN, aD); + b.Normalized(); + return b; + } + public FractionNumber divide(FractionNumber a) { + int aN = a.getNumerator(); + int aD = a.getDenominator(); + int An = this.Numerator; + int Ad = this.Denominator; + + Ad = Ad * aN; + An = An * aD; + FractionNumber b = new FractionNumber(An, Ad); + b.Normalized(); + return b; + } + + public FractionNumber subtract(FractionNumber a) { + int aN = a.getNumerator(); + int aD = a.getDenominator(); + + int An = this.Numerator; + int Ad = this.Denominator; + if (this.Denominator == aD) { + aN = An - aN; + } else { + + aN = aN * Ad; + An = An * aD; + aN = An-aN; + aD = Ad * aD; + } + FractionNumber b = new FractionNumber(aN, aD); + b.Normalized(); + return b; + } + + + final int def = 1; + protected int Numerator; + protected int Denominator; + + int a = Numerator; + int b = Denominator; + +} + + + + + + + + + + + + + + diff --git a/src/main/java/school/lemon/changerequest/java/Fraction_Number/Test.java b/src/main/java/school/lemon/changerequest/java/Fraction_Number/Test.java new file mode 100644 index 0000000..6a47e0d --- /dev/null +++ b/src/main/java/school/lemon/changerequest/java/Fraction_Number/Test.java @@ -0,0 +1,34 @@ +package school.lemon.changerequest.java.Fraction_Number; + +/** + * Created by User on 07.12.2016. + */ +public class Test { + public static void main(String[] args) { + + FractionNumber f1=new FractionNumber(3,4); + FractionNumber f2= new FractionNumber(9,2); + System.out.println("df"); + FractionNumber f3=new FractionNumber(3,0); + System.out.println(f3.toString()); + System.out.println(f1.toString()); + System.out.println(f2.toString()); + System.out.println("ТЕСТ на сложение "+f1.add(f2).toString()); + System.out.println(f1.toString()); + System.out.println(f2.toString()); + System.out.println("Тест На умножение "+f1.multiply(f2).toString()); + System.out.println(f1.toString()); + System.out.println(f2.toString()); + System.out.println("Тест На деление "+f1.divide(f2).toString()); + System.out.println(f1.toString()); + System.out.println(f2.toString()); + System.out.println("Тест На отнимание "+f1.subtract(f2).toString()); + System.out.println("Тест На отнимание "+f2.subtract(f1).toString()); + + + + + } + + +}