------------------------------------------------------------ revno: 4056 committer: Anton Gladky <[email protected]> timestamp: Thu 2014-07-03 19:20:40 +0200 message: Clean up in header inclusions. modified: core/Body.cpp core/Body.hpp core/BodyContainer.hpp core/Clump.cpp core/Clump.hpp core/Dispatcher.cpp core/Dispatcher.hpp core/EnergyTracker.hpp core/Engine.hpp core/FileGenerator.cpp core/ForceContainer.hpp core/InteractionContainer.hpp core/Material.cpp core/Material.hpp core/Omega.cpp core/Scene.cpp core/State.cpp core/ThreadRunner.cpp core/Timing.hpp core/corePlugins.cpp core/main/pyboot.cpp gui/qt4/GLViewer.cpp gui/qt4/GLViewerDisplay.cpp gui/qt4/GLViewerMouse.cpp gui/qt4/_GLViewer.cpp lib/base/Math.hpp lib/base/openmp-accu.hpp lib/factory/ClassFactory.hpp lib/factory/DynLibManager.cpp lib/factory/DynLibManager.hpp lib/multimethods/FunctorWrapper.hpp lib/opengl/GLUtils.hpp lib/pyutil/doc_opts.hpp lib/pyutil/numpy_boost.hpp lib/pyutil/raw_constructor.hpp lib/serialization/Serializable.hpp lib/smoothing/WeightedAverage2d.hpp lib/triangulation/KinematicLocalisationAnalyser.cpp pkg/common/BoundaryController.cpp pkg/common/Callbacks.hpp pkg/common/ElastMat.hpp pkg/common/InsertionSortCollider.cpp pkg/common/MatchMaker.cpp pkg/common/MatchMaker.hpp pkg/common/ParallelEngine.cpp pkg/common/ParallelEngine.hpp pkg/common/PersistentTriangulationCollider.cpp pkg/common/Recorder.hpp pkg/common/ResetRandomPosition.cpp pkg/common/Wall.cpp pkg/common/ZECollider.cpp pkg/common/ZECollider.hpp pkg/dem/CapillaryStressRecorder.cpp pkg/dem/CapillaryTriaxialTest.cpp pkg/dem/CohesiveFrictionalContactLaw.hpp pkg/dem/CohesiveTriaxialTest.cpp pkg/dem/FlatGridCollider.hpp pkg/dem/FrictViscoPM.hpp pkg/dem/Integrator.cpp pkg/dem/Integrator.hpp pkg/dem/L3Geom.cpp pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp pkg/dem/Polyhedra.hpp pkg/dem/SampleCapillaryPressureEngine.cpp pkg/dem/Shop.hpp pkg/dem/Shop_01.cpp pkg/dem/Shop_02.cpp pkg/dem/SpherePack.hpp pkg/dem/TesselationWrapper.cpp pkg/dem/TesselationWrapper.hpp pkg/dem/Tetra.hpp pkg/dem/ThreeDTriaxialEngine.cpp pkg/dem/ThreeDTriaxialEngine.hpp pkg/dem/TriaxialCompressionEngine.cpp pkg/dem/TriaxialCompressionEngine.hpp pkg/dem/TriaxialStateRecorder.cpp pkg/dem/TriaxialTest.cpp pkg/dem/UniaxialStrainer.cpp pkg/dem/UniaxialStrainer.hpp py/_polyhedra_utils.cpp py/_utils.cpp py/mathWrap/miniEigen.cpp py/pack/_packObb.cpp py/pack/_packPredicates.cpp py/wrapper/customConverters.cpp py/wrapper/yadeWrapper.cpp
-- lp:yade https://code.launchpad.net/~yade-pkg/yade/git-trunk Your team Yade developers is subscribed to branch lp:yade. To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription
=== modified file 'core/Body.cpp' --- core/Body.cpp 2014-06-17 10:18:00 +0000 +++ core/Body.cpp 2014-07-03 17:20:40 +0000 @@ -1,6 +1,5 @@ #include<yade/core/Body.hpp> -#include<limits> #include<yade/core/Scene.hpp> #include<yade/core/Omega.hpp> #include<yade/core/InteractionContainer.hpp> === modified file 'core/Body.hpp' --- core/Body.hpp 2014-06-17 10:18:00 +0000 +++ core/Body.hpp 2014-07-03 17:20:40 +0000 @@ -9,8 +9,6 @@ *************************************************************************/ #pragma once -#include<iostream> -#include<map> #include"Shape.hpp" #include"Bound.hpp" #include"State.hpp" === modified file 'core/BodyContainer.hpp' --- core/BodyContainer.hpp 2014-05-15 17:50:26 +0000 +++ core/BodyContainer.hpp 2014-07-03 17:20:40 +0000 @@ -5,12 +5,6 @@ #pragma once #include<yade/lib/serialization/Serializable.hpp> - -#include<boost/foreach.hpp> -#ifndef FOREACH -# define FOREACH BOOST_FOREACH -#endif - #include<boost/tuple/tuple.hpp> class Body; === modified file 'core/Clump.cpp' --- core/Clump.cpp 2014-07-02 16:11:24 +0000 +++ core/Clump.cpp 2014-07-03 17:20:40 +0000 @@ -1,7 +1,6 @@ // (c) 2007-2010 Vaclav Smilauer <[email protected]> #include"Clump.hpp" -#include<algorithm> #include<yade/core/Scene.hpp> #include<yade/core/BodyContainer.hpp> #include<yade/core/State.hpp> === modified file 'core/Clump.hpp' --- core/Clump.hpp 2014-05-23 13:05:19 +0000 +++ core/Clump.hpp 2014-07-03 17:20:40 +0000 @@ -2,9 +2,6 @@ #pragma once -#include<vector> -#include<map> -#include<stdexcept> #include<yade/core/Body.hpp> #include<yade/lib/base/Logging.hpp> #include<yade/lib/base/Math.hpp> === modified file 'core/Dispatcher.cpp' --- core/Dispatcher.cpp 2010-08-24 12:54:14 +0000 +++ core/Dispatcher.cpp 2014-07-03 17:20:40 +0000 @@ -11,8 +11,5 @@ Functor::~Functor(){}; // vtable #include "Dispatcher.hpp" -#include<algorithm> -#include<vector> - Dispatcher::~Dispatcher(){} === modified file 'core/Dispatcher.hpp' --- core/Dispatcher.hpp 2014-07-02 16:11:24 +0000 +++ core/Dispatcher.hpp 2014-07-03 17:20:40 +0000 @@ -8,7 +8,6 @@ #pragma once -#include<boost/lexical_cast.hpp> #include<yade/core/Engine.hpp> #include<yade/core/Functor.hpp> === modified file 'core/EnergyTracker.hpp' --- core/EnergyTracker.hpp 2014-05-23 13:03:50 +0000 +++ core/EnergyTracker.hpp 2014-07-03 17:20:40 +0000 @@ -1,14 +1,7 @@ #pragma once -#include<boost/python.hpp> -#include<boost/foreach.hpp> -#include<string> #include<yade/lib/base/openmp-accu.hpp> #include<yade/lib/serialization/Serializable.hpp> -#ifndef FOREACH - #define FOREACH BOOST_FOREACH -#endif - namespace py=boost::python; class EnergyTracker: public Serializable{ === modified file 'core/Engine.hpp' --- core/Engine.hpp 2013-05-14 21:24:11 +0000 +++ core/Engine.hpp 2014-07-03 17:20:40 +0000 @@ -14,12 +14,6 @@ #include<yade/core/Omega.hpp> #include<yade/core/Timing.hpp> #include<yade/lib/base/Logging.hpp> -#include<stdexcept> - -#include<boost/foreach.hpp> -#ifndef FOREACH -#define FOREACH BOOST_FOREACH -#endif class Body; class Scene; === modified file 'core/FileGenerator.cpp' --- core/FileGenerator.cpp 2014-07-02 16:11:24 +0000 +++ core/FileGenerator.cpp 2014-07-03 17:20:40 +0000 @@ -4,7 +4,6 @@ *************************************************************************/ #include<yade/core/Omega.hpp> -#include<cstdlib> #include<boost/date_time/posix_time/posix_time.hpp> #include<yade/lib/pyutil/gil.hpp> #include<yade/lib/serialization/ObjectIO.hpp> === modified file 'core/ForceContainer.hpp' --- core/ForceContainer.hpp 2014-07-02 16:11:24 +0000 +++ core/ForceContainer.hpp 2014-07-03 17:20:40 +0000 @@ -1,8 +1,6 @@ // 2009 © Václav Šmilauer <[email protected]> #pragma once -#include<string.h> -#include<vector> #include<yade/lib/base/Math.hpp> #include<yade/core/Body.hpp> === modified file 'core/InteractionContainer.hpp' --- core/InteractionContainer.hpp 2014-06-04 08:51:38 +0000 +++ core/InteractionContainer.hpp 2014-07-03 17:20:40 +0000 @@ -14,11 +14,6 @@ #include<yade/core/Interaction.hpp> #include<yade/core/BodyContainer.hpp> -#include<boost/foreach.hpp> -#ifndef FOREACH -# define FOREACH BOOST_FOREACH -#endif - /* This InteractionContainer implementation has reference to the body container and stores interactions in 2 places: === modified file 'core/Material.cpp' --- core/Material.cpp 2010-09-27 17:47:59 +0000 +++ core/Material.cpp 2014-07-03 17:20:40 +0000 @@ -1,10 +1,6 @@ #include<stdexcept> #include<yade/core/Material.hpp> #include<yade/core/Scene.hpp> -#include<boost/foreach.hpp> -#ifndef FOREACH - #define FOREACH BOOST_FOREACH -#endif Material::~Material(){} === modified file 'core/Material.hpp' --- core/Material.hpp 2010-11-07 11:46:20 +0000 +++ core/Material.hpp 2014-07-03 17:20:40 +0000 @@ -1,6 +1,5 @@ // 2009 © Václav Šmilauer <[email protected]> #pragma once -#include<string> #include<yade/lib/serialization/Serializable.hpp> #include<yade/lib/multimethods/Indexable.hpp> #include<yade/core/State.hpp> === modified file 'core/Omega.cpp' --- core/Omega.cpp 2014-07-02 19:23:14 +0000 +++ core/Omega.cpp 2014-07-03 17:20:40 +0000 @@ -15,14 +15,11 @@ #include<yade/lib/base/Math.hpp> #include<yade/lib/multimethods/FunctorWrapper.hpp> #include<yade/lib/multimethods/Indexable.hpp> -#include<cstdlib> #include<boost/filesystem/operations.hpp> #include<boost/filesystem/convenience.hpp> #include<boost/filesystem/exception.hpp> #include<boost/algorithm/string.hpp> #include<boost/thread/mutex.hpp> -#include<boost/version.hpp> -#include<boost/python.hpp> #include<yade/lib/serialization/ObjectIO.hpp> === modified file 'core/Scene.cpp' --- core/Scene.cpp 2014-07-02 16:11:24 +0000 +++ core/Scene.cpp 2014-07-03 17:20:40 +0000 @@ -14,7 +14,6 @@ #include<yade/core/TimeStepper.hpp> #include<yade/lib/base/Math.hpp> -#include<boost/foreach.hpp> #include<boost/date_time/posix_time/posix_time.hpp> #include<boost/algorithm/string.hpp> === modified file 'core/State.cpp' --- core/State.cpp 2014-05-23 13:05:19 +0000 +++ core/State.cpp 2014-07-03 17:20:40 +0000 @@ -1,10 +1,5 @@ // 2009 © Václav Šmilauer <[email protected]> #include<yade/core/State.hpp> -#include<boost/foreach.hpp> -#include<stdexcept> -#ifndef FOREACH - #define FOREACH BOOST_FOREACH -#endif CREATE_LOGGER(State); === modified file 'core/ThreadRunner.cpp' --- core/ThreadRunner.cpp 2012-05-07 17:27:44 +0000 +++ core/ThreadRunner.cpp 2014-07-03 17:20:40 +0000 @@ -14,8 +14,6 @@ #include <boost/function.hpp> #include <boost/bind.hpp> -#include<iostream> - CREATE_LOGGER(ThreadRunner); void ThreadRunner::run() === modified file 'core/Timing.hpp' --- core/Timing.hpp 2009-12-18 20:55:02 +0000 +++ core/Timing.hpp 2014-07-03 17:20:40 +0000 @@ -1,7 +1,6 @@ // 2009 © Václav Šmilauer <[email protected]> #pragma once #include<time.h> -#include<boost/python.hpp> struct TimingInfo{ typedef unsigned long long delta; === modified file 'core/corePlugins.cpp' --- core/corePlugins.cpp 2010-11-07 11:46:20 +0000 +++ core/corePlugins.cpp 2014-07-03 17:20:40 +0000 @@ -20,7 +20,6 @@ #include<yade/core/State.hpp> #include<yade/core/TimeStepper.hpp> -#include<boost/version.hpp> // these two are not accessible from python directly (though they should be in the future, perhaps) === modified file 'core/main/pyboot.cpp' --- core/main/pyboot.cpp 2014-05-23 13:20:43 +0000 +++ core/main/pyboot.cpp 2014-07-03 17:20:40 +0000 @@ -2,13 +2,7 @@ #include<yade/lib/base/Logging.hpp> #include<signal.h> -#include<cstdlib> -#include<cstdio> -#include<iostream> -#include<string> -#include<stdexcept> -#include<boost/python.hpp> #include<boost/filesystem/convenience.hpp> #ifdef YADE_DEBUG === modified file 'gui/qt4/GLViewer.cpp' --- gui/qt4/GLViewer.cpp 2014-07-02 19:23:14 +0000 +++ gui/qt4/GLViewer.cpp 2014-07-03 17:20:40 +0000 @@ -18,8 +18,6 @@ #include<yade/core/DisplayParameters.hpp> #include<boost/filesystem/operations.hpp> #include<boost/algorithm/string.hpp> -#include<boost/version.hpp> -#include<boost/python.hpp> #include<sstream> #include<iomanip> #include<boost/algorithm/string/case_conv.hpp> === modified file 'gui/qt4/GLViewerDisplay.cpp' --- gui/qt4/GLViewerDisplay.cpp 2014-07-03 07:16:58 +0000 +++ gui/qt4/GLViewerDisplay.cpp 2014-07-03 17:20:40 +0000 @@ -18,8 +18,6 @@ #include<yade/core/DisplayParameters.hpp> #include<boost/filesystem/operations.hpp> #include<boost/algorithm/string.hpp> -#include<boost/version.hpp> -#include<boost/python.hpp> #include<sstream> #include<iomanip> #include<boost/algorithm/string/case_conv.hpp> === modified file 'gui/qt4/GLViewerMouse.cpp' --- gui/qt4/GLViewerMouse.cpp 2014-05-23 13:03:50 +0000 +++ gui/qt4/GLViewerMouse.cpp 2014-07-03 17:20:40 +0000 @@ -18,8 +18,6 @@ #include<yade/core/DisplayParameters.hpp> #include<boost/filesystem/operations.hpp> #include<boost/algorithm/string.hpp> -#include<boost/version.hpp> -#include<boost/python.hpp> #include<sstream> #include<iomanip> #include<boost/algorithm/string/case_conv.hpp> === modified file 'gui/qt4/_GLViewer.cpp' --- gui/qt4/_GLViewer.cpp 2014-07-02 16:11:24 +0000 +++ gui/qt4/_GLViewer.cpp 2014-07-03 17:20:40 +0000 @@ -1,6 +1,5 @@ #include"GLViewer.hpp" #include"OpenGLManager.hpp" -#include<boost/python.hpp> #include<yade/pkg/common/OpenGLRenderer.hpp> #include<yade/lib/pyutil/doc_opts.hpp> === modified file 'lib/base/Math.hpp' --- lib/base/Math.hpp 2014-06-17 10:18:00 +0000 +++ lib/base/Math.hpp 2014-07-03 17:20:40 +0000 @@ -8,21 +8,86 @@ typedef double Real; #endif +#include <algorithm> +#include <cassert> +#include <cmath> +#include <cstdlib> +#include <cstdio> +#include <fstream> +#include <iostream> +#include <limits> +#include <list> +#include <map> +#include <set> +#include <sstream> +#include <stdexcept> +#include <string> +#include <typeinfo> +#include <utility> +#include <vector> + +using std::endl; +using std::cout; +using std::cerr; +using std::vector; +using std::string; +using std::list; +using std::pair; +using std::min; +using std::max; +using std::set; +using std::map; +using std::type_info; +using std::ifstream; +using std::ofstream; +using std::runtime_error; +using std::logic_error; +using std::invalid_argument; +using std::ios; +using std::ios_base; +using std::fstream; +using std::ostream; +using std::ostringstream; +using std::istringstream; +using std::swap; +using std::make_pair; + +#include <boost/lexical_cast.hpp> +#include <boost/python.hpp> +#include <boost/python/object.hpp> +#include <boost/version.hpp> +#include <boost/any.hpp> +#include <boost/type_traits.hpp> +#include <boost/preprocessor.hpp> +#include <boost/python/module.hpp> +#include <boost/python/class.hpp> + +#ifndef __GXX_EXPERIMENTAL_CXX0X__ +# include <boost/shared_ptr.hpp> + using boost::shared_ptr; +#else +# include <memory> + using std::shared_ptr; +#endif + +#include <boost/foreach.hpp> +#ifndef FOREACH + #define FOREACH BOOST_FOREACH +#endif + #define EIGEN_DONT_PARALLELIZE -#include<limits> -#include<cstdlib> #ifdef YADE_MASK_ARBITRARY -#include<bitset> + #include <bitset> #endif -#include<Eigen/Core> -#include<Eigen/Geometry> -#include<Eigen/QR> -#include<Eigen/LU> -#include<Eigen/SVD> -#include<Eigen/Eigenvalues> -#include<float.h> +#include <Eigen/Core> +#include <Eigen/Geometry> +#include <Eigen/QR> +#include <Eigen/LU> +#include <Eigen/SVD> +#include <Eigen/Eigenvalues> +#include <float.h> // templates of those types with single parameter are not possible, use macros for now #define VECTOR2_TEMPLATE(Scalar) Eigen::Matrix<Scalar,2,1> @@ -234,8 +299,6 @@ */ typedef Se3<Real> Se3r; - - /* * Serialization of math classes */ === modified file 'lib/base/openmp-accu.hpp' --- lib/base/openmp-accu.hpp 2014-05-08 08:11:40 +0000 +++ lib/base/openmp-accu.hpp 2014-07-03 17:20:40 +0000 @@ -5,14 +5,8 @@ #include <yade/lib/base/Math.hpp> #include <boost/serialization/split_free.hpp> -#include <boost/lexical_cast.hpp> -#include <string> -#include <vector> #include <cstdlib> #include <unistd.h> -#include <stdexcept> -#include <iostream> - #ifdef YADE_OPENMP #include "omp.h" === modified file 'lib/factory/ClassFactory.hpp' --- lib/factory/ClassFactory.hpp 2014-07-02 16:11:24 +0000 +++ lib/factory/ClassFactory.hpp 2014-07-03 17:20:40 +0000 @@ -10,27 +10,8 @@ #pragma once - -#include<map> -#include<string> -#include<list> -#include<iostream> -#include<cstdio> - -#ifndef __GXX_EXPERIMENTAL_CXX0X__ -# include<boost/shared_ptr.hpp> - using boost::shared_ptr; -#else -# include<memory> - using std::shared_ptr; -#endif - - -#include<yade/lib/base/Singleton.hpp> - -#include<boost/preprocessor.hpp> - - +#include <yade/lib/base/Math.hpp> +#include <yade/lib/base/Singleton.hpp> #include "DynLibManager.hpp" /*! define the following macro to enable experimenta boost::serialization support @@ -38,7 +19,6 @@ Python wrapper defines O.saveXML('file.xml') to try it out. Loading is not yet implemented (should be easy) */ -#include<boost/version.hpp> #include<boost/archive/binary_oarchive.hpp> #include<boost/archive/binary_iarchive.hpp> @@ -47,7 +27,6 @@ #include<boost/serialization/export.hpp> // must come after all supported archive types -#include<boost/serialization/base_object.hpp> #include<boost/serialization/shared_ptr.hpp> #include<boost/serialization/list.hpp> #include<boost/serialization/vector.hpp> === modified file 'lib/factory/DynLibManager.cpp' --- lib/factory/DynLibManager.cpp 2014-07-02 16:18:24 +0000 +++ lib/factory/DynLibManager.cpp 2014-07-03 17:20:40 +0000 @@ -9,11 +9,8 @@ #include "DynLibManager.hpp" -#include<fstream> -#include<stdexcept> #include<boost/filesystem/operations.hpp> #include<boost/filesystem/convenience.hpp> -#include<string.h> #include "ClassFactory.hpp" === modified file 'lib/factory/DynLibManager.hpp' --- lib/factory/DynLibManager.hpp 2014-07-03 07:15:45 +0000 +++ lib/factory/DynLibManager.hpp 2014-07-03 17:20:40 +0000 @@ -11,22 +11,8 @@ #include <dlfcn.h> -#include <string> -#include <iostream> -#include <map> -#include <vector> -#include <set> -#include <list> - #include<yade/lib/base/Logging.hpp> - -using std::type_info; -using std::string; -using std::vector; -using std::list; -using std::set; -using std::map; -using std::istringstream; +#include<yade/lib/base/Math.hpp> class DynLibManager { === modified file 'lib/multimethods/FunctorWrapper.hpp' --- lib/multimethods/FunctorWrapper.hpp 2010-11-07 11:46:20 +0000 +++ lib/multimethods/FunctorWrapper.hpp 2014-07-03 17:20:40 +0000 @@ -26,7 +26,6 @@ #include <string> -#include <boost/lexical_cast.hpp> /////////////////////////////////////////////////////////////////////////////////////////////////// /// base template for classes that provide virtual functions for multiple dispatch, /// === modified file 'lib/opengl/GLUtils.hpp' --- lib/opengl/GLUtils.hpp 2010-11-07 11:46:20 +0000 +++ lib/opengl/GLUtils.hpp 2014-07-03 17:20:40 +0000 @@ -5,7 +5,6 @@ #pragma once #include<yade/lib/opengl/OpenGLWrapper.hpp> -#include<boost/lexical_cast.hpp> #include<sstream> #include<iomanip> #include<string> === modified file 'lib/pyutil/doc_opts.hpp' --- lib/pyutil/doc_opts.hpp 2010-05-05 21:36:25 +0000 +++ lib/pyutil/doc_opts.hpp 2014-07-03 17:20:40 +0000 @@ -1,5 +1,4 @@ #pragma once -#include<boost/version.hpp> // macro to set the same docstring generation options in all modules // disable_cpp_signatures apparently appeared after 1.35 or 1.34 === modified file 'lib/pyutil/numpy_boost.hpp' --- lib/pyutil/numpy_boost.hpp 2013-10-16 05:58:05 +0000 +++ lib/pyutil/numpy_boost.hpp 2014-07-03 17:20:40 +0000 @@ -40,7 +40,6 @@ #include <numpy/arrayobject.h> #include <boost/multi_array.hpp> #include <boost/cstdint.hpp> -#include <boost/python.hpp> #include <complex> #include <algorithm> === modified file 'lib/pyutil/raw_constructor.hpp' --- lib/pyutil/raw_constructor.hpp 2010-01-21 07:53:17 +0000 +++ lib/pyutil/raw_constructor.hpp 2014-07-03 17:20:40 +0000 @@ -1,5 +1,4 @@ #pragma once -#include<boost/python.hpp> #include<boost/python/raw_function.hpp> // many thanks to http://markmail.org/message/s4ksg6nfspw2wxwd namespace boost { namespace python { namespace detail { === modified file 'lib/serialization/Serializable.hpp' --- lib/serialization/Serializable.hpp 2014-07-03 07:15:45 +0000 +++ lib/serialization/Serializable.hpp 2014-07-03 17:20:40 +0000 @@ -10,53 +10,12 @@ #pragma once -#include <boost/any.hpp> -#include <boost/foreach.hpp> -#ifndef __GXX_EXPERIMENTAL_CXX0X__ -# include<boost/shared_ptr.hpp> - using boost::shared_ptr; -#else -# include<memory> - using std::shared_ptr; -#endif -#include<boost/version.hpp> -#include<boost/python.hpp> -#include<boost/type_traits.hpp> -#include<boost/lexical_cast.hpp> -#include<boost/preprocessor.hpp> -#include<boost/type_traits/integral_constant.hpp> -#include<list> -#include<map> -#include<string> -#include<vector> -#include<iostream> -#include<yade/lib/factory/Factorable.hpp> -#include<yade/lib/pyutil/raw_constructor.hpp> -#include<yade/lib/pyutil/doc_opts.hpp> - -#include<yade/lib/base/Math.hpp> - -using std::endl; -using std::cout; -using std::cerr; -using std::vector; -using std::string; -using std::list; -using std::min; -using std::max; -using std::ifstream; -using std::ofstream; -using std::pair; -using std::runtime_error; -using std::logic_error; -using std::invalid_argument; -using std::ios; -using std::ios_base; -using std::fstream; -using std::ostream; -using std::ostringstream; -using std::swap; -using std::make_pair; +#include <boost/type_traits/integral_constant.hpp> + +#include <yade/lib/base/Math.hpp> +#include <yade/lib/factory/Factorable.hpp> +#include <yade/lib/pyutil/raw_constructor.hpp> +#include <yade/lib/pyutil/doc_opts.hpp> // empty functions for ADL //namespace{ === modified file 'lib/smoothing/WeightedAverage2d.hpp' --- lib/smoothing/WeightedAverage2d.hpp 2014-07-02 16:18:24 +0000 +++ lib/smoothing/WeightedAverage2d.hpp 2014-07-03 17:20:40 +0000 @@ -2,32 +2,9 @@ #pragma once -#include<iostream> -#include<vector> -#include<cstdlib> -#include<algorithm> -#include<cassert> -#include<cmath> -#include<stdexcept> -#include<boost/foreach.hpp> -#include<boost/lexical_cast.hpp> -#include<boost/python.hpp> -#include<boost/python/object.hpp> -#include<boost/version.hpp> +#include<yade/lib/base/Math.hpp> + #include<boost/math/distributions/normal.hpp> -#include<yade/lib/base/Math.hpp> - -#ifndef FOREACH - #define FOREACH BOOST_FOREACH -#endif - -#ifndef __GXX_EXPERIMENTAL_CXX0X__ -# include<boost/shared_ptr.hpp> - using boost::shared_ptr; -#else -# include<memory> - using std::shared_ptr; -#endif using std::vector; using std::string; === modified file 'lib/triangulation/KinematicLocalisationAnalyser.cpp' --- lib/triangulation/KinematicLocalisationAnalyser.cpp 2014-07-03 07:16:58 +0000 +++ lib/triangulation/KinematicLocalisationAnalyser.cpp 2014-07-03 17:20:40 +0000 @@ -13,8 +13,6 @@ #include "KinematicLocalisationAnalyser.hpp" //This one first, because it defines the info types // #include "Tesselation.h" // #include "TriaxialState.h" -#include <iostream> -#include <fstream> #include <sstream> #include "basicVTKwritter.hpp" //#include <utility> === modified file 'pkg/common/BoundaryController.cpp' --- pkg/common/BoundaryController.cpp 2010-11-07 11:46:20 +0000 +++ pkg/common/BoundaryController.cpp 2014-07-03 17:20:40 +0000 @@ -1,4 +1,3 @@ #include<yade/pkg/common/BoundaryController.hpp> -#include<stdexcept> void BoundaryController::action(){ throw std::runtime_error("BoundaryController must not be used in simulations directly (BoundaryController::action called)."); } YADE_PLUGIN((BoundaryController)); === modified file 'pkg/common/Callbacks.hpp' --- pkg/common/Callbacks.hpp 2011-01-09 16:34:50 +0000 +++ pkg/common/Callbacks.hpp 2014-07-03 17:20:40 +0000 @@ -1,7 +1,6 @@ // 2010 © Václav Šmilauer <[email protected]> #pragma once -#include<stdexcept> #include<yade/lib/serialization/Serializable.hpp> class Interaction; === modified file 'pkg/common/ElastMat.hpp' --- pkg/common/ElastMat.hpp 2012-02-14 16:51:38 +0000 +++ pkg/common/ElastMat.hpp 2014-07-03 17:20:40 +0000 @@ -1,7 +1,7 @@ // 2009 © Václav Šmilauer <[email protected]> #pragma once #include<yade/core/Material.hpp> -#include<limits> + /*! Elastic material */ class ElastMat: public Material{ public: === modified file 'pkg/common/InsertionSortCollider.cpp' --- pkg/common/InsertionSortCollider.cpp 2014-07-03 07:16:58 +0000 +++ pkg/common/InsertionSortCollider.cpp 2014-07-03 17:20:40 +0000 @@ -9,8 +9,6 @@ #include<yade/pkg/dem/NewtonIntegrator.hpp> #include<yade/pkg/common/Sphere.hpp> -#include<algorithm> -#include<vector> #include<boost/static_assert.hpp> #ifdef YADE_OPENMP #include<omp.h> === modified file 'pkg/common/MatchMaker.cpp' --- pkg/common/MatchMaker.cpp 2014-05-23 13:03:50 +0000 +++ pkg/common/MatchMaker.cpp 2014-07-03 17:20:40 +0000 @@ -1,10 +1,6 @@ // 2010 © Václav Šmilauer <[email protected]> #include<yade/pkg/common/MatchMaker.hpp> -#include<boost/foreach.hpp> -#ifndef FOREACH - #define FOREACH BOOST_FOREACH -#endif YADE_PLUGIN((MatchMaker)); MatchMaker::~MatchMaker(){} === modified file 'pkg/common/MatchMaker.hpp' --- pkg/common/MatchMaker.hpp 2014-07-02 16:11:24 +0000 +++ pkg/common/MatchMaker.hpp 2014-07-03 17:20:40 +0000 @@ -1,7 +1,6 @@ // 2010 © Václav Šmilauer <[email protected]> #pragma once #include<yade/lib/serialization/Serializable.hpp> -#include<string> namespace py = boost::python; === modified file 'pkg/common/ParallelEngine.cpp' --- pkg/common/ParallelEngine.cpp 2014-05-23 13:03:50 +0000 +++ pkg/common/ParallelEngine.cpp 2014-07-03 17:20:40 +0000 @@ -1,5 +1,4 @@ #include"ParallelEngine.hpp" -#include<boost/python.hpp> #ifdef YADE_OPENMP #include<omp.h> === modified file 'pkg/common/ParallelEngine.hpp' --- pkg/common/ParallelEngine.hpp 2014-05-23 13:03:50 +0000 +++ pkg/common/ParallelEngine.hpp 2014-07-03 17:20:40 +0000 @@ -1,6 +1,5 @@ #pragma once #include<yade/core/GlobalEngine.hpp> -#include<boost/python.hpp> class ParallelEngine; shared_ptr<ParallelEngine> ParallelEngine_ctor_list(const boost::python::list& slaves); === modified file 'pkg/common/PersistentTriangulationCollider.cpp' --- pkg/common/PersistentTriangulationCollider.cpp 2014-07-02 16:18:24 +0000 +++ pkg/common/PersistentTriangulationCollider.cpp 2014-07-03 17:20:40 +0000 @@ -10,9 +10,6 @@ #include<yade/core/Body.hpp> #include<yade/core/Scene.hpp> #include<yade/core/BodyContainer.hpp> -#include<limits> -#include<utility> -#include<vector> #include<yade/pkg/common/Sphere.hpp> #include<yade/pkg/common/ElastMat.hpp> === modified file 'pkg/common/Recorder.hpp' --- pkg/common/Recorder.hpp 2010-11-07 11:46:20 +0000 +++ pkg/common/Recorder.hpp 2014-07-03 17:20:40 +0000 @@ -1,8 +1,6 @@ // 2009 © Václav Šmilauer <[email protected]> #pragma once #include<yade/pkg/common/PeriodicEngines.hpp> -#include<fstream> -#include<string> class Recorder: public PeriodicEngine{ void openAndCheck(); protected: === modified file 'pkg/common/ResetRandomPosition.cpp' --- pkg/common/ResetRandomPosition.cpp 2011-01-21 08:14:28 +0000 +++ pkg/common/ResetRandomPosition.cpp 2014-07-03 17:20:40 +0000 @@ -18,7 +18,6 @@ #include<yade/pkg/common/InteractionLoop.hpp> //#include<yade/pkg/dem/BodyMacroParameters.hpp> #include"ResetRandomPosition.hpp" -#include<sstream> YADE_PLUGIN((ResetRandomPosition)); CREATE_LOGGER(ResetRandomPosition); === modified file 'pkg/common/Wall.cpp' --- pkg/common/Wall.cpp 2014-07-02 16:11:24 +0000 +++ pkg/common/Wall.cpp 2014-07-03 17:20:40 +0000 @@ -1,7 +1,6 @@ // © 2009 Václav Šmilauer <[email protected]> #include<yade/pkg/common/Wall.hpp> #include<yade/pkg/common/Aabb.hpp> -#include<limits> YADE_PLUGIN((Wall)(Bo1_Wall_Aabb) #ifdef YADE_OPENGL === modified file 'pkg/common/ZECollider.cpp' --- pkg/common/ZECollider.cpp 2014-07-03 07:16:58 +0000 +++ pkg/common/ZECollider.cpp 2014-07-03 17:20:40 +0000 @@ -10,8 +10,6 @@ #include<yade/pkg/dem/NewtonIntegrator.hpp> #include<yade/pkg/common/Sphere.hpp> -#include<algorithm> -#include<vector> #include<boost/static_assert.hpp> YADE_PLUGIN((ZECollider)) === modified file 'pkg/common/ZECollider.hpp' --- pkg/common/ZECollider.hpp 2012-09-08 01:19:45 +0000 +++ pkg/common/ZECollider.hpp 2014-07-03 17:20:40 +0000 @@ -5,8 +5,6 @@ #include<yade/core/Scene.hpp> class InteractionContainer; - - // #define this macro to enable timing within this engine #define ISC_TIMING @@ -18,11 +16,8 @@ class NewtonIntegrator; - - #include <CGAL/box_intersection_d.h> #include <CGAL/Bbox_2.h> -#include <iostream> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/intersections.h> #include <CGAL/point_generators_3.h> @@ -31,7 +26,6 @@ #include <CGAL/function_objects.h> #include <CGAL/Join_input_iterator.h> #include <CGAL/algorithm.h> -#include <vector> typedef CGAL::Bbox_3 CGBbox; // typedef CGAL::Box_intersection_d::Box_with_handle_d<double,3,shared_ptr<Body> > CGBox; === modified file 'pkg/dem/CapillaryStressRecorder.cpp' --- pkg/dem/CapillaryStressRecorder.cpp 2014-05-23 13:05:19 +0000 +++ pkg/dem/CapillaryStressRecorder.cpp 2014-07-03 17:20:40 +0000 @@ -15,7 +15,6 @@ #include <yade/core/Omega.hpp> #include <yade/core/Scene.hpp> -#include <boost/lexical_cast.hpp> YADE_PLUGIN((CapillaryStressRecorder)); CREATE_LOGGER(CapillaryStressRecorder); === modified file 'pkg/dem/CapillaryTriaxialTest.cpp' --- pkg/dem/CapillaryTriaxialTest.cpp 2014-07-03 07:16:58 +0000 +++ pkg/dem/CapillaryTriaxialTest.cpp 2014-07-03 17:20:40 +0000 @@ -43,7 +43,6 @@ #include<yade/pkg/dem/Shop.hpp> #include <boost/filesystem/convenience.hpp> -#include <boost/lexical_cast.hpp> #include <boost/numeric/conversion/bounds.hpp> #include <boost/limits.hpp> === modified file 'pkg/dem/CohesiveFrictionalContactLaw.hpp' --- pkg/dem/CohesiveFrictionalContactLaw.hpp 2014-05-26 16:49:23 +0000 +++ pkg/dem/CohesiveFrictionalContactLaw.hpp 2014-07-03 17:20:40 +0000 @@ -12,7 +12,6 @@ #include<yade/pkg/dem/ScGeom.hpp> #include<yade/pkg/dem/CohFrictPhys.hpp> #include<yade/pkg/common/Dispatching.hpp> -#include<set> #include<boost/tuple/tuple.hpp> class Law2_ScGeom6D_CohFrictPhys_CohesionMoment: public LawFunctor{ === modified file 'pkg/dem/CohesiveTriaxialTest.cpp' --- pkg/dem/CohesiveTriaxialTest.cpp 2014-07-03 07:16:58 +0000 +++ pkg/dem/CohesiveTriaxialTest.cpp 2014-07-03 17:20:40 +0000 @@ -39,7 +39,6 @@ #include<yade/pkg/dem/Shop.hpp> #include <boost/filesystem/convenience.hpp> -#include <boost/lexical_cast.hpp> #include <boost/numeric/conversion/bounds.hpp> #include <boost/limits.hpp> === modified file 'pkg/dem/FlatGridCollider.hpp' --- pkg/dem/FlatGridCollider.hpp 2012-09-08 01:19:45 +0000 +++ pkg/dem/FlatGridCollider.hpp 2014-07-03 17:20:40 +0000 @@ -1,5 +1,4 @@ // 2009 © Václav Šmilauer <[email protected]> -#include<vector> #include<yade/pkg/common/Collider.hpp> class NewtonIntegrator; class FlatGridCollider: public Collider{ === modified file 'pkg/dem/FrictViscoPM.hpp' --- pkg/dem/FrictViscoPM.hpp 2014-06-10 03:36:47 +0000 +++ pkg/dem/FrictViscoPM.hpp 2014-07-03 17:20:40 +0000 @@ -26,7 +26,6 @@ #include<yade/pkg/dem/ScGeom.hpp> #include<yade/lib/base/openmp-accu.hpp> -#include<set> #include<boost/tuple/tuple.hpp> /** This class holds information associated with each body */ === modified file 'pkg/dem/Integrator.cpp' --- pkg/dem/Integrator.cpp 2014-07-03 07:16:58 +0000 +++ pkg/dem/Integrator.cpp 2014-07-03 17:20:40 +0000 @@ -1,7 +1,6 @@ #include<yade/core/Clump.hpp> #include<yade/core/Scene.hpp> #include<yade/pkg/dem/Integrator.hpp> -#include<boost/python.hpp> #ifdef YADE_OPENMP #include<omp.h> === modified file 'pkg/dem/Integrator.hpp' --- pkg/dem/Integrator.hpp 2014-02-17 14:31:35 +0000 +++ pkg/dem/Integrator.hpp 2014-07-03 17:20:40 +0000 @@ -1,7 +1,6 @@ #pragma once #include<yade/core/TimeStepper.hpp> -#include<boost/python.hpp> class Integrator; === modified file 'pkg/dem/L3Geom.cpp' --- pkg/dem/L3Geom.cpp 2014-07-03 07:16:58 +0000 +++ pkg/dem/L3Geom.cpp 2014-07-03 17:20:40 +0000 @@ -4,8 +4,6 @@ #include<yade/pkg/common/Wall.hpp> #include<yade/pkg/common/Facet.hpp> -#include<sstream> - #ifdef YADE_OPENGL #include<yade/lib/opengl/OpenGLWrapper.hpp> #include<yade/lib/opengl/GLUtils.hpp> === modified file 'pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp' --- pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp 2014-07-02 16:18:24 +0000 +++ pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp 2014-07-03 17:20:40 +0000 @@ -21,10 +21,6 @@ #include <yade/core/Scene.hpp> #include <yade/lib/base/Math.hpp> - -#include <iostream> -#include <fstream> - YADE_PLUGIN((Law2_ScGeom_CapillaryPhys_Capillarity)); void Law2_ScGeom_CapillaryPhys_Capillarity::postLoad(Law2_ScGeom_CapillaryPhys_Capillarity&){ === modified file 'pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp' --- pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp 2014-07-02 16:11:24 +0000 +++ pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp 2014-07-03 17:20:40 +0000 @@ -11,14 +11,8 @@ #pragma once #include <yade/core/GlobalEngine.hpp> -#include <set> #include <boost/tuple/tuple.hpp> -#include <vector> -#include <list> #include <utility> -#include <iostream> -#include <fstream> -#include <string> /** This law allows one to take into account capillary forces/effects between spheres coming from the presence of interparticular liquid bridges (menisci). === modified file 'pkg/dem/Polyhedra.hpp' --- pkg/dem/Polyhedra.hpp 2014-05-16 11:58:59 +0000 +++ pkg/dem/Polyhedra.hpp 2014-07-03 17:20:40 +0000 @@ -6,7 +6,6 @@ #ifdef YADE_CGAL -#include<vector> #include<yade/core/Shape.hpp> #include<yade/core/IGeom.hpp> #include<yade/core/GlobalEngine.hpp> === modified file 'pkg/dem/SampleCapillaryPressureEngine.cpp' --- pkg/dem/SampleCapillaryPressureEngine.cpp 2014-07-02 16:18:24 +0000 +++ pkg/dem/SampleCapillaryPressureEngine.cpp 2014-07-03 17:20:40 +0000 @@ -14,7 +14,6 @@ #include<yade/core/Omega.hpp> #include<yade/pkg/dem/FrictPhys.hpp> #include<yade/lib/base/Math.hpp> -#include <boost/lexical_cast.hpp> YADE_PLUGIN((SampleCapillaryPressureEngine)); CREATE_LOGGER(SampleCapillaryPressureEngine); === modified file 'pkg/dem/Shop.hpp' --- pkg/dem/Shop.hpp 2014-07-02 16:18:24 +0000 +++ pkg/dem/Shop.hpp 2014-07-03 17:20:40 +0000 @@ -2,11 +2,6 @@ #pragma once -#include<string> -#include<map> -#include<iostream> -#include<typeinfo> -#include<boost/any.hpp> #include<boost/lambda/lambda.hpp> #include "yade/lib/base/Math.hpp" === modified file 'pkg/dem/Shop_01.cpp' --- pkg/dem/Shop_01.cpp 2014-07-03 07:16:58 +0000 +++ pkg/dem/Shop_01.cpp 2014-07-03 17:20:40 +0000 @@ -46,11 +46,6 @@ #include"yade/pkg/common/Gl1_NormPhys.hpp" #endif -#include<boost/foreach.hpp> -#ifndef FOREACH - #define FOREACH BOOST_FOREACH -#endif - CREATE_LOGGER(Shop); /*! Flip periodic cell by given number of cells. === modified file 'pkg/dem/Shop_02.cpp' --- pkg/dem/Shop_02.cpp 2014-07-01 18:14:18 +0000 +++ pkg/dem/Shop_02.cpp 2014-07-03 17:20:40 +0000 @@ -48,11 +48,6 @@ #include<yade/pkg/common/Gl1_NormPhys.hpp> #endif -#include<boost/foreach.hpp> -#ifndef FOREACH - #define FOREACH BOOST_FOREACH -#endif - CREATE_LOGGER(Shop); /*! Flip periodic cell by given number of cells. === modified file 'pkg/dem/SpherePack.hpp' --- pkg/dem/SpherePack.hpp 2014-07-02 16:18:24 +0000 +++ pkg/dem/SpherePack.hpp 2014-07-03 17:20:40 +0000 @@ -2,36 +2,10 @@ #pragma once -#include<vector> -#include<string> -#include<limits> -#include<iostream> - -#include<boost/python.hpp> -#include<boost/python/object.hpp> -#include<boost/version.hpp> - -#include<boost/foreach.hpp> -#ifndef FOREACH - #define FOREACH BOOST_FOREACH -#endif - -#ifndef __GXX_EXPERIMENTAL_CXX0X__ -# include<boost/shared_ptr.hpp> - using boost::shared_ptr; -#else -# include<memory> - using std::shared_ptr; -#endif #include<yade/lib/base/Logging.hpp> #include<yade/lib/base/Math.hpp> -using std::vector; -using std::string; -using std::min; -using std::runtime_error; - /*! Class representing geometry of spherical packing, with some utility functions. */ class SpherePack{ // return coordinate wrapped to x0…x1, relative to x0; don't care about period === modified file 'pkg/dem/TesselationWrapper.cpp' --- pkg/dem/TesselationWrapper.cpp 2014-07-02 16:18:24 +0000 +++ pkg/dem/TesselationWrapper.cpp 2014-07-03 17:20:40 +0000 @@ -8,14 +8,11 @@ #ifdef YADE_CGAL -#include<yade/lib/pyutil/numpy.hpp> -#include<boost/python.hpp> -#include<boost/python/object.hpp> -#include<boost/version.hpp> #include<yade/pkg/dem/Shop.hpp> #include"TesselationWrapper.hpp" #include<yade/lib/triangulation/Timer.h> #include<yade/pkg/dem/SpherePack.hpp> +#include<yade/lib/pyutil/numpy.hpp> YADE_PLUGIN((TesselationWrapper)); CREATE_LOGGER(TesselationWrapper); === modified file 'pkg/dem/TesselationWrapper.hpp' --- pkg/dem/TesselationWrapper.hpp 2014-05-23 13:05:19 +0000 +++ pkg/dem/TesselationWrapper.hpp 2014-07-03 17:20:40 +0000 @@ -9,12 +9,8 @@ #include<yade/core/GlobalEngine.hpp> #include<yade/pkg/common/Sphere.hpp> #include<yade/core/Omega.hpp> -#include <utility> #include<yade/core/Scene.hpp> #include<yade/lib/triangulation/Tesselation.h> -#include<boost/python.hpp> -#include<boost/python/object.hpp> -#include<boost/version.hpp> #include<yade/pkg/dem/MicroMacroAnalyser.hpp> /*! \class TesselationWrapper === modified file 'pkg/dem/Tetra.hpp' --- pkg/dem/Tetra.hpp 2013-09-11 21:43:09 +0000 +++ pkg/dem/Tetra.hpp 2014-07-03 17:20:40 +0000 @@ -3,8 +3,6 @@ #pragma once -#include<vector> - #include<yade/core/Shape.hpp> #include<yade/core/IGeom.hpp> #include<yade/core/GlobalEngine.hpp> === modified file 'pkg/dem/ThreeDTriaxialEngine.cpp' --- pkg/dem/ThreeDTriaxialEngine.cpp 2013-02-26 19:28:47 +0000 +++ pkg/dem/ThreeDTriaxialEngine.cpp 2014-07-03 17:20:40 +0000 @@ -11,7 +11,6 @@ #include<yade/core/Omega.hpp> #include<yade/lib/base/Math.hpp> -#include<boost/lexical_cast.hpp> #include<boost/lambda/lambda.hpp> #include<yade/pkg/dem/Shop.hpp> #include<yade/core/Interaction.hpp> === modified file 'pkg/dem/ThreeDTriaxialEngine.hpp' --- pkg/dem/ThreeDTriaxialEngine.hpp 2012-11-22 14:32:53 +0000 +++ pkg/dem/ThreeDTriaxialEngine.hpp 2014-07-03 17:20:40 +0000 @@ -12,9 +12,6 @@ #include<yade/core/PartialEngine.hpp> #include<yade/lib/base/Math.hpp> #include<yade/pkg/dem/TriaxialStressController.hpp> -#include<string> - - /** \brief Class for controlling in stress or in strain with respect to each spatial direction a cubical assembly of particles. * === modified file 'pkg/dem/TriaxialCompressionEngine.cpp' --- pkg/dem/TriaxialCompressionEngine.cpp 2014-07-03 07:16:58 +0000 +++ pkg/dem/TriaxialCompressionEngine.cpp 2014-07-03 17:20:40 +0000 @@ -10,7 +10,6 @@ #include<yade/core/Scene.hpp> #include<yade/core/Omega.hpp> #include<yade/lib/base/Math.hpp> -#include<boost/lexical_cast.hpp> #include<boost/lambda/lambda.hpp> #include<yade/pkg/dem/Shop.hpp> #include<yade/core/Interaction.hpp> === modified file 'pkg/dem/TriaxialCompressionEngine.hpp' --- pkg/dem/TriaxialCompressionEngine.hpp 2013-03-06 20:39:22 +0000 +++ pkg/dem/TriaxialCompressionEngine.hpp 2014-07-03 17:20:40 +0000 @@ -11,7 +11,6 @@ #include<yade/core/PartialEngine.hpp> #include<yade/lib/base/Math.hpp> #include<yade/pkg/dem/TriaxialStressController.hpp> -#include<string> /** \brief Class for controlling optional initial isotropic compaction and subsequent triaxial test with constant lateral stress and constant axial strain rate. The algorithms used have been developed initialy for simulations reported in [Chareyre2002a] and [Chareyre2005]. They have been ported to Yade in a second step and used in e.g. [Kozicki2008],[Scholtes2009b],[Jerier2010b]. * === modified file 'pkg/dem/TriaxialStateRecorder.cpp' --- pkg/dem/TriaxialStateRecorder.cpp 2014-05-23 13:05:19 +0000 +++ pkg/dem/TriaxialStateRecorder.cpp 2014-07-03 17:20:40 +0000 @@ -14,7 +14,6 @@ #include<yade/pkg/common/Sphere.hpp> #include <yade/core/Omega.hpp> #include <yade/core/Scene.hpp> -#include <boost/lexical_cast.hpp> #include <yade/pkg/dem/ScGeom.hpp> #include <yade/pkg/dem/FrictPhys.hpp> #include <yade/pkg/dem/Shop.hpp> === modified file 'pkg/dem/TriaxialTest.cpp' --- pkg/dem/TriaxialTest.cpp 2014-07-03 07:16:58 +0000 +++ pkg/dem/TriaxialTest.cpp 2014-07-03 17:20:40 +0000 @@ -41,7 +41,6 @@ #include<yade/pkg/common/Wall.hpp> #include <boost/filesystem/convenience.hpp> -#include <boost/lexical_cast.hpp> #include <boost/numeric/conversion/bounds.hpp> #include <boost/limits.hpp> // random === modified file 'pkg/dem/UniaxialStrainer.cpp' --- pkg/dem/UniaxialStrainer.cpp 2014-07-03 07:16:58 +0000 +++ pkg/dem/UniaxialStrainer.cpp 2014-07-03 17:20:40 +0000 @@ -1,7 +1,5 @@ // 2008 © Václav Šmilauer <[email protected]> #include"UniaxialStrainer.hpp" -#include<boost/foreach.hpp> -#include<stdexcept> #include<yade/core/Scene.hpp> #include<yade/core/InteractionContainer.hpp> === modified file 'pkg/dem/UniaxialStrainer.hpp' --- pkg/dem/UniaxialStrainer.hpp 2014-04-02 07:44:58 +0000 +++ pkg/dem/UniaxialStrainer.hpp 2014-07-03 17:20:40 +0000 @@ -1,15 +1,9 @@ // 2008 © Václav Šmilauer <[email protected]> #pragma once -#include<fstream> -#include<limits> #include<yade/core/Scene.hpp> #include<yade/pkg/dem/Shop.hpp> #include<yade/pkg/common/BoundaryController.hpp> -#ifndef FOREACH -#define FOREACH BOOST_FOREACH -#endif - /*! Axial displacing two groups of bodies in the opposite direction with given strain rate. * * Takes two groups of body IDs (in posIds and negIds) and displaces them at each timestep in the direction given by axis∈{0,1,2} (for axes x,y,z respectively). These bodies automatically have Body::isDynamic==false. === modified file 'py/_polyhedra_utils.cpp' --- py/_polyhedra_utils.cpp 2014-07-02 16:18:24 +0000 +++ py/_polyhedra_utils.cpp 2014-07-03 17:20:40 +0000 @@ -5,8 +5,6 @@ #include"yade/pkg/dem/Polyhedra.hpp" -#include<boost/python.hpp> -#include <boost/python/module.hpp> #include<yade/core/Scene.hpp> #include<yade/core/Omega.hpp> #include<yade/pkg/common/Sphere.hpp> === modified file 'py/_utils.cpp' --- py/_utils.cpp 2014-07-02 16:18:24 +0000 +++ py/_utils.cpp 2014-07-03 17:20:40 +0000 @@ -1,7 +1,4 @@ #include<yade/pkg/dem/Shop.hpp> -#include<boost/python.hpp> -#include<boost/python/object.hpp> -#include<boost/version.hpp> #include<yade/core/Scene.hpp> #include<yade/core/Omega.hpp> #include<yade/pkg/dem/ScGeom.hpp> @@ -12,7 +9,6 @@ #include<yade/pkg/common/NormShearPhys.hpp> #include<yade/lib/computational-geometry/Hull2d.hpp> #include<yade/lib/pyutil/doc_opts.hpp> -#include<cmath> #include<yade/pkg/dem/ViscoelasticPM.hpp> #include<numpy/ndarrayobject.h> === modified file 'py/mathWrap/miniEigen.cpp' --- py/mathWrap/miniEigen.cpp 2013-07-09 12:42:00 +0000 +++ py/mathWrap/miniEigen.cpp 2014-07-03 17:20:40 +0000 @@ -1,11 +1,5 @@ // 2009 © Václav Šmilauer <[email protected]> -#include<boost/python.hpp> -#include<boost/lexical_cast.hpp> #include<boost/algorithm/string/trim.hpp> -#include<string> -#include<stdexcept> -#include<sstream> -#include<iostream> #include<yade/lib/base/Math.hpp> #include<yade/lib/pyutil/doc_opts.hpp> === modified file 'py/pack/_packObb.cpp' --- py/pack/_packObb.cpp 2014-05-23 13:03:50 +0000 +++ py/pack/_packObb.cpp 2014-07-03 17:20:40 +0000 @@ -2,21 +2,10 @@ // the code written after http://www.amillionpixels.us/bestfitobb.cpp // which is MIT-licensed -#include<boost/python.hpp> -#include<boost/foreach.hpp> -#include<boost/python/object.hpp> -#include<boost/version.hpp> #include<yade/lib/base/Logging.hpp> #include<yade/lib/base/Math.hpp> #include<yade/lib/pyutil/doc_opts.hpp> -#include<vector> -#include<stdexcept> - -#ifndef FOREACH - #define FOREACH BOOST_FOREACH -#endif - // compute minimum bounding for a cloud of points // returns volume === modified file 'py/pack/_packPredicates.cpp' --- py/pack/_packPredicates.cpp 2014-07-02 16:18:24 +0000 +++ py/pack/_packPredicates.cpp 2014-07-03 17:20:40 +0000 @@ -1,11 +1,7 @@ // 2009 © Václav Šmilauer <[email protected]> -#include<boost/python.hpp> -#include<boost/python/object.hpp> -#include<boost/version.hpp> #include<yade/lib/base/Logging.hpp> #include<yade/lib/base/Math.hpp> #include<yade/lib/pyutil/doc_opts.hpp> -#include<iostream> namespace py=boost::python; === modified file 'py/wrapper/customConverters.cpp' --- py/wrapper/customConverters.cpp 2014-06-17 10:18:00 +0000 +++ py/wrapper/customConverters.cpp 2014-07-03 17:20:40 +0000 @@ -1,33 +1,6 @@ // 2009 © Václav Šmilauer <[email protected]> -// this is not currently used, but can be enabled if needed -// probably breaks compilation for older (like <=1.35 or so) -// boost::python -#if 0 - #include<indexing_suite/container_suite.hpp> - // #include<indexing_suite/container_proxy.hpp> - #include<indexing_suite/vector.hpp> -#endif - -#if 0 - #include<yade/lib/pyutil/numpy.hpp> -#endif - -#include<boost/python.hpp> -#include<boost/python/class.hpp> -#include<boost/python/module.hpp> -#include<boost/foreach.hpp> -#ifndef FOREACH - #define FOREACH BOOST_FOREACH -#endif - -#include<vector> -#include<string> -#include<stdexcept> -#include<iostream> -#include<map> - #include<yade/lib/base/Math.hpp> #include<yade/lib/base/openmp-accu.hpp> @@ -43,7 +16,6 @@ #endif #include<yade/pkg/common/MatchMaker.hpp> - // move this to the miniEigen wrapper later /* two-way se3 handling */ === modified file 'py/wrapper/yadeWrapper.cpp' --- py/wrapper/yadeWrapper.cpp 2014-07-02 16:18:24 +0000 +++ py/wrapper/yadeWrapper.cpp 2014-07-03 17:20:40 +0000 @@ -1,28 +1,17 @@ // 2007,2008 © Václav Šmilauer <[email protected]> -#include<sstream> -#include<map> -#include<vector> +#include<yade/lib/base/Math.hpp> #include<unistd.h> #include<list> #include<signal.h> -#include<boost/python.hpp> #include<boost/python/raw_function.hpp> -// unused now -#if 0 - #include<boost/python/suite/indexing/vector_indexing_suite.hpp> -#endif #include<boost/bind.hpp> #include<boost/lambda/bind.hpp> #include<boost/thread/thread.hpp> #include<boost/filesystem/operations.hpp> #include<boost/date_time/posix_time/posix_time.hpp> -#include<boost/any.hpp> -#include<boost/python.hpp> -#include<boost/foreach.hpp> #include<boost/algorithm/string.hpp> -#include<boost/version.hpp> #include<yade/lib/base/Logging.hpp> #include<yade/lib/pyutil/gil.hpp> @@ -44,8 +33,7 @@ #include<yade/pkg/common/InteractionLoop.hpp> -// #include<yade/pkg/dem/Shop.hpp> -#include<yade/core/Clump.hpp> +#include <yade/core/Clump.hpp> #include <yade/pkg/common/Sphere.hpp> #if BOOST_VERSION>=104700 @@ -59,8 +47,6 @@ #include <boost/random/uniform_real.hpp> #include <boost/random/variate_generator.hpp> #include <boost/archive/codecvt_null.hpp> -#include <boost/python/object.hpp> -#include <boost/version.hpp> #include <yade/core/Timing.hpp> #include <yade/lib/serialization/ObjectIO.hpp>
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
