kindred/solver
1
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Limits output issue.

Browse Source
This commit is contained in:
Aik-Siong Koh
2024-04-08 23:01:06 -06:00
parent 55963abe51
commit 8d3aecbcfb
31 changed files with 47 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OndselSolver/ASMTAssembly.cpp
View File

@@ -501,6 +501,8 @@ void MbD::ASMTAssembly::runDraggingTest2()
limit2->settol("1.0e-9");
assembly->addLimit(limit2);
assembly->outputFile("assembly.asmt");
auto& dragPart = assembly->parts->at(0);
auto dragParts = std::make_shared<std::vector<std::shared_ptr<ASMTPart>>>();
dragParts->push_back(dragPart);
@@ -519,7 +521,7 @@ void MbD::ASMTAssembly::runDraggingTest2()
void MbD::ASMTAssembly::runDraggingTest3()
{
auto assembly = ASMTAssembly::assemblyFromFile("../testapp/rackPinion2.asmt");
auto assembly = ASMTAssembly::assemblyFromFile("../testapp/rackPinion3.asmt");
auto dragPart = assembly->partNamed("/OndselAssembly/rackPinion#Box");
auto rotPart = assembly->partNamed("/OndselAssembly/rackPinion#Cylinder");
auto dragParts = std::make_shared<std::vector<std::shared_ptr<ASMTPart>>>();
@@ -1455,6 +1457,7 @@ void MbD::ASMTAssembly::storeOnLevelConstraintSets(std::ofstream& os, size_t lev
storeOnLevelString(os, level, "ConstraintSets");
storeOnLevelJoints(os, level + 1);
storeOnLevelMotions(os, level + 1);
storeOnLevelLimits(os, level + 1);
storeOnLevelGeneralConstraintSets(os, level + 1);
}
@@ -1482,6 +1485,14 @@ void MbD::ASMTAssembly::storeOnLevelMotions(std::ofstream& os, size_t level)
}
}
void MbD::ASMTAssembly::storeOnLevelLimits(std::ofstream& os, size_t level)
{
storeOnLevelString(os, level, "Limits");
for (auto& limit : *limits) {
limit->storeOnLevel(os, level + 1);
}
}
void MbD::ASMTAssembly::storeOnLevelGeneralConstraintSets(std::ofstream& os, size_t level)
{
storeOnLevelString(os, level, "GeneralConstraintSets");