Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 12 additions & 2 deletions basics/src/main/java/ru/msu/vmk/NumberSample.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
package ru.msu.vmk;

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Arrays;

public class NumberSample {
public static BigDecimal[] split(BigDecimal amount, int n) {
// разделить amount на n частей
// если остается остаток, прибавить его к первому числу
return null;
BigDecimal dividedEqualAmount = amount.divide(new BigDecimal(n), 2, RoundingMode.DOWN)
.stripTrailingZeros().movePointRight(1).movePointLeft(1);
BigDecimal remainder = amount.subtract(dividedEqualAmount.multiply(new BigDecimal(n)));

BigDecimal[] result = new BigDecimal[n];
Arrays.fill(result, dividedEqualAmount);
result[0].add(remainder).stripTrailingZeros().movePointRight(1).movePointLeft(1);

return result;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package ru.msu.vmk;

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Arrays;

public class NumberSample {
public static BigDecimal[] split(BigDecimal amount, int n) {
// разделить amount на n частей
// если остается остаток, прибавить его к первому числу
BigDecimal dividedEqualAmount = amount.divide(new BigDecimal(n), 2, RoundingMode.DOWN)
.stripTrailingZeros().movePointRight(1).movePointLeft(1);
BigDecimal remainder = amount.subtract(dividedEqualAmount.multiply(new BigDecimal(n)));

BigDecimal[] result = new BigDecimal[n];
Arrays.fill(result, dividedEqualAmount);
result[0].add(remainder).stripTrailingZeros().movePointRight(1).movePointLeft(1);

return result;
}
}
75 changes: 69 additions & 6 deletions object-oriented-programming/src/main/java/ru/msu/vmk/Quantity.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package ru.msu.vmk;

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Objects;

/**
* По примеру класса {@link Money} реализовать класс Quantity:
Expand All @@ -13,19 +15,35 @@
* <br/> - для проверки работы реализовать функцию main() или Unit-test
*/
public class Quantity {

private BigDecimal amount;
private String unitOfMeasurement;

/**
* @param amount - сумма
* @param unitOfMeasurement - единица измерения
*/
public Quantity(BigDecimal amount, String unitOfMeasurement) {
if (amount == null) {
throw new IllegalArgumentException("amount cannot be null");
}
if (unitOfMeasurement == null || unitOfMeasurement.isBlank()) {
throw new IllegalArgumentException("units cannot be empty");
}
this.amount = amount.setScale(2, RoundingMode.HALF_EVEN);
this.unitOfMeasurement = unitOfMeasurement;
}

/**
* Get метод для {@link Quantity#amount}
* @return {@link Quantity#amount}
*/
public BigDecimal getAmount() {
return null;
return amount;
}

public void setAmount(BigDecimal amount) {
this.amount = amount;
}

/**
Expand All @@ -35,7 +53,9 @@ public BigDecimal getAmount() {
* @return сумма чисел
*/
public Quantity add(Quantity quantity) throws Exception {
return null;
validateEqualUnitOfMeasurement(quantity);
BigDecimal sum = this.amount.add(quantity.amount);
return new Quantity(sum, this.unitOfMeasurement);
}

/**
Expand All @@ -45,7 +65,9 @@ public Quantity add(Quantity quantity) throws Exception {
* @return разность чисел
*/
public Quantity subtract(Quantity quantity) throws Exception {
return null;
validateEqualUnitOfMeasurement(quantity);
BigDecimal diff = this.amount.subtract(quantity.amount);
return new Quantity(diff, this.unitOfMeasurement);
}

/**
Expand All @@ -55,7 +77,9 @@ public Quantity subtract(Quantity quantity) throws Exception {
* @return произведение
*/
public Quantity multiply(Quantity quantity) throws Exception {
return null;
validateEqualUnitOfMeasurement(quantity);
BigDecimal result = this.amount.multiply(quantity.amount);
return new Quantity(result, this.unitOfMeasurement);
}

/**
Expand All @@ -65,7 +89,10 @@ public Quantity multiply(Quantity quantity) throws Exception {
* @return частное
*/
public Quantity divide(Quantity quantity) throws Exception {
return null;
// No check because quantity.amount cannot be null
validateEqualUnitOfMeasurement(quantity);
BigDecimal result = this.amount.divide(quantity.amount);
return new Quantity(result, this.unitOfMeasurement);
}

/**
Expand All @@ -75,6 +102,42 @@ public Quantity divide(Quantity quantity) throws Exception {
* @return равные части числа
*/
public Quantity[] divide(int n) throws Exception {
return null;
if (n == 0) {
throw new IllegalArgumentException("Невозможно разделить на 0 частей");
}

BigDecimal[] splitted = NumberSample.split(this.amount, n);
Quantity[] quantityResult = new Quantity[n];
for (int i = 0; i < n; i++) {
quantityResult[i] = new Quantity(splitted[i], this.unitOfMeasurement);
}
return quantityResult;
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof Quantity quantity)) return false;
return Objects.equals(amount, quantity.amount) && Objects.equals(unitOfMeasurement, quantity.unitOfMeasurement);
}

@Override
public int hashCode() {
return Objects.hash(amount, unitOfMeasurement);
}

@Override
public String toString() {
return "Quantity{" +
"amount=" + amount +
", unitOfMeasurement='" + unitOfMeasurement + '\'' +
'}';
}

private void validateEqualUnitOfMeasurement(Quantity qRight) {
if (!this.unitOfMeasurement.equals(qRight.unitOfMeasurement)) {
throw new IllegalArgumentException("Единицы измерения не совпадают: "
+ this.unitOfMeasurement + " " + qRight.unitOfMeasurement);
}
}
}