From 25137db5ca7e9cd6ae08313a6208e26fd2e42ddf Mon Sep 17 00:00:00 2001 From: Uwe Date: Sat, 12 Mar 2022 17:54:35 +0100 Subject: [PATCH] [Assembly] fox typos in element names all found by the spellchecker CI --- .../Assembly/App/opendcm/core/constraint.hpp | 6 +++--- .../App/opendcm/core/imp/clustergraph_imp.hpp | 18 +++++++++--------- .../opendcm/core/imp/constraint_holder_imp.hpp | 16 ++++++++-------- .../App/opendcm/core/imp/kernel_imp.hpp | 12 ++++++------ .../App/opendcm/core/imp/system_imp.hpp | 2 +- src/Mod/Assembly/App/opendcm/core/kernel.hpp | 8 ++++---- .../core/{sheduler.hpp => scheduler.hpp} | 6 +++--- src/Mod/Assembly/App/opendcm/core/system.hpp | 6 +++--- .../Assembly/App/opendcm/module3d/module.hpp | 4 ++-- .../Assembly/App/opendcm/module3d/solver.hpp | 2 +- .../Assembly/App/opendcm/modulePart/module.hpp | 4 ++-- 11 files changed, 42 insertions(+), 42 deletions(-) rename src/Mod/Assembly/App/opendcm/core/{sheduler.hpp => scheduler.hpp} (97%) diff --git a/src/Mod/Assembly/App/opendcm/core/constraint.hpp b/src/Mod/Assembly/App/opendcm/core/constraint.hpp index 9cb957b3d5..cd4918b8f4 100644 --- a/src/Mod/Assembly/App/opendcm/core/constraint.hpp +++ b/src/Mod/Assembly/App/opendcm/core/constraint.hpp @@ -196,13 +196,13 @@ public: operator()(EquationSet& val) const; }; - struct Calculater { + struct Calculator { geom_ptr first, second; Scalar scale; AccessType access; - Calculater(geom_ptr f, geom_ptr s, Scalar sc, AccessType a = general); + Calculator(geom_ptr f, geom_ptr s, Scalar sc, AccessType a = general); template< typename T > void operator()(T& val) const; @@ -303,7 +303,7 @@ public: EquationSets m_sets; Objects m_objects; protected: - void for_each(EquationSets m_sets, Calculater Calculater); + void for_each(EquationSets m_sets, Calculator Calculator); }; placeholder* content; diff --git a/src/Mod/Assembly/App/opendcm/core/imp/clustergraph_imp.hpp b/src/Mod/Assembly/App/opendcm/core/imp/clustergraph_imp.hpp index 7d08b0d89e..8ae9ee3848 100644 --- a/src/Mod/Assembly/App/opendcm/core/imp/clustergraph_imp.hpp +++ b/src/Mod/Assembly/App/opendcm/core/imp/clustergraph_imp.hpp @@ -71,7 +71,7 @@ struct vertex_copier { Graph& graph2; }; -struct placehoder { +struct placeholder { template void operator()(T t) {}; }; @@ -273,7 +273,7 @@ void ClusterGraph::copyInto(std:: put(propmapIndex, *vit.first, c); //first copy all vertices and edges, but be aware that the objects in the new graph - //are also copys only and point to the old graph. there is a bug in older boost version + //are also copies only and point to the old graph. there is a bug in older boost version //(<1.5 i believe) that breaks vertex_all property map for bundled properties, so we //have to create our own copier functors into->clear(); @@ -425,7 +425,7 @@ void ClusterGraph::removeCluster( template< typename edge_prop, typename vertex_prop, typename cluster_prop, typename objects> void ClusterGraph::removeCluster(std::shared_ptr g) { - placehoder p; + placeholder p; removeCluster(getClusterVertex(g), p); }; @@ -457,7 +457,7 @@ void ClusterGraph::removeCluster( template< typename edge_prop, typename vertex_prop, typename cluster_prop, typename objects> void ClusterGraph::removeCluster(LocalVertex v) { - placehoder p; + placeholder p; removeCluster(v, p); }; @@ -717,7 +717,7 @@ void ClusterGraph::removeVertex(L template< typename edge_prop, typename vertex_prop, typename cluster_prop, typename objects> void ClusterGraph::removeVertex(LocalVertex id) { - placehoder p; + placeholder p; removeVertex(getGlobalVertex(id), p); }; @@ -729,7 +729,7 @@ void ClusterGraph::removeVertex(G template< typename edge_prop, typename vertex_prop, typename cluster_prop, typename objects> void ClusterGraph::removeVertex(GlobalVertex id) { - placehoder p; + placeholder p; removeVertex(id, p); }; @@ -740,9 +740,9 @@ void ClusterGraph::removeEdge(Glo if(!fusion::at_c<2> (res)) return; //TODO:throw - placehoder p; + placeholder p; std::vector& vec = fusion::at_c<1> ((*fusion::at_c<1> (res)) [fusion::at_c<0> (res)]); - vec.erase(std::remove_if(vec.begin(), vec.end(), apply_remove_prediacte (p, id)), vec.end()); + vec.erase(std::remove_if(vec.begin(), vec.end(), apply_remove_prediacte (p, id)), vec.end()); if(vec.empty()) boost::remove_edge(fusion::at_c<0> (res), *fusion::at_c<1> (res)); @@ -753,7 +753,7 @@ template void ClusterGraph::removeEdge(LocalEdge id, Functor& f) { std::vector& vec = fusion::at_c<1> ((*this) [id]); - std::for_each(vec.begin(), vec.end(), boost::bind (boost::ref(apply_remove_prediacte (f, -1)), bp::_1)); + std::for_each(vec.begin(), vec.end(), boost::bind (boost::ref(apply_remove_prediacte (f, -1)), bp::_1)); boost::remove_edge(id, *this); }; diff --git a/src/Mod/Assembly/App/opendcm/core/imp/constraint_holder_imp.hpp b/src/Mod/Assembly/App/opendcm/core/imp/constraint_holder_imp.hpp index 4761095195..79750a2519 100644 --- a/src/Mod/Assembly/App/opendcm/core/imp/constraint_holder_imp.hpp +++ b/src/Mod/Assembly/App/opendcm/core/imp/constraint_holder_imp.hpp @@ -65,7 +65,7 @@ Constraint::holder::OptionSetter::operat template template -Constraint::holder::Calculater::Calculater(geom_ptr f, geom_ptr s, Scalar sc, AccessType a) +Constraint::holder::Calculator::Calculator(geom_ptr f, geom_ptr s, Scalar sc, AccessType a) : first(f), second(s), scale(sc), access(a) { }; @@ -73,7 +73,7 @@ Constraint::holder::Calculater::Calculat template template template< typename T > -void Constraint::holder::Calculater::operator()(T& val) const { +void Constraint::holder::Calculator::operator()(T& val) const { //if the equation is disabled we don't have anything mapped so avoid accessing it if(!val.enabled) @@ -243,7 +243,7 @@ void Constraint::holder::LGZ::operator() //to treat local gradient zeros we calculate a approximate second derivative of the equations //only do that if neseccary: residual is not zero - if(!Kernel::isSame(val.m_residual(0),0, 1e-7)) { //TODO: use exact precission and scale value + if(!Kernel::isSame(val.m_residual(0),0, 1e-7)) { //TODO: use exact precision and scale value //rotations exist only in cluster if(first->getClusterMode() && !first->isClusterFixed()) { @@ -253,11 +253,11 @@ void Constraint::holder::LGZ::operator() //only treat if the gradient really is zero if(Kernel::isSame(val.m_diff_first_rot(i), 0, 1e-7)) { - //to get the approximated second derivative we need the slightly moved geometrie + //to get the approximated second derivative we need the slightly moved geometry const typename Kernel::Vector p_old = first->m_parameter; first->m_parameter += first->m_diffparam.col(i)*1e-3; first->normalize(); - //with this changed geometrie we test if a gradient exist now + //with this changed geometry we test if a gradient exist now typename Kernel::VectorMap block(&first->m_diffparam(0,i),first->m_parameterCount,1, DS(1,1)); typename Kernel::number_type res = val.m_eq.calculateGradientFirst(first->m_parameter, second->m_parameter, block); @@ -280,11 +280,11 @@ void Constraint::holder::LGZ::operator() //only treat if the gradient really is zero if(Kernel::isSame(val.m_diff_second_rot(i), 0, 1e-7)) { - //to get the approximated second derivative we need the slightly moved geometrie + //to get the approximated second derivative we need the slightly moved geometry const typename Kernel::Vector p_old = second->m_parameter; second->m_parameter += second->m_diffparam.col(i)*1e-3; second->normalize(); - //with this changed geometrie we test if a gradient exist now + //with this changed geometry we test if a gradient exist now typename Kernel::VectorMap block(&second->m_diffparam(0,i),second->m_parameterCount,1, DS(1,1)); typename Kernel::number_type res = val.m_eq.calculateGradientFirst(first->m_parameter, second->m_parameter, block); @@ -355,7 +355,7 @@ template template void Constraint::holder::calculate(geom_ptr first, geom_ptr second, Scalar scale, AccessType access) { - fusion::for_each(m_sets, Calculater(first, second, scale, access)); + fusion::for_each(m_sets, Calculator(first, second, scale, access)); }; template diff --git a/src/Mod/Assembly/App/opendcm/core/imp/kernel_imp.hpp b/src/Mod/Assembly/App/opendcm/core/imp/kernel_imp.hpp index b836f7ba3e..791460059a 100644 --- a/src/Mod/Assembly/App/opendcm/core/imp/kernel_imp.hpp +++ b/src/Mod/Assembly/App/opendcm/core/imp/kernel_imp.hpp @@ -467,19 +467,19 @@ SolverInfo Kernel::getSolverInfo() { //static comparison versions template class Nonlinear> template -bool Kernel::isSame(const E::MatrixBase& p1,const E::MatrixBase& p2, number_type precission) { - return ((p1-p2).squaredNorm() < precission); +bool Kernel::isSame(const E::MatrixBase& p1,const E::MatrixBase& p2, number_type precision) { + return ((p1-p2).squaredNorm() < precision); } template class Nonlinear> -bool Kernel::isSame(number_type t1, number_type t2, number_type precission) { - return (std::abs(t1-t2) < precission); +bool Kernel::isSame(number_type t1, number_type t2, number_type precision) { + return (std::abs(t1-t2) < precision); } template class Nonlinear> template -bool Kernel::isOpposite(const E::MatrixBase& p1,const E::MatrixBase& p2, number_type precission) { - return ((p1+p2).squaredNorm() < precission); +bool Kernel::isOpposite(const E::MatrixBase& p1,const E::MatrixBase& p2, number_type precision) { + return ((p1+p2).squaredNorm() < precision); } template class Nonlinear> diff --git a/src/Mod/Assembly/App/opendcm/core/imp/system_imp.hpp b/src/Mod/Assembly/App/opendcm/core/imp/system_imp.hpp index d6318e1ff7..a72de4dc94 100644 --- a/src/Mod/Assembly/App/opendcm/core/imp/system_imp.hpp +++ b/src/Mod/Assembly/App/opendcm/core/imp/system_imp.hpp @@ -91,7 +91,7 @@ void System::clear() { template< typename KernelType, typename T1, typename T2, typename T3 > SolverInfo System::solve() { clock_t start = clock(); - m_sheduler.execute(*this); + m_scheduler.execute(*this); clock_t end = clock(); SolverInfo info = m_kernel.getSolverInfo(); diff --git a/src/Mod/Assembly/App/opendcm/core/kernel.hpp b/src/Mod/Assembly/App/opendcm/core/kernel.hpp index 4526a6370e..bb07578d9c 100644 --- a/src/Mod/Assembly/App/opendcm/core/kernel.hpp +++ b/src/Mod/Assembly/App/opendcm/core/kernel.hpp @@ -200,12 +200,12 @@ struct Kernel : public PropertyOwner< mpl::vector2 > { //static comparison versions template - static bool isSame(const E::MatrixBase& p1,const E::MatrixBase& p2, number_type precission); - static bool isSame(number_type t1, number_type t2, number_type precission); + static bool isSame(const E::MatrixBase& p1,const E::MatrixBase& p2, number_type precision); + static bool isSame(number_type t1, number_type t2, number_type precision); template - static bool isOpposite(const E::MatrixBase& p1,const E::MatrixBase& p2, number_type precission); + static bool isOpposite(const E::MatrixBase& p1,const E::MatrixBase& p2, number_type precision); - //runtime comparison versions (which use user settings for precission) + //runtime comparison versions (which use user settings for precision) template bool isSame(const E::MatrixBase& p1,const E::MatrixBase& p2); bool isSame(number_type t1, number_type t2); diff --git a/src/Mod/Assembly/App/opendcm/core/sheduler.hpp b/src/Mod/Assembly/App/opendcm/core/scheduler.hpp similarity index 97% rename from src/Mod/Assembly/App/opendcm/core/sheduler.hpp rename to src/Mod/Assembly/App/opendcm/core/scheduler.hpp index 873caf6ba3..3e732283c9 100644 --- a/src/Mod/Assembly/App/opendcm/core/sheduler.hpp +++ b/src/Mod/Assembly/App/opendcm/core/scheduler.hpp @@ -17,8 +17,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef GCM_SHEDULER_H -#define GCM_SHEDULER_H +#ifndef GCM_SCHEDULER_H +#define GCM_SCHEDULER_H #include #include @@ -97,4 +97,4 @@ protected: } -#endif //GCM_SHEDULER_H +#endif //GCM_SCHEDULER_H diff --git a/src/Mod/Assembly/App/opendcm/core/system.hpp b/src/Mod/Assembly/App/opendcm/core/system.hpp index 9ca504641a..c99df3ad7d 100644 --- a/src/Mod/Assembly/App/opendcm/core/system.hpp +++ b/src/Mod/Assembly/App/opendcm/core/system.hpp @@ -34,7 +34,7 @@ #include "property.hpp" #include "clustergraph.hpp" -#include "sheduler.hpp" +#include "scheduler.hpp" #include "logging.hpp" #include "traits.hpp" #include "object.hpp" @@ -220,7 +220,7 @@ protected: public: typedef ClusterGraph Cluster; - typedef Sheduler< BaseType > Shedule; + typedef Scheduler< BaseType > Schedule; typedef KernelType Kernel; public: @@ -280,7 +280,7 @@ public: std::shared_ptr m_cluster; std::shared_ptr m_storage; - Shedule m_sheduler; + Schedule m_scheduler; Kernel m_kernel; std::vector > m_subsystems; diff --git a/src/Mod/Assembly/App/opendcm/module3d/module.hpp b/src/Mod/Assembly/App/opendcm/module3d/module.hpp index b5a374c7da..9466538e65 100644 --- a/src/Mod/Assembly/App/opendcm/module3d/module.hpp +++ b/src/Mod/Assembly/App/opendcm/module3d/module.hpp @@ -32,7 +32,7 @@ #include "opendcm/core/object.hpp" #include "opendcm/core/geometry.hpp" #include "opendcm/core/clustergraph.hpp" -#include "opendcm/core/sheduler.hpp" +#include "opendcm/core/scheduler.hpp" #include "opendcm/core/traits.hpp" #include "geometry.hpp" #include "distance.hpp" @@ -276,7 +276,7 @@ struct Module3D { typedef mpl::map0<> signals; static void system_init(Sys& sys) { - sys.m_sheduler.addProcessJob(new SystemSolver()); + sys.m_scheduler.addProcessJob(new SystemSolver()); }; static void system_copy(const Sys& from, Sys& into) { //nothing to to as all objects and properties are copied with the clustergraph diff --git a/src/Mod/Assembly/App/opendcm/module3d/solver.hpp b/src/Mod/Assembly/App/opendcm/module3d/solver.hpp index 413c32e3ea..e31207954b 100644 --- a/src/Mod/Assembly/App/opendcm/module3d/solver.hpp +++ b/src/Mod/Assembly/App/opendcm/module3d/solver.hpp @@ -21,7 +21,7 @@ #define GCM_SOLVER_3D_H #include "defines.hpp" -#include "opendcm/core/sheduler.hpp" +#include "opendcm/core/scheduler.hpp" #include diff --git a/src/Mod/Assembly/App/opendcm/modulePart/module.hpp b/src/Mod/Assembly/App/opendcm/modulePart/module.hpp index 386d307a02..251daaf0c3 100644 --- a/src/Mod/Assembly/App/opendcm/modulePart/module.hpp +++ b/src/Mod/Assembly/App/opendcm/modulePart/module.hpp @@ -273,8 +273,8 @@ struct ModulePart { }; static void system_init(Sys& sys) { - sys.m_sheduler.addPreprocessJob(new PrepareCluster()); - sys.m_sheduler.addPostprocessJob(new EvaljuateCluster()); + sys.m_scheduler.addPreprocessJob(new PrepareCluster()); + sys.m_scheduler.addPostprocessJob(new EvaljuateCluster()); }; static void system_copy(const Sys& from, Sys& into) {}; };