From 00d592af835e892902bdf6cc5db29a64f24ab9d3 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jodersky@gmail.com>
Date: Sun, 29 May 2011 20:09:19 +0000
Subject: *Ajoute interactions avancees *Ecrit conception *Commentaires

---
 src/test/AcceleratorBenchmarkTest.cc |  7 +---
 src/test/ElementsSimulationTest.cc   |  4 +-
 src/test/P10ExerciceTest.cc          | 81 ------------------------------------
 src/test/exerciceP11Test.cc          |  4 +-
 4 files changed, 6 insertions(+), 90 deletions(-)
 delete mode 100644 src/test/P10ExerciceTest.cc

(limited to 'src/test')

diff --git a/src/test/AcceleratorBenchmarkTest.cc b/src/test/AcceleratorBenchmarkTest.cc
index 520d3fe..be898b9 100644
--- a/src/test/AcceleratorBenchmarkTest.cc
+++ b/src/test/AcceleratorBenchmarkTest.cc
@@ -81,10 +81,7 @@ int main() {
 	int steps = 1000;
 	double dt = 1E-11;
 
-	cout << "Simulating " << steps << " steps with " << accelerator->getParticles().size() << " particles in " << accelerator->getBeams().size() << " beams...";
-	for (Accelerator::BeamCollection::const_iterator i = accelerator->getBeams().begin(); i != accelerator->getBeams().end(); ++i) {
-		cout << (**i).getParticles().size();
-		}
+	cout << "Simulating " << steps << " steps with " << accelerator->getParticles()->size() << " particles in " << accelerator->getBeams().size() << " beams...";
 	cout.flush();
 	int t0 = clock();
 	for (int i = 0; i < steps; ++i) {
@@ -95,7 +92,7 @@ int main() {
 
 	cout << "Time taken: " << t1 << " ticks @ " << CLOCKS_PER_SEC << " ticks/s ~ " << 1.0 * t1 / CLOCKS_PER_SEC << "s" << endl;
 	cout << "Average: " << 1.0 * t1 / CLOCKS_PER_SEC / steps << " s/step" << endl;
-	cout << "Average: " << 1.0 * t1 / CLOCKS_PER_SEC / steps / accelerator->getParticles().size() << " s/step/particle" << endl;
+	cout << "Average: " << 1.0 * t1 / CLOCKS_PER_SEC / steps / accelerator->getParticles()->size() << " s/step/particle" << endl;
 
 	return 0;
 }
diff --git a/src/test/ElementsSimulationTest.cc b/src/test/ElementsSimulationTest.cc
index 2406171..3ef0460 100644
--- a/src/test/ElementsSimulationTest.cc
+++ b/src/test/ElementsSimulationTest.cc
@@ -72,8 +72,8 @@ int main() {
 		//test de simulation
 		for(unsigned int j(0); j<it; ++j){
 			va[i]->step(10E-11);
-			if(!(va[i]->getParticles().empty())){
-				cout<<"after "<<j+1<<" step :"<<endl << (va[i]->getParticles().front()->toString())<<endl;
+			if(!(va[i]->getParticles()->empty())){
+				cout<<"after "<<j+1<<" step :"<<endl << (va[i]->getParticles()->front()->toString())<<endl;
 			}
 		}
 
diff --git a/src/test/P10ExerciceTest.cc b/src/test/P10ExerciceTest.cc
deleted file mode 100644
index dd54f6d..0000000
--- a/src/test/P10ExerciceTest.cc
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * exerciceP10.cc
- *
- *  Created on: 20 avr. 2011
- *      Author: christian
- */
-#include "Accelerator.h"
-#include "Dipole.h"
-#include "StraightElement.h"
-#include "Quadrupole.h"
-#include "FODO.h"
-#include "exceptions.h"
-#include <iostream>
-#include <string>
-#include <vector>
-
-using namespace std;
-using namespace vhc;
-
-//TODO erreur sur l'affichage de p1 ===> "NAN"  <========
-/** Affiche la réponse de l'exercice P.10 de l'étape 5 (semaine 6) du projet.*/
-int main() {
-
-	Accelerator a;
-
-	Dipole* d = new Dipole(
-			Vector3D(1,0,0),
-			Vector3D(0,-1,0),
-			0.1,
-			1,
-			Vector3D(0,0,7),
-			NULL);
-
-	StraightElement* s = new StraightElement(
-			Vector3D(0,-1,0),
-			Vector3D(-1,-1,0),
-			0.1);
-
-	Quadrupole* q = new Quadrupole(
-			Vector3D(-1,-1,0),
-			Vector3D(-1,-2,0),
-			0.1,
-			1.2);
-
-	FODO* f = new FODO(
-			Vector3D(-1,-2,0),
-			Vector3D(-1,0,0),
-			0.1,
-			1,
-			1.2);
-
-	Particle* p1 = new Particle(
-			Vector3D( 1.00984,-0.191837,0 ),
-			0.938272,
-			1.60217653e-19,
-			2,
-			Vector3D(-210200,-2.64754e+08,0));
-
-	Particle* p2 = new Particle(
-			Vector3D(0.99016,-0.191837,0),
-			0.938272,
-			1.60217653e-19,
-			2,
-			Vector3D(210200,-2.64754e+08,0));
-
-	a.add(*d);
-	a.add(*s);
-	a.add(*q);
-	a.add(*f);
-	a.add(*p1);
-	a.add(*p2);
-
-	a.enableLinear(true);
-	a.close();
-
-	cout << a << endl;
-	a.clear();
-
-
-	return 0;
-}
diff --git a/src/test/exerciceP11Test.cc b/src/test/exerciceP11Test.cc
index fcb7bb5..04af329 100644
--- a/src/test/exerciceP11Test.cc
+++ b/src/test/exerciceP11Test.cc
@@ -105,8 +105,8 @@ void makeTest(){
 
 	for(unsigned int j(0); j<it; ++j){
 		a->step(10E-11);
-		cout<<"after "<<j+1<<" step :"<<endl<<"part 1 :"<< (a->getParticles().front()->toString()) <<endl;
-		cout<<"after "<<j+1<<" step :"<<endl<<"part 2 :"<< (a->getParticles().back()->toString()) <<endl;
+		cout<<"after "<<j+1<<" step :"<<endl<<"part 1 :"<< (a->getParticles()->front()->toString()) <<endl;
+		cout<<"after "<<j+1<<" step :"<<endl<<"part 2 :"<< (a->getParticles()->back()->toString()) <<endl;
 	}
 }
 
-- 
cgit v1.2.3