diff options
author | Jakob Odersky <jodersky@gmail.com> | 2011-04-12 20:16:56 +0000 |
---|---|---|
committer | Jakob Odersky <jodersky@gmail.com> | 2011-04-12 20:16:56 +0000 |
commit | 7e3f864123c021d85abbf80fc102e1d319733bc4 (patch) | |
tree | 71e8e8a015eaf885ebd1ce5b2d863c0fe61c561f /src/main/CompositeElement.h | |
parent | 7846d1872c66e43001cd6a46f2b9444b92259a2f (diff) | |
download | vhc-7e3f864123c021d85abbf80fc102e1d319733bc4.tar.gz vhc-7e3f864123c021d85abbf80fc102e1d319733bc4.tar.bz2 vhc-7e3f864123c021d85abbf80fc102e1d319733bc4.zip |
Changements mineures dans la classe 'Accelerator'. Je me suis permis de faire ces changemenets car j'ai besoin de l'accelerateur pour la simulation graphique.
Diffstat (limited to 'src/main/CompositeElement.h')
-rw-r--r-- | src/main/CompositeElement.h | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/src/main/CompositeElement.h b/src/main/CompositeElement.h index b2fbd5a..90cb6a5 100644 --- a/src/main/CompositeElement.h +++ b/src/main/CompositeElement.h @@ -29,31 +29,14 @@ protected: public: - CompositeElement(const Vector3D& entry, const Vector3D& exit, double sectionRadius, Element* next = NULL): - Element(entry, exit, sectionRadius, next), - elements(0) {}; - - - virtual ~CompositeElement() {}; - - /*for (int i(0); i < elements.size(); ++i) { - delete elements[i]; - elements[i] = NULL; - };*/ + CompositeElement(const Vector3D& entry, const Vector3D& exit, double sectionRadius, Element* next = NULL); + virtual ~CompositeElement(); /** Determine si une particule a heurte le bord de cet element, donc d'un des elements composants. */ - virtual bool isOutside(const Particle& particle) const { - for (int i(0); i < elements.size(); ++i) { - if (elements[i]->isOutside(particle)) return true; - } - return false; - } + virtual bool isOutside(const Particle& particle) const; /** Determine si une particule a passe cet element, donc passe le dernier element composant. */ - virtual bool isPast(const Particle& particle) const { - if (elements[elements.size() - 1]->isPast(particle)) return true; - else return false; - } + virtual bool isPast(const Particle& particle) const; virtual Vector3D magneticFieldAt(const Vector3D& position) const { Vector3D b = Vector3D::Null; |