diff options
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/Makefile | 6 | ||||
-rw-r--r-- | src/main/Particle.h | 28 | ||||
-rw-r--r-- | src/main/Vector3D.cc | 2 | ||||
-rw-r--r-- | src/main/Vector3D.h | 6 | ||||
-rw-r--r-- | src/main/vhc.cc | 2 |
5 files changed, 34 insertions, 10 deletions
diff --git a/src/main/Makefile b/src/main/Makefile index af9deab..20a44ec 100644 --- a/src/main/Makefile +++ b/src/main/Makefile @@ -2,9 +2,9 @@ # Makefile recursif # #=======================================================================# # Les variables suivantes sont definis dans un makefile plus haut. # -# BASEDIR repertoire de base du projet # -# SRCDIR repertoire contenant le code source # -# BINDIR repertoire ou sont places toutes objets compiles # +# BASEDIR repertoire de base du projet # +# SRCDIR repertoire contenant le code source # +# BINDIR repertoire ou sont places toutes objets compiles # ######################################################################### # Nom du repertoire contenant ce makefile diff --git a/src/main/Particle.h b/src/main/Particle.h index 128dbb1..cc15c93 100644 --- a/src/main/Particle.h +++ b/src/main/Particle.h @@ -16,10 +16,27 @@ class Particle { private: Vector3D position; + Vector3D force; + double mass; + double charge; public: -/* - Vector3D getPosition(); + + void applyForce(const Vector3D& f) {force = force + f;} + + Vector3D getPosition() const {return position;} + + void setPosition(const Vector3D& pos) {position = pos;} + + Vector3D getForce() const {return force;} + + double getMass() const {return mass;} + + double getCharge() const {return charge;} + + + /* + Vector3D getPosition() {return position;} Vector3D getVelocity(); @@ -29,7 +46,12 @@ public: Vector3D getMomentum(); */ - Particle(): position(0, 0, 0) {}; + Particle(const Vector3D& position0, double mass, double charge): + position(position0), + force(0, 0, 0), + mass(mass), + charge(charge) {}; + virtual ~Particle(); }; diff --git a/src/main/Vector3D.cc b/src/main/Vector3D.cc index 258922f..8acaa86 100644 --- a/src/main/Vector3D.cc +++ b/src/main/Vector3D.cc @@ -17,7 +17,7 @@ Vector3D const Vector3D::i = Vector3D(1.0, 0.0, 0.0); Vector3D const Vector3D::j = Vector3D(0.0, 1.0, 0.0); Vector3D const Vector3D::k = Vector3D(0.0, 0.0, 1.0); -ostream& operator<< (ostream& output, const Vector3D& v) { +std::ostream& operator<< (ostream& output, const Vector3D& v) { output << v.toString(); return output; } diff --git a/src/main/Vector3D.h b/src/main/Vector3D.h index 042463d..31094da 100644 --- a/src/main/Vector3D.h +++ b/src/main/Vector3D.h @@ -39,9 +39,9 @@ private: public: /** Cree une nouvelle instance de <code>Vector3D</code>. - * @param x 1e composante - * @param y 2e composante - * @param z 3e composante + * @param _x 1e composante + * @param _y 2e composante + * @param _z 3e composante */ Vector3D(double _x, double _y, double _z) : x(_x), y(_y), z(_z) {}; diff --git a/src/main/vhc.cc b/src/main/vhc.cc index 52d293c..6f95ca6 100644 --- a/src/main/vhc.cc +++ b/src/main/vhc.cc @@ -1,2 +1,4 @@ +//ce fichier ne contient que la documentation de l'espace de nom + /** Espace de nom contenant tout code relatif au projet `Virtual Hadron Collider'. */ namespace vhc {}; |