github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Validate tests with improvement in case of two 40cm canvases and 50cm canvases

pull/6221/head
Qiuyi LI 2023-11-14 14:20:23 +01:00
parent a2f27094c3
commit 0c57d68a12
1 changed files with 53 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/AddPortraitTubeJob.java
View File

@ -252,7 +252,11 @@ public class AddPortraitTubeJob implements Job {
} }
} else { } else {
if (totalRemainderCount > 1) { if (totalRemainderCount > 1) {
tube40MultipleCount++; if (canvas40RemainderCount > 0) {
tube40MultipleCount++;
} else {
tube30SingleDoubleCount++;
}
} else { } else {
if (canvas40RemainderCount > 0) { if (canvas40RemainderCount > 0) {
tube40SingleCount++; tube40SingleCount++;
@ -265,18 +269,23 @@ public class AddPortraitTubeJob implements Job {
// When remaining 4 to 6 canvases, one 50cm canvas imposes one 50cm multiple tube // When remaining 4 to 6 canvases, one 50cm canvas imposes one 50cm multiple tube
if (canvas50RemainderCount > 0) { if (canvas50RemainderCount > 0) {
tube50MultipleCount++; tube50MultipleCount++;
// If we have two 50cm canvases and a total of 5 of 6 canvases, then we have to use 2 50cm multiple tubes if (canvas50RemainderCount > 1) {
if (totalRemainderCount > 4) { // If we have two 50cm canvases and a total of 5 of 6 canvases
tube50MultipleCount++; if (totalRemainderCount > 4) {
} else { if (canvas40RemainderCount > 1) {
// There's one remaining canvas, an adequate single tube suffices tube40MultipleCount++;
if (canvas50RemainderCount > 1) { } else {
tube50SingleCount++; tube30SingleDoubleCount++;
} else if (canvas40RemainderCount > 0) { }
tube40SingleCount++; } else {
} else if (canvas30RemainderCount > 0){ if (canvas40RemainderCount > 1) {
tube30SingleDoubleCount++; tube40SingleCount++;
} else {
tube30SingleDoubleCount++;
}
} }
} else {
tube30SingleDoubleCount++;
} }
} else { } else {
// No 50cm canvases means only one combination possible: two 40cm canvases and two 30cm canvases // No 50cm canvases means only one combination possible: two 40cm canvases and two 30cm canvases
@ -304,111 +313,86 @@ public class AddPortraitTubeJob implements Job {
} }
public static void main(String[] args) { public static void main(String[] args) {
List<OrderItem> orderItems = buildOrderItems(1, 0); List<OrderItem> orderItems = buildOrderItems(0,0,0);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(0, 1); orderItems = buildOrderItems(0,0,1);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(1, 1); orderItems = buildOrderItems(0,0,2);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(2, 0); orderItems = buildOrderItems(0,1,0);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(0, 2); orderItems = buildOrderItems(0,1,1);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(2, 1); orderItems = buildOrderItems(0,1,2);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(1, 2); orderItems = buildOrderItems(0,2,0);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(2, 2); orderItems = buildOrderItems(0,2,1);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(3, 0); orderItems = buildOrderItems(0,2,2);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(0, 3); orderItems = buildOrderItems(1,0,0);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(3, 1); orderItems = buildOrderItems(1,0,1);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(1, 3); orderItems = buildOrderItems(1,0,2);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(3, 2); orderItems = buildOrderItems(1,1,0);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(2, 3); orderItems = buildOrderItems(1,1,1);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(3, 3); orderItems = buildOrderItems(1,1,2);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(4, 0); orderItems = buildOrderItems(1,2,0);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(0, 4); orderItems = buildOrderItems(1,2,1);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(4, 1); orderItems = buildOrderItems(1,2,2);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(1, 4); orderItems = buildOrderItems(2,0,0);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(4, 2); orderItems = buildOrderItems(2,0,1);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(2, 4); orderItems = buildOrderItems(2,0,2);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(4, 3); orderItems = buildOrderItems(2,1,0);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(3, 4); orderItems = buildOrderItems(2,1,1);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(4, 4); orderItems = buildOrderItems(2,1,2);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(5, 0); orderItems = buildOrderItems(2,2,0);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(0, 5); orderItems = buildOrderItems(2,2,1);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(5, 1); orderItems = buildOrderItems(2,2,2);
compare(orderItems); compare(orderItems);
orderItems = buildOrderItems(1, 5);
compare(orderItems);
orderItems = buildOrderItems(5, 2);
compare(orderItems);
orderItems = buildOrderItems(2, 5);
compare(orderItems);
orderItems = buildOrderItems(5, 3);
compare(orderItems);
orderItems = buildOrderItems(3, 5);
compare(orderItems);
orderItems = buildOrderItems(5, 4);
compare(orderItems);
orderItems = buildOrderItems(4, 5);
compare(orderItems);
orderItems = buildOrderItems(5, 5);
compare(orderItems);
} }
private static void compare(List<OrderItem> orderItems) { private static void compare(List<OrderItem> orderItems) {
@ -419,14 +403,18 @@ public class AddPortraitTubeJob implements Job {
System.out.println(tubesOldWay.containsAll(tubesNewWay) && tubesNewWay.containsAll(tubesOldWay) ? "we're good" : "shit"); System.out.println(tubesOldWay.containsAll(tubesNewWay) && tubesNewWay.containsAll(tubesOldWay) ? "we're good" : "shit");
} }
private static List<OrderItem> buildOrderItems(Integer canvas40q, Integer canvas50q) { private static List<OrderItem> buildOrderItems(Integer canvas30q, Integer canvas40q, Integer canvas50q) {
List<OrderItem> orderItems = new ArrayList<>(); List<OrderItem> orderItems = new ArrayList<>();
if (canvas30q != null) {
orderItems.add(buildOrderItem(PREFIX_30_CANVAS, canvas30q));
}
if (canvas40q != null) { if (canvas40q != null) {
orderItems.add(buildOrderItem(PREFIX_40_CANVAS, canvas40q)); orderItems.add(buildOrderItem(PREFIX_40_CANVAS, canvas40q));
} }
if (canvas50q != null) { if (canvas50q != null) {
orderItems.add(buildOrderItem(PREFIX_50_CANVAS, canvas50q)); orderItems.add(buildOrderItem(PREFIX_50_CANVAS, canvas50q));
} }
System.out.println(canvas30q + " x 30cm " + canvas40q + " x 40cm " + canvas50q + " x 50cm");
return orderItems; return orderItems;
} }