kindred/create
1
1
Fork 0
Code Issues 44 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[Assembly] fox typos in element names

Browse Source 
all found by the spellchecker CI
This commit is contained in:
Uwe
2022-03-12 17:54:35 +01:00
parent 217174d548
commit 25137db5ca
11 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Assembly/App/opendcm/core/constraint.hpp
View File

@@ -196,13 +196,13 @@ public:
operator()(EquationSet<T>& 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;

18
src/Mod/Assembly/App/opendcm/core/imp/clustergraph_imp.hpp
View File

@@ -71,7 +71,7 @@ struct vertex_copier {
Graph& graph2;
};
struct placehoder {
struct placeholder {
template<typename T>
void operator()(T t) {};
};
@@ -273,7 +273,7 @@ void ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::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<edge_prop, vertex_prop, cluster_prop, objects>::removeCluster(
template< typename edge_prop, typename vertex_prop, typename cluster_prop, typename objects>
void ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::removeCluster(std::shared_ptr<ClusterGraph> g) {
placehoder p;
placeholder p;
removeCluster(getClusterVertex(g), p);
};
@@ -457,7 +457,7 @@ void ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::removeCluster(
template< typename edge_prop, typename vertex_prop, typename cluster_prop, typename objects>
void ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::removeCluster(LocalVertex v) {
placehoder p;
placeholder p;
removeCluster(v, p);
};
@@ -717,7 +717,7 @@ void ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::removeVertex(L
template< typename edge_prop, typename vertex_prop, typename cluster_prop, typename objects>
void ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::removeVertex(LocalVertex id) {
placehoder p;
placeholder p;
removeVertex(getGlobalVertex(id), p);
};
@@ -729,7 +729,7 @@ void ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::removeVertex(G
template< typename edge_prop, typename vertex_prop, typename cluster_prop, typename objects>
void ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::removeVertex(GlobalVertex id) {
placehoder p;
placeholder p;
removeVertex(id, p);
};
@@ -740,9 +740,9 @@ void ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::removeEdge(Glo
if(!fusion::at_c<2> (res))
return; //TODO:throw
placehoder p;
placeholder p;
std::vector<edge_bundle_single>& 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<placehoder, ClusterGraph> (p, id)), vec.end());
vec.erase(std::remove_if(vec.begin(), vec.end(), apply_remove_prediacte<placeholder, ClusterGraph> (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<typename Functor>
void ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::removeEdge(LocalEdge id, Functor& f) {
std::vector<edge_bundle_single>& vec = fusion::at_c<1> ((*this) [id]);
std::for_each(vec.begin(), vec.end(), boost::bind<void> (boost::ref(apply_remove_prediacte<placehoder, ClusterGraph> (f, -1)), bp::_1));
std::for_each(vec.begin(), vec.end(), boost::bind<void> (boost::ref(apply_remove_prediacte<placeholder, ClusterGraph> (f, -1)), bp::_1));
boost::remove_edge(id, *this);
};

16
src/Mod/Assembly/App/opendcm/core/imp/constraint_holder_imp.hpp
View File

@@ -65,7 +65,7 @@ Constraint<Sys, Dim>::holder<ConstraintVector, tag1, tag2>::OptionSetter::operat
template<typename Sys, int Dim>
template<typename ConstraintVector, typename tag1, typename tag2>
Constraint<Sys, Dim>::holder<ConstraintVector, tag1, tag2>::Calculater::Calculater(geom_ptr f, geom_ptr s, Scalar sc, AccessType a)
Constraint<Sys, Dim>::holder<ConstraintVector, tag1, tag2>::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<Sys, Dim>::holder<ConstraintVector, tag1, tag2>::Calculater::Calculat
template<typename Sys, int Dim>
template<typename ConstraintVector, typename tag1, typename tag2>
template< typename T >
void Constraint<Sys, Dim>::holder<ConstraintVector, tag1, tag2>::Calculater::operator()(T& val) const {
void Constraint<Sys, Dim>::holder<ConstraintVector, tag1, tag2>::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<Sys, Dim>::holder<ConstraintVector, tag1, tag2>::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<Sys, Dim>::holder<ConstraintVector, tag1, tag2>::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<Sys, Dim>::holder<ConstraintVector, tag1, tag2>::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<typename Sys, int Dim>
template<typename ConstraintVector, typename tag1, typename tag2>
void Constraint<Sys, Dim>::holder<ConstraintVector, tag1, tag2>::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<typename Sys, int Dim>

12
src/Mod/Assembly/App/opendcm/core/imp/kernel_imp.hpp
View File

@@ -467,19 +467,19 @@ SolverInfo Kernel<Scalar, Nonlinear>::getSolverInfo() {
//static comparison versions
template<typename Scalar, template<class> class Nonlinear>
template <typename DerivedA,typename DerivedB>
bool Kernel<Scalar, Nonlinear>::isSame(const E::MatrixBase<DerivedA>& p1,const E::MatrixBase<DerivedB>& p2, number_type precission) {
return ((p1-p2).squaredNorm() < precission);
bool Kernel<Scalar, Nonlinear>::isSame(const E::MatrixBase<DerivedA>& p1,const E::MatrixBase<DerivedB>& p2, number_type precision) {
return ((p1-p2).squaredNorm() < precision);
}
template<typename Scalar, template<class> class Nonlinear>
bool Kernel<Scalar, Nonlinear>::isSame(number_type t1, number_type t2, number_type precission) {
return (std::abs(t1-t2) < precission);
bool Kernel<Scalar, Nonlinear>::isSame(number_type t1, number_type t2, number_type precision) {
return (std::abs(t1-t2) < precision);
}
template<typename Scalar, template<class> class Nonlinear>
template <typename DerivedA,typename DerivedB>
bool Kernel<Scalar, Nonlinear>::isOpposite(const E::MatrixBase<DerivedA>& p1,const E::MatrixBase<DerivedB>& p2, number_type precission) {
return ((p1+p2).squaredNorm() < precission);
bool Kernel<Scalar, Nonlinear>::isOpposite(const E::MatrixBase<DerivedA>& p1,const E::MatrixBase<DerivedB>& p2, number_type precision) {
return ((p1+p2).squaredNorm() < precision);
}
template<typename Scalar, template<class> class Nonlinear>

2
src/Mod/Assembly/App/opendcm/core/imp/system_imp.hpp
View File

@@ -91,7 +91,7 @@ void System<KernelType, T1, T2, T3>::clear() {
template< typename KernelType, typename T1, typename T2, typename T3 >
SolverInfo System<KernelType, T1, T2, T3>::solve() {
clock_t start = clock();
m_sheduler.execute(*this);
m_scheduler.execute(*this);
clock_t end = clock();
SolverInfo info = m_kernel.getSolverInfo();

8
src/Mod/Assembly/App/opendcm/core/kernel.hpp
View File

@@ -200,12 +200,12 @@ struct Kernel : public PropertyOwner< mpl::vector2<precision, iterations> > {
//static comparison versions
template <typename DerivedA,typename DerivedB>
static bool isSame(const E::MatrixBase<DerivedA>& p1,const E::MatrixBase<DerivedB>& p2, number_type precission);
static bool isSame(number_type t1, number_type t2, number_type precission);
static bool isSame(const E::MatrixBase<DerivedA>& p1,const E::MatrixBase<DerivedB>& p2, number_type precision);
static bool isSame(number_type t1, number_type t2, number_type precision);
template <typename DerivedA,typename DerivedB>
static bool isOpposite(const E::MatrixBase<DerivedA>& p1,const E::MatrixBase<DerivedB>& p2, number_type precission);
static bool isOpposite(const E::MatrixBase<DerivedA>& p1,const E::MatrixBase<DerivedB>& p2, number_type precision);
//runtime comparison versions (which use user settings for precission)
//runtime comparison versions (which use user settings for precision)
template <typename DerivedA,typename DerivedB>
bool isSame(const E::MatrixBase<DerivedA>& p1,const E::MatrixBase<DerivedB>& p2);
bool isSame(number_type t1, number_type t2);

6
src/Mod/Assembly/App/opendcm/core/sheduler.hpp → src/Mod/Assembly/App/opendcm/core/scheduler.hpp
View File

@@ -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 <set>
#include <algorithm>
@@ -97,4 +97,4 @@ protected:
}
#endif //GCM_SHEDULER_H
#endif //GCM_SCHEDULER_H

6
src/Mod/Assembly/App/opendcm/core/system.hpp
View File

@@ -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<edge_properties, vertex_properties, cluster_properties, objects> Cluster;
typedef Sheduler< BaseType > Shedule;
typedef Scheduler< BaseType > Schedule;
typedef KernelType Kernel;
public:
@@ -280,7 +280,7 @@ public:
std::shared_ptr<Cluster> m_cluster;
std::shared_ptr<Storage> m_storage;
Shedule m_sheduler;
Schedule m_scheduler;
Kernel m_kernel;
std::vector<std::shared_ptr<System> > m_subsystems;

4
src/Mod/Assembly/App/opendcm/module3d/module.hpp
View File

@@ -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

2
src/Mod/Assembly/App/opendcm/module3d/solver.hpp
View File

@@ -21,7 +21,7 @@
#define GCM_SOLVER_3D_H
#include "defines.hpp"
#include "opendcm/core/sheduler.hpp"
#include "opendcm/core/scheduler.hpp"
#include <boost/graph/depth_first_search.hpp>

4
src/Mod/Assembly/App/opendcm/modulePart/module.hpp
View File

@@ -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) {};
};