diff --git a/src/cts/src/HTreeBuilder.cpp b/src/cts/src/HTreeBuilder.cpp index 1074b1dbf73..e97510b1399 100644 --- a/src/cts/src/HTreeBuilder.cpp +++ b/src/cts/src/HTreeBuilder.cpp @@ -345,8 +345,8 @@ void adjustToplevelTopology(Point& a, } } -void HTreeBuilder::findLegalLocations(const Point parentPoint, - const Point branchPoint, +void HTreeBuilder::findLegalLocations(Point parentPoint, + Point branchPoint, double x1, double y1, double x2, @@ -390,10 +390,10 @@ void HTreeBuilder::findLegalLocations(const Point parentPoint, } Point HTreeBuilder::findBestLegalLocation( - const double targetDist, - const Point branchPoint, - const Point parentPoint, - const std::vector>& legalLocations, + double targetDist, + Point branchPoint, + Point parentPoint, + std::vector>& legalLocations, const std::vector>& sinks, double x1, double y1, @@ -429,9 +429,9 @@ Point HTreeBuilder::findBestLegalLocation( // point to parent point The second priority is to lower the weighted sink // distance Point HTreeBuilder::adjustBestLegalLocation( - const double targetDist, - const Point currLoc, - const Point parentPoint, + double targetDist, + Point currLoc, + Point parentPoint, const std::vector>& sinks, double x1, double y1, @@ -508,10 +508,10 @@ Point HTreeBuilder::adjustBestLegalLocation( } void HTreeBuilder::checkLegalityAndCostSpecial( - const Point oldLoc, - const Point newLoc, - const Point parentPoint, - const double targetDist, + Point oldLoc, + Point newLoc, + Point parentPoint, + double targetDist, const std::vector>& sinks, int scalingFactor, double x1, @@ -544,9 +544,9 @@ void HTreeBuilder::checkLegalityAndCostSpecial( // legal branch point. In either scenario, move branch point to match target // distance and to minimize weighted sink distance Point HTreeBuilder::adjustBranchLength( - const Point branchPoint, - const Point parentPoint, - const double targetDist, + Point branchPoint, + Point parentPoint, + double targetDist, const std::vector>& sinks, int scalingFactor) { @@ -621,17 +621,16 @@ Point HTreeBuilder::adjustBranchLength( return branchPoint; } -void HTreeBuilder::checkLegalityAndCost(const Point oldLoc, - const Point newLoc, - const Point parentPoint, - const double targetDist, +void HTreeBuilder::checkLegalityAndCost(Point oldLoc, + Point newLoc, + Point parentPoint, + double targetDist, const std::vector>& sinks, int scalingFactor, Point& bestLoc, double& sinkDist, double& bestSinkDist) { - double x1, y1, x2, y2; if (floatEqual(newLoc.computeDist(parentPoint), targetDist) && checkLegalityLoc(newLoc, scalingFactor)) { sinkDist = weightedDistance(newLoc, oldLoc, sinks); @@ -644,8 +643,7 @@ void HTreeBuilder::checkLegalityAndCost(const Point oldLoc, "dist={:0.3f}, sinkDist={:0.3f}", oldLoc, newLoc, targetDist, sinkDist); } else { debugPrint(logger_, CTS, "legalizer", 3, "adjustBranchLength: branchPt move:{}=>{} is illegal or dist {:0.3f} " - "!= {:0.3f} blockage ({:0.3f} {:0.3f}) ({:0.3f} {:0.3f})", - oldLoc, newLoc, newLoc.computeDist(parentPoint), targetDist, x1, y1, x2, y2); + "!= {:0.3f}", oldLoc, newLoc, newLoc.computeDist(parentPoint), targetDist); // clang-format on } } diff --git a/src/cts/src/HTreeBuilder.h b/src/cts/src/HTreeBuilder.h index 654e973f846..acca69f44ee 100644 --- a/src/cts/src/HTreeBuilder.h +++ b/src/cts/src/HTreeBuilder.h @@ -180,20 +180,20 @@ class HTreeBuilder : public TreeBuilder } void run() override; - void findLegalLocations(const Point parentPoint, - const Point branchPoint, + void findLegalLocations(Point parentPoint, + Point branchPoint, double x1, double y1, double x2, double y2, std::vector>& points); - void addCandidateLoc(const double x, - const double y, - const Point parentPoint, - const double x1, - const double y1, - const double x2, - const double y2, + void addCandidateLoc(double x, + double y, + Point parentPoint, + double x1, + double y1, + double x2, + double y2, std::vector>& points) { Point candidate(x, y); @@ -202,29 +202,29 @@ class HTreeBuilder : public TreeBuilder } } Point findBestLegalLocation( - const double origDist, - const Point branchPoint, - const Point parentPoint, - const std::vector>& legalLocations, + double targetDist, + Point branchPoint, + Point parentPoint, + std::vector>& legalLocations, const std::vector>& sinks, double x1, double y1, double x2, double y2, int scalingFactor); - Point adjustBestLegalLocation(const double origDist, - const Point currLoc, - const Point parentPoint, + Point adjustBestLegalLocation(double targetDist, + Point currLoc, + Point parentPoint, const std::vector>& sinks, double x1, double y1, double x2, double y2, int scalingFactor); - void checkLegalityAndCostSpecial(const Point oldLoc, - const Point newLoc, - const Point parentPoint, - const double targetDist, + void checkLegalityAndCostSpecial(Point oldLoc, + Point newLoc, + Point parentPoint, + double targetDist, const std::vector>& sinks, int scalingFactor, double x1, @@ -234,15 +234,15 @@ class HTreeBuilder : public TreeBuilder Point& bestLoc, double& sinkDist, double& bestSinkDist); - Point adjustBranchLength(const Point branchPoint, - const Point parentPoint, - const double targetDist, + Point adjustBranchLength(Point branchPoint, + Point parentPoint, + double targetDist, const std::vector>& sinks, int scalingFactor); - void checkLegalityAndCost(const Point oldLoc, - const Point newLoc, - const Point parentPoint, - const double targetDist, + void checkLegalityAndCost(Point oldLoc, + Point newLoc, + Point parentPoint, + double targetDist, const std::vector>& sinks, int scalingFactor, Point& bestLoc, diff --git a/src/cts/test/array.ok b/src/cts/test/array.ok index b7c7a031897..c350d892c6e 100644 --- a/src/cts/test/array.ok +++ b/src/cts/test/array.ok @@ -501,24 +501,24 @@ HTree: level*4* bufId*31*: branchPt:[(591.398, 649.387)] topo len:44.000 dist to [DEBUG CTS-legalizer] adjustBestLegalLoc: branchPt move:[(519.857, 246.278)]=>[(533.529, 246.278)] is illegal or dist 88.000 != 88.000 [DEBUG CTS-legalizer] findBestLegalLocation branchPt:[(523.216, 246.278)]=>[(519.857, 259.950)] parentPt:[(505.950, 185.857)] new branchPt is outside blockage HTree level*2* bufId*4*, parent:[(189.857, 526.787)], branch:[(182.622, 471.602)], leng:62.420, sinks:40 -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(182.622, 471.602)]=>[(184.522, 444.122)] is illegal or dist 88.000 != 88.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(182.622, 471.602)]=>[(184.522, 609.451)] is illegal or dist 88.000 != 88.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(182.622, 471.602)]=>[(180.722, 447.922)] is illegal or dist 88.000 != 88.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(182.622, 471.602)]=>[(180.722, 605.651)] is illegal or dist 88.000 != 88.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(182.622, 471.602)]=>[(155.042, 473.602)] is illegal or dist 88.000 != 88.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(182.622, 471.602)]=>[(224.673, 473.602)] is illegal or dist 88.000 != 88.000 blockage (0.000 0.000) (0.000 0.000) +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(182.622, 471.602)]=>[(184.522, 444.122)] is illegal or dist 88.000 != 88.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(182.622, 471.602)]=>[(184.522, 609.451)] is illegal or dist 88.000 != 88.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(182.622, 471.602)]=>[(180.722, 447.922)] is illegal or dist 88.000 != 88.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(182.622, 471.602)]=>[(180.722, 605.651)] is illegal or dist 88.000 != 88.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(182.622, 471.602)]=>[(155.042, 473.602)] is illegal or dist 88.000 != 88.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(182.622, 471.602)]=>[(224.673, 473.602)] is illegal or dist 88.000 != 88.000 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(182.622, 471.602)]=>[(159.042, 469.602)] is legal, dist=88.000, sinkDist=6183.787 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(182.622, 471.602)]=>[(220.673, 469.602)] is legal, dist=88.000, sinkDist=7014.497 [DEBUG CTS-legalizer] adjustBranchLength applied to legal branchPt:[(182.622, 471.602)]=>[(159.042, 469.602)] parentPt:[(189.857, 526.787)] newDist=88.000 HTree level*2* bufId*5*, parent:[(189.857, 526.787)], branch:[(185.931, 593.233)], leng:70.372, sinks:38 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(185.931, 593.233)]=>[(187.831, 440.813)] is legal, dist=88.000, sinkDist=16157.597 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(185.931, 593.233)]=>[(187.831, 612.761)] is legal, dist=88.000, sinkDist=5552.858 -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(185.931, 593.233)]=>[(184.031, 444.613)] is illegal or dist 88.000 != 88.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(185.931, 593.233)]=>[(184.031, 608.961)] is illegal or dist 88.000 != 88.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(185.931, 593.233)]=>[(170.303, 595.233)] is illegal or dist 88.000 != 88.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(185.931, 593.233)]=>[(209.411, 595.233)] is illegal or dist 88.000 != 88.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(185.931, 593.233)]=>[(166.303, 591.233)] is illegal or dist 88.000 != 88.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(185.931, 593.233)]=>[(213.411, 591.233)] is illegal or dist 88.000 != 88.000 blockage (0.000 0.000) (0.000 0.000) +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(185.931, 593.233)]=>[(184.031, 444.613)] is illegal or dist 88.000 != 88.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(185.931, 593.233)]=>[(184.031, 608.961)] is illegal or dist 88.000 != 88.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(185.931, 593.233)]=>[(170.303, 595.233)] is illegal or dist 88.000 != 88.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(185.931, 593.233)]=>[(209.411, 595.233)] is illegal or dist 88.000 != 88.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(185.931, 593.233)]=>[(166.303, 591.233)] is illegal or dist 88.000 != 88.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(185.931, 593.233)]=>[(213.411, 591.233)] is illegal or dist 88.000 != 88.000 [DEBUG CTS-legalizer] adjustBranchLength applied to legal branchPt:[(185.931, 593.233)]=>[(187.831, 612.761)] parentPt:[(189.857, 526.787)] newDist=88.000 HTree level*2* bufId*6*, parent:[(472.714, 554.070)], branch:[(522.500, 468.572)], leng:135.285, sinks:46 branchPt:[(522.500, 468.572)] is not legal, parentPt:[(472.714, 554.070)] blockages:(519.857 425.571) (563.000 468.714) @@ -860,12 +860,12 @@ HTree: level*4* bufId*31*: branchPt:[(591.398, 649.387)] topo len:44.000 dist to HTree level*3* bufId*11*, parent:[(187.831, 612.761)], branch:[(234.709, 626.454)], leng:60.572, sinks:22 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(234.709, 626.454)]=>[(236.609, 579.539)] is legal, dist=82.000, sinkDist=3388.625 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(234.709, 626.454)]=>[(236.609, 645.982)] is legal, dist=82.000, sinkDist=2502.010 -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(234.709, 626.454)]=>[(232.809, 575.739)] is illegal or dist 82.000 != 82.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(234.709, 626.454)]=>[(232.809, 649.782)] is illegal or dist 82.000 != 82.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(234.709, 626.454)]=>[(121.525, 628.454)] is illegal or dist 82.000 != 82.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(234.709, 626.454)]=>[(254.137, 628.454)] is illegal or dist 82.000 != 82.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(234.709, 626.454)]=>[(117.525, 624.454)] is illegal or dist 82.000 != 82.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(234.709, 626.454)]=>[(258.137, 624.454)] is illegal or dist 82.000 != 82.000 blockage (0.000 0.000) (0.000 0.000) +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(234.709, 626.454)]=>[(232.809, 575.739)] is illegal or dist 82.000 != 82.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(234.709, 626.454)]=>[(232.809, 649.782)] is illegal or dist 82.000 != 82.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(234.709, 626.454)]=>[(121.525, 628.454)] is illegal or dist 82.000 != 82.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(234.709, 626.454)]=>[(254.137, 628.454)] is illegal or dist 82.000 != 82.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(234.709, 626.454)]=>[(117.525, 624.454)] is illegal or dist 82.000 != 82.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(234.709, 626.454)]=>[(258.137, 624.454)] is illegal or dist 82.000 != 82.000 [DEBUG CTS-legalizer] adjustBranchLength applied to legal branchPt:[(234.709, 626.454)]=>[(236.609, 645.982)] parentPt:[(187.831, 612.761)] newDist=82.000 HTree level*3* bufId*12*, parent:[(475.358, 468.714)], branch:[(453.801, 455.271)], leng:35.000, sinks:25 branchPt:[(453.801, 455.271)] is not legal, parentPt:[(475.358, 468.714)] blockages:(425.571 425.571) (468.714 468.714) @@ -1198,14 +1198,14 @@ HTree: level*4* bufId*31*: branchPt:[(591.398, 649.387)] topo len:44.000 dist to [DEBUG CTS-legalizer] adjustBestLegalLoc: branchPt move:[(238.806, 284.143)]=>[(238.806, 276.898)] is illegal or dist 44.000 != 44.000 [DEBUG CTS-legalizer] adjustBestLegalLoc: branchPt move:[(238.806, 284.143)]=>[(246.050, 284.143)] is illegal or dist 52.154 != 44.000 [DEBUG CTS-legalizer] adjustBestLegalLoc: branchPt move:[(238.806, 284.143)]=>[(237.896, 284.143)] is illegal or dist 52.154 != 44.000 -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.806, 284.143)]=>[(240.706, 193.333)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.806, 284.143)]=>[(240.706, 278.798)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.806, 284.143)]=>[(240.706, 193.333)] is illegal or dist 44.000 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.806, 284.143)]=>[(240.706, 278.798)] is illegal or dist 44.000 != 44.000 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.806, 284.143)]=>[(236.906, 197.133)] is legal, dist=44.000, sinkDist=2966.620 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.806, 284.143)]=>[(236.906, 274.998)] is legal, dist=44.000, sinkDist=1097.865 -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.806, 284.143)]=>[(248.050, 286.143)] is illegal or dist 56.154 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.806, 284.143)]=>[(235.896, 286.143)] is illegal or dist 56.154 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.806, 284.143)]=>[(244.050, 282.143)] is illegal or dist 48.154 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.806, 284.143)]=>[(239.896, 282.143)] is illegal or dist 48.154 != 44.000 blockage (0.000 0.000) (0.000 0.000) +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.806, 284.143)]=>[(248.050, 286.143)] is illegal or dist 56.154 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.806, 284.143)]=>[(235.896, 286.143)] is illegal or dist 56.154 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.806, 284.143)]=>[(244.050, 282.143)] is illegal or dist 48.154 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.806, 284.143)]=>[(239.896, 282.143)] is illegal or dist 48.154 != 44.000 [DEBUG CTS-legalizer] findBestLegalLocation branchPt:[(237.620, 302.139)]=>[(236.906, 274.998)] parentPt:[(241.973, 236.066)] new branchPt is outside blockage HTree level*4* bufId*8*, parent:[(458.050, 91.571)], branch:[(446.293, 59.560)], leng:43.769, sinks:9 branchPt:[(446.293, 59.560)] is not legal, parentPt:[(458.050, 91.571)] blockages:(425.571 48.429) (468.714 91.571) @@ -1292,11 +1292,11 @@ HTree: level*4* bufId*31*: branchPt:[(591.398, 649.387)] topo len:44.000 dist to HTree level*4* bufId*11*, parent:[(585.664, 95.571)], branch:[(610.945, 114.451)], leng:44.161, sinks:9 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(610.945, 114.451)]=>[(612.845, 78.753)] is legal, dist=44.000, sinkDist=1215.290 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(610.945, 114.451)]=>[(612.845, 112.390)] is legal, dist=44.000, sinkDist=684.877 -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(610.945, 114.451)]=>[(609.045, 74.953)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(610.945, 114.451)]=>[(609.045, 116.190)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(610.945, 114.451)]=>[(562.543, 116.451)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(610.945, 114.451)]=>[(608.785, 116.451)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(610.945, 114.451)]=>[(558.543, 112.451)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(610.945, 114.451)]=>[(609.045, 74.953)] is illegal or dist 44.000 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(610.945, 114.451)]=>[(609.045, 116.190)] is illegal or dist 44.000 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(610.945, 114.451)]=>[(562.543, 116.451)] is illegal or dist 44.000 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(610.945, 114.451)]=>[(608.785, 116.451)] is illegal or dist 44.000 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(610.945, 114.451)]=>[(558.543, 112.451)] is illegal or dist 44.000 != 44.000 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(610.945, 114.451)]=>[(612.785, 112.451)] is legal, dist=44.000, sinkDist=683.908 [DEBUG CTS-legalizer] adjustBranchLength applied to legal branchPt:[(610.945, 114.451)]=>[(612.785, 112.451)] parentPt:[(585.664, 95.571)] newDist=44.000 HTree level*4* bufId*12*, parent:[(458.050, 280.143)], branch:[(444.215, 224.639)], leng:69.339, sinks:12 @@ -1356,24 +1356,24 @@ HTree: level*4* bufId*31*: branchPt:[(591.398, 649.387)] topo len:44.000 dist to [DEBUG CTS-legalizer] adjustBestLegalLoc: branchPt move:[(425.571, 293.998)]=>[(488.195, 293.998)] is illegal or dist 44.000 != 44.000 [DEBUG CTS-legalizer] findBestLegalLocation branchPt:[(444.936, 293.998)]=>[(425.571, 291.664)] parentPt:[(458.050, 280.143)] new branchPt is outside blockage HTree level*4* bufId*14*, parent:[(578.907, 237.000)], branch:[(616.064, 233.100)], leng:41.057, sinks:10 -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(616.064, 233.100)]=>[(617.964, 232.057)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(616.064, 233.100)]=>[(617.964, 241.943)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(616.064, 233.100)]=>[(614.164, 228.257)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(616.064, 233.100)]=>[(614.164, 245.743)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(616.064, 233.100)]=>[(617.964, 232.057)] is illegal or dist 44.000 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(616.064, 233.100)]=>[(617.964, 241.943)] is illegal or dist 44.000 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(616.064, 233.100)]=>[(614.164, 228.257)] is illegal or dist 44.000 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(616.064, 233.100)]=>[(614.164, 245.743)] is illegal or dist 44.000 != 44.000 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(616.064, 233.100)]=>[(536.807, 235.100)] is legal, dist=44.000, sinkDist=2018.521 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(616.064, 233.100)]=>[(621.008, 235.100)] is legal, dist=44.000, sinkDist=675.646 -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(616.064, 233.100)]=>[(540.807, 231.100)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(616.064, 233.100)]=>[(617.008, 231.100)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(616.064, 233.100)]=>[(540.807, 231.100)] is illegal or dist 44.000 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(616.064, 233.100)]=>[(617.008, 231.100)] is illegal or dist 44.000 != 44.000 [DEBUG CTS-legalizer] adjustBranchLength applied to legal branchPt:[(616.064, 233.100)]=>[(621.008, 235.100)] parentPt:[(578.907, 237.000)] newDist=44.000 HTree level*4* bufId*15*, parent:[(578.907, 237.000)], branch:[(613.646, 281.848)], leng:79.586, sinks:10 -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(613.646, 281.848)]=>[(615.546, 229.638)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(613.646, 281.848)]=>[(615.546, 244.362)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(613.646, 281.848)]=>[(615.546, 229.638)] is illegal or dist 44.000 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(613.646, 281.848)]=>[(615.546, 244.362)] is illegal or dist 44.000 != 44.000 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(613.646, 281.848)]=>[(611.746, 225.838)] is legal, dist=44.000, sinkDist=1797.294 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(613.646, 281.848)]=>[(611.746, 248.162)] is legal, dist=44.000, sinkDist=1350.815 -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(613.646, 281.848)]=>[(581.755, 283.848)] is illegal or dist 49.696 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(613.646, 281.848)]=>[(576.060, 283.848)] is illegal or dist 49.696 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(613.646, 281.848)]=>[(577.755, 279.848)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(613.646, 281.848)]=>[(580.060, 279.848)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(613.646, 281.848)]=>[(581.755, 283.848)] is illegal or dist 49.696 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(613.646, 281.848)]=>[(576.060, 283.848)] is illegal or dist 49.696 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(613.646, 281.848)]=>[(577.755, 279.848)] is illegal or dist 44.000 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(613.646, 281.848)]=>[(580.060, 279.848)] is illegal or dist 44.000 != 44.000 [DEBUG CTS-legalizer] adjustBranchLength applied to legal branchPt:[(613.646, 281.848)]=>[(611.746, 248.162)] parentPt:[(578.907, 237.000)] newDist=44.000 HTree level*4* bufId*16*, parent:[(95.571, 451.072)], branch:[(97.435, 430.789)], leng:22.147, sinks:8 branchPt:[(97.435, 430.789)] is not legal, parentPt:[(95.571, 451.072)] blockages:(95.571 425.571) (138.714 468.714) @@ -1404,12 +1404,12 @@ HTree: level*4* bufId*31*: branchPt:[(591.398, 649.387)] topo len:44.000 dist to HTree level*4* bufId*17*, parent:[(95.571, 451.072)], branch:[(92.380, 475.523)], leng:27.641, sinks:8 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(92.380, 475.523)]=>[(94.280, 408.363)] is legal, dist=44.000, sinkDist=1599.772 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(92.380, 475.523)]=>[(94.280, 493.782)] is legal, dist=44.000, sinkDist=726.984 -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(92.380, 475.523)]=>[(90.480, 412.163)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(92.380, 475.523)]=>[(90.480, 489.982)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(92.380, 475.523)]=>[(78.022, 477.523)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(92.380, 475.523)]=>[(113.121, 477.523)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(92.380, 475.523)]=>[(74.022, 473.523)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(92.380, 475.523)]=>[(117.121, 473.523)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(92.380, 475.523)]=>[(90.480, 412.163)] is illegal or dist 44.000 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(92.380, 475.523)]=>[(90.480, 489.982)] is illegal or dist 44.000 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(92.380, 475.523)]=>[(78.022, 477.523)] is illegal or dist 44.000 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(92.380, 475.523)]=>[(113.121, 477.523)] is illegal or dist 44.000 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(92.380, 475.523)]=>[(74.022, 473.523)] is illegal or dist 44.000 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(92.380, 475.523)]=>[(117.121, 473.523)] is illegal or dist 44.000 != 44.000 [DEBUG CTS-legalizer] adjustBranchLength applied to legal branchPt:[(92.380, 475.523)]=>[(94.280, 493.782)] parentPt:[(95.571, 451.072)] newDist=44.000 HTree level*4* bufId*18*, parent:[(240.154, 468.714)], branch:[(237.434, 407.752)], leng:63.683, sinks:12 branchPt:[(237.434, 407.752)] is not legal, parentPt:[(240.154, 468.714)] blockages:(237.000 378.429) (280.143 421.571) @@ -1439,13 +1439,13 @@ HTree: level*4* bufId*31*: branchPt:[(591.398, 649.387)] topo len:44.000 dist to [DEBUG CTS-legalizer] adjustBestLegalLoc: branchPt move:[(238.050, 421.571)]=>[(243.296, 421.571)] is illegal or dist 50.286 != 44.000 [DEBUG CTS-legalizer] adjustBestLegalLoc: branchPt move:[(238.050, 421.571)]=>[(237.011, 421.571)] is illegal or dist 50.286 != 44.000 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.050, 421.571)]=>[(239.950, 424.918)] is legal, dist=44.000, sinkDist=945.338 -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.050, 421.571)]=>[(239.950, 512.511)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.050, 421.571)]=>[(239.950, 512.511)] is illegal or dist 44.000 != 44.000 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.050, 421.571)]=>[(236.150, 428.718)] is legal, dist=44.000, sinkDist=1004.580 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.050, 421.571)]=>[(236.150, 508.711)] is legal, dist=44.000, sinkDist=2909.676 -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.050, 421.571)]=>[(241.296, 423.571)] is illegal or dist 46.286 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.050, 421.571)]=>[(239.011, 423.571)] is illegal or dist 46.286 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.050, 421.571)]=>[(245.296, 419.571)] is illegal or dist 54.286 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.050, 421.571)]=>[(235.011, 419.571)] is illegal or dist 54.286 != 44.000 blockage (0.000 0.000) (0.000 0.000) +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.050, 421.571)]=>[(241.296, 423.571)] is illegal or dist 46.286 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.050, 421.571)]=>[(239.011, 423.571)] is illegal or dist 46.286 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.050, 421.571)]=>[(245.296, 419.571)] is illegal or dist 54.286 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(238.050, 421.571)]=>[(235.011, 419.571)] is illegal or dist 54.286 != 44.000 [DEBUG CTS-legalizer] findBestLegalLocation branchPt:[(237.434, 407.752)]=>[(239.950, 424.918)] parentPt:[(240.154, 468.714)] new branchPt is outside blockage HTree level*4* bufId*19*, parent:[(240.154, 468.714)], branch:[(237.663, 488.644)], leng:22.420, sinks:12 branchPt:[(237.663, 488.644)] is not legal, parentPt:[(240.154, 468.714)] blockages:(237.000 472.714) (280.143 515.857) @@ -1642,13 +1642,13 @@ HTree: level*4* bufId*31*: branchPt:[(591.398, 649.387)] topo len:44.000 dist to [DEBUG CTS-legalizer] adjustBestLegalLoc: branchPt move:[(437.848, 472.714)]=>[(433.358, 472.714)] is legal, dist=44.000, sinkDist=844.885 [DEBUG CTS-legalizer] findBestLegalLocation branchPt:[(443.288, 488.759)]=>[(433.358, 472.714)] parentPt:[(425.571, 436.501)] new branchPt is outside blockage HTree level*4* bufId*26*, parent:[(557.358, 468.714)], branch:[(612.653, 432.724)], leng:91.285, sinks:10 -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(612.653, 432.724)]=>[(614.553, 481.909)] is illegal or dist 70.389 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(612.653, 432.724)]=>[(614.553, 455.520)] is illegal or dist 70.389 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(612.653, 432.724)]=>[(610.753, 478.109)] is illegal or dist 62.789 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(612.653, 432.724)]=>[(610.753, 459.320)] is illegal or dist 62.789 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(612.653, 432.724)]=>[(547.348, 434.724)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(612.653, 432.724)]=>[(567.368, 434.724)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(612.653, 432.724)]=>[(551.348, 430.724)] is illegal or dist 44.000 != 44.000 blockage (0.000 0.000) (0.000 0.000) +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(612.653, 432.724)]=>[(614.553, 481.909)] is illegal or dist 70.389 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(612.653, 432.724)]=>[(614.553, 455.520)] is illegal or dist 70.389 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(612.653, 432.724)]=>[(610.753, 478.109)] is illegal or dist 62.789 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(612.653, 432.724)]=>[(610.753, 459.320)] is illegal or dist 62.789 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(612.653, 432.724)]=>[(547.348, 434.724)] is illegal or dist 44.000 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(612.653, 432.724)]=>[(567.368, 434.724)] is illegal or dist 44.000 != 44.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(612.653, 432.724)]=>[(551.348, 430.724)] is illegal or dist 44.000 != 44.000 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(612.653, 432.724)]=>[(563.368, 430.724)] is legal, dist=44.000, sinkDist=1492.439 [DEBUG CTS-legalizer] adjustBranchLength applied to legal branchPt:[(612.653, 432.724)]=>[(563.368, 430.724)] parentPt:[(557.358, 468.714)] newDist=44.000 HTree level*4* bufId*27*, parent:[(557.358, 468.714)], branch:[(616.787, 480.959)], leng:71.674, sinks:11 diff --git a/src/cts/test/check_buffers_blockages.ok b/src/cts/test/check_buffers_blockages.ok index f16212d03af..e8613567f5c 100644 --- a/src/cts/test/check_buffers_blockages.ok +++ b/src/cts/test/check_buffers_blockages.ok @@ -94,8 +94,8 @@ HTree: level*1* bufId*3*: branchPt:[(11.178, 8.122)] topo len:2.000 dist to pare [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(3.511, 4.455)]=>[(2.154, 6.672)] is legal, dist=2.000, sinkDist=63.297 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(3.511, 4.455)]=>[(1.937, 6.455)] is legal, dist=2.000, sinkDist=61.996 [DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(3.511, 4.455)]=>[(5.206, 6.455)] is legal, dist=2.000, sinkDist=64.378 -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(3.511, 4.455)]=>[(5.206, 2.455)] is illegal or dist 5.269 != 2.000 blockage (0.000 0.000) (0.000 0.000) -[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(3.511, 4.455)]=>[(1.937, 2.455)] is illegal or dist 5.269 != 2.000 blockage (0.000 0.000) (0.000 0.000) +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(3.511, 4.455)]=>[(5.206, 2.455)] is illegal or dist 5.269 != 2.000 +[DEBUG CTS-legalizer] adjustBranchLength: branchPt move:[(3.511, 4.455)]=>[(1.937, 2.455)] is illegal or dist 5.269 != 2.000 [DEBUG CTS-legalizer] adjustBranchLength applied to legal branchPt:[(3.511, 4.455)]=>[(4.868, 5.386)] parentPt:[(3.571, 6.089)] newDist=2.000 HTree level*1* bufId*1*, parent:[(3.571, 6.089)], branch:[(3.757, 7.904)], leng:2.000, sinks:8 HTree level*1* bufId*2*, parent:[(11.358, 6.302)], branch:[(11.156, 4.505)], leng:2.000, sinks:7