X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchSolver%2FPlaneGCSSolver%2FPlaneGCSSolver_Solver.cpp;h=eea2a60ef302d9412573f8082e105acec5565723;hb=745c72679f6346375d5e886b25cc3865f3c4daae;hp=b1097be9716f9cdbf3e34dfe914ffa180eb4478b;hpb=5b6031b015602aa07f5a6fc668c13ac3faf7a8a9;p=modules%2Fshaper.git diff --git a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.cpp b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.cpp index b1097be97..eea2a60ef 100644 --- a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.cpp +++ b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.cpp @@ -1,34 +1,36 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: PlaneGCSSolver_Solver.cpp -// Created: 14 Dec 2014 -// Author: Artem ZHIDKOV - -#include "PlaneGCSSolver_Solver.h" +// Copyright (C) 2014-2021 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +#include #include -#include - -// remove indices of all point-point coincidences from the vector -static void removePtPtCoincidences(const ConstraintMap& theConstraints, GCS::VEC_I& theVecToClear) -{ - ConstraintMap::const_iterator aCIt = theConstraints.begin(); - for (; aCIt != theConstraints.end(); ++aCIt) { - if (aCIt->second != CONSTRAINT_PT_PT_COINCIDENT) - continue; - GCS::VEC_I::iterator aRIt = theVecToClear.begin(); - for (; aRIt != theVecToClear.end(); ++aRIt) - if (aCIt->first->getTag() == *aRIt) { - theVecToClear.erase(aRIt); - break; - } - } -} +// Multiplier to correlate IDs of SketchPlugin constraint and primitive PlaneGCS constraints +static const int THE_CONSTRAINT_MULT = 100; PlaneGCSSolver_Solver::PlaneGCSSolver_Solver() : myEquationSystem(new GCS::System), - myConfCollected(false) + myDiagnoseBeforeSolve(false), + myInitilized(false), + myConfCollected(false), + myDOF(0), + myFictiveConstraint(0) { } @@ -40,37 +42,109 @@ PlaneGCSSolver_Solver::~PlaneGCSSolver_Solver() void PlaneGCSSolver_Solver::clear() { myEquationSystem->clear(); - myConstraints.clear(); myParameters.clear(); + myConstraints.clear(); + myConflictingIDs.clear(); + myDOF = 0; + + removeFictiveConstraint(); +} + +void PlaneGCSSolver_Solver::addConstraint(const ConstraintID& theMultiConstraintID, + const std::list& theConstraints) +{ + int anID = theMultiConstraintID > CID_UNKNOWN ? + theMultiConstraintID * THE_CONSTRAINT_MULT : + theMultiConstraintID; + + for (std::list::const_iterator anIt = theConstraints.begin(); + anIt != theConstraints.end(); ++anIt) { + GCSConstraintPtr aConstraint = *anIt; + aConstraint->setTag(anID); + myEquationSystem->addConstraint(aConstraint.get()); + + if (anID > CID_UNKNOWN) + ++anID; + } + myConstraints[theMultiConstraintID] = theConstraints; + + if (theMultiConstraintID >= CID_UNKNOWN) + myDOF = -1; + myInitilized = false; } -void PlaneGCSSolver_Solver::addConstraint(GCSConstraintPtr theConstraint, - const SketchSolver_ConstraintType theType) +void PlaneGCSSolver_Solver::removeConstraint(const ConstraintID& theID) { - GCS::Constraint* aConstraint = theConstraint.get(); - if (myConstraints.find(aConstraint) != myConstraints.end()) - return; // constraint already exists, no need to add it again + ConstraintMap::iterator aFound = myConstraints.find(theID); + if (aFound != myConstraints.end()) { + for (std::list::iterator anIt = aFound->second.begin(); + anIt != aFound->second.end(); ++anIt) + myEquationSystem->clearByTag((*anIt)->getTag()); + + myConstraints.erase(aFound); + } + + if (myConstraints.empty()) { + myEquationSystem->clear(); + myDOF = (int)myParameters.size(); + } else if (theID >= CID_UNKNOWN) + myDOF = -1; - myEquationSystem->addConstraint(aConstraint); - myConstraints[aConstraint] = theType; + myInitilized = false; } -void PlaneGCSSolver_Solver::removeConstraint(GCSConstraintPtr theConstraint) +double* PlaneGCSSolver_Solver::createParameter() { - GCS::Constraint* aConstraint = theConstraint.get(); - removeConstraint(aConstraint); + double* aResult = new double(0); + myParameters.push_back(aResult); + if (myConstraints.empty() && myDOF >= 0) + ++myDOF; // calculate DoF by hand if and only if there is no constraints yet + else + myDiagnoseBeforeSolve = true; + return aResult; } -void PlaneGCSSolver_Solver::removeConstraint(GCS::Constraint* theConstraint) +void PlaneGCSSolver_Solver::addParameters(const GCS::SET_pD& theParams) { - if (myConstraints.find(theConstraint) == myConstraints.end()) - return; // no constraint, no need to remove it + GCS::SET_pD aParams(theParams); + // leave new parameters only + GCS::VEC_pD::iterator anIt = myParameters.begin(); + for (; anIt != myParameters.end(); ++anIt) + if (aParams.find(*anIt) != aParams.end()) + aParams.erase(*anIt); + + myParameters.insert(myParameters.end(), aParams.begin(), aParams.end()); + if (myConstraints.empty() && myDOF >=0) + myDOF += (int)aParams.size(); // calculate DoF by hand only if there is no constraints yet + else + myDiagnoseBeforeSolve = true; +} - myEquationSystem->removeConstraint(theConstraint); - myConstraints.erase(theConstraint); +void PlaneGCSSolver_Solver::removeParameters(const GCS::SET_pD& theParams) +{ + for (int i = (int)myParameters.size() - 1; i >= 0; --i) + if (theParams.find(myParameters[i]) != theParams.end()) { + myParameters.erase(myParameters.begin() + i); + --myDOF; + } + if (!myConstraints.empty()) + myDiagnoseBeforeSolve = true; } -SketchSolver_SolveStatus PlaneGCSSolver_Solver::solve() +void PlaneGCSSolver_Solver::initialize() +{ + Events_LongOp::start(this); + addFictiveConstraintIfNecessary(); + if (myDiagnoseBeforeSolve) + diagnose(); + myEquationSystem->declareUnknowns(myParameters); + myEquationSystem->initSolution(); + Events_LongOp::end(this); + + myInitilized = true; +} + +PlaneGCSSolver_Solver::SolveStatus PlaneGCSSolver_Solver::solve() { // clear list of conflicting constraints if (myConfCollected) { @@ -78,220 +152,225 @@ SketchSolver_SolveStatus PlaneGCSSolver_Solver::solve() myConfCollected = false; } - if (myConstraints.empty()) - return STATUS_EMPTYSET; if (myParameters.empty()) - return STATUS_INCONSISTENT; + return myConstraints.empty() ? STATUS_OK : STATUS_INCONSISTENT; - Events_LongOp::start(this); GCS::SolveStatus aResult = GCS::Success; - // if there is a constraint with all attributes constant, set fail status - GCS::SET_pD aParameters; - aParameters.insert(myParameters.begin(), myParameters.end()); - ConstraintMap::const_iterator aConstrIt = myConstraints.begin(); - for (; aConstrIt != myConstraints.end(); ++aConstrIt) { - GCS::VEC_pD aParams = aConstrIt->first->params(); - GCS::VEC_pD::const_iterator aPIt = aParams.begin(); - for (; aPIt != aParams.end(); ++aPIt) - if (aParameters.find(*aPIt) != aParameters.end()) - break; - if (aPIt == aParams.end() && aConstrIt->first->getTag() > 0) { - myConflictingIDs.insert(aConstrIt->first->getTag()); - myConfCollected = true; - aResult = GCS::Failed; - } - } - // solve equations - if (aResult == GCS::Success) + Events_LongOp::start(this); + if (myInitilized) { + aResult = (GCS::SolveStatus)myEquationSystem->solve(); + } else { + addFictiveConstraintIfNecessary(); + diagnose(); aResult = (GCS::SolveStatus)myEquationSystem->solve(myParameters); - - GCS::VEC_I aRedundantID; - - // Workaround: the system with tangent constraint - // may fail if the tangent entities are connected smoothly. - // Investigate this situation and move constraints to redundant list - if (aResult == GCS::Failed && !myTangent.empty()) { - GCS::VEC_I aConflictingID; - myEquationSystem->getConflicting(aConflictingID); - GCS::VEC_I::iterator aCIt = aConflictingID.begin(); - for (; aCIt != aConflictingID.end(); ++ aCIt) { - if (myTangent.find(*aCIt) == myTangent.end()) - continue; - if (isTangentTruth(*aCIt)) - aRedundantID.push_back(*aCIt); - } - - if (!aRedundantID.empty()) - aResult = GCS::Success; // check redundant constraints } - // Additionally check redundant constraints - if (aResult == GCS::Success || aResult == GCS::Converged) { - GCS::VEC_I aRedundantLocal; - myEquationSystem->getRedundant(aRedundantLocal); - aRedundantID.insert(aRedundantID.end(), aRedundantLocal.begin(), aRedundantLocal.end()); - // Workaround: remove all point-point coincidences from list of redundant - if (!aRedundantID.empty()) - removePtPtCoincidences(myConstraints, aRedundantID); - // The system with tangent constraints may show redundant constraints - // if the entities are coupled smoothly. - // Sometimes tangent constraints are fall to both conflicting and redundant constraints. - // Need to check if there are redundant constraints without these tangencies. - if (!aRedundantID.empty()) - aResult = myTangent.empty() ? GCS::Failed : solveWithoutTangent(); - else - aResult = GCS::Success; + if (aResult == GCS::Failed) { + // DogLeg solver failed without conflicting constraints, try to use Levenberg-Marquardt solver + diagnose(GCS::LevenbergMarquardt); + aResult = (GCS::SolveStatus)myEquationSystem->solve(myParameters, true, + GCS::LevenbergMarquardt); + if (aResult == GCS::Failed) { + diagnose(GCS::BFGS); + aResult = (GCS::SolveStatus)myEquationSystem->solve(myParameters, true, GCS::BFGS); + } } Events_LongOp::end(this); - SketchSolver_SolveStatus aStatus; - if (aResult == GCS::Success) { + // collect information about conflicting constraints every time, + // sometimes solver reports about succeeded recalculation but has conflicting constraints + // (for example, apply horizontal constraint for a copied feature) + collectConflicting(); + if (!myConflictingIDs.empty()) + aResult = GCS::Failed; + + SolveStatus aStatus; + if (aResult == GCS::Failed) + aStatus = STATUS_FAILED; + else { myEquationSystem->applySolution(); + if (myDOF < 0) + myDOF = myEquationSystem->dofsNumber(); aStatus = STATUS_OK; - } else - aStatus = STATUS_FAILED; + } + removeFictiveConstraint(); + myInitilized = false; return aStatus; } -GCS::SolveStatus PlaneGCSSolver_Solver::solveWithoutTangent() +void PlaneGCSSolver_Solver::undo() { - std::shared_ptr aSystemWithoutTangent(new GCS::System); - - // Remove tangency which leads to redundant or conflicting constraints - GCS::VEC_I aConflicting, aRedundant; - myEquationSystem->getRedundant(aRedundant); - size_t aNbRemove = myTangent.size(); // number of tangent constraints which can be removed - myEquationSystem->getConflicting(aConflicting); - aRedundant.insert(aRedundant.end(), aConflicting.begin(), aConflicting.end()); - - GCS::SET_I aTangentToRemove; - GCS::VEC_I::iterator aCIt = aRedundant.begin(); - for (; aCIt != aRedundant.end() && aNbRemove > 0; ++aCIt) - if (myTangent.find(*aCIt) != myTangent.end()) { - aTangentToRemove.insert(*aCIt); - --aNbRemove; - } - - std::set aRemovedTangent; - ConstraintMap::const_iterator aConstrIt = myConstraints.begin(); - while (aConstrIt != myConstraints.end()) { - GCS::Constraint* aConstraint = aConstrIt->first; - int anID = aConstraint->getTag(); - ++aConstrIt; - if (aTangentToRemove.find(anID) == aTangentToRemove.end()) - aSystemWithoutTangent->addConstraint(aConstraint); - else - aRemovedTangent.insert(aConstraint); - } - - myTangent.clear(); - GCS::SolveStatus aResult = (GCS::SolveStatus)aSystemWithoutTangent->solve(myParameters); - if (aResult == GCS::Success) { - GCS::VEC_I aRedundant; - aSystemWithoutTangent->getRedundant(aRedundant); - if (!aRedundant.empty()) { - removePtPtCoincidences(myConstraints, aRedundant); - if (!aRedundant.empty()) - aResult = GCS::Failed; - } - } - - // additional check that removed constraints are still correct - if (aResult == GCS::Success) { - aSystemWithoutTangent->applySolution(); - std::set::const_iterator aRemIt = aRemovedTangent.begin(); - for (; aRemIt != aRemovedTangent.end(); ++aRemIt) - if (!isTangentTruth(*aRemIt)) - break; - if (aRemIt != aRemovedTangent.end()) { - aResult = (GCS::SolveStatus)myEquationSystem->solve(myParameters); - if (aResult != GCS::Failed) { - aSystemWithoutTangent = myEquationSystem; - aResult = GCS::Success; - } - } - } - - if (aResult == GCS::Success) - myEquationSystem = aSystemWithoutTangent; - else { - // Add IDs of removed tangent to the list of conflicting constraints - std::set::const_iterator aRemIt = aRemovedTangent.begin(); - for (; aRemIt != aRemovedTangent.end(); ++aRemIt) - myConflictingIDs.insert((*aRemIt)->getTag()); - } - - return aResult; + myEquationSystem->undoSolution(); } -bool PlaneGCSSolver_Solver::isTangentTruth(GCS::Constraint* theTangent) const +bool PlaneGCSSolver_Solver::isConflicting(const ConstraintID& theConstraint) const { - if (theTangent->getTypeId() == GCS::TangentCircumf) { - static const double aTol = 1e-4; - GCS::VEC_pD aParams = theTangent->params(); - double dx = *(aParams[2]) - *(aParams[0]); - double dy = *(aParams[3]) - *(aParams[1]); - double aDist2 = dx * dx + dy * dy; - double aRadSum = *(aParams[4]) + *(aParams[5]); - double aRadDiff = *(aParams[4]) - *(aParams[5]); - double aTol2 = aTol * aRadSum; - aTol2 *= aTol2; - return fabs(aDist2 - aRadSum * aRadSum) <= aTol2 || - fabs(aDist2 - aRadDiff * aRadDiff) <= aTol2; - } - if (theTangent->getTypeId() == GCS::P2LDistance) { - static const double aTol2 = 1e-10; - GCS::VEC_pD aParams = theTangent->params(); - double aDist2 = *(aParams[6]) * *(aParams[6]); - // orthogonal line direction - double aDirX = *(aParams[5]) - *(aParams[3]); - double aDirY = *(aParams[2]) - *(aParams[4]); - double aLen2 = aDirX * aDirX + aDirY * aDirY; - // vector from line's start to point - double aVecX = *(aParams[0]) - *(aParams[2]); - double aVecY = *(aParams[1]) - *(aParams[3]); - - double aDot = aVecX * aDirX + aVecY * aDirY; - return fabs(aDot * aDot - aDist2 * aLen2) <= aTol2 * aLen2; - } - return false; + if (!myConfCollected) + const_cast(this)->collectConflicting(); + return myConflictingIDs.find((int)theConstraint) != myConflictingIDs.end(); } -bool PlaneGCSSolver_Solver::isTangentTruth(int theTagID) const +void PlaneGCSSolver_Solver::collectConflicting(bool withRedundant) { - ConstraintMap::const_iterator anIt = myConstraints.begin(); - for (; anIt != myConstraints.end(); ++anIt) - if (anIt->first->getTag() == theTagID) - return isTangentTruth(anIt->first); - return false; + GCS::VEC_I aConflict; + myEquationSystem->getConflicting(aConflict); + // convert PlaneGCS constraint IDs to SketchPlugin's ID + for (GCS::VEC_I::const_iterator anIt = aConflict.begin(); anIt != aConflict.end(); ++anIt) + myConflictingIDs.insert((*anIt) / THE_CONSTRAINT_MULT); + + if (withRedundant) { + myEquationSystem->getRedundant(aConflict); + // convert PlaneGCS constraint IDs to SketchPlugin's ID + for (GCS::VEC_I::const_iterator anIt = aConflict.begin(); anIt != aConflict.end(); ++anIt) + myConflictingIDs.insert((*anIt) / THE_CONSTRAINT_MULT); + } + + myConfCollected = true; } -void PlaneGCSSolver_Solver::undo() +int PlaneGCSSolver_Solver::dof() { - myEquationSystem->undoSolution(); + if (myDOF < 0 && !myConstraints.empty()) + diagnose(); + return myDOF; } -bool PlaneGCSSolver_Solver::isConflicting(const ConstraintID& theConstraint) const +void PlaneGCSSolver_Solver::diagnose(const GCS::Algorithm& theAlgo) { - if (!myConfCollected) - const_cast(this)->collectConflicting(); - return myConflictingIDs.find((int)theConstraint) != myConflictingIDs.end(); + myEquationSystem->declareUnknowns(myParameters); + myDOF = myEquationSystem->diagnose(theAlgo); + myDiagnoseBeforeSolve = false; } -void PlaneGCSSolver_Solver::collectConflicting() +void PlaneGCSSolver_Solver::getFreeParameters(GCS::SET_pD& theFreeParams) { - GCS::VEC_I aConflict; - myEquationSystem->getConflicting(aConflict); - myConflictingIDs.insert(aConflict.begin(), aConflict.end()); + if (myConstraints.empty()) + theFreeParams.insert(myParameters.begin(), myParameters.end()); + else { + GCS::VEC_pD aParametersCopy = myParameters; + ConstraintMap aConstraintCopy = myConstraints; + + // clear the set of equations + clear(); + // reset constraints + myParameters = aParametersCopy; + for (ConstraintMap::iterator anIt = aConstraintCopy.begin(); + anIt != aConstraintCopy.end(); ++anIt) + addConstraint(anIt->first, anIt->second); + + // parameters detection works for Dense QR only + GCS::QRAlgorithm aQRAlgo = myEquationSystem->qrAlgorithm; + myEquationSystem->qrAlgorithm = GCS::EigenDenseQR; + diagnose(); + GCS::VEC_pD aFreeParams; + myEquationSystem->getDependentParams(aFreeParams); + theFreeParams.insert(aFreeParams.begin(), aFreeParams.end()); + // revert QR decomposition algorithm + myEquationSystem->qrAlgorithm = aQRAlgo; + } - myEquationSystem->getRedundant(aConflict); - myConflictingIDs.insert(aConflict.begin(), aConflict.end()); + if (theFreeParams.empty()) + return; + + // find all equal parameters too + struct EqualParameters + { + typedef std::map::iterator> MapParamGroup; + + std::list myEqualParams; + MapParamGroup myGroups; + + void add(double* theParam1, double* theParam2) + { + MapParamGroup::iterator aFound1 = myGroups.find(theParam1); + MapParamGroup::iterator aFound2 = myGroups.find(theParam2); + + if (aFound1 == myGroups.end()) { + if (aFound2 == myGroups.end()) { + // create new group + myEqualParams.push_back(GCS::SET_pD()); + std::list::iterator aGroup = --myEqualParams.end(); + aGroup->insert(theParam1); + aGroup->insert(theParam2); + myGroups[theParam1] = aGroup; + myGroups[theParam2] = aGroup; + } + else { + // add first parameter to the second group + aFound2->second->insert(theParam1); + myGroups[theParam1] = aFound2->second; + } + } + else { + if (aFound2 == myGroups.end()) { + // add second parameter to the first group + aFound1->second->insert(theParam2); + myGroups[theParam2] = aFound1->second; + } + else if (aFound1 != aFound2) { + // merge two groups + GCS::SET_pD aCopy = *(aFound2->second); + myEqualParams.erase(aFound2->second); + for (GCS::SET_pD::iterator anIt = aCopy.begin(); anIt != aCopy.end(); ++anIt) + myGroups[*anIt] = aFound1->second; + aFound1->second->insert(aCopy.begin(), aCopy.end()); + } + } + } + } anEqualParams; - myConfCollected = true; + for (ConstraintMap::iterator anIt = myConstraints.begin(); anIt != myConstraints.end(); ++anIt) + for (std::list::iterator aCIt = anIt->second.begin(); + aCIt != anIt->second.end(); ++aCIt) { + if ((*aCIt)->getTypeId() == GCS::Equal) + anEqualParams.add((*aCIt)->params()[0], (*aCIt)->params()[1]); + } + + GCS::SET_pD aFreeParamsCopy = theFreeParams; + for (GCS::SET_pD::iterator anIt = aFreeParamsCopy.begin(); + anIt != aFreeParamsCopy.end(); ++anIt) { + EqualParameters::MapParamGroup::iterator aFound = anEqualParams.myGroups.find(*anIt); + if (aFound != anEqualParams.myGroups.end()) + theFreeParams.insert(aFound->second->begin(), aFound->second->end()); + } } -int PlaneGCSSolver_Solver::dof() const +void PlaneGCSSolver_Solver::addFictiveConstraintIfNecessary() { - return const_cast(this)->myEquationSystem->dofsNumber(); + bool hasOnlyMovement = true; + for (ConstraintMap::iterator anIt = myConstraints.begin(); + anIt != myConstraints.end() && hasOnlyMovement; ++anIt) + hasOnlyMovement = anIt->first == CID_MOVEMENT; + if (!hasOnlyMovement) + return; // regular constraints are available too + + if (myFictiveConstraint) + return; // no need several fictive constraints + + int aDOF = myDOF; + double* aParam = createParameter(); + double* aFictiveParameter = new double(0.0); + + myFictiveConstraint = new GCS::ConstraintEqual(aFictiveParameter, aParam); + myFictiveConstraint->setTag(CID_FICTIVE); + myEquationSystem->addConstraint(myFictiveConstraint); + // DoF should not be changed when adding fictive constraint + myDOF = aDOF; +} + +void PlaneGCSSolver_Solver::removeFictiveConstraint() +{ + if (myFictiveConstraint) { + myEquationSystem->clearByTag(myFictiveConstraint->getTag()); + myParameters.pop_back(); + + GCS::VEC_pD aParams = myFictiveConstraint->params(); + for (GCS::VEC_pD::iterator anIt = aParams.begin(); anIt != aParams.end(); ++anIt) { + double* aPar = *anIt; + delete aPar; + } + delete myFictiveConstraint; + myFictiveConstraint = 0; + } }