*J'ai revu les 3 premier exercises du projet et modifie quelques reponses (jusqu'a P7.2 compris) et fichiers tests.

*Rajoute la classe MutableVector3D pour representer des vecteurs mutables.

2 files changed, 54 insertions, 21 deletions

diff --git a/src/test/PacticleTest.cc b/src/test/PacticleTest.cc
new file mode 100644
index 0000000..4bc5a59
--- /dev/null
+++ b/src/test/PacticleTest.cc
@@ -0,0 +1,28 @@
+/*
+ * PacticleTest.cc
+ *
+ *  Created on: Apr 25, 2011
+ *      Author: jakob
+ */
+
+#include <iostream>
+#include "constants.h"
+#include "Particle.h"
+#include "Vector3D.h"
+
+using namespace std;
+using namespace vhc;
+using namespace constants;
+
+int main() {
+	Particle p1 = Particle(Vector3D::Null, PROTON_MASS, E, 1 * GeV, Vector3D::i);
+	Particle p2 = Particle(Vector3D(5,3,2), ELECTRON_MASS, E, 1.5 * GeV, Vector3D::j);
+	Particle p3 = p1;
+
+	cout << p1 << endl;
+	cout << p2 << endl;
+	cout << p3 << endl;
+
+
+	return 0;
+}
diff --git a/src/test/Vector3DTest.cc b/src/test/Vector3DTest.cc
index d090682..c9bd3c7 100644
--- a/src/test/Vector3DTest.cc
+++ b/src/test/Vector3DTest.cc
@@ -16,18 +16,37 @@ using namespace std;
 using namespace vhc;
 
 
-bool printTest();
-
 int main() {
-	//equality test
-	assert(Vector3D(1, 2, 3) == Vector3D(1, 2, 3));
-	assert(Vector3D(1, 2.4, 3) != Vector3D(1, 2, 3));
+	Vector3D vect1(1.0, 2, -0.1);
+	Vector3D vect2(2.6, 3.5, 4.1);
+	Vector3D vect3 = vect1;
+
+	cout << "Vecteur 1 :";
+	cout << vect1;
+
+	cout << "Vecteur 2 :";
+	cout << vect2;
+
+	cout << "Le vecteur 1 est ";
+	if (Vector3D::ae(vect1, vect2)) {
+	    cout << "egal au";
+	} else {
+	    cout << "différent du";
+	}
+	cout << " vecteur 2," << endl << "et est";
+	if (Vector3D::ae(vect1, vect3)) {
+	    cout << "egal au";
+	} else {
+	    cout << "différent du";
+	}
+	cout << " vecteur 3." << endl;
+
 
 	//addition test
-	assert(Vector3D(1, -0.9, 57683) + Vector3D(-1, 0.9, -57683) == Vector3D::Null);
+	assert(Vector3D::ae(Vector3D(1, -0.9, 57683) + Vector3D(-1, 0.9, -57683), Vector3D::Null));
 
 	//addition, multiplication test
-	assert(Vector3D(4, 0, 16) / 4 == -Vector3D(0.25, 0, 1) * -4);
+	assert(Vector3D::ae(Vector3D(4, 0, 16) / 4, -Vector3D(0.25, 0, 1) * -4));
 
 	//length test
 	assert(Vector3D(0,3,4).norm() == 5);
@@ -50,17 +69,3 @@ int main() {
 
 	return 0;
 }
-
-bool printTest() {
-	cout << "PRINT TEST" << endl;
-	cout << Vector3D(1,2,3) << endl;
-	char answer;
-	do {
-		cout << "Was 'Vector3D(1,2,3)' displayed? (y/n)" << endl;
-		cin >> answer;
-	} while (answer != 'y' && answer != 'n');
-	cout << "END PRINT TEST" << endl;
-
-	if (answer == 'y') return true;
-	else return false;
-}