|
@@ -82,17 +82,18 @@ public class YrProdEfficiencyVO {
|
|
|
this.energy = BigDecimal.valueOf(2.6d);
|
|
|
this.ratio = BigDecimal.valueOf(this.open * 100).divide(BigDecimal.valueOf(this.total), 2, RoundingMode.HALF_UP);
|
|
|
this.lengthA = BigDecimal.valueOf(3000 + 3000 * random.nextDouble()).multiply(BigDecimal.valueOf(ldt.getHour() / 12f)).setScale(2, RoundingMode.HALF_UP);
|
|
|
- this.weightA = lengthA.multiply(BigDecimal.valueOf(1.5)).divide(BigDecimal.valueOf(1000), 2,RoundingMode.HALF_UP);
|
|
|
- if (ldt.getHour() > 12) {
|
|
|
- this.timeA = BigDecimal.valueOf(12).subtract(BigDecimal.valueOf(ldt.getHour() * 0.25 * random.nextFloat())).setScale(1, RoundingMode.HALF_UP);
|
|
|
+ this.weightA = lengthA.multiply(BigDecimal.valueOf(1.5)).divide(BigDecimal.valueOf(1000), 2, RoundingMode.HALF_UP);
|
|
|
+ int hour = ldt.getHour() + 1;
|
|
|
+ if (hour > 12) {
|
|
|
+ this.timeA = BigDecimal.valueOf(12).subtract(BigDecimal.valueOf(hour * 0.25 * random.nextFloat())).setScale(1, RoundingMode.HALF_UP);
|
|
|
this.effA = timeA.divide(BigDecimal.valueOf(12), 4, RoundingMode.HALF_UP);
|
|
|
- this.lengthB = BigDecimal.valueOf(3000 + 3000 * random.nextDouble()).multiply(BigDecimal.valueOf((ldt.getHour() - 12) / 12f)).setScale(2, RoundingMode.HALF_UP);
|
|
|
- this.weightB = lengthB.multiply(BigDecimal.valueOf(1.5)).divide(BigDecimal.valueOf(1000), 2,RoundingMode.HALF_UP);;
|
|
|
- this.timeB = BigDecimal.valueOf(ldt.getHour() - 12).subtract(BigDecimal.valueOf((ldt.getHour()-12) * 0.25 * random.nextFloat())).setScale(1, RoundingMode.HALF_UP);
|
|
|
- this.effB = timeB.divide(BigDecimal.valueOf(ldt.getHour() - 12), 4, RoundingMode.HALF_UP);
|
|
|
+ this.lengthB = BigDecimal.valueOf(3000 + 3000 * random.nextDouble()).multiply(BigDecimal.valueOf((hour - 12) / 12f)).setScale(2, RoundingMode.HALF_UP);
|
|
|
+ this.weightB = lengthB.multiply(BigDecimal.valueOf(1.5)).divide(BigDecimal.valueOf(1000), 2, RoundingMode.HALF_UP);
|
|
|
+ this.timeB = BigDecimal.valueOf(hour - 12).subtract(BigDecimal.valueOf((hour - 12) * 0.25 * random.nextFloat())).setScale(1, RoundingMode.HALF_UP);
|
|
|
+ this.effB = timeB.divide(BigDecimal.valueOf(hour - 12), 4, RoundingMode.HALF_UP);
|
|
|
} else {
|
|
|
- this.timeA = BigDecimal.valueOf(ldt.getHour()).subtract(BigDecimal.valueOf(ldt.getHour() * 0.25 * random.nextFloat())).setScale(1, RoundingMode.HALF_UP);
|
|
|
- this.effA = timeA.divide(BigDecimal.valueOf(ldt.getHour()), 4, RoundingMode.HALF_UP);
|
|
|
+ this.timeA = BigDecimal.valueOf(hour).subtract(BigDecimal.valueOf(hour * 0.25 * random.nextFloat())).setScale(1, RoundingMode.HALF_UP);
|
|
|
+ this.effA = timeA.divide(BigDecimal.valueOf(hour), 4, RoundingMode.HALF_UP);
|
|
|
this.timeB = BigDecimal.ZERO;
|
|
|
this.lengthB = BigDecimal.ZERO;
|
|
|
this.weightB = BigDecimal.ZERO;
|