Changeset 455 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/softwareTransport.cc

Timestamp:

Dec 16, 2013, 5:16:54 PM (11 years ago)

Author:

garnier

Message:

grosse modification pour intégrer les sections

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/softwareTransport.cc (modified) (5 diffs)

Interface_Web/trunk/pspaWT/sources/controler/src/softwareTransport.cc

@@ -11 +11 @@
 }
 
-softwareTransport::softwareTransport(string inputFileName,globalParameters* globals, dataManager* dt) : abstractSoftware(inputFileName, globals, dt)
+softwareTransport::softwareTransport(string inputFileName,sectionToExecute* sect) : abstractSoftware(inputFileName, sect)
 {
   nameOfSoftware_ = nomDeLogiciel("transport");
@@ -22 +22 @@
 }
 
-bool softwareTransport::createInputFile(particleBeam* beamBefore, unsigned int numeroDeb, unsigned int numeroFin, string workingDir)
+bool softwareTransport::createInputFile(particleBeam* beamBefore, string workingDir)
 { 
 
 
-
-  if ( !initComputationLimits(numeroDeb,numeroFin) ) return false;
-
-  abstractElement* premierEl = NULL;
-  premierEl = dataManager_->getElementPointerFromNumero(numeroDeb_);
+  abstractElement* premierEl = getSectionToExecute()->getElements().front();
 
   // ceinture et bretelles
@@ -88 +84 @@
 
   abstractElement* elPtr;
-  for (unsigned k = numeroDeb_; k <= numeroFin_; k++)
+  for (unsigned k = 0; k < getSectionToExecute()->getElements().size(); k++)
     {
-      elPtr = dataManager_->getElementPointerFromNumero(k);
+      elPtr = getSectionToExecute()->getElements()[k];
       cout << "debug:: element [" << k << "] " << elPtr->getNomdElement().getExpandedName() << endl;
       //      outfile << elPtr->transportOutputFlow();
@@ -109 +105 @@
 
   ostringstream sortie;
-  sortie << " EXECUTION DE TRANSPORT DE " << numeroDeb_ << " a " << numeroFin_ << endl;
+  sortie << " EXECUTION DE TRANSPORT DE " << numeroDeb_deprecated_ << " a " << numeroFin_deprecated_ << endl;
   
   string transportJob = workingDir + "transport";
@@ -145 +141 @@
 
   bool result = true;
-  if ( !ComputationLimitsOk() ) return false;
-
-  for (unsigned k = numeroDeb_; k <= numeroFin_; k++)
+  if ( !ComputationLimitsOk_deprecated() ) return false;
+
+  for (unsigned k = 0; k < getSectionToExecute()->getElements().size(); k++)
     {
-      abstractElement* ptr = dataManager_->getElementPointerFromNumero(k);
+      abstractElement* ptr = getSectionToExecute()->getElements()[k];
       if ( ptr == NULL ) {
         dataManager_->consoleMessage(" softwareTransport::buildBeamAfterElements : null pointer on element " );