MES-FE/webcad-api
1
0
Fork 0
Code Issues Pull Requests Releases 58 Wiki Activity

修复 动态规划导致的结果

Browse Source
This commit is contained in:
ChenX 2023-12-18 14:09:36 +08:00
parent 596ab9dba3
commit 6ef1e8d8b0
4 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
api.cjs.js
View File

@ -23079,10 +23079,10 @@ function GetMaxAreaFn(rects) {
return Max(rects, (t1, t2) => t2[0] > t1[0]); return Max(rects, (t1, t2) => t2[0] > t1[0]);
} }
function GetMaxWidthFn(rects) { function GetMaxWidthFn(rects) {
return Max(rects, (t1, t2) => t2[5] > t1[5]); return Max(rects, (t1, t2) => t2[5] === t1[5] ? t2[6] > t1[6] : t2[5] > t1[5]);
} }
function GetMaxHeightFn(rects) { function GetMaxHeightFn(rects) {
return Max(rects, (t1, t2) => t2[6] > t1[6]); return Max(rects, (t1, t2) => t2[6] === t1[6] ? t2[6] > t1[6] : t2[5] > t1[5]);
} }
//最大内接矩形 //最大内接矩形
//1.分析盒子 //1.分析盒子
@ -23304,7 +23304,8 @@ class LargestInteriorRectangle {
rects.push([area, down[i], j, xCount, yCount, width, height]); rects.push([area, down[i], j, xCount, yCount, width, height]);
} }
} }
while (rects.length) { // while (rects.length)
if (rects.length) {
let maxIndex = this.GetMaxRectIndexFn(rects); let maxIndex = this.GetMaxRectIndexFn(rects);
let [area, maxXIndex, maxYIndex, xCount, yCount] = rects[maxIndex]; let [area, maxXIndex, maxYIndex, xCount, yCount] = rects[maxIndex];
let xMax = xs[maxXIndex]; let xMax = xs[maxXIndex];
@ -23320,16 +23321,20 @@ class LargestInteriorRectangle {
} }
} }
//如果有被标记的方块,则删除它 //如果有被标记的方块,则删除它
arrayRemoveIf(rects, rect => { //某些情况不适合这个算法,移除了它,保证结果正确性
let [area, maxX, maxY, xCount, yCount] = rect; // arrayRemoveIf(rects, rect =>
for (let i = 0; i < xCount; i++) { // {
for (let j = 0; j < yCount; j++) { // let [area, maxX, maxY, xCount, yCount] = rect;
if (!matrix[maxX - 1 - i][maxY - j]) // for (let i = 0; i < xCount; i++)
return true; // {
} // for (let j = 0; j < yCount; j++)
} // {
return false; // if (!matrix[maxX - 1 - i][maxY - j])
}); // return true;
// }
// }
// return false;
// });
} }
}; };
let maxRects = []; let maxRects = [];

2
api.cjs.js.map
View File

File diff suppressed because one or more lines are too long

31
api.esm.js
View File

@ -23070,10 +23070,10 @@ function GetMaxAreaFn(rects) {
return Max(rects, (t1, t2) => t2[0] > t1[0]); return Max(rects, (t1, t2) => t2[0] > t1[0]);
} }
function GetMaxWidthFn(rects) { function GetMaxWidthFn(rects) {
return Max(rects, (t1, t2) => t2[5] > t1[5]); return Max(rects, (t1, t2) => t2[5] === t1[5] ? t2[6] > t1[6] : t2[5] > t1[5]);
} }
function GetMaxHeightFn(rects) { function GetMaxHeightFn(rects) {
return Max(rects, (t1, t2) => t2[6] > t1[6]); return Max(rects, (t1, t2) => t2[6] === t1[6] ? t2[6] > t1[6] : t2[5] > t1[5]);
} }
//最大内接矩形 //最大内接矩形
//1.分析盒子 //1.分析盒子
@ -23295,7 +23295,8 @@ class LargestInteriorRectangle {
rects.push([area, down[i], j, xCount, yCount, width, height]); rects.push([area, down[i], j, xCount, yCount, width, height]);
} }
} }
while (rects.length) { // while (rects.length)
if (rects.length) {
let maxIndex = this.GetMaxRectIndexFn(rects); let maxIndex = this.GetMaxRectIndexFn(rects);
let [area, maxXIndex, maxYIndex, xCount, yCount] = rects[maxIndex]; let [area, maxXIndex, maxYIndex, xCount, yCount] = rects[maxIndex];
let xMax = xs[maxXIndex]; let xMax = xs[maxXIndex];
@ -23311,16 +23312,20 @@ class LargestInteriorRectangle {
} }
} }
//如果有被标记的方块,则删除它 //如果有被标记的方块,则删除它
arrayRemoveIf(rects, rect => { //某些情况不适合这个算法,移除了它,保证结果正确性
let [area, maxX, maxY, xCount, yCount] = rect; // arrayRemoveIf(rects, rect =>
for (let i = 0; i < xCount; i++) { // {
for (let j = 0; j < yCount; j++) { // let [area, maxX, maxY, xCount, yCount] = rect;
if (!matrix[maxX - 1 - i][maxY - j]) // for (let i = 0; i < xCount; i++)
return true; // {
} // for (let j = 0; j < yCount; j++)
} // {
return false; // if (!matrix[maxX - 1 - i][maxY - j])
}); // return true;
// }
// }
// return false;
// });
} }
}; };
let maxRects = []; let maxRects = [];

2
api.esm.js.map
View File

File diff suppressed because one or more lines are too long