diff options
author | Jakob Odersky <jodersky@gmail.com> | 2011-04-25 12:58:55 +0000 |
---|---|---|
committer | Jakob Odersky <jodersky@gmail.com> | 2011-04-25 12:58:55 +0000 |
commit | 9b765d14760bddc1caac167e938670031d70a864 (patch) | |
tree | c05b21ebe8f771e638d5fc4a943d7212119d9999 /src/test/Vector3DTest.cc | |
parent | 0398843f48f15028c537a1dc1aefaa9cf5141896 (diff) | |
download | vhc-9b765d14760bddc1caac167e938670031d70a864.tar.gz vhc-9b765d14760bddc1caac167e938670031d70a864.tar.bz2 vhc-9b765d14760bddc1caac167e938670031d70a864.zip |
*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.
Diffstat (limited to 'src/test/Vector3DTest.cc')
-rw-r--r-- | src/test/Vector3DTest.cc | 47 |
1 files changed, 26 insertions, 21 deletions
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; -} |