Index: kernel/src/ModelData.cpp =================================================================== --- kernel/src/ModelData.cpp (revision 377) +++ kernel/src/ModelData.cpp (working copy) @@ -14,7 +14,6 @@ //! Constructor ModelData::ModelData() { - check_particles_active_ = false; } Index: kernel/src/Particle.cpp =================================================================== --- kernel/src/Particle.cpp (revision 377) +++ kernel/src/Particle.cpp (working copy) @@ -45,9 +45,6 @@ void Particle::set_is_active(const bool is_active) { is_active_ = is_active; - - // indicate to restraints that a particle's active status may have changed - model_->get_model_data()->set_check_particles_active(true); } Index: kernel/include/IMP/ModelData.h =================================================================== --- kernel/include/IMP/ModelData.h (revision 377) +++ kernel/include/IMP/ModelData.h (working copy) @@ -8,12 +8,11 @@ #ifndef __IMP_MODEL_DATA_H #define __IMP_MODEL_DATA_H -#include -#include - #include "IMP_config.h" #include "base_types.h" +#include + namespace IMP { @@ -48,18 +47,6 @@ bool is_optimized_; }; - //! variable statistics - /** intended for keeping track of change sizes during optimization - for efficiency issues (e.g. updates of neighborhoods) - */ - class Statistics - { - public: - Float min_; - Float max_; - Float max_delta_; - Float min_delta_; - }; public: @@ -168,14 +155,6 @@ */ void add_to_deriv(const FloatIndex idx, const Float value); - //! used by model to see if restraints need to check their particles - bool check_particles_active() { - return check_particles_active_; - } - void set_check_particles_active(bool check_particles_active) { - check_particles_active_ = check_particles_active; - } - //! particle variables and attributes /** these are stored outside of particles to allow restraints to get access them directly through @@ -187,15 +166,6 @@ std::vector int_data_; //! See float_data_. std::vector string_data_; - - //! float attribute state change statistics associated with a particular - //! name in some subset of particles - std::map stat_indexes_; - //! See stat_indexes_. - std::vector float_stats_; - - //! flag set whenever a particle is activated or deactivated - bool check_particles_active_; }; IMP_OUTPUT_OPERATOR(ModelData);