summaryrefslogtreecommitdiff
path: root/src/main/Accelerator.cc
diff options
context:
space:
mode:
authorChristian Vazquez <christian.vazquez@epfl.ch>2011-04-21 05:54:15 +0000
committerChristian Vazquez <christian.vazquez@epfl.ch>2011-04-21 05:54:15 +0000
commita80f5cb7b3d8e4cf3e48c55895b3ea23a940b8ec (patch)
tree5ae8258d36786fd23c585bfae39e22076a0af089 /src/main/Accelerator.cc
parent9872f694f264c1deea2cce057713b560a883d89f (diff)
downloadvhc-a80f5cb7b3d8e4cf3e48c55895b3ea23a940b8ec.tar.gz
vhc-a80f5cb7b3d8e4cf3e48c55895b3ea23a940b8ec.tar.bz2
vhc-a80f5cb7b3d8e4cf3e48c55895b3ea23a940b8ec.zip
Mis à jour AccelTest et toString de Accelerator.
Rjouté quelques commentaires (dans FODO). Crée un fichier P10ExerciceTest.
Diffstat (limited to 'src/main/Accelerator.cc')
-rw-r--r--src/main/Accelerator.cc36
1 files changed, 19 insertions, 17 deletions
diff --git a/src/main/Accelerator.cc b/src/main/Accelerator.cc
index 01f4f90..400ab0d 100644
--- a/src/main/Accelerator.cc
+++ b/src/main/Accelerator.cc
@@ -13,28 +13,30 @@ namespace vhc {
std::string Accelerator::toString() const {
std::stringstream s;
+
if (elementCollec.size() == 0) {
s << "This accelerator doesn't contain anything."<<"\n";
- } else if (elementCollec.size()==1) {
- s << "This accelerator is made of the following element :" << "\n";
- s << elementCollec[0]->toString()<<"\n";
} else {
- s << "This accelerator is made of the " << elementCollec.size() << " following elements :" << "\n";
- for (int i(0); i < elementCollec.size(); ++i){
- s << elementCollec[i]->toString() << "\n";
+ if (elementCollec.size()==1) {
+ s << "This accelerator is made of the following element :" << "\n";
+ s << elementCollec[0]->toString()<<"\n";
+ } else {
+ s << "This accelerator is made of the " << elementCollec.size() << " following elements :" << "\n";
+ for (int i(0); i < elementCollec.size(); ++i){
+ s << elementCollec[i]->toString() << "\n";
+ }
}
- }
-
- if (particleCollec.size() == 0) {
- s << "This accelerator doesn't contain any particle." << "\n";
- } else if (particleCollec.size() == 1) {
- s << "This accelerator contains the following particle :" << "\n";
- s << particleCollec[0]->toString() << "\n";
- }else{
- s << "This accelerator contains the " << particleCollec.size() << " following particles :"<<"\n";
- for (int i(0); i < particleCollec.size(); ++i){
- s << particleCollec[i]->toString() << "\n";
+ if (particleCollec.size() == 0) {
+ s << "This accelerator doesn't contain any particle." << "\n";
+ } else if (particleCollec.size() == 1) {
+ s << "This accelerator contains the following particle :" << "\n";
+ s << particleCollec[0]->toString() << "\n";
+ }else{
+ s << "This accelerator contains the " << particleCollec.size() << " following particles :"<<"\n";
+ for (int i(0); i < particleCollec.size(); ++i){
+ s << particleCollec[i]->toString() << "\n";
+ }
}
}