Commit 4fd00cf4 authored by Anton Gladky's avatar Anton Gladky
Browse files

Clean up in header inclusions.

parent 72320e09
#include<yade/core/Body.hpp>
#include<limits>
#include<yade/core/Scene.hpp>
#include<yade/core/Omega.hpp>
#include<yade/core/InteractionContainer.hpp>
......
......@@ -9,8 +9,6 @@
*************************************************************************/
#pragma once
#include<iostream>
#include<map>
#include"Shape.hpp"
#include"Bound.hpp"
#include"State.hpp"
......
......@@ -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;
......
// (c) 2007-2010 Vaclav Smilauer <eudoxos@arcig.cz>
#include"Clump.hpp"
#include<algorithm>
#include<yade/core/Scene.hpp>
#include<yade/core/BodyContainer.hpp>
#include<yade/core/State.hpp>
......
......@@ -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>
......
......@@ -11,8 +11,5 @@
Functor::~Functor(){}; // vtable
#include "Dispatcher.hpp"
#include<algorithm>
#include<vector>
Dispatcher::~Dispatcher(){}
......@@ -8,7 +8,6 @@
#pragma once
#include<boost/lexical_cast.hpp>
#include<yade/core/Engine.hpp>
#include<yade/core/Functor.hpp>
......
#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{
......
......@@ -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;
......
......@@ -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>
......
// 2009 © Václav Šmilauer <eudoxos@arcig.cz>
#pragma once
#include<string.h>
#include<vector>
#include<yade/lib/base/Math.hpp>
#include<yade/core/Body.hpp>
......
......@@ -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:
......
#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(){}
......
// 2009 © Václav Šmilauer <eudoxos@arcig.cz>
#pragma once
#include<string>
#include<yade/lib/serialization/Serializable.hpp>
#include<yade/lib/multimethods/Indexable.hpp>
#include<yade/core/State.hpp>
......
......@@ -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>
......
......@@ -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>
......
// 2009 © Václav Šmilauer <eudoxos@arcig.cz>
#include<yade/core/State.hpp>
#include<boost/foreach.hpp>
#include<stdexcept>
#ifndef FOREACH
#define FOREACH BOOST_FOREACH
#endif
CREATE_LOGGER(State);
......
......@@ -14,8 +14,6 @@
#include <boost/function.hpp>
#include <boost/bind.hpp>
#include<iostream>
CREATE_LOGGER(ThreadRunner);
void ThreadRunner::run()
......
// 2009 © Václav Šmilauer <eudoxos@arcig.cz>
#pragma once
#include<time.h>
#include<boost/python.hpp>
struct TimingInfo{
typedef unsigned long long delta;
......
......@@ -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)
......
......@@ -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
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
#include"GLViewer.hpp"
#include"OpenGLManager.hpp"
#include<boost/python.hpp>
#include<yade/pkg/common/OpenGLRenderer.hpp>
#include<yade/lib/pyutil/doc_opts.hpp>
......
......@@ -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 int mask_t;
*/
typedef Se3<Real> Se3r;
/*
* Serialization of math classes
*/
......
......@@ -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"
......
......@@ -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>
......
......@@ -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"
......
......@@ -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
{
......
......@@ -26,7 +26,6 @@
#include <string>
#include <boost/lexical_cast.hpp>
///////////////////////////////////////////////////////////////////////////////////////////////////
/// base template for classes that provide virtual functions for multiple dispatch, ///
......
......@@ -5,7 +5,6 @@
#pragma once
#include<yade/lib/opengl/OpenGLWrapper.hpp>
#include<boost/lexical_cast.hpp>
#include<sstream>
#include<iomanip>
#include<string>
......
#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
......
......@@ -40,7 +40,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <numpy/arrayobject.h>
#include <boost/multi_array.hpp>
#include <boost/cstdint.hpp>
#include <boost/python.hpp>
#include <complex>
#include <algorithm>
......
#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 {
......
......@@ -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{
......
......@@ -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<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
#include<boost/math/distributions/normal.hpp>